zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/repositories/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2014-01-10 16:43:39 +00:00
parent 38d7dea4f8 2aba2c995b
commit c1f86547de
12 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
applications/solvers/multiphase/twoPhaseEulerFoam/phaseIncompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

6
applications/utilities/mesh/advanced/PDRMesh/PDRMesh.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -181,7 +181,7 @@ void subsetVolFields
{ {
label oldFaceI = subsetter.faceMap()[newStart+j]; label oldFaceI = subsetter.faceMap()[newStart+j];
if(oldFaceI < oldStart || oldFaceI >= oldStart+oldSize) if (oldFaceI < oldStart || oldFaceI >= oldStart+oldSize)
{ {
fld[j] = exposedValue; fld[j] = exposedValue;
} }
@ -254,7 +254,7 @@ void subsetSurfaceFields
{ {
label oldFaceI = subsetter.faceMap()[newStart+j]; label oldFaceI = subsetter.faceMap()[newStart+j];
if(oldFaceI < oldStart || oldFaceI >= oldStart+oldSize) if (oldFaceI < oldStart || oldFaceI >= oldStart+oldSize)
{ {
fld[j] = exposedValue; fld[j] = exposedValue;
} }

6
applications/utilities/mesh/generation/foamyHexMesh/cvMeshSurfaceSimplify/cvMeshSurfaceSimplify.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -154,8 +154,8 @@ public:
{ {
int l = c.lv() ; int l = c.lv() ;
if( l >= _max_level ) return false; if ( l >= _max_level ) return false;
if( l < min_level_ ) return true; if ( l < min_level_ ) return true;
treeBoundBox bb treeBoundBox bb
( (

4
applications/utilities/preProcessing/viewFactorsGen/viewFactorsGen.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -443,7 +443,7 @@ int main(int argc, char *argv[])
forAll(availablePoints, iPoint) forAll(availablePoints, iPoint)
{ {
point cfFine = availablePoints[iPoint]; point cfFine = availablePoints[iPoint];
if(mag(cfFine-cfo) < dist) if (mag(cfFine-cfo) < dist)
{ {
dist = mag(cfFine-cfo); dist = mag(cfFine-cfo);
cf = cfFine; cf = cfFine;

4
src/OpenFOAM/containers/Lists/UIndirectList/UIndirectListIO.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -67,7 +67,7 @@ Foam::Ostream& Foam::operator<<
// Write end delimiter // Write end delimiter
os << token::END_BLOCK; os << token::END_BLOCK;
} }
else if(L.size() <= 1 || (L.size() < 11 && contiguous<T>())) else if (L.size() <= 1 || (L.size() < 11 && contiguous<T>()))
{ {
// Write size and start delimiter // Write size and start delimiter
os << L.size() << token::BEGIN_LIST; os << L.size() << token::BEGIN_LIST;

4
src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -64,7 +64,7 @@ Ostream& operator<<(Ostream&, const cellShape&);
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class cellShape Declaration Class cellShape Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class cellShape class cellShape

4
src/finiteVolume/fvMesh/singleCellFvMesh/singleCellFvMesh.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -48,7 +48,7 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class singleCellFvMesh Declaration Class singleCellFvMesh Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class singleCellFvMesh class singleCellFvMesh

2
src/fvOptions/sources/general/codedSource/CodedSource.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

2
src/fvOptions/sources/general/codedSource/CodedSource.H
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License

4
src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -170,7 +170,7 @@ void Foam::IsotropyModels::Stochastic<CloudType>::calculate()
const scalar x = exponentAverage.interpolate(p.position(), tetIs); const scalar x = exponentAverage.interpolate(p.position(), tetIs);
if(x < rndGen.sample01<scalar>()) if (x < rndGen.sample01<scalar>())
{ {
const vector r(sampleGauss(), sampleGauss(), sampleGauss()); const vector r(sampleGauss(), sampleGauss(), sampleGauss());

4
src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Explicit/Explicit.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2013 OpenFOAM Foundation \\ / A nd | Copyright (C) 2013-2014 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -172,7 +172,7 @@ Foam::vector Foam::PackingModels::Explicit<CloudType>::velocityCorrection
// + forces.calcNonCoupled(p, deltaT, p.mass(), Re, p.muc()); // + forces.calcNonCoupled(p, deltaT, p.mass(), Re, p.muc());
// correction velocity // correction velocity
if((uRelative & alphaGrad) > 0) if ((uRelative & alphaGrad) > 0)
{ {
dU = - deltaT*tauGrad/(p.rho()*alpha/* + deltaT*F.Sp()*/); dU = - deltaT*tauGrad/(p.rho()*alpha/* + deltaT*F.Sp()*/);
} }