From adcebb9e1fed5b606b71a92efbd1c32c09b49edf Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 14 Jan 2011 18:07:51 +0000 Subject: [PATCH 001/367] BUG: Numeration of rayIDs for multi region cases --- .../radiation/radiationModel/fvDOM/fvDOM/fvDOM.C | 9 ++++++--- .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.C | 8 ++------ .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.H | 3 ++- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C index dca6315cb7..3ef7c1b0e8 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C @@ -157,7 +157,8 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T) deltaTheta, nLambda_, absorptionEmission_, - blackBody_ + blackBody_, + i ) ); i++; @@ -190,7 +191,8 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T) deltaTheta, nLambda_, absorptionEmission_, - blackBody_ + blackBody_, + i ) ); i++; @@ -220,7 +222,8 @@ Foam::radiation::fvDOM::fvDOM(const volScalarField& T) deltaTheta, nLambda_, absorptionEmission_, - blackBody_ + blackBody_, + i ) ); i++; diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C index 89b8e5725c..bc9f0e85d9 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C @@ -30,9 +30,6 @@ License using namespace Foam::constant; -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -Foam::label Foam::radiation::radiativeIntensityRay::rayId(0); const Foam::word Foam::radiation::radiativeIntensityRay::intensityPrefix("ILambda"); @@ -50,7 +47,8 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay const scalar deltaTheta, const label nLambda, const absorptionEmissionModel& absorptionEmission, - const blackBodyEmission& blackBody + const blackBodyEmission& blackBody, + const label rayId ) : dom_(dom), @@ -167,7 +165,6 @@ Foam::radiation::radiativeIntensityRay::radiativeIntensityRay ); } } - rayId++; } @@ -182,7 +179,6 @@ Foam::radiation::radiativeIntensityRay::~radiativeIntensityRay() Foam::scalar Foam::radiation::radiativeIntensityRay::correct() { // reset boundary heat flux to zero - //Qr_ = dimensionedScalar("zero", dimMass/pow3(dimTime), 0.0); Qr_.boundaryField() = 0.0; scalar maxResidual = -GREAT; diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H index a795052305..4c1d3bf31d 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H @@ -130,7 +130,8 @@ public: const scalar deltaTheta, const label lambda, const absorptionEmissionModel& absEmmModel_, - const blackBodyEmission& blackBody + const blackBodyEmission& blackBody, + const label rayId ); From 66ef07aee8b39f46e41ca07b277af049b4749d67 Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 14 Jan 2011 18:09:47 +0000 Subject: [PATCH 002/367] STY: modification date --- .../radiation/radiationModel/fvDOM/fvDOM/fvDOM.C | 2 +- .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.C | 2 +- .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.H | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C index 3ef7c1b0e8..cda5e495a0 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C index bc9f0e85d9..4edf09663f 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H index 4c1d3bf31d..a7a95648d4 100644 --- a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H +++ b/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License From 129695a9505a6c088fc918faa2b7e39d51e9dbaf Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 19 Jan 2011 14:29:56 +0100 Subject: [PATCH 003/367] STYLE: adjust executable names for some tests --- applications/test/Distribution/Make/files | 2 +- .../Distribution/{DistributionTest.C => Test-Distribution.C} | 2 +- applications/test/HashTable2/Make/files | 4 ++-- .../test/HashTable2/{hashTableTest2.C => Test-HashTable2.C} | 3 ++- applications/test/HashTable3/Make/files | 4 ++-- .../test/HashTable3/{hashTableTest3.C => Test-HashTable3.C} | 3 +-- applications/test/NamedEnum/Make/files | 2 +- applications/test/dimensionedType/Make/files | 2 +- applications/test/pTraits/Make/files | 2 +- applications/test/simpleMatrix/Make/files | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) rename applications/test/Distribution/{DistributionTest.C => Test-Distribution.C} (99%) rename applications/test/HashTable2/{hashTableTest2.C => Test-HashTable2.C} (95%) rename applications/test/HashTable3/{hashTableTest3.C => Test-HashTable3.C} (97%) diff --git a/applications/test/Distribution/Make/files b/applications/test/Distribution/Make/files index 3585a60fc1..3b3486c124 100644 --- a/applications/test/Distribution/Make/files +++ b/applications/test/Distribution/Make/files @@ -1,3 +1,3 @@ -DistributionTest.C +Test-Distribution.C EXE = $(FOAM_USER_APPBIN)/Test-DistributionTest diff --git a/applications/test/Distribution/DistributionTest.C b/applications/test/Distribution/Test-Distribution.C similarity index 99% rename from applications/test/Distribution/DistributionTest.C rename to applications/test/Distribution/Test-Distribution.C index f6da957fb9..8f84237019 100644 --- a/applications/test/Distribution/DistributionTest.C +++ b/applications/test/Distribution/Test-Distribution.C @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - DistributionTest + Test-Distribution Description Test the Distribution class diff --git a/applications/test/HashTable2/Make/files b/applications/test/HashTable2/Make/files index 2bf9c9217d..e5bc377b8b 100644 --- a/applications/test/HashTable2/Make/files +++ b/applications/test/HashTable2/Make/files @@ -1,3 +1,3 @@ -hashTableTest2.C +Test-HashTable2.C -EXE = $(FOAM_USER_APPBIN)/hashTableTest2 +EXE = $(FOAM_USER_APPBIN)/Test-HashTable2 diff --git a/applications/test/HashTable2/hashTableTest2.C b/applications/test/HashTable2/Test-HashTable2.C similarity index 95% rename from applications/test/HashTable2/hashTableTest2.C rename to applications/test/HashTable2/Test-HashTable2.C index f1bfd70c04..468c3960a0 100644 --- a/applications/test/HashTable2/hashTableTest2.C +++ b/applications/test/HashTable2/Test-HashTable2.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,6 +22,7 @@ License along with OpenFOAM. If not, see . Description + Miscellaneous tests for HashTable \*---------------------------------------------------------------------------*/ diff --git a/applications/test/HashTable3/Make/files b/applications/test/HashTable3/Make/files index e8ec193ffa..67aef16a29 100644 --- a/applications/test/HashTable3/Make/files +++ b/applications/test/HashTable3/Make/files @@ -1,3 +1,3 @@ -hashTableTest3.C +Test-HashTable3.C -EXE = $(FOAM_USER_APPBIN)/hashTableTest3 +EXE = $(FOAM_USER_APPBIN)/Test-HashTable3 diff --git a/applications/test/HashTable3/hashTableTest3.C b/applications/test/HashTable3/Test-HashTable3.C similarity index 97% rename from applications/test/HashTable3/hashTableTest3.C rename to applications/test/HashTable3/Test-HashTable3.C index e295b861da..8931084ef2 100644 --- a/applications/test/HashTable3/hashTableTest3.C +++ b/applications/test/HashTable3/Test-HashTable3.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,6 @@ License along with OpenFOAM. If not, see . Description - Test speeds for some HashTable operations \*---------------------------------------------------------------------------*/ diff --git a/applications/test/NamedEnum/Make/files b/applications/test/NamedEnum/Make/files index e861aaa1b2..755b72ba5e 100644 --- a/applications/test/NamedEnum/Make/files +++ b/applications/test/NamedEnum/Make/files @@ -1,3 +1,3 @@ Test-namedEnum.C -EXE = $(FOAM_USER_APPBIN)/NamedEnum +EXE = $(FOAM_USER_APPBIN)/Test-NamedEnum diff --git a/applications/test/dimensionedType/Make/files b/applications/test/dimensionedType/Make/files index 36a682e281..38f7d4ee8d 100644 --- a/applications/test/dimensionedType/Make/files +++ b/applications/test/dimensionedType/Make/files @@ -1,3 +1,3 @@ Test-dimensionedType.C -EXE = $(FOAM_USER_APPBIN)/dimensionedType +EXE = $(FOAM_USER_APPBIN)/Test-dimensionedType diff --git a/applications/test/pTraits/Make/files b/applications/test/pTraits/Make/files index 7cebcf09d9..268e879af2 100644 --- a/applications/test/pTraits/Make/files +++ b/applications/test/pTraits/Make/files @@ -1,2 +1,2 @@ Test-pTraits.C -EXE = $(FOAM_USER_APPBIN)/pTraits +EXE = $(FOAM_USER_APPBIN)/Test-pTraits diff --git a/applications/test/simpleMatrix/Make/files b/applications/test/simpleMatrix/Make/files index 2b80bbe4f7..804d3ecefe 100644 --- a/applications/test/simpleMatrix/Make/files +++ b/applications/test/simpleMatrix/Make/files @@ -1,3 +1,3 @@ Test-simpleMatrix.C -EXE = $(FOAM_USER_APPBIN)/simpleMatrix +EXE = $(FOAM_USER_APPBIN)/Test-simpleMatrix From fe8545958a06602aaa67aa854a8a375b611c79cd Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 24 Jan 2011 17:32:54 +0000 Subject: [PATCH 004/367] ENH: mapDistribute: extra printing --- .../meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C index 54d8690dee..25e7727c8e 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C @@ -222,7 +222,7 @@ void Foam::mapDistribute::printLayout(Ostream& os) const localSize = maxIndex[Pstream::myProcNo()]+1; } - os << "Layout:" << endl + os << "Layout: (constructSize:" << constructSize_ << ")" << endl << "local (processor " << Pstream::myProcNo() << "):" << endl << " start : 0" << endl << " size : " << localSize << endl; From 0ecf34e2f2640951fa533008fdf65ff4769bbbb1 Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 24 Jan 2011 17:33:19 +0000 Subject: [PATCH 005/367] BUG: volPointInterpolate.C: incorrect index --- .../interpolation/volPointInterpolation/volPointInterpolate.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C index d2841c9c54..5e7194dca8 100644 --- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C +++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C @@ -120,7 +120,7 @@ void volPointInterpolation::pushUntransformedData const labelList& slavePoints = slaves[i]; // Copy master data to slave slots - forAll(slaves, j) + forAll(slavePoints, j) { elems[slavePoints[j]] = elems[i]; } From be54c0266867ed70f58ff72a4e608f8d92f56caf Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 24 Jan 2011 17:34:01 +0000 Subject: [PATCH 006/367] STYLE: twoPhaseMixture: corrected comment --- .../incompressibleTwoPhaseMixture/twoPhaseMixture.H | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H index 13a7c47f88..732225f5e6 100644 --- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H +++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -146,7 +146,7 @@ public: return nu_; } - //- Return the face-interpolated dynamic laminar viscosity + //- Return the face-interpolated kinematic laminar viscosity tmp nuf() const; //- Correct the laminar viscosity From daf429d879bb0e40a1b6525d6fc393ad370b2de2 Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 24 Jan 2011 17:59:00 +0000 Subject: [PATCH 007/367] BUG: mapDistributeTemplates.C : truncating before transformation applied --- .../mapPolyMesh/mapDistribute/mapDistributeTemplates.C | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C index 68e6cb7acb..f72b83dd45 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeTemplates.C @@ -966,8 +966,6 @@ void Foam::mapDistribute::reverseDistribute const bool dummyTransform ) const { - fld.setSize(constructSize); - if (dummyTransform) { applyDummyInverseTransforms(fld); @@ -1024,8 +1022,6 @@ void Foam::mapDistribute::reverseDistribute const bool dummyTransform ) const { - fld.setSize(constructSize); - if (dummyTransform) { applyDummyInverseTransforms(fld); From 4877156db8d43db2e0e8e30fd8bcf05f1fb76be1 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 25 Jan 2011 12:16:52 +0000 Subject: [PATCH 008/367] COMP: Allwmake : allow build-type argument to pass through into wmake --- src/Pstream/Allwmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake index cc3329e384..ec3b07a859 100755 --- a/src/Pstream/Allwmake +++ b/src/Pstream/Allwmake @@ -2,7 +2,10 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso dummy +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +wmake $makeOption dummy case "$WM_MPLIB" in *MPI*) @@ -11,7 +14,7 @@ case "$WM_MPLIB" in echo "Note: ignore spurious warnings about missing mpicxx.h headers" set -x # force compilation into qualified directory - WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB wmake libso mpi + WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB wmake $makeOption mpi ;; #GAMMA) From 0124a3149b103a95f46506731e2fafacdd9c1be2 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 26 Jan 2011 11:08:16 +0100 Subject: [PATCH 009/367] COMP: avoid ambiguous construct from tmp --- src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C index 5196377197..12dae220d8 100644 --- a/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C +++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C @@ -51,7 +51,7 @@ void Smagorinsky::updateSubGridScaleFields(const volTensorField& gradU) volScalarField b((2.0/3.0)*tr(D)); volScalarField c(2*ck_*delta()*(dev(D) && D)); - volScalarField k = sqr((-b + sqrt(sqr(b) + 4*a*c))/(2*a)); + volScalarField k(sqr((-b + sqrt(sqr(b) + 4*a*c))/(2*a))); muSgs_ = ck_*rho()*delta()*sqrt(k); muSgs_.correctBoundaryConditions(); From 232c13eef06905fc8f480c392a73d218a31bbad5 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 26 Jan 2011 11:11:48 +0100 Subject: [PATCH 010/367] BUG: update OpenFOAM version strings failed with compiler switch - now remove all generated files for all platforms when the version changes --- src/Allwmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Allwmake b/src/Allwmake index f3c4420474..53e6093053 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -17,13 +17,13 @@ wmakeCheckPwd "$WM_PROJECT_DIR/src" || { set -x # update OpenFOAM version strings if required -wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/$WM_OPTIONS/global.? 2>/dev/null +wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/*/global.? 2>/dev/null wmakeLnInclude OpenFOAM -wmakeLnInclude OSspecific/$WM_OSTYPE +wmakeLnInclude OSspecific/${WM_OSTYPE:-POSIX} Pstream/Allwmake -OSspecific/$WM_OSTYPE/Allwmake +OSspecific/${WM_OSTYPE:-POSIX}/Allwmake wmake libso OpenFOAM wmake libso fileFormats From e1fd499c30dd53ec8ba3b9706d26cdcbb04a5bdb Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 26 Jan 2011 12:15:46 +0000 Subject: [PATCH 011/367] ENH: sampledTriSurfaceMesh : only sample non-coupled faces --- .../sampledTriSurfaceMesh.C | 64 ++++++++++++++++++- .../sampledTriSurfaceMesh.H | 37 +++++++++-- 2 files changed, 95 insertions(+), 6 deletions(-) diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C index 859db2f9af..3e3d56c6ed 100644 --- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C +++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.C @@ -76,6 +76,63 @@ namespace Foam } +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +const Foam::indexedOctree& +Foam::sampledTriSurfaceMesh::nonCoupledboundaryTree() const +{ + // Variant of meshSearch::boundaryTree() that only does non-coupled + // boundary faces. + + if (!boundaryTreePtr_.valid()) + { + // all non-coupled boundary faces (not just walls) + const polyBoundaryMesh& patches = mesh().boundaryMesh(); + + labelList bndFaces(mesh().nFaces()-mesh().nInternalFaces()); + label bndI = 0; + forAll(patches, patchI) + { + const polyPatch& pp = patches[patchI]; + if (!pp.coupled()) + { + forAll(pp, i) + { + bndFaces[bndI++] = pp.start()+i; + } + } + } + bndFaces.setSize(bndI); + + + treeBoundBox overallBb(mesh().points()); + Random rndGen(123456); + overallBb = overallBb.extend(rndGen, 1E-4); + overallBb.min() -= point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); + overallBb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL); + + boundaryTreePtr_.reset + ( + new indexedOctree + ( + treeDataFace // all information needed to search faces + ( + false, // do not cache bb + mesh(), + bndFaces // boundary faces only + ), + overallBb, // overall search domain + 8, // maxLevel + 10, // leafsize + 3.0 // duplicity + ) + ); + } + + return boundaryTreePtr_(); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::sampledTriSurfaceMesh::sampledTriSurfaceMesh @@ -159,6 +216,8 @@ bool Foam::sampledTriSurfaceMesh::expire() sampledSurface::clearGeom(); MeshStorage::clear(); + + boundaryTreePtr_.clear(); sampleElements_.clear(); samplePoints_.clear(); @@ -224,7 +283,10 @@ bool Foam::sampledTriSurfaceMesh::update() { // Search for nearest boundaryFace - const indexedOctree& bTree = meshSearcher.boundaryTree(); + ////- Search on all (including coupled) boundary faces + //const indexedOctree& bTree = meshSearcher.boundaryTree() + //- Search on all non-coupled boundary faces + const indexedOctree& bTree = nonCoupledboundaryTree(); forAll(fc, triI) { diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H index 20426e576b..c54bf28dc0 100644 --- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H +++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMesh.H @@ -28,12 +28,31 @@ Description A sampledSurface from a triSurfaceMesh. It samples on the points/triangles of the triSurface. - It samples using the cell nearest to the triangle centre so does - not check the cell the centre is actually in ... + - it either samples cells or (non-coupled) boundary faces - In parallel every processor just operates on the part of the surface - where the face centres are inside the mesh. It is then up to the - caller to stitch the partial surfaces together. + - 4 different modes: + - source=cells, interpolate=false: + finds per triangle centre the nearest cell centre and uses its value + - source=cells, interpolate=true + finds per triangle centre the nearest cell centre. + Per surface point checks if this nearest cell is the one containing + point; otherwise projects the point onto the nearest point on + the boundary of the cell (to make sure interpolateCellPoint + gets a valid location) + + - source=boundaryFaces, interpolate=false: + finds per triangle centre the nearest point on the boundary + (uncoupled faces only) and uses the value (or 0 if the nearest + is on an empty boundary) + - source=boundaryFaces, interpolate=true: + finds per triangle centre the nearest point on the boundary + (uncoupled faces only). + Per surface point projects the point onto this boundary face + (to make sure interpolateCellPoint gets a valid location) + + - since it finds a nearest per triangle each triangle is guaranteed + to be on one processor only. So after stitching (by sampledSurfaces) + the original surface should be complete. SourceFiles sampledTriSurfaceMesh.C @@ -52,6 +71,8 @@ SourceFiles namespace Foam { +class treeDataFace; + /*---------------------------------------------------------------------------*\ Class sampledTriSurfaceMesh Declaration \*---------------------------------------------------------------------------*/ @@ -88,6 +109,9 @@ private: //- Track if the surface needs an update mutable bool needsUpdate_; + //- Search tree for all non-coupled boundary faces + mutable autoPtr > boundaryTreePtr_; + //- From local surface triangle to mesh cell/face. labelList sampleElements_; @@ -97,6 +121,9 @@ private: // Private Member Functions + //- Get tree of all non-coupled boundary faces + const indexedOctree& nonCoupledboundaryTree() const; + //- sample field on faces template tmp > sampleField From 51df389de63052d27766682bb5cf53b18b964082 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 26 Jan 2011 13:36:37 +0100 Subject: [PATCH 012/367] ENH: rework surface writers as non-templated classes - easier (more logical) when adding a new writer ENH: add surface field writer for 'starcd' format - creates *.usr files, which can be read in proSTAR with the 'getuser' command, but which can also be parsed directly since the format is extremely primitive --- src/sampling/Make/files | 16 +- .../sampledSurfaces/sampledSurfaces.C | 17 +- .../sampledSurfaces/sampledSurfaces.H | 45 +- .../sampledSurfacesTemplates.C | 21 +- .../writers/dx/dxSurfaceWriter.C | 141 +++-- .../writers/dx/dxSurfaceWriter.H | 103 +++- .../writers/dx/dxSurfaceWriterRunTime.C | 43 -- .../writers/ensight/ensightSurfaceWriter.C | 200 ++++--- .../writers/ensight/ensightSurfaceWriter.H | 119 +++- .../ensight/ensightSurfaceWriterRunTime.C | 44 -- .../writers/foamFile/foamFileSurfaceWriter.C | 127 ++-- .../writers/foamFile/foamFileSurfaceWriter.H | 105 +++- .../foamFile/foamFileSurfaceWriterRunTime.C | 44 -- .../writers/makeSurfaceWriterMethods.H | 92 +++ .../writers/null/nullSurfaceWriter.C | 63 -- .../writers/null/nullSurfaceWriter.H | 103 ---- .../writers/null/nullSurfaceWriterRunTime.C | 44 -- .../writers/proxy/proxySurfaceWriter.C | 34 +- .../writers/proxy/proxySurfaceWriter.H | 38 +- .../writers/proxy/proxySurfaceWriterRunTime.C | 45 -- .../writers/raw/rawSurfaceWriter.C | 540 ++++++++---------- .../writers/raw/rawSurfaceWriter.H | 158 ++--- .../writers/raw/rawSurfaceWriterRunTime.C | 44 -- .../writers/starcd/starcdSurfaceWriter.C | 172 ++++++ .../writers/starcd/starcdSurfaceWriter.H | 181 ++++++ .../sampledSurface/writers/surfaceWriter.C | 60 +- .../sampledSurface/writers/surfaceWriter.H | 98 +++- .../sampledSurface/writers/surfaceWriters.C | 50 -- .../sampledSurface/writers/surfaceWriters.H | 76 --- .../writers/vtk/vtkSurfaceWriter.C | 167 +++--- .../writers/vtk/vtkSurfaceWriter.H | 103 +++- .../writers/vtk/vtkSurfaceWriterRunTime.C | 44 -- 32 files changed, 1594 insertions(+), 1543 deletions(-) delete mode 100644 src/sampling/sampledSurface/writers/dx/dxSurfaceWriterRunTime.C delete mode 100644 src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterRunTime.C delete mode 100644 src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriterRunTime.C create mode 100644 src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H delete mode 100644 src/sampling/sampledSurface/writers/null/nullSurfaceWriter.C delete mode 100644 src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H delete mode 100644 src/sampling/sampledSurface/writers/null/nullSurfaceWriterRunTime.C delete mode 100644 src/sampling/sampledSurface/writers/proxy/proxySurfaceWriterRunTime.C delete mode 100644 src/sampling/sampledSurface/writers/raw/rawSurfaceWriterRunTime.C create mode 100644 src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C create mode 100644 src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H delete mode 100644 src/sampling/sampledSurface/writers/surfaceWriters.C delete mode 100644 src/sampling/sampledSurface/writers/surfaceWriters.H delete mode 100644 src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriterRunTime.C diff --git a/src/sampling/Make/files b/src/sampling/Make/files index 3c61e371b6..c9b26376d0 100644 --- a/src/sampling/Make/files +++ b/src/sampling/Make/files @@ -46,14 +46,14 @@ sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C surfWriters = sampledSurface/writers -$(surfWriters)/surfaceWriters.C -$(surfWriters)/dx/dxSurfaceWriterRunTime.C -$(surfWriters)/ensight/ensightSurfaceWriterRunTime.C -$(surfWriters)/foamFile/foamFileSurfaceWriterRunTime.C -$(surfWriters)/null/nullSurfaceWriterRunTime.C -$(surfWriters)/proxy/proxySurfaceWriterRunTime.C -$(surfWriters)/raw/rawSurfaceWriterRunTime.C -$(surfWriters)/vtk/vtkSurfaceWriterRunTime.C +$(surfWriters)/surfaceWriter.C +$(surfWriters)/dx/dxSurfaceWriter.C +$(surfWriters)/ensight/ensightSurfaceWriter.C +$(surfWriters)/foamFile/foamFileSurfaceWriter.C +$(surfWriters)/proxy/proxySurfaceWriter.C +$(surfWriters)/raw/rawSurfaceWriter.C +$(surfWriters)/starcd/starcdSurfaceWriter.C +$(surfWriters)/vtk/vtkSurfaceWriter.C graphField/writePatchGraph.C graphField/writeCellGraph.C diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C index 06b3278489..e44e1f8a46 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -83,7 +83,7 @@ void Foam::sampledSurfaces::writeGeometry() const { if (Pstream::master() && mergeList_[surfI].faces.size()) { - genericFormatter_->write + formatter_->write ( outputDir, s.name(), @@ -94,7 +94,7 @@ void Foam::sampledSurfaces::writeGeometry() const } else if (s.faces().size()) { - genericFormatter_->write + formatter_->write ( outputDir, s.name(), @@ -123,9 +123,8 @@ Foam::sampledSurfaces::sampledSurfaces outputPath_(fileName::null), fieldSelection_(), interpolationScheme_(word::null), - writeFormat_(word::null), mergeList_(), - genericFormatter_(NULL), + formatter_(NULL), scalarFields_(), vectorFields_(), sphericalTensorFields_(), @@ -201,7 +200,7 @@ void Foam::sampledSurfaces::write() // write geometry first if required, // or when no fields would otherwise be written - if (nFields == 0 || genericFormatter_->separateFiles()) + if (nFields == 0 || formatter_->separateGeometry()) { writeGeometry(); } @@ -221,11 +220,11 @@ void Foam::sampledSurfaces::read(const dictionary& dict) clearFieldGroups(); dict.lookup("interpolationScheme") >> interpolationScheme_; - dict.lookup("surfaceFormat") >> writeFormat_; - // define the generic (geometry) writer - genericFormatter_ = surfaceWriter::New(writeFormat_); + word writeFormat(dict.lookup("surfaceFormat")); + // define the surface formatter + formatter_ = surfaceWriter::New(writeFormat); PtrList newList ( diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H index 0c2084507a..4293cf9e62 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,36 +68,11 @@ class sampledSurfaces { public: - //- The surface formatter - autoPtr< surfaceWriter > formatter; - //- Construct null fieldGroup() : - DynamicList(0), - formatter(NULL) + DynamicList(0) {} - - //- Construct for a particular surface format - fieldGroup(const word& writeFormat) - : - DynamicList(0), - formatter(surfaceWriter::New(writeFormat)) - {} - - //- Reset format and field list - void clear() - { - DynamicList::clear(); - formatter.clear(); - } - - //- Assign a new formatter - void operator=(const word& writeFormat) - { - formatter = surfaceWriter::New(writeFormat); - } - }; @@ -151,10 +126,6 @@ class sampledSurfaces //- Interpolation scheme to use word interpolationScheme_; - //- Output format to use - word writeFormat_; - - // surfaces //- Information for merging surfaces @@ -163,8 +134,8 @@ class sampledSurfaces // Calculated - //- Generic surface formatter - autoPtr< surfaceWriter > genericFormatter_; + //- Surface formatter + autoPtr formatter_; //- Categorized scalar/vector/tensor fields fieldGroup scalarFields_; @@ -190,14 +161,10 @@ class sampledSurfaces //- Sample and write a particular volume field template - void sampleAndWrite - ( - const GeometricField&, - const surfaceWriter& formatter - ); + void sampleAndWrite(const GeometricField&); //- Sample and write all the fields of the given type - template + template void sampleAndWrite(fieldGroup&); //- Disallow default bitwise copy construct and assignment diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C index 578212ba3f..1351821419 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfacesTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,8 +32,7 @@ License template void Foam::sampledSurfaces::sampleAndWrite ( - const GeometricField& vField, - const surfaceWriter& formatter + const GeometricField& vField ) { // interpolator for this field @@ -96,7 +95,7 @@ void Foam::sampledSurfaces::sampleAndWrite // skip surface without faces (eg, a failed cut-plane) if (mergeList_[surfI].faces.size()) { - formatter.write + formatter_->write ( outputDir, s.name(), @@ -115,7 +114,7 @@ void Foam::sampledSurfaces::sampleAndWrite // skip surface without faces (eg, a failed cut-plane) if (s.faces().size()) { - formatter.write + formatter_->write ( outputDir, s.name(), @@ -139,12 +138,6 @@ void Foam::sampledSurfaces::sampleAndWrite { if (fields.size()) { - // create or use existing surfaceWriter - if (fields.formatter.empty()) - { - fields.formatter = surfaceWriter::New(writeFormat_); - } - forAll(fields, fieldI) { if (Pstream::master() && verbose_) @@ -168,8 +161,7 @@ void Foam::sampledSurfaces::sampleAndWrite false ), mesh_ - ), - fields.formatter() + ) ); } else @@ -190,8 +182,7 @@ void Foam::sampledSurfaces::sampleAndWrite > ( fields[fieldI] - ), - fields.formatter() + ) ); } } diff --git a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C index 6bdb3e63e9..3d477daf9a 100644 --- a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,10 +28,19 @@ License #include "OFstream.H" #include "OSspecific.H" +#include "makeSurfaceWriterMethods.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + makeSurfaceWriterType(dxSurfaceWriter); +} + + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::dxSurfaceWriter::writeGeometry +void Foam::dxSurfaceWriter::writeGeometry ( Ostream& os, const pointField& points, @@ -54,7 +63,6 @@ void Foam::dxSurfaceWriter::writeGeometry os << nl; // Write triangles - os << "# The irregular connections (triangles)" << nl << "object 2 class array type int rank 1 shape 3 items " << faces.size() << " data follows" << nl; @@ -80,17 +88,41 @@ void Foam::dxSurfaceWriter::writeGeometry } +void Foam::dxSurfaceWriter::writeTrailer(Ostream& os, const bool isNodeValues) +{ + if (isNodeValues) + { + os << nl << "attribute \"dep\" string \"positions\"" + << nl << nl; + } + else + { + os << nl << "attribute \"dep\" string \"connections\"" + << nl << nl; + } + + os << "# the field, with three components: \"positions\"," + << " \"connections\", and \"data\"" << nl + << "object \"irregular positions irregular " + << "connections\" class field" + << nl + << "component \"positions\" value 1" << nl + << "component \"connections\" value 2" << nl + << "component \"data\" value 3" << nl; + + os << "end" << endl; +} + + namespace Foam { - // Write scalarField in DX format template<> - void Foam::dxSurfaceWriter::writeData + void Foam::dxSurfaceWriter::writeData ( Ostream& os, const Field& values ) { - // Write data os << "object 3 class array type float rank 0 items " << values.size() << " data follows" << nl; @@ -101,15 +133,13 @@ namespace Foam } - // Write vectorField in DX format template<> - void Foam::dxSurfaceWriter::writeData + void Foam::dxSurfaceWriter::writeData ( Ostream& os, const Field& values ) { - // Write data os << "object 3 class array type float rank 1 shape 3 items " << values.size() << " data follows" << nl; @@ -122,15 +152,13 @@ namespace Foam } - // Write sphericalTensorField in DX format template<> - void Foam::dxSurfaceWriter::writeData + void Foam::dxSurfaceWriter::writeData ( Ostream& os, const Field& values ) { - // Write data os << "object 3 class array type float rank 0 items " << values.size() << " data follows" << nl; @@ -141,15 +169,13 @@ namespace Foam } - // Write symmTensorField in DX format template<> - void Foam::dxSurfaceWriter::writeData + void Foam::dxSurfaceWriter::writeData ( Ostream& os, const Field& values ) { - // Write data os << "object 3 class array type float rank 2 shape 3 items " << values.size() << " data follows" << nl; @@ -165,15 +191,14 @@ namespace Foam } - // Write tensorField in DX format + // Write Field in DX format template<> - void Foam::dxSurfaceWriter::writeData + inline void Foam::dxSurfaceWriter::writeData ( Ostream& os, const Field& values ) { - // Write data os << "object 3 class array type float rank 2 shape 3 items " << values.size() << " data follows" << nl; @@ -189,15 +214,15 @@ namespace Foam } } -// Write tensorField in DX format + +// arbitrary field template -void Foam::dxSurfaceWriter::writeData +inline void Foam::dxSurfaceWriter::writeData ( Ostream& os, const Field& values ) { - // Write data os << "object 3 class array type float rank 0 items " << values.size() << " data follows" << nl; @@ -208,41 +233,8 @@ void Foam::dxSurfaceWriter::writeData } -// Write trailer in DX format template -void Foam::dxSurfaceWriter::writeTrailer(Ostream& os) -{ - os << "# the field, with three components: \"positions\"," - << " \"connections\", and \"data\"" << nl - << "object \"irregular positions irregular " - << "connections\" class field" - << nl - << "component \"positions\" value 1" << nl - << "component \"connections\" value 2" << nl - << "component \"data\" value 3" << nl; -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::dxSurfaceWriter::dxSurfaceWriter() -: - surfaceWriter() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template -Foam::dxSurfaceWriter::~dxSurfaceWriter() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::dxSurfaceWriter::write +void Foam::dxSurfaceWriter::writeTemplate ( const fileName& outputDir, const fileName& surfaceName, @@ -270,24 +262,29 @@ void Foam::dxSurfaceWriter::write } writeGeometry(os, points, faces); - writeData(os, values); - - if (isNodeValues) - { - os << nl << "attribute \"dep\" string \"positions\"" - << nl << nl; - } - else - { - os << nl << "attribute \"dep\" string \"connections\"" - << nl << nl; - } - - writeTrailer(os); - - os << "end" << nl; + writeTrailer(os, isNodeValues); } +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::dxSurfaceWriter::dxSurfaceWriter() +: + surfaceWriter() +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::dxSurfaceWriter::~dxSurfaceWriter() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +// create write methods +defineSurfaceWriterWriteFields(Foam::dxSurfaceWriter); + + // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H index feccf33be1..e4e3af67e6 100644 --- a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,7 @@ Class Foam::dxSurfaceWriter Description + A surfaceWriter for OpenDX format. SourceFiles dxSurfaceWriter.C @@ -42,22 +43,36 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class dxSurfaceWriter Declaration + Class dxSurfaceWriter Declaration \*---------------------------------------------------------------------------*/ -template class dxSurfaceWriter : - public surfaceWriter + public surfaceWriter { // Private Member Functions static void writeGeometry(Ostream&, const pointField&, const faceList&); + static void writeTrailer(Ostream&, const bool isNodeValues); - static void writeData(Ostream&, const Field& values); + template + static void writeData(Ostream&, const Field&); + + //- Templated write operation + template + void writeTemplate + ( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const word& fieldName, + const Field& values, + const bool isNodeValues, + const bool verbose + ) const; - static void writeTrailer(Ostream&); public: @@ -77,20 +92,76 @@ public: // Member Functions - // Write - - //- Writes single surface to file. + //- Write scalarField for a single surface to file. + // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, - const fileName& surfaceName, + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, - const word& fieldName, - const Field& values, + const word& fieldName, // name of field + const Field& values, const bool isNodeValues, const bool verbose = false ) const; + + //- Write vectorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write sphericalTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write symmTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write tensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + }; @@ -100,12 +171,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository -# include "dxSurfaceWriter.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriterRunTime.C b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriterRunTime.C deleted file mode 100644 index a53ba0f34f..0000000000 --- a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriterRunTime.C +++ /dev/null @@ -1,43 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "dxSurfaceWriter.H" -#include "surfaceWriters.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeSurfaceWriters(dxSurfaceWriter); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C index cde2d597a8..d705525ebc 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,6 +31,16 @@ License #include "ensightGeoFile.H" #include "ensightPartNonMeshFaces.H" +#include "makeSurfaceWriterMethods.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + makeSurfaceWriterType(ensightSurfaceWriter); +} + + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // namespace Foam @@ -38,30 +48,15 @@ namespace Foam // Write scalarField in ensight format template<> - void Foam::ensightSurfaceWriter::writeData + inline void Foam::ensightSurfaceWriter::writeData ( Ostream& os, - const Field& values + const Field& values ) { forAll(values, i) { - os << values[i] << nl; - } - } - - - // Write booField in ensight format - template<> - void Foam::ensightSurfaceWriter::writeData - ( - Ostream& os, - const Field& values - ) - { - forAll(values, i) - { - os << values[i] << nl; + os << values[i] << nl; } } } @@ -69,96 +64,25 @@ namespace Foam // Write generic field in ensight format template -void Foam::ensightSurfaceWriter::writeData +inline void Foam::ensightSurfaceWriter::writeData ( Ostream& os, const Field& values ) { - for (direction cmpt = 0; cmpt < vector::nComponents; cmpt++) + for (direction cmpt = 0; cmpt < vector::nComponents; ++cmpt) { scalarField v(values.component(cmpt)); forAll(v, i) { - os << v[i] << nl; + os << v[i] << nl; } } } -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -// Construct from components template -Foam::ensightSurfaceWriter::ensightSurfaceWriter() -: - surfaceWriter() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template -Foam::ensightSurfaceWriter::~ensightSurfaceWriter() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::ensightSurfaceWriter::write -( - const fileName& outputDir, - const fileName& surfaceName, - const pointField& points, - const faceList& faces, - const bool verbose -) const -{ - if (!isDir(outputDir)) - { - mkDir(outputDir); - } - - //const scalar timeValue = Foam::name(this->mesh().time().timeValue()); - const scalar timeValue = 0.0; - - - OFstream caseStr(outputDir/surfaceName + ".case"); - ensightGeoFile geomStr - ( - outputDir/surfaceName + ".000.mesh", - IOstream::ASCII - ); - - if (verbose) - { - Info<< "Writing case file to " << caseStr.name() << endl; - } - - caseStr - << "FORMAT" << nl - << "type: ensight gold" << nl - << nl - << "GEOMETRY" << nl - << "model: 1 " << geomStr.name().name() << nl - << nl - << "TIME" << nl - << "time set: 1" << nl - << "number of steps: 1" << nl - << "filename start number: 0" << nl - << "filename increment: 1" << nl - << "time values:" << nl - << timeValue << nl - << nl; - - ensightPartNonMeshFaces faceWriter(0, geomStr.name().name(), faces, points); - faceWriter.writeGeometry(geomStr); -} - - -template -void Foam::ensightSurfaceWriter::write +void Foam::ensightSurfaceWriter::writeTemplate ( const fileName& outputDir, const fileName& surfaceName, @@ -175,10 +99,9 @@ void Foam::ensightSurfaceWriter::write mkDir(outputDir/fieldName); } - //const scalar timeValue = Foam::name(this->mesh().time().timeValue()); + // const scalar timeValue = Foam::name(this->mesh().time().timeValue()); const scalar timeValue = 0.0; - OFstream caseStr(outputDir/fieldName/surfaceName + ".case"); ensightGeoFile geomStr ( @@ -230,8 +153,8 @@ void Foam::ensightSurfaceWriter::write << timeValue << nl << nl; - ensightPartNonMeshFaces faceWriter(0, geomStr.name().name(), faces, points); - faceWriter.writeGeometry(geomStr); + ensightPartNonMeshFaces ensPart(0, geomStr.name().name(), faces, points); + geomStr << ensPart; // Write field fieldStr @@ -246,19 +169,19 @@ void Foam::ensightSurfaceWriter::write } else { - //faceWriter.writeField(fieldStr, values); - forAll(faceWriter.elementTypes(), elemI) + // ensPart.writeField(fieldStr, values); + forAll(ensPart.elementTypes(), elemI) { - if (faceWriter.elemLists()[elemI].size()) + if (ensPart.elemLists()[elemI].size()) { - fieldStr.writeKeyword(faceWriter.elementTypes()[elemI]); + fieldStr.writeKeyword(ensPart.elementTypes()[elemI]); writeData ( fieldStr, Field ( values, - faceWriter.elemLists()[elemI] + ensPart.elemLists()[elemI] ) ); } @@ -267,4 +190,75 @@ void Foam::ensightSurfaceWriter::write } +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::ensightSurfaceWriter::ensightSurfaceWriter() +: + surfaceWriter() +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::ensightSurfaceWriter::~ensightSurfaceWriter() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::ensightSurfaceWriter::write +( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const bool verbose +) const +{ + if (!isDir(outputDir)) + { + mkDir(outputDir); + } + + //const scalar timeValue = Foam::name(this->mesh().time().timeValue()); + const scalar timeValue = 0.0; + + + OFstream caseStr(outputDir/surfaceName + ".case"); + ensightGeoFile geomStr + ( + outputDir/surfaceName + ".000.mesh", + IOstream::ASCII + ); + + if (verbose) + { + Info<< "Writing case file to " << caseStr.name() << endl; + } + + caseStr + << "FORMAT" << nl + << "type: ensight gold" << nl + << nl + << "GEOMETRY" << nl + << "model: 1 " << geomStr.name().name() << nl + << nl + << "TIME" << nl + << "time set: 1" << nl + << "number of steps: 1" << nl + << "filename start number: 0" << nl + << "filename increment: 1" << nl + << "time values:" << nl + << timeValue << nl + << nl; + + ensightPartNonMeshFaces ensPart(0, geomStr.name().name(), faces, points); + geomStr << ensPart; +} + + +// create write methods +defineSurfaceWriterWriteFields(Foam::ensightSurfaceWriter); + + // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H index d2f01c6479..4d2bf47b90 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,7 @@ Class Foam::ensightSurfaceWriter Description + A surfaceWriter for Ensight format. SourceFiles ensightSurfaceWriter.C @@ -41,29 +42,41 @@ SourceFiles namespace Foam { -class ensightGeoFile; - /*---------------------------------------------------------------------------*\ Class ensightSurfaceWriter Declaration \*---------------------------------------------------------------------------*/ -template class ensightSurfaceWriter : - public surfaceWriter + public surfaceWriter { // Private data - fileName caseFileName_; - fileName surfaceName_; - fileName geomName_; - DynamicList varNames_; - DynamicList varFileNames_; +// fileName caseFileName_; +// fileName surfaceName_; +// fileName geomName_; +// DynamicList varNames_; +// DynamicList varFileNames_; // Private Member Functions - static void writeData(Ostream&, const Field& values); + template + static inline void writeData(Ostream&, const Field&); + + //- Templated write operation + template + void writeTemplate + ( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const word& fieldName, + const Field& values, + const bool isNodeValues, + const bool verbose + ) const; public: @@ -84,9 +97,15 @@ public: // Member Functions - // Write + //- True if the surface format supports geometry in a separate file. + // False if geometry and field must be in a single file + virtual bool separateGeometry() + { + return true; + } - //- Write geometry to file. + + //- Write single surface geometry to file. virtual void write ( const fileName& outputDir, @@ -97,18 +116,76 @@ public: ) const; - //- Writes single surface to file. + //- Write scalarField for a single surface to file. + // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, - const fileName& surfaceName, + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, - const word& fieldName, - const Field& values, + const word& fieldName, // name of field + const Field& values, const bool isNodeValues, const bool verbose = false ) const; + + //- Write vectorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write sphericalTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write symmTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write tensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + }; @@ -118,12 +195,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository -# include "ensightSurfaceWriter.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterRunTime.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterRunTime.C deleted file mode 100644 index 8355a6d991..0000000000 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriterRunTime.C +++ /dev/null @@ -1,44 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "ensightSurfaceWriter.H" -#include "surfaceWriters.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeSurfaceWriterType(ensightSurfaceWriter, bool); -makeSurfaceWriters(ensightSurfaceWriter); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C index 747a79f39a..06005b5c0a 100644 --- a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,67 +28,20 @@ License #include "OFstream.H" #include "OSspecific.H" -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // +#include "makeSurfaceWriterMethods.H" -template -Foam::foamFileSurfaceWriter::foamFileSurfaceWriter() -: - surfaceWriter() -{} +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template -Foam::foamFileSurfaceWriter::~foamFileSurfaceWriter() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::foamFileSurfaceWriter::write -( - const fileName& outputDir, - const fileName& surfaceName, - const pointField& points, - const faceList& faces, - const bool verbose -) const +namespace Foam { - fileName surfaceDir(outputDir/surfaceName); - - if (!isDir(surfaceDir)) - { - mkDir(surfaceDir); - } - - if (verbose) - { - Info<< "Writing geometry to " << surfaceDir << endl; - } - - // Points - OFstream(surfaceDir/"points")() << points; - - // Faces - OFstream(surfaceDir/"faces")() << faces; - - // Face centers. Not really necessary but very handy when reusing as inputs - // for e.g. timeVaryingMapped bc. - pointField faceCentres(faces.size(),point::zero); - - forAll (faces, faceI) - { - faceCentres[faceI] = faces[faceI].centre(points); - } - - OFstream(surfaceDir/"faceCentres")() << faceCentres; + makeSurfaceWriterType(foamFileSurfaceWriter); } +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + template -void Foam::foamFileSurfaceWriter::write +void Foam::foamFileSurfaceWriter::writeTemplate ( const fileName& outputDir, const fileName& surfaceName, @@ -113,7 +66,6 @@ void Foam::foamFileSurfaceWriter::write } // geometry should already have been written - // Values to separate directory (e.g. "scalarField/p") fileName foamName(pTraits::typeName); @@ -125,8 +77,69 @@ void Foam::foamFileSurfaceWriter::write } // values - OFstream(valuesDir/fieldName)() << values; + OFstream(valuesDir/fieldName)() << values; } +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::foamFileSurfaceWriter::foamFileSurfaceWriter() +: + surfaceWriter() +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::foamFileSurfaceWriter::~foamFileSurfaceWriter() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::foamFileSurfaceWriter::write +( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const bool verbose +) const +{ + fileName surfaceDir(outputDir/surfaceName); + + if (!isDir(surfaceDir)) + { + mkDir(surfaceDir); + } + + if (verbose) + { + Info<< "Writing geometry to " << surfaceDir << endl; + } + + + // Points + OFstream(surfaceDir/"points")() << points; + + // Faces + OFstream(surfaceDir/"faces")() << faces; + + // Face centers. Not really necessary but very handy when reusing as inputs + // for e.g. timeVaryingMapped bc. + pointField faceCentres(faces.size(),point::zero); + + forAll(faces, faceI) + { + faceCentres[faceI] = faces[faceI].centre(points); + } + + OFstream(surfaceDir/"faceCentres")() << faceCentres; +} + + +// create write methods +defineSurfaceWriterWriteFields(Foam::foamFileSurfaceWriter); + + // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H index 0076abdc88..ce19c21455 100644 --- a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,14 +43,29 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class foamFileSurfaceWriter Declaration + Class foamFileSurfaceWriter Declaration \*---------------------------------------------------------------------------*/ -template class foamFileSurfaceWriter : - public surfaceWriter + public surfaceWriter { + // Private Member Functions + + //- Templated write operation + template + void writeTemplate + ( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const word& fieldName, + const Field& values, + const bool isNodeValues, + const bool verbose + ) const; + public: @@ -70,13 +85,14 @@ public: // Member Functions - //- Return true if the surface format supports separate files - virtual bool separateFiles() + //- True if the surface format supports geometry in a separate file. + // False if geometry and field must be in a single file + virtual bool separateGeometry() { return true; } - //- Write geometry to file. + //- Write single surface geometry to file. virtual void write ( const fileName& outputDir, @@ -86,18 +102,77 @@ public: const bool verbose = false ) const; - //- Writes single surface to file. + + //- Write scalarField for a single surface to file. + // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, - const fileName& surfaceName, + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, - const word& fieldName, - const Field& values, + const word& fieldName, // name of field + const Field& values, const bool isNodeValues, const bool verbose = false ) const; + + //- Write vectorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write sphericalTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write symmTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write tensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + }; @@ -107,12 +182,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository -# include "foamFileSurfaceWriter.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriterRunTime.C b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriterRunTime.C deleted file mode 100644 index c8a40e736c..0000000000 --- a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriterRunTime.C +++ /dev/null @@ -1,44 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "foamFileSurfaceWriter.H" -#include "surfaceWriters.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeSurfaceWriterType(foamFileSurfaceWriter, bool); -makeSurfaceWriters(foamFileSurfaceWriter); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H b/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H new file mode 100644 index 0000000000..b748a32c6c --- /dev/null +++ b/src/sampling/sampledSurface/writers/makeSurfaceWriterMethods.H @@ -0,0 +1,92 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +InClass + Foam::makeSurfaceWriterMethods + +Description + Convenience macros for instantiating writer methods for surfaceWriter + classes. + +\*---------------------------------------------------------------------------*/ + +#ifndef makeSurfaceWriterMethods_H +#define makeSurfaceWriterMethods_H + +#include "surfaceWriter.H" +#include "addToRunTimeSelectionTable.H" + +namespace Foam +{ + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#define makeSurfaceWriterType(ThisClass) \ + defineTypeNameAndDebug(ThisClass, 0); \ + addToRunTimeSelectionTable(surfaceWriter, ThisClass, word) + + +#define defineSurfaceWriterWriteField(ThisClass, FieldType) \ + void ThisClass::write \ + ( \ + const fileName& outputDir, \ + const fileName& surfaceName, \ + const pointField& points, \ + const faceList& faces, \ + const word& fieldName, \ + const Field& values, \ + const bool isNodeValues, \ + const bool verbose \ + ) const \ + { \ + writeTemplate \ + ( \ + outputDir, \ + surfaceName, \ + points, \ + faces, \ + fieldName, \ + values, \ + isNodeValues, \ + verbose \ + ); \ + } + + +#define defineSurfaceWriterWriteFields(ThisClass) \ + defineSurfaceWriterWriteField(ThisClass, scalar); \ + defineSurfaceWriterWriteField(ThisClass, vector); \ + defineSurfaceWriterWriteField(ThisClass, sphericalTensor); \ + defineSurfaceWriterWriteField(ThisClass, symmTensor); \ + defineSurfaceWriterWriteField(ThisClass, tensor) + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.C b/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.C deleted file mode 100644 index 85d4fcbb62..0000000000 --- a/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.C +++ /dev/null @@ -1,63 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "nullSurfaceWriter.H" - -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::nullSurfaceWriter::nullSurfaceWriter() -: - surfaceWriter() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template -Foam::nullSurfaceWriter::~nullSurfaceWriter() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::nullSurfaceWriter::write -( - const fileName& outputDir, - const fileName& surfaceName, - const pointField& points, - const faceList& faces, - const word& fieldName, - const Field& values, - const bool isNodeValues, - const bool verbose -) const -{} - - -// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H b/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H deleted file mode 100644 index aef12a76ce..0000000000 --- a/src/sampling/sampledSurface/writers/null/nullSurfaceWriter.H +++ /dev/null @@ -1,103 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::nullSurfaceWriter - -Description - -SourceFiles - nullSurfaceWriter.C - -\*---------------------------------------------------------------------------*/ - -#ifndef nullSurfaceWriter_H -#define nullSurfaceWriter_H - -#include "surfaceWriter.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class nullSurfaceWriter Declaration -\*---------------------------------------------------------------------------*/ - -template -class nullSurfaceWriter -: - public surfaceWriter -{ - -public: - - //- Runtime type information - TypeName("null"); - - - // Constructors - - //- Construct null - nullSurfaceWriter(); - - - //- Destructor - virtual ~nullSurfaceWriter(); - - - // Member Functions - - // Write - - //- Writes single surface to file. - virtual void write - ( - const fileName& outputDir, - const fileName& surfaceName, - const pointField& points, - const faceList& faces, - const word& fieldName, - const Field& values, - const bool isNodeValues, - const bool verbose = false - ) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#ifdef NoRepository -# include "nullSurfaceWriter.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/null/nullSurfaceWriterRunTime.C b/src/sampling/sampledSurface/writers/null/nullSurfaceWriterRunTime.C deleted file mode 100644 index c9fd6af9d9..0000000000 --- a/src/sampling/sampledSurface/writers/null/nullSurfaceWriterRunTime.C +++ /dev/null @@ -1,44 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "nullSurfaceWriter.H" -#include "surfaceWriters.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeSurfaceWriterType(nullSurfaceWriter, bool); -makeSurfaceWriters(nullSurfaceWriter); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C index 11990cfd83..d598754b38 100644 --- a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,27 +29,34 @@ License #include "OFstream.H" #include "OSspecific.H" +#include "makeSurfaceWriterMethods.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + defineTypeNameAndDebug(proxySurfaceWriter, 0); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::proxySurfaceWriter::proxySurfaceWriter(const word& ext) +Foam::proxySurfaceWriter::proxySurfaceWriter(const word& ext) : - surfaceWriter(), + surfaceWriter(), ext_(ext) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::proxySurfaceWriter::~proxySurfaceWriter() +Foam::proxySurfaceWriter::~proxySurfaceWriter() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -template -void Foam::proxySurfaceWriter::write +void Foam::proxySurfaceWriter::write ( const fileName& outputDir, const fileName& surfaceName, @@ -69,19 +76,14 @@ void Foam::proxySurfaceWriter::write mkDir(outputDir); } - fileName fName(outputDir/surfaceName + "." + ext_); + fileName outName(outputDir/surfaceName + "." + ext_); if (verbose) { - Info<< "Writing geometry to " << fName << endl; + Info<< "Writing geometry to " << outName << endl; } - MeshedSurfaceProxy - ( - points, - faces - ).write(fName); - + MeshedSurfaceProxy(points, faces).write(outName); } diff --git a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H index 2cbc6c30ac..ad134b7b6e 100644 --- a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,8 @@ Class Foam::proxySurfaceWriter Description + A surfaceWriter that writes the geometry via the MeshedSurfaceProxy, but + which does not support any fields. SourceFiles proxySurfaceWriter.C @@ -42,13 +44,12 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class proxySurfaceWriter Declaration + Class proxySurfaceWriter Declaration \*---------------------------------------------------------------------------*/ -template class proxySurfaceWriter : - public surfaceWriter + public surfaceWriter { // Private data @@ -74,15 +75,16 @@ public: // Member Functions - //- Always write separate geometry file - virtual bool separateFiles() + + //- True if the surface format supports geometry in a separate file. + // False if geometry and field must be in a single file + virtual bool separateGeometry() { return true; } - // Write - //- Write geometry to file. + //- Write single surface geometry to file. virtual void write ( const fileName& outputDir, @@ -92,20 +94,6 @@ public: const bool verbose = false ) const; - - //- Writes single surface to file. - virtual void write - ( - const fileName& outputDir, - const fileName& surfaceName, - const pointField& points, - const faceList& faces, - const word& fieldName, - const Field& values, - const bool isNodeValues, - const bool verbose = false - ) const - {} }; @@ -115,12 +103,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository -# include "proxySurfaceWriter.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriterRunTime.C b/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriterRunTime.C deleted file mode 100644 index 508b41c1b6..0000000000 --- a/src/sampling/sampledSurface/writers/proxy/proxySurfaceWriterRunTime.C +++ /dev/null @@ -1,45 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "proxySurfaceWriter.H" -#include "surfaceWriters.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -// create type names, but do not register with run-time tables -makeTypeSurfaceWritersTypeName(proxySurfaceWriter, bool); -makeSurfaceWritersTypeName(proxySurfaceWriter); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C index 46b8a188ec..90e42c0c07 100644 --- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,334 +29,187 @@ License #include "OSspecific.H" #include "IOmanip.H" +#include "makeSurfaceWriterMethods.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + makeSurfaceWriterType(rawSurfaceWriter); +} + + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::rawSurfaceWriter::writeGeometry +inline void Foam::rawSurfaceWriter::writeLocation ( + Ostream& os, const pointField& points, - const label pointI, - Ostream& os + const label pointI ) { const point& pt = points[pointI]; - - os << pt.x() << ' ' << pt.y() << ' ' << pt.z() << ' '; + os << pt.x() << ' ' << pt.y() << ' ' << pt.z() << ' '; } -template -void Foam::rawSurfaceWriter::writeGeometry +inline void Foam::rawSurfaceWriter::writeLocation ( + Ostream& os, const pointField& points, const faceList& faces, - const label faceI, - Ostream& os + const label faceI ) { const point& ct = faces[faceI].centre(points); - - os << ct.x() << ' ' << ct.y() << ' ' << ct.z() << ' '; -} - - -// Write scalarField in raw format -template -void Foam::rawSurfaceWriter::writeData -( - const word& fieldName, - const pointField& points, - const faceList& faces, - const scalarField& values, - const bool isNodeValues, - Ostream& os -) -{ - // header - os << "# x y z " << fieldName << endl; - - // Write data - if (isNodeValues) - { - forAll(values, elemI) - { - writeGeometry(points, elemI, os); - os << values[elemI] << nl; - } - } - else - { - forAll(values, elemI) - { - writeGeometry(points, faces, elemI, os); - os << values[elemI] << nl; - } - } - - os << nl; -} - - -// Write vectorField in raw format -template -void Foam::rawSurfaceWriter::writeData -( - const word& fieldName, - const pointField& points, - const faceList& faces, - const vectorField& values, - const bool isNodeValues, - Ostream& os -) -{ - // header - os << "# x y z " - << fieldName << "_x " - << fieldName << "_y " - << fieldName << "_z " - << endl; - - // Write data - if (isNodeValues) - { - forAll(values, elemI) - { - writeGeometry(points, elemI, os); - - const vector& v = values[elemI]; - os << v[0] << ' ' << v[1] << ' ' << v[2] << nl; - } - } - else - { - forAll(values, elemI) - { - writeGeometry(points, faces, elemI, os); - - const vector& v = values[elemI]; - os << v[0] << ' ' << v[1] << ' ' << v[2] << nl; - } - } - -} - - -// Write sphericalTensorField in raw format -template -void Foam::rawSurfaceWriter::writeData -( - const word& fieldName, - const pointField& points, - const faceList& faces, - const sphericalTensorField& values, - const bool isNodeValues, - Ostream& os -) -{ - // header - os << "# ii "; - os << fieldName << "_ii" << endl; - - // Write data - if (isNodeValues) - { - forAll(values, elemI) - { - writeGeometry(points, elemI, os); - - const sphericalTensor& v = values[elemI]; - os << v[0] << nl; - } - } - else - { - forAll(values, elemI) - { - writeGeometry(points, faces, elemI, os); - - const sphericalTensor& v = values[elemI]; - os << v[0] << nl; - } - } -} - - -// Write symmTensorField in raw format -template -void Foam::rawSurfaceWriter::writeData -( - const word& fieldName, - const pointField& points, - const faceList& faces, - const symmTensorField& values, - const bool isNodeValues, - Ostream& os -) -{ - // header - os << "# xx xy xz yy yz "; - for (int i=0; i<6; i++) - { - os << fieldName << "_" << i << " "; - } - os << endl; - - // Write data - if (isNodeValues) - { - forAll(values, elemI) - { - writeGeometry(points, elemI, os); - - const symmTensor& v = values[elemI]; - - os << v[0] << ' ' << v[1] << ' ' << v[2] << ' ' - << v[3] << ' ' << v[4] << ' ' << v[5] << nl; - } - } - else - { - forAll(values, elemI) - { - writeGeometry(points, faces, elemI, os); - - const symmTensor& v = values[elemI]; - - os << v[0] << ' ' << v[1] << ' ' << v[2] << ' ' - << v[3] << ' ' << v[4] << ' ' << v[5] << nl; - } - } -} - - -// Write tensorField in raw format -template -void Foam::rawSurfaceWriter::writeData -( - const word& fieldName, - const pointField& points, - const faceList& faces, - const tensorField& values, - const bool isNodeValues, - Ostream& os -) -{ - // header - os << "# xx xy xz yx yy yz zx zy zz"; - for (int i=0; i<9; ++i) - { - os << fieldName << "_" << i << " "; - } - os << endl; - - // Write data - if (isNodeValues) - { - forAll(values, elemI) - { - writeGeometry(points, elemI, os); - - const tensor& v = values[elemI]; - os << v[0] << ' ' << v[1] << ' ' << v[2] << ' ' - << v[3] << ' ' << v[4] << ' ' << v[5] << ' ' - << v[6] << ' ' << v[7] << ' ' << v[8] << nl; - } - } - else - { - forAll(values, elemI) - { - writeGeometry(points, faces, elemI, os); - - const tensor& v = values[elemI]; - os << v[0] << ' ' << v[1] << ' ' << v[2] << ' ' - << v[3] << ' ' << v[4] << ' ' << v[5] << ' ' - << v[6] << ' ' << v[7] << ' ' << v[8] << nl; - } - } -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -template -Foam::rawSurfaceWriter::rawSurfaceWriter() -: - surfaceWriter() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template -Foam::rawSurfaceWriter::~rawSurfaceWriter() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::rawSurfaceWriter::write -( - const fileName& outputDir, - const fileName& surfaceName, - const pointField& points, - const faceList& faces, - const bool verbose -) const -{ - if (!isDir(outputDir)) - { - mkDir(outputDir); - } - - OFstream os - ( - outputDir/surfaceName + ".raw" - ); - - if (verbose) - { - Info<< "Writing geometry to " << os.name() << endl; - } - - - // header - os << "# geometry NO_DATA " << faces.size() << nl - << "# x y z" << endl; - - // Write faces - forAll(faces, elemI) - { - writeGeometry(points, faces, elemI, os); - os << nl; - } - - os << nl; + os << ct.x() << ' ' << ct.y() << ' ' << ct.z() << ' '; } namespace Foam { - // bool fields aren't supported template<> - void Foam::rawSurfaceWriter::write + void Foam::rawSurfaceWriter::writeHeader ( - const fileName& outputDir, - const fileName& surfaceName, - const pointField& points, - const faceList& faces, + Ostream& os, const word& fieldName, - const Field& values, - const bool isNodeValues, - const bool verbose - ) const - {} + const Field& values + ) + { + os << values.size() << nl + << "# x y z " << fieldName << nl; + } + + + template<> + void Foam::rawSurfaceWriter::writeHeader + ( + Ostream& os, + const word& fieldName, + const Field& values + ) + { + os << values.size() << nl + << "# x y z " + << fieldName << "_x " + << fieldName << "_y " + << fieldName << "_z " + << endl; + } + + + template<> + void Foam::rawSurfaceWriter::writeHeader + ( + Ostream& os, + const word& fieldName, + const Field& values + ) + { + os << values.size() << nl + << "# ii " + << fieldName << "_ii" << nl; + } + + + template<> + void Foam::rawSurfaceWriter::writeHeader + ( + Ostream& os, + const word& fieldName, + const Field& values + ) + { + os << values.size() << nl + << "# xx xy xz yy yz "; + for (int i=0; i<6; ++i) + { + os << fieldName << "_" << i << " "; + } + os << endl; + } + + + template<> + void Foam::rawSurfaceWriter::writeHeader + ( + Ostream& os, + const word& fieldName, + const Field& values + ) + { + os << values.size() << nl + << "# xx xy xz yx yy yz zx zy zz"; + for (int i=0; i<9; ++i) + { + os << fieldName << "_" << i << " "; + } + os << nl; + } + + + template<> + inline void Foam::rawSurfaceWriter::writeData + ( + Ostream& os, + const scalar& v + ) + { + os << v << nl; + } + + + template<> + inline void Foam::rawSurfaceWriter::writeData + ( + Ostream& os, + const vector& v + ) + { + os << v[0] << ' ' << v[1] << ' ' << v[2] << nl; + } + + + template<> + inline void Foam::rawSurfaceWriter::writeData + ( + Ostream& os, + const sphericalTensor& v + ) + { + os << v[0] << nl; + } + + + template<> + inline void Foam::rawSurfaceWriter::writeData + ( + Ostream& os, + const symmTensor& v + ) + { + os << v[0] << ' ' << v[1] << ' ' << v[2] << ' ' + << v[3] << ' ' << v[4] << ' ' << v[5] << nl; + } + + + template<> + inline void Foam::rawSurfaceWriter::writeData + ( + Ostream& os, + const tensor& v + ) + { + os << v[0] << ' ' << v[1] << ' ' << v[2] << ' ' + << v[3] << ' ' << v[4] << ' ' << v[5] << ' ' + << v[6] << ' ' << v[7] << ' ' << v[8] << nl; + } + } template -void Foam::rawSurfaceWriter::write +void Foam::rawSurfaceWriter::writeTemplate ( const fileName& outputDir, const fileName& surfaceName, @@ -373,17 +226,13 @@ void Foam::rawSurfaceWriter::write mkDir(outputDir); } - OFstream os - ( - outputDir/fieldName + '_' + surfaceName + ".raw" - ); + OFstream os(outputDir/fieldName + '_' + surfaceName + ".raw"); if (verbose) { Info<< "Writing field " << fieldName << " to " << os.name() << endl; } - // header os << "# " << fieldName; if (isNodeValues) @@ -395,10 +244,85 @@ void Foam::rawSurfaceWriter::write os << " FACE_DATA "; } - os << values.size() << nl; + // header + writeHeader(os, fieldName, values); - writeData(fieldName, points, faces, values, isNodeValues, os); + // values + if (isNodeValues) + { + forAll(values, elemI) + { + writeLocation(os, points, elemI); + writeData(os, values[elemI]); + } + } + else + { + forAll(values, elemI) + { + writeLocation(os, points, faces, elemI); + writeData(os, values[elemI]); + } + } } + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::rawSurfaceWriter::rawSurfaceWriter() +: + surfaceWriter() +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::rawSurfaceWriter::~rawSurfaceWriter() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::rawSurfaceWriter::write +( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const bool verbose +) const +{ + if (!isDir(outputDir)) + { + mkDir(outputDir); + } + + OFstream os(outputDir/surfaceName + ".raw"); + + if (verbose) + { + Info<< "Writing geometry to " << os.name() << endl; + } + + + // header + os << "# geometry NO_DATA " << faces.size() << nl + << "# x y z" << nl; + + // Write faces centres + forAll(faces, elemI) + { + writeLocation(os, points, faces, elemI); + os << nl; + } + + os << nl; +} + + +// create write methods +defineSurfaceWriterWriteFields(Foam::rawSurfaceWriter); + + // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H index 771824bd89..5ec4d1ac30 100644 --- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,7 @@ Class Foam::rawSurfaceWriter Description + A surfaceWriter for raw output. SourceFiles rawSurfaceWriter.C @@ -36,86 +37,62 @@ SourceFiles #include "surfaceWriter.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { /*---------------------------------------------------------------------------*\ - Class raw Declaration + Class rawSurfaceWriter Declaration \*---------------------------------------------------------------------------*/ -template class rawSurfaceWriter : - public surfaceWriter + public surfaceWriter { // Private Member Functions - static void writeGeometry + static inline void writeLocation ( - const pointField& points, - const label pointI, - Ostream& os + Ostream&, + const pointField&, + const label pointI ); - static void writeGeometry + static inline void writeLocation ( - const pointField& points, - const faceList& faces, - const label faceI, - Ostream& os + Ostream&, + const pointField&, + const faceList&, + const label faceI ); - static void writeData + template + static void writeHeader ( + Ostream&, const word& fieldName, - const pointField& points, - const faceList& faces, - const scalarField& values, - const bool isNodeValues, - Ostream& os + const Field& ); - static void writeData - ( - const word& fieldName, - const pointField& points, - const faceList& faces, - const vectorField& values, - const bool isNodeValues, - Ostream& os - ); + template + static inline void writeData(Ostream&, const Type&); - static void writeData - ( - const word& fieldName, - const pointField& points, - const faceList& faces, - const sphericalTensorField& values, - const bool isNodeValues, - Ostream& os - ); - static void writeData + //- Templated write operation + template + void writeTemplate ( - const word& fieldName, + const fileName& outputDir, + const fileName& surfaceName, const pointField& points, const faceList& faces, - const symmTensorField& values, - const bool isNodeValues, - Ostream& os - ); - - static void writeData - ( const word& fieldName, - const pointField& points, - const faceList& faces, - const tensorField& values, + const Field& values, const bool isNodeValues, - Ostream& os - ); + const bool verbose + ) const; public: @@ -136,9 +113,7 @@ public: // Member Functions - // Write - - //- Write geometry to file. + //- Write single surface geometry to file. virtual void write ( const fileName& outputDir, @@ -148,18 +123,77 @@ public: const bool verbose = false ) const; - //- Writes single surface to file. + + //- Write scalarField for a single surface to file. + // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, - const fileName& surfaceName, + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, - const word& fieldName, - const Field& values, + const word& fieldName, // name of field + const Field& values, const bool isNodeValues, const bool verbose = false ) const; + + //- Write vectorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write sphericalTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write symmTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write tensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + }; @@ -169,12 +203,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository -# include "rawSurfaceWriter.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriterRunTime.C b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriterRunTime.C deleted file mode 100644 index d6a1a89cc9..0000000000 --- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriterRunTime.C +++ /dev/null @@ -1,44 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "rawSurfaceWriter.H" -#include "surfaceWriters.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeSurfaceWriterType(rawSurfaceWriter, bool); -makeSurfaceWriters(rawSurfaceWriter); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C new file mode 100644 index 0000000000..5ab7290218 --- /dev/null +++ b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.C @@ -0,0 +1,172 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "starcdSurfaceWriter.H" + +#include "MeshedSurfaceProxy.H" +#include "OFstream.H" +#include "OSspecific.H" + +#include "makeSurfaceWriterMethods.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + makeSurfaceWriterType(starcdSurfaceWriter); +} + + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +namespace Foam +{ + template<> + inline void Foam::starcdSurfaceWriter::writeData + ( + Ostream& os, + const scalar& v + ) + { + os << v << nl; + } + + + template<> + inline void Foam::starcdSurfaceWriter::writeData + ( + Ostream& os, + const vector& v + ) + { + os << v[0] << ' ' << v[1] << ' ' << v[2] << nl; + } + + + template<> + inline void Foam::starcdSurfaceWriter::writeData + ( + Ostream& os, + const sphericalTensor& v + ) + { + os << v[0] << nl; + } + +} + + +template +inline void Foam::starcdSurfaceWriter::writeData +( + Ostream& os, + const Type& v +) +{} + + +template +void Foam::starcdSurfaceWriter::writeTemplate +( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const word& fieldName, + const Field& values, + const bool isNodeValues, + const bool verbose +) const +{ + if (!isDir(outputDir)) + { + mkDir(outputDir); + } + + OFstream os(outputDir/fieldName + '_' + surfaceName + ".usr"); + + if (verbose) + { + Info<< "Writing field " << fieldName << " to " << os.name() << endl; + } + + // no header, just write values + forAll(values, elemI) + { + os << elemI+1 << ' '; + writeData(os, values[elemI]); + } +} + + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::starcdSurfaceWriter::starcdSurfaceWriter() +: + surfaceWriter() +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::starcdSurfaceWriter::~starcdSurfaceWriter() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::starcdSurfaceWriter::write +( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const bool verbose +) const +{ + if (!isDir(outputDir)) + { + mkDir(outputDir); + } + + fileName outName(outputDir/surfaceName + ".inp"); + + if (verbose) + { + Info<< "Writing geometry to " << outName << endl; + } + + MeshedSurfaceProxy(points, faces).write(outName); +} + + +// create write methods +defineSurfaceWriterWriteField(Foam::starcdSurfaceWriter, scalar); +defineSurfaceWriterWriteField(Foam::starcdSurfaceWriter, vector); +defineSurfaceWriterWriteField(Foam::starcdSurfaceWriter, sphericalTensor); + + +// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H new file mode 100644 index 0000000000..bf0a0eb824 --- /dev/null +++ b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H @@ -0,0 +1,181 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::starcdSurfaceWriter + +Description + A surfaceWriter for STARCD files. + + The geometry is written via the MeshedSurfaceProxy, the fields + are written in a trivial ASCII format with ID and VALUE as + so-called user data. These @c .usr files can be read into proSTAR + with these types of commands. For element data: + @verbatim + getuser FILENAME.usr cell scalar free + getuser FILENAME.usr cell vector free + @endverbatim + and for vertex data: + @verbatim + getuser FILENAME.usr vertex scalar free + getuser FILENAME.usr vertex vector free + @endverbatim + +Note + Only scalar and vector fields are supported directly. + A sphericalTensor is written as a scalar. + Other field types are not written. + +SourceFiles + starcdSurfaceWriter.C + +\*---------------------------------------------------------------------------*/ + +#ifndef starcdSurfaceWriter_H +#define starcdSurfaceWriter_H + +#include "surfaceWriter.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class starcdSurfaceWriter Declaration +\*---------------------------------------------------------------------------*/ + +class starcdSurfaceWriter +: + public surfaceWriter +{ + // Private Member Functions + + template + static inline void writeData(Ostream&, const Type&); + + + //- Templated write operation + template + void writeTemplate + ( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const word& fieldName, + const Field& values, + const bool isNodeValues, + const bool verbose + ) const; + + +public: + + //- Runtime type information + TypeName("starcd"); + + + // Constructors + + //- Construct null + starcdSurfaceWriter(); + + + //- Destructor + virtual ~starcdSurfaceWriter(); + + + // Member Functions + + //- True if the surface format supports geometry in a separate file. + // False if geometry and field must be in a single file + virtual bool separateGeometry() + { + return true; + } + + //- Write single surface geometry to file. + virtual void write + ( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const bool verbose = false + ) const; + + //- Write scalarField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write vectorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write sphericalTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.C b/src/sampling/sampledSurface/writers/surfaceWriter.C index d4ebc9c222..0f52c6f4aa 100644 --- a/src/sampling/sampledSurface/writers/surfaceWriter.C +++ b/src/sampling/sampledSurface/writers/surfaceWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,47 +26,43 @@ License #include "surfaceWriter.H" #include "MeshedSurfaceProxy.H" -#include "nullSurfaceWriter.H" #include "proxySurfaceWriter.H" #include "HashTable.H" #include "word.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -template -Foam::autoPtr< Foam::surfaceWriter > -Foam::surfaceWriter::New(const word& writeType) +namespace Foam { - typename wordConstructorTable::iterator cstrIter = + defineTypeNameAndDebug(surfaceWriter, 0); + defineRunTimeSelectionTable(surfaceWriter, word); + addNamedToRunTimeSelectionTable + ( + surfaceWriter, + surfaceWriter, + word, + null + ); +} + + +// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // + +Foam::autoPtr +Foam::surfaceWriter::New(const word& writeType) +{ + wordConstructorTable::iterator cstrIter = wordConstructorTablePtr_->find(writeType); if (cstrIter == wordConstructorTablePtr_->end()) { - // not supported for this data type, but it generally does work - // (it handles the 'bool' specialization - ie, geometry write) - if - ( - Foam::surfaceWriter::wordConstructorTablePtr_->found - ( - writeType - ) - ) - { - // use 'null' handler instead - return autoPtr< surfaceWriter > - ( - new nullSurfaceWriter() - ); - } - else if (MeshedSurfaceProxy::canWriteType(writeType)) + if (MeshedSurfaceProxy::canWriteType(writeType)) { // generally unknown, but can be written via MeshedSurfaceProxy // use 'proxy' handler instead - return autoPtr< surfaceWriter > - ( - new proxySurfaceWriter(writeType) - ); + return autoPtr(new proxySurfaceWriter(writeType)); } if (cstrIter == wordConstructorTablePtr_->end()) @@ -83,24 +79,20 @@ Foam::surfaceWriter::New(const word& writeType) } } - return autoPtr< surfaceWriter >(cstrIter()()); + return autoPtr(cstrIter()()); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -template -Foam::surfaceWriter::surfaceWriter() +Foam::surfaceWriter::surfaceWriter() {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -template -Foam::surfaceWriter::~surfaceWriter() +Foam::surfaceWriter::~surfaceWriter() {} -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.H b/src/sampling/sampledSurface/writers/surfaceWriter.H index d17db7a3f3..1057a187bd 100644 --- a/src/sampling/sampledSurface/writers/surfaceWriter.H +++ b/src/sampling/sampledSurface/writers/surfaceWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ SourceFiles #ifndef surfaceWriter_H #define surfaceWriter_H -#include "Field.H" +#include "volFields.H" #include "typeInfo.H" #include "autoPtr.H" #include "pointField.H" @@ -48,22 +48,12 @@ SourceFiles namespace Foam { -// Forward declaration of friend functions and operators - -template class surfaceWriter; -template class nullSurfaceWriter; -template class proxySurfaceWriter; - /*---------------------------------------------------------------------------*\ Class surfaceWriter Declaration \*---------------------------------------------------------------------------*/ -template class surfaceWriter { - //- friendship between writer data types - template friend class surfaceWriter; - public: //- Runtime type information @@ -99,14 +89,15 @@ public: // Member Functions - //- Return true if the surface format supports separate files - virtual bool separateFiles() + //- True if the surface format supports geometry in a separate file. + // False if geometry and field must be in a single file + virtual bool separateGeometry() { return false; } - //- Writes single surface geometry to file. + //- Write single surface geometry to file. virtual void write ( const fileName& outputDir, // //surface/TIME @@ -118,8 +109,8 @@ public: {} - //- Writes single surface to file. Either one value per vertex or - // one value per face (isNodeValues = false) + //- Write scalarField for a single surface to file. + // One value per face or vertex (isNodeValues = true) virtual void write ( const fileName& outputDir, // //surface/TIME @@ -127,10 +118,73 @@ public: const pointField& points, const faceList& faces, const word& fieldName, // name of field - const Field& values, + const Field& values, const bool isNodeValues, const bool verbose = false - ) const = 0; + ) const + {} + + //- Write vectorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const + {} + + //- Write sphericalTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const + {} + + //- Write symmTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const + {} + + //- Write tensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const + {} + + }; @@ -140,12 +194,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository -# include "surfaceWriter.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/surfaceWriters.C b/src/sampling/sampledSurface/writers/surfaceWriters.C deleted file mode 100644 index 5a677c793e..0000000000 --- a/src/sampling/sampledSurface/writers/surfaceWriters.C +++ /dev/null @@ -1,50 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "surfaceWriters.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -#define defineSurfaceWriterType(dataType) \ - defineNamedTemplateTypeNameAndDebug(surfaceWriter< dataType >, 0); \ - defineTemplatedRunTimeSelectionTable(surfaceWriter, word, dataType) - -defineSurfaceWriterType(bool); - -defineSurfaceWriterType(scalar); -defineSurfaceWriterType(vector); -defineSurfaceWriterType(sphericalTensor); -defineSurfaceWriterType(symmTensor); -defineSurfaceWriterType(tensor); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/surfaceWriters.H b/src/sampling/sampledSurface/writers/surfaceWriters.H deleted file mode 100644 index 0369d2e993..0000000000 --- a/src/sampling/sampledSurface/writers/surfaceWriters.H +++ /dev/null @@ -1,76 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -InClass - Foam::surfaceWriters - -Description - -\*---------------------------------------------------------------------------*/ - -#ifndef surfaceWriters_H -#define surfaceWriters_H - -#include "surfaceWriter.H" -#include "fieldTypes.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -// Only used internally -#define makeTypeSurfaceWritersTypeName(typeWriter, dataType) \ - \ - defineNamedTemplateTypeNameAndDebug(typeWriter< dataType >, 0) - -// Sometimes used externally -#define makeSurfaceWritersTypeName(typeWriter) \ - \ - makeTypeSurfaceWritersTypeName(typeWriter, scalar); \ - makeTypeSurfaceWritersTypeName(typeWriter, vector); \ - makeTypeSurfaceWritersTypeName(typeWriter, sphericalTensor); \ - makeTypeSurfaceWritersTypeName(typeWriter, symmTensor); \ - makeTypeSurfaceWritersTypeName(typeWriter, tensor) - -// Define type info for single dataType template instantiation (eg, vector) -#define makeSurfaceWriterType(typeWriter, dataType) \ - \ - defineNamedTemplateTypeNameAndDebug(typeWriter< dataType >, 0); \ - addTemplatedToRunTimeSelectionTable \ - ( \ - surfaceWriter, typeWriter, dataType, word \ - ) - - -// Define type info for scalar, vector etc. instantiations -#define makeSurfaceWriters(typeWriter) \ - \ - makeSurfaceWriterType(typeWriter, scalar); \ - makeSurfaceWriterType(typeWriter, vector); \ - makeSurfaceWriterType(typeWriter, sphericalTensor); \ - makeSurfaceWriterType(typeWriter, symmTensor); \ - makeSurfaceWriterType(typeWriter, tensor) - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C index 085dbd67d0..2f333a9515 100644 --- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -28,10 +28,19 @@ License #include "OFstream.H" #include "OSspecific.H" +#include "makeSurfaceWriterMethods.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + makeSurfaceWriterType(vtkSurfaceWriter); +} + + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -template -void Foam::vtkSurfaceWriter::writeGeometry +void Foam::vtkSurfaceWriter::writeGeometry ( Ostream& os, const pointField& points, @@ -71,12 +80,12 @@ void Foam::vtkSurfaceWriter::writeGeometry { const face& f = faces[faceI]; - os << f.size(); + os << f.size(); forAll(f, fp) { - os << ' ' << f[fp]; + os << ' ' << f[fp]; } - os << nl; + os << nl; } } @@ -84,15 +93,14 @@ void Foam::vtkSurfaceWriter::writeGeometry namespace Foam { - // Write scalarField in vtk format template<> - void Foam::vtkSurfaceWriter::writeData + void Foam::vtkSurfaceWriter::writeData ( Ostream& os, - const Field& values + const Field& values ) { - os << "1 " << values.size() << " float" << nl; + os << "1 " << values.size() << " float" << nl; forAll(values, elemI) { @@ -100,29 +108,28 @@ namespace Foam { if (elemI % 10) { - os << ' '; + os << ' '; } else { - os << nl; + os << nl; } } - const scalar v = values[elemI]; - os << float(v); + os << float(values[elemI]); } - os << nl; + os << nl; } - // Write vectorField in vtk format + template<> - void Foam::vtkSurfaceWriter::writeData + void Foam::vtkSurfaceWriter::writeData ( Ostream& os, - const Field& values + const Field& values ) { - os << "3 " << values.size() << " float" << nl; + os << "3 " << values.size() << " float" << nl; forAll(values, elemI) { @@ -133,33 +140,31 @@ namespace Foam } - // Write sphericalTensorField in vtk format template<> - void Foam::vtkSurfaceWriter::writeData + void Foam::vtkSurfaceWriter::writeData ( Ostream& os, const Field& values ) { - os << "1 " << values.size() << " float" << nl; + os << "1 " << values.size() << " float" << nl; forAll(values, elemI) { const sphericalTensor& v = values[elemI]; - os << float(v[0]) << nl; + os << float(v[0]) << nl; } } - // Write symmTensorField in vtk format template<> - void Foam::vtkSurfaceWriter::writeData + void Foam::vtkSurfaceWriter::writeData ( Ostream& os, const Field& values ) { - os << "6 " << values.size() << " float" << nl; + os << "6 " << values.size() << " float" << nl; forAll(values, elemI) { @@ -172,15 +177,14 @@ namespace Foam } - // Write tensorField in vtk format template<> - void Foam::vtkSurfaceWriter::writeData + void Foam::vtkSurfaceWriter::writeData ( Ostream& os, const Field& values ) { - os << "9 " << values.size() << " float" << nl; + os << "9 " << values.size() << " float" << nl; forAll(values, elemI) { @@ -197,69 +201,23 @@ namespace Foam // Write generic field in vtk format template -void Foam::vtkSurfaceWriter::writeData +void Foam::vtkSurfaceWriter::writeData ( Ostream& os, const Field& values ) { - os << "1 " << values.size() << " float" << nl; + os << "1 " << values.size() << " float" << nl; forAll(values, elemI) { - os << float(0) << nl; + os << float(0) << nl; } } -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -// Construct from components template -Foam::vtkSurfaceWriter::vtkSurfaceWriter() -: - surfaceWriter() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -template -Foam::vtkSurfaceWriter::~vtkSurfaceWriter() -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -template -void Foam::vtkSurfaceWriter::write -( - const fileName& outputDir, - const fileName& surfaceName, - const pointField& points, - const faceList& faces, - const bool verbose -) const -{ - if (!isDir(outputDir)) - { - mkDir(outputDir); - } - - fileName fName(outputDir/surfaceName + ".vtk"); - - if (verbose) - { - Info<< "Writing geometry to " << fName << endl; - } - - OFstream os(fName); - writeGeometry(os, points, faces); -} - - -template -void Foam::vtkSurfaceWriter::write +void Foam::vtkSurfaceWriter::writeTemplate ( const fileName& outputDir, const fileName& surfaceName, @@ -276,10 +234,7 @@ void Foam::vtkSurfaceWriter::write mkDir(outputDir); } - OFstream os - ( - outputDir/fieldName + '_' + surfaceName + ".vtk" - ); + OFstream os(outputDir/fieldName + '_' + surfaceName + ".vtk"); if (verbose) { @@ -304,8 +259,52 @@ void Foam::vtkSurfaceWriter::write // Write data writeData(os, values); - } +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::vtkSurfaceWriter::vtkSurfaceWriter() +: + surfaceWriter() +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::vtkSurfaceWriter::~vtkSurfaceWriter() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::vtkSurfaceWriter::write +( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const bool verbose +) const +{ + if (!isDir(outputDir)) + { + mkDir(outputDir); + } + + OFstream os(outputDir/surfaceName + ".vtk"); + + if (verbose) + { + Info<< "Writing geometry to " << os.name() << endl; + } + + writeGeometry(os, points, faces); +} + + +// create write methods +defineSurfaceWriterWriteFields(Foam::vtkSurfaceWriter); + + // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H index bc13be23c2..322159094b 100644 --- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,6 +25,7 @@ Class Foam::vtkSurfaceWriter Description + A surfaceWriter for VTK legacy format. SourceFiles vtkSurfaceWriter.C @@ -42,21 +43,35 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class vtkSurfaceWriter Declaration + Class vtkSurfaceWriter Declaration \*---------------------------------------------------------------------------*/ -template class vtkSurfaceWriter : - public surfaceWriter + public surfaceWriter { // Private Member Functions static void writeGeometry(Ostream&, const pointField&, const faceList&); - static void writeData(Ostream&, const Field& values); + template + static void writeData(Ostream&, const Field&); + //- Templated write operation + template + void writeTemplate + ( + const fileName& outputDir, + const fileName& surfaceName, + const pointField& points, + const faceList& faces, + const word& fieldName, + const Field& values, + const bool isNodeValues, + const bool verbose + ) const; + public: //- Runtime type information @@ -75,9 +90,7 @@ public: // Member Functions - // Write - - //- Write geometry to file. + //- Write single surface geometry to file. virtual void write ( const fileName& outputDir, @@ -88,18 +101,76 @@ public: ) const; - //- Writes single surface to file. + //- Write scalarField for a single surface to file. + // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, - const fileName& surfaceName, + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, - const word& fieldName, - const Field& values, + const word& fieldName, // name of field + const Field& values, const bool isNodeValues, const bool verbose = false ) const; + + //- Write vectorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write sphericalTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write symmTensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + + //- Write tensorField for a single surface to file. + // One value per face or vertex (isNodeValues = true) + virtual void write + ( + const fileName& outputDir, // //surface/TIME + const fileName& surfaceName, // name of surface + const pointField& points, + const faceList& faces, + const word& fieldName, // name of field + const Field& values, + const bool isNodeValues, + const bool verbose = false + ) const; + }; @@ -109,12 +180,6 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#ifdef NoRepository -# include "vtkSurfaceWriter.C" -#endif - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - #endif // ************************************************************************* // diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriterRunTime.C b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriterRunTime.C deleted file mode 100644 index 1901acfef6..0000000000 --- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriterRunTime.C +++ /dev/null @@ -1,44 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "vtkSurfaceWriter.H" -#include "surfaceWriters.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeSurfaceWriterType(vtkSurfaceWriter, bool); -makeSurfaceWriters(vtkSurfaceWriter); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // From 0498967cc6a42ef77d2cd55d64bdfa8a4a5ccd6c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 26 Jan 2011 13:45:17 +0100 Subject: [PATCH 013/367] ENH: only use point/face/mesh references where needed in ensightPart* - add points/faces constructor to ensightPartFaces with optional contiguousPoints flag. - Remove the now redundantensightPartNonMeshFaces class. --- src/conversion/Make/files | 1 - src/conversion/ensight/file/ensightFile.C | 2 +- src/conversion/ensight/file/ensightFile.H | 2 +- src/conversion/ensight/file/ensightGeoFile.C | 2 +- src/conversion/ensight/file/ensightGeoFile.H | 2 +- src/conversion/ensight/part/ensightPart.C | 51 ++----- src/conversion/ensight/part/ensightPart.H | 53 +++---- .../ensight/part/ensightPartCells.C | 139 ++++++------------ .../ensight/part/ensightPartCells.H | 53 ++++--- .../ensight/part/ensightPartFaces.C | 88 +++++++---- .../ensight/part/ensightPartFaces.H | 82 +++++++---- src/conversion/ensight/part/ensightPartIO.C | 40 ++++- .../ensight/part/ensightPartNonMeshFaces.C | 122 --------------- .../ensight/part/ensightPartNonMeshFaces.H | 131 ----------------- ...{ensightPartI.H => ensightPartTemplates.C} | 10 +- src/conversion/ensight/part/ensightParts.C | 75 ++++------ src/conversion/ensight/part/ensightParts.H | 15 +- ...nsightPartsI.H => ensightPartsTemplates.C} | 4 +- .../writers/ensight/ensightSurfaceWriter.C | 7 +- 19 files changed, 317 insertions(+), 562 deletions(-) delete mode 100644 src/conversion/ensight/part/ensightPartNonMeshFaces.C delete mode 100644 src/conversion/ensight/part/ensightPartNonMeshFaces.H rename src/conversion/ensight/part/{ensightPartI.H => ensightPartTemplates.C} (90%) rename src/conversion/ensight/part/{ensightPartsI.H => ensightPartsTemplates.C} (96%) diff --git a/src/conversion/Make/files b/src/conversion/Make/files index 563d177682..7c5a0aa91c 100644 --- a/src/conversion/Make/files +++ b/src/conversion/Make/files @@ -4,7 +4,6 @@ ensight/part/ensightPart.C ensight/part/ensightPartIO.C ensight/part/ensightPartCells.C ensight/part/ensightPartFaces.C -ensight/part/ensightPartNonMeshFaces.C ensight/part/ensightParts.C meshTables/boundaryRegion.C diff --git a/src/conversion/ensight/file/ensightFile.C b/src/conversion/ensight/file/ensightFile.C index e5f1b18f9c..23ae7a1e37 100644 --- a/src/conversion/ensight/file/ensightFile.C +++ b/src/conversion/ensight/file/ensightFile.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/conversion/ensight/file/ensightFile.H b/src/conversion/ensight/file/ensightFile.H index 46e10ce61f..59b28ebb9e 100644 --- a/src/conversion/ensight/file/ensightFile.H +++ b/src/conversion/ensight/file/ensightFile.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/conversion/ensight/file/ensightGeoFile.C b/src/conversion/ensight/file/ensightGeoFile.C index f7a7adceb8..dffcd07891 100644 --- a/src/conversion/ensight/file/ensightGeoFile.C +++ b/src/conversion/ensight/file/ensightGeoFile.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/conversion/ensight/file/ensightGeoFile.H b/src/conversion/ensight/file/ensightGeoFile.H index 7b59b111a9..eae4a0b4d5 100644 --- a/src/conversion/ensight/file/ensightGeoFile.H +++ b/src/conversion/ensight/file/ensightGeoFile.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/conversion/ensight/part/ensightPart.C b/src/conversion/ensight/part/ensightPart.C index 4c071a4220..d87eb239bb 100644 --- a/src/conversion/ensight/part/ensightPart.C +++ b/src/conversion/ensight/part/ensightPart.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,21 +24,22 @@ License \*----------------------------------------------------------------------------*/ #include "ensightPart.H" -#include "addToRunTimeSelectionTable.H" #include "dictionary.H" #include "ListOps.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(ensightPart, 0); - defineTemplateTypeNameAndDebug(IOPtrList, 0); - defineRunTimeSelectionTable(ensightPart, istream); + defineTypeNameAndDebug(ensightPart, 0); + defineTemplateTypeNameAndDebug(IOPtrList, 0); + defineRunTimeSelectionTable(ensightPart, istream); } -Foam::List Foam::ensightPart::elemTypes_(0); +const Foam::List Foam::ensightPart::elemTypes_(0); -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // bool Foam::ensightPart::isFieldDefined(const List& field) const { @@ -72,7 +73,7 @@ Foam::ensightPart::ensightPart size_(0), isCellData_(true), matId_(0), - meshPtr_(0) + points_(pointField::null()) {} @@ -89,7 +90,7 @@ Foam::ensightPart::ensightPart size_(0), isCellData_(true), matId_(0), - meshPtr_(0) + points_(pointField::null()) {} @@ -97,7 +98,7 @@ Foam::ensightPart::ensightPart ( label partNumber, const string& partDescription, - const polyMesh& pMesh + const pointField& points ) : number_(partNumber), @@ -107,7 +108,7 @@ Foam::ensightPart::ensightPart size_(0), isCellData_(true), matId_(0), - meshPtr_(&pMesh) + points_(points) {} @@ -120,7 +121,7 @@ Foam::ensightPart::ensightPart(const ensightPart& part) size_(part.size_), isCellData_(part.isCellData_), matId_(part.matId_), - meshPtr_(part.meshPtr_) + points_(part.points_) {} @@ -158,31 +159,7 @@ Foam::ensightPart::~ensightPart() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::ensightPart::reconstruct(Istream& is) -{ - dictionary dict(is); - dict.lookup("id") >> number_; - dict.lookup("name") >> name_; - dict.readIfPresent("offset", offset_); - - // populate elemLists_ - elemLists_.setSize(elementTypes().size()); - - forAll(elementTypes(), elemI) - { - word key(elementTypes()[elemI]); - - elemLists_[elemI].clear(); - dict.readIfPresent(key, elemLists_[elemI]); - - size_ += elemLists_[elemI].size(); - } - - is.check("ensightPart::reconstruct(Istream&)"); -} - - -void Foam::ensightPart::renumber(labelList const& origId) +void Foam::ensightPart::renumber(const labelList& origId) { // transform to global values first if (offset_) diff --git a/src/conversion/ensight/part/ensightPart.H b/src/conversion/ensight/part/ensightPart.H index b335ef8632..b2074f55b9 100644 --- a/src/conversion/ensight/part/ensightPart.H +++ b/src/conversion/ensight/part/ensightPart.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ Description SourceFiles ensightPart.C ensightPartIO.C - ensightPartI.H + ensightPartTemplates.C \*---------------------------------------------------------------------------*/ @@ -52,7 +52,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class ensightPart Declaration + Class ensightPart Declaration \*---------------------------------------------------------------------------*/ class ensightPart @@ -60,7 +60,7 @@ class ensightPart // Private data // Static data members - static List elemTypes_; + static const List elemTypes_; protected: @@ -88,8 +88,8 @@ protected: //- material id (numeric) label matId_; - //- mesh reference used - const polyMesh* meshPtr_; + //- pointField referenced + const pointField& points_; // Protected Classes @@ -104,25 +104,27 @@ protected: //- map global to local indices labelList list; - // null constructor + //- null constructor localPoints() : nPoints(0), list(0) {} - // construct for mesh points - localPoints(const polyMesh& pMesh) + //- construct for mesh points + localPoints(const pointField& pts) : nPoints(0), - list(pMesh.points().size(), -1) + list(pts.size(), -1) {} }; // Protected Member Functions - //- reconstruct contents from Istream + //- Reconstruct part characteristics (eg, element types) from Istream + // A part reconstructed in this manner can be used when writing fields, + // but cannot be used to write a new geometry void reconstruct(Istream&); //- check for fully defined fields @@ -170,12 +172,12 @@ public: //- Construct empty part with number and description ensightPart(label partNumber, const string& partDescription); - //- Construct empty part with number and description + //- Construct part with number, description and points reference ensightPart ( label partNumber, const string& partDescription, - const polyMesh& pMesh + const pointField& points ); //- Construct as copy @@ -202,8 +204,9 @@ public: return autoPtr(new ensightPart(*this)); }; - //- Construct on freestore from Istream - static autoPtr New(Istream& is); + //- Reconstruct part characteristics on freestore from Istream + // @sa reconstruct + static autoPtr New(Istream&); //- Destructor @@ -212,7 +215,7 @@ public: // Static members - virtual List const& elementTypes() const + virtual const List& elementTypes() const { return elemTypes_; } @@ -256,12 +259,13 @@ public: return matId_; } - //- non-const access + //- non-const access to part name or description void name(const string& value) { name_ = value; } + //- non-const access to material id void materialId(const label value) { matId_ = value; @@ -283,7 +287,7 @@ public: // Edit //- renumber elements - void renumber(labelList const&); + void renumber(const labelList&); //- write summary information about the object bool writeSummary(Ostream&) const; @@ -296,7 +300,7 @@ public: {} //- Helper: write geometry given the pointField - void writeGeometry(ensightGeoFile&, const pointField& points) const; + void writeGeometry(ensightGeoFile&, const pointField&) const; //- write scalar field void writeScalarField @@ -316,7 +320,7 @@ public: //- write generalized field components - template + template void writeField ( ensightFile&, @@ -339,11 +343,8 @@ public: friend Ostream& operator<<(Ostream&, const ensightPart&); //- write geometry - friend ensightGeoFile& operator<< - ( - ensightGeoFile&, - const ensightPart& - ); + friend ensightGeoFile& operator<<(ensightGeoFile&, const ensightPart&); + }; @@ -354,7 +355,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ensightPartI.H" +# include "ensightPartTemplates.C" #endif // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/conversion/ensight/part/ensightPartCells.C b/src/conversion/ensight/part/ensightPartCells.C index d00e9b6f4b..8bd8465c41 100644 --- a/src/conversion/ensight/part/ensightPartCells.C +++ b/src/conversion/ensight/part/ensightPartCells.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,22 +24,21 @@ License \*----------------------------------------------------------------------------*/ #include "ensightPartCells.H" -#include "addToRunTimeSelectionTable.H" #include "IOstream.H" #include "IStringStream.H" #include "dictionary.H" #include "cellModeller.H" - +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(ensightPartCells, 0); - addToRunTimeSelectionTable(ensightPart, ensightPartCells, istream); + defineTypeNameAndDebug(ensightPartCells, 0); + addToRunTimeSelectionTable(ensightPart, ensightPartCells, istream); } -Foam::List Foam::ensightPartCells::elemTypes_ +const Foam::List Foam::ensightPartCells::elemTypes_ ( IStringStream ( @@ -50,7 +49,11 @@ Foam::List Foam::ensightPartCells::elemTypes_ // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::ensightPartCells::classify(const labelList& idList) +void Foam::ensightPartCells::classify +( + const polyMesh& mesh, + const labelList& idList +) { // References to cell shape models const cellModel& tet = *(cellModeller::lookup("tet")); @@ -58,7 +61,6 @@ void Foam::ensightPartCells::classify(const labelList& idList) const cellModel& prism = *(cellModeller::lookup("prism")); const cellModel& hex = *(cellModeller::lookup("hex")); - const polyMesh& mesh = *meshPtr_; const cellShapeList& cellShapes = mesh.cellShapes(); offset_ = 0; @@ -78,13 +80,6 @@ void Foam::ensightPartCells::classify(const labelList& idList) label nHex = 0; label nPoly = 0; - - // TODO: allow tet-decomposition of polyhedral cells -#if 0 - label nTetDecomp = 0; - label nPyrDecomp = 0; -#endif - for (label listI = 0; listI < size_; ++listI) { label cellId = listI; @@ -115,26 +110,6 @@ void Foam::ensightPartCells::classify(const labelList& idList) else { nPoly++; - - // TODO: allow tet-decomposition of polyhedral cells -#if 0 - const cell& cFaces = mesh.cells()[cellI]; - - forAll(cFaces, cFaceI) - { - const face& f = mesh.faces()[cFaces[cFaceI]]; - - label nQuads = 0; - label nTris = 0; - f.nTrianglesQuads(mesh.points(), nTris, nQuads); - - nTetDecomp += nTris; - nPyrDecomp += nQuads; - } - - nAddCells--; - nAddPoints++; -#endif } } @@ -183,29 +158,6 @@ void Foam::ensightPartCells::classify(const labelList& idList) else { polyCells[nPoly++] = cellId; - - // TODO: allow tet-decomposition of polyhedral cells -#if 0 - // Mapping from additional point to cell - addPointCellLabels_[api] = cellId; - - const cell& cFaces = mesh.cells()[cellId]; - - forAll(cFaces, cFaceI) - { - const face& f = mesh.faces()[cFaces[cFaceI]]; - - label nQuads = 0; - label nTris = 0; - f.nTrianglesQuads(mesh.points(), nTris, nQuads); - - nTetDecomp += nTris; - nPyrDecomp += nQuads; - } - - nAddCells--; - nAddPoints++; -#endif } } @@ -213,11 +165,11 @@ void Foam::ensightPartCells::classify(const labelList& idList) // MUST match with elementTypes elemLists_.setSize(elementTypes().size()); - elemLists_[tetra4Elements].transfer( tetCells ); - elemLists_[pyramid5Elements].transfer( pyramidCells ); - elemLists_[penta6Elements].transfer( prismCells ); - elemLists_[hexa8Elements].transfer( hexCells ); - elemLists_[nfacedElements].transfer( polyCells ); + elemLists_[tetra4Elements].transfer(tetCells); + elemLists_[pyramid5Elements].transfer(pyramidCells); + elemLists_[penta6Elements].transfer(prismCells); + elemLists_[hexa8Elements].transfer(hexCells); + elemLists_[nfacedElements].transfer(polyCells); } @@ -229,57 +181,63 @@ Foam::ensightPartCells::ensightPartCells const string& partDescription ) : - ensightPart(partNumber, partDescription) + ensightPart(partNumber, partDescription), + mesh_(*reinterpret_cast(0)) {} Foam::ensightPartCells::ensightPartCells ( label partNumber, - const polyMesh& pMesh + const polyMesh& mesh ) : - ensightPart(partNumber, "cells", pMesh) + ensightPart(partNumber, "cells", mesh.points()), + mesh_(mesh) { - classify(); + classify(mesh); } Foam::ensightPartCells::ensightPartCells ( label partNumber, - const polyMesh& pMesh, + const polyMesh& mesh, const labelList& idList ) : - ensightPart(partNumber, "cells", pMesh) + ensightPart(partNumber, "cells", mesh.points()), + mesh_(mesh) { - classify(idList); + classify(mesh, idList); } Foam::ensightPartCells::ensightPartCells ( label partNumber, - const polyMesh& pMesh, + const polyMesh& mesh, const cellZone& cZone ) : - ensightPart(partNumber, cZone.name(), pMesh) + ensightPart(partNumber, cZone.name(), mesh.points()), + mesh_(mesh) { - classify(cZone); + classify(mesh, cZone); } Foam::ensightPartCells::ensightPartCells(const ensightPartCells& part) : - ensightPart(part) + ensightPart(part), + mesh_(part.mesh_) {} Foam::ensightPartCells::ensightPartCells(Istream& is) : - ensightPart() + ensightPart(), + mesh_(*reinterpret_cast(0)) { reconstruct(is); } @@ -295,9 +253,7 @@ Foam::ensightPartCells::~ensightPartCells() Foam::ensightPart::localPoints Foam::ensightPartCells::calcLocalPoints() const { - const polyMesh& mesh = *meshPtr_; - - localPoints ptList(mesh); + localPoints ptList(points_); labelList& usedPoints = ptList.list; label nPoints = 0; @@ -309,11 +265,11 @@ Foam::ensightPart::localPoints Foam::ensightPartCells::calcLocalPoints() const forAll(idList, i) { label id = idList[i] + offset_; - const labelList& cFaces = mesh.cells()[id]; + const labelList& cFaces = mesh_.cells()[id]; forAll(cFaces, cFaceI) { - const face& f = mesh.faces()[cFaces[cFaceI]]; + const face& f = mesh_.faces()[cFaces[cFaceI]]; forAll(f, fp) { @@ -353,20 +309,18 @@ void Foam::ensightPartCells::writeConnectivity os.write(idList.size()); os.newline(); - const polyMesh& mesh = *meshPtr_; - // write polyhedral if (key == "nfaced") { - const faceList& meshFaces = mesh.faces(); + const faceList& meshFaces = mesh_.faces(); // write the number of faces per element forAll(idList, i) { label id = idList[i] + offset_; - const labelList& cFace = mesh.cells()[id]; + const labelList& cFace = mesh_.cells()[id]; - os.write( cFace.size() ); + os.write(cFace.size()); os.newline(); } @@ -374,13 +328,13 @@ void Foam::ensightPartCells::writeConnectivity forAll(idList, i) { label id = idList[i] + offset_; - const labelList& cFace = mesh.cells()[id]; + const labelList& cFace = mesh_.cells()[id]; forAll(cFace, faceI) { const face& cf = meshFaces[cFace[faceI]]; - os.write( cf.size() ); + os.write(cf.size()); os.newline(); } } @@ -389,7 +343,7 @@ void Foam::ensightPartCells::writeConnectivity forAll(idList, i) { label id = idList[i] + offset_; - const labelList& cFace = mesh.cells()[id]; + const labelList& cFace = mesh_.cells()[id]; forAll(cFace, faceI) { @@ -399,7 +353,7 @@ void Foam::ensightPartCells::writeConnectivity { // convert global -> local index // (note: Ensight indices start with 1) - os.write( pointMap[cf[ptI]] + 1); + os.write(pointMap[cf[ptI]] + 1); } os.newline(); } @@ -408,7 +362,7 @@ void Foam::ensightPartCells::writeConnectivity else { // write primitive - const cellShapeList& cellShapes = mesh.cellShapes(); + const cellShapeList& cellShapes = mesh_.cellShapes(); forAll(idList, i) { @@ -419,7 +373,7 @@ void Foam::ensightPartCells::writeConnectivity // (note: Ensight indices start with 1) forAll(cellPoints, ptI) { - os.write( pointMap[cellPoints[ptI]] + 1 ); + os.write(pointMap[cellPoints[ptI]] + 1); } os.newline(); } @@ -429,8 +383,7 @@ void Foam::ensightPartCells::writeConnectivity void Foam::ensightPartCells::writeGeometry(ensightGeoFile& os) const { - const polyMesh& mesh = *meshPtr_; - ensightPart::writeGeometry(os, mesh.points()); + ensightPart::writeGeometry(os, points_); } diff --git a/src/conversion/ensight/part/ensightPartCells.H b/src/conversion/ensight/part/ensightPartCells.H index 82b0f80d89..bf6bf951a7 100644 --- a/src/conversion/ensight/part/ensightPartCells.H +++ b/src/conversion/ensight/part/ensightPartCells.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,8 +56,12 @@ class ensightPartCells //- Disallow default bitwise assignment void operator=(const ensightPartCells&); - //- classify the cell types - void classify(const labelList& idLabels = labelList::null()); + //- Classify the cell types, set elemLists. + void classify + ( + const polyMesh&, + const labelList& idLabels = labelList::null() + ); //- track points used virtual localPoints calcLocalPoints() const; @@ -74,24 +78,29 @@ class ensightPartCells const labelList& pointMap ) const; - //- write geometry - virtual void writeGeometry(ensightGeoFile& os) const; - protected: - //- addressable Ensight element types - enum elemType - { - tetra4Elements, - pyramid5Elements, - penta6Elements, - hexa8Elements, - nfacedElements - }; + //- addressable ensight element types + enum elemType + { + tetra4Elements, + pyramid5Elements, + penta6Elements, + hexa8Elements, + nfacedElements + }; + // Static data members - static List elemTypes_; + + static const List elemTypes_; + + + // Protected data + + //- mesh referenced + const polyMesh& mesh_; public: @@ -126,10 +135,13 @@ public: //- Construct as copy ensightPartCells(const ensightPartCells&); - //- Construct from Istream + //- Reconstruct part characteristics (eg, element types) from Istream + // A part reconstructed in this manner can be used when writing fields, + // but cannot be used to write a new geometry + // @sa Foam::ensightPart::reconstruct ensightPartCells(Istream&); - //- Construct on freestore from Istream + //- Reconstruct part characteristics on freestore from Istream static autoPtr New(Istream& is) { return autoPtr(new ensightPartCells(is)); @@ -142,8 +154,11 @@ public: // Member Functions + //- write geometry + virtual void writeGeometry(ensightGeoFile&) const; + //- static listing of the element types - virtual List const& elementTypes() const + virtual const List& elementTypes() const { return elemTypes_; } diff --git a/src/conversion/ensight/part/ensightPartFaces.C b/src/conversion/ensight/part/ensightPartFaces.C index 46169cd90f..250be573c6 100644 --- a/src/conversion/ensight/part/ensightPartFaces.C +++ b/src/conversion/ensight/part/ensightPartFaces.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,21 +24,21 @@ License \*----------------------------------------------------------------------------*/ #include "ensightPartFaces.H" -#include "addToRunTimeSelectionTable.H" #include "IOstreams.H" #include "IStringStream.H" #include "dictionary.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(ensightPartFaces, 0); - addToRunTimeSelectionTable(ensightPart, ensightPartFaces, istream); + defineTypeNameAndDebug(ensightPartFaces, 0); + addToRunTimeSelectionTable(ensightPart, ensightPartFaces, istream); } -Foam::List Foam::ensightPartFaces::elemTypes_ +const Foam::List Foam::ensightPartFaces::elemTypes_ ( IStringStream ( @@ -49,7 +49,7 @@ Foam::List Foam::ensightPartFaces::elemTypes_ // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // -void Foam::ensightPartFaces::binShapes(const faceList& faces) +void Foam::ensightPartFaces::classify(const faceList& faces) { // count the shapes label nTri = 0; @@ -107,9 +107,9 @@ void Foam::ensightPartFaces::binShapes(const faceList& faces) // MUST match with elementTypes elemLists_.setSize(elementTypes().size()); - elemLists_[tria3Elements].transfer( triCells ); - elemLists_[quad4Elements].transfer( quadCells ); - elemLists_[nsidedElements].transfer( polygonCells ); + elemLists_[tria3Elements].transfer(triCells); + elemLists_[quad4Elements].transfer(quadCells); + elemLists_[nsidedElements].transfer(polygonCells); size_ = faces.size(); } @@ -123,7 +123,9 @@ Foam::ensightPartFaces::ensightPartFaces const string& partDescription ) : - ensightPart(partNumber, partDescription) + ensightPart(partNumber, partDescription), + faces_(faceList::null()), + contiguousPoints_(false) { isCellData_ = false; offset_ = 0; @@ -134,29 +136,57 @@ Foam::ensightPartFaces::ensightPartFaces Foam::ensightPartFaces::ensightPartFaces ( label partNumber, - const polyMesh& pMesh, - const polyPatch& pPatch + const string& partDescription, + const pointField& points, + const faceList& faces, + const bool contiguousPoints ) : - ensightPart(partNumber, pPatch.name(), pMesh) + ensightPart(partNumber, partDescription, points), + faces_(faces), + contiguousPoints_(contiguousPoints) { isCellData_ = false; - offset_ = pPatch.start(); + offset_ = 0; + size_ = 0; - // count the shapes - binShapes(pPatch); + // classify the face shapes + classify(faces); +} + + +Foam::ensightPartFaces::ensightPartFaces +( + label partNumber, + const polyMesh& mesh, + const polyPatch& patch +) +: + ensightPart(partNumber, patch.name(), mesh.points()), + faces_(mesh.faces()), + contiguousPoints_(false) +{ + isCellData_ = false; + offset_ = patch.start(); + + // classify the face shapes + classify(patch); } Foam::ensightPartFaces::ensightPartFaces(const ensightPartFaces& part) : - ensightPart(part) + ensightPart(part), + faces_(part.faces_), + contiguousPoints_(part.contiguousPoints_) {} Foam::ensightPartFaces::ensightPartFaces(Istream& is) : - ensightPart() + ensightPart(), + faces_(faceList::null()), + contiguousPoints_(false) { isCellData_ = false; reconstruct(is); @@ -173,9 +203,15 @@ Foam::ensightPartFaces::~ensightPartFaces() Foam::ensightPart::localPoints Foam::ensightPartFaces::calcLocalPoints() const { - const polyMesh& mesh = *meshPtr_; + if (contiguousPoints_) + { + localPoints ptList; + ptList.list = identity(points_.size()); + ptList.nPoints = points_.size(); + return ptList; + } - localPoints ptList(mesh); + localPoints ptList(points_); labelList& usedPoints = ptList.list; label nPoints = 0; @@ -187,7 +223,7 @@ Foam::ensightPart::localPoints Foam::ensightPartFaces::calcLocalPoints() const forAll(idList, i) { label id = idList[i] + offset_; - const face& f = mesh.faces()[id]; + const face& f = faces_[id]; forAll(f, fp) { @@ -236,7 +272,7 @@ void Foam::ensightPartFaces::writeConnectivity label id = idList[i] + offset_; const face& f = faces[id]; - os.write( f.size() ); + os.write(f.size()); os.newline(); } } @@ -251,7 +287,7 @@ void Foam::ensightPartFaces::writeConnectivity // (note: Ensight indices start with 1) forAll(f, fp) { - os.write( pointMap[f[fp]] + 1 ); + os.write(pointMap[f[fp]] + 1); } os.newline(); } @@ -270,7 +306,7 @@ void Foam::ensightPartFaces::writeConnectivity ( os, key, - meshPtr_->faces(), + faces_, idList, pointMap ); @@ -279,9 +315,7 @@ void Foam::ensightPartFaces::writeConnectivity void Foam::ensightPartFaces::writeGeometry(ensightGeoFile& os) const { - const polyMesh& mesh = *meshPtr_; - const pointField& points = mesh.points(); - ensightPart::writeGeometry(os, points); + ensightPart::writeGeometry(os, points_); } diff --git a/src/conversion/ensight/part/ensightPartFaces.H b/src/conversion/ensight/part/ensightPartFaces.H index 3871300b5c..78d5cf6d16 100644 --- a/src/conversion/ensight/part/ensightPartFaces.H +++ b/src/conversion/ensight/part/ensightPartFaces.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,41 +61,52 @@ class ensightPartFaces //- element connectivity virtual void writeConnectivity ( - ensightGeoFile& os, + ensightGeoFile&, const word& key, const labelList& idList, const labelList& pointMap ) const; - //- write geometry - virtual void writeGeometry(ensightGeoFile& os) const; - protected: - //- addressable ensight element types - enum elemType - { - tria3Elements, - quad4Elements, - nsidedElements - }; + //- addressable ensight element types + enum elemType + { + tria3Elements, + quad4Elements, + nsidedElements + }; + // Static data members - static List elemTypes_; - //- Divide the shapes, set elemLists. - void binShapes(const faceList& faces); + static const List elemTypes_; - //- Helper: write connectivity - void writeConnectivity - ( - ensightGeoFile& os, - const word& key, - const faceList& faces, - const labelList& idList, - const labelList& pointMap - ) const; + + // Protected data + + //- faces referenced + const faceList& faces_; + + //- Can skip local point renumbering when points are contiguous + const bool contiguousPoints_; + + + // Protected Member Functions + + //- Classify the face shapes, set elemLists. + void classify(const faceList&); + + //- Helper: write connectivity + void writeConnectivity + ( + ensightGeoFile&, + const word& key, + const faceList&, + const labelList& idList, + const labelList& pointMap + ) const; public: @@ -108,6 +119,17 @@ public: //- Construct empty part with number and description ensightPartFaces(label partNumber, const string& partDescription); + //- Construct part with number, description, points and faces + // Can skip local point renumbering when points are contiguous + ensightPartFaces + ( + label partNumber, + const string& partDescription, + const pointField&, + const faceList&, + const bool contiguousPoints = false + ); + //- Construct from polyMesh and polyPatch ensightPartFaces ( @@ -119,10 +141,13 @@ public: //- Construct as copy ensightPartFaces(const ensightPartFaces&); - //- Construct from Istream + //- Reconstruct part characteristics (eg, element types) from Istream + // A part reconstructed in this manner can be used when writing fields, + // but cannot be used to write a new geometry + // @sa Foam::ensightPart::reconstruct ensightPartFaces(Istream&); - //- Construct on freestore from Istream + //- Reconstruct part characteristics on freestore from Istream static autoPtr New(Istream& is) { return autoPtr(new ensightPartFaces(is)); @@ -135,8 +160,11 @@ public: // Member Functions + //- write geometry + virtual void writeGeometry(ensightGeoFile&) const; + //- static listing of the element types - virtual List const& elementTypes() const + virtual const List& elementTypes() const { return elemTypes_; } diff --git a/src/conversion/ensight/part/ensightPartIO.C b/src/conversion/ensight/part/ensightPartIO.C index ac903bdf99..7760b7b07f 100644 --- a/src/conversion/ensight/part/ensightPartIO.C +++ b/src/conversion/ensight/part/ensightPartIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -77,6 +77,32 @@ void Foam::ensightPart::writeFieldList // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +void Foam::ensightPart::reconstruct(Istream& is) +{ + dictionary dict(is); + dict.lookup("id") >> number_; + dict.lookup("name") >> name_; + + offset_ = 0; + dict.readIfPresent("offset", offset_); + + // populate elemLists_ + elemLists_.setSize(elementTypes().size()); + + forAll(elementTypes(), elemI) + { + word key(elementTypes()[elemI]); + + elemLists_[elemI].clear(); + dict.readIfPresent(key, elemLists_[elemI]); + + size_ += elemLists_[elemI].size(); + } + + is.check("ensightPart::reconstruct(Istream&)"); +} + + bool Foam::ensightPart::writeSummary(Ostream& os) const { os << indent << type() << nl @@ -88,7 +114,7 @@ bool Foam::ensightPart::writeSummary(Ostream& os) const os.writeKeyword("offset") << offset() << token::END_STATEMENT << nl; os.writeKeyword("size") << size() << token::END_STATEMENT << nl; - os << decrIndent << indent << token::END_BLOCK << nl << endl; + os << decrIndent << indent << token::END_BLOCK << nl << endl; return true; } @@ -112,7 +138,7 @@ bool Foam::ensightPart::writeData(Ostream& os) const } } - os << decrIndent << indent << token::END_BLOCK << nl << endl; + os << decrIndent << indent << token::END_BLOCK << nl << endl; return true; } @@ -136,13 +162,13 @@ void Foam::ensightPart::writeGeometry os.write(ptList.nPoints); os.newline(); - for (direction cmpt=0; cmpt < vector::nComponents; cmpt++) + for (direction cmpt=0; cmpt < point::nComponents; ++cmpt) { forAll(pointMap, ptI) { if (pointMap[ptI] > -1) { - os.write( points[ptI].component(cmpt) ); + os.write(points[ptI].component(cmpt)); os.newline(); } } @@ -182,7 +208,7 @@ void Foam::ensightPart::writeScalarField if (idList.size()) { - os.writeKeyword( elementTypes()[elemI] ); + os.writeKeyword(elementTypes()[elemI]); writeFieldList(os, field, idList); } } @@ -208,7 +234,7 @@ void Foam::ensightPart::writeVectorField if (idList.size()) { - os.writeKeyword( elementTypes()[elemI] ); + os.writeKeyword(elementTypes()[elemI]); writeFieldList(os, field0, idList); writeFieldList(os, field1, idList); writeFieldList(os, field2, idList); diff --git a/src/conversion/ensight/part/ensightPartNonMeshFaces.C b/src/conversion/ensight/part/ensightPartNonMeshFaces.C deleted file mode 100644 index e991844bf0..0000000000 --- a/src/conversion/ensight/part/ensightPartNonMeshFaces.C +++ /dev/null @@ -1,122 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "ensightPartNonMeshFaces.H" -#include "addToRunTimeSelectionTable.H" - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(ensightPartNonMeshFaces, 0); - addToRunTimeSelectionTable(ensightPart, ensightPartNonMeshFaces, istream); -} - - -// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // - -Foam::ensightPart::localPoints -Foam::ensightPartNonMeshFaces::calcLocalPoints() const -{ - localPoints ptList; - ptList.list = identity(points_.size()); - ptList.nPoints = points_.size(); - return ptList; -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::ensightPartNonMeshFaces::ensightPartNonMeshFaces -( - label partNumber, - const string& partDescription, - const faceList& faces, - const pointField& points -) -: - ensightPartFaces(partNumber, partDescription), - faces_(faces), - points_(points) -{ - binShapes(faces); -} - - -//- Construct as copy -Foam::ensightPartNonMeshFaces::ensightPartNonMeshFaces -( - const ensightPartNonMeshFaces& part -) -: - ensightPartFaces(part), - faces_(part.faces_), - points_(part.points_) -{} - - -//- Construct from Istream -Foam::ensightPartNonMeshFaces::ensightPartNonMeshFaces(Istream& is) -: - ensightPartFaces(is), - faces_(is), - points_(is) -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -Foam::ensightPartNonMeshFaces::~ensightPartNonMeshFaces() -{} - - -// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // - -void Foam::ensightPartNonMeshFaces::writeConnectivity -( - ensightGeoFile& os, - const word& key, - const labelList& idList, - const labelList& pointMap -) const -{ - ensightPartFaces::writeConnectivity - ( - os, - key, - faces_, - idList, - pointMap - ); -} - - -void Foam::ensightPartNonMeshFaces::writeGeometry(ensightGeoFile& os) const -{ - ensightPart::writeGeometry(os, points_); -} - - -// ************************************************************************* // diff --git a/src/conversion/ensight/part/ensightPartNonMeshFaces.H b/src/conversion/ensight/part/ensightPartNonMeshFaces.H deleted file mode 100644 index ab7f4a782a..0000000000 --- a/src/conversion/ensight/part/ensightPartNonMeshFaces.H +++ /dev/null @@ -1,131 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -Class - Foam::ensightPartNonMeshFaces - -Description - An implementation of ensightPart to work on self-contained faces and points - (without a mesh). - -SourceFiles - ensightPartNonMeshFaces.C - -\*---------------------------------------------------------------------------*/ - -#ifndef ensightPartNonMeshFaces_H -#define ensightPartNonMeshFaces_H - -#include "ensightPartFaces.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -/*---------------------------------------------------------------------------*\ - Class ensightPartNonMeshFaces Declaration -\*---------------------------------------------------------------------------*/ - -class ensightPartNonMeshFaces -: - public ensightPartFaces -{ - // Private data - - //- faces (reference) - const faceList& faces_; - - //- points (reference) - const pointField& points_; - - - // Private Member Functions - - //- Disallow default bitwise assignment - void operator=(const ensightPartNonMeshFaces&); - - //- track points used - virtual localPoints calcLocalPoints() const; - -public: - - //- Runtime type information - TypeName("ensightNonMeshFaces"); - - // Constructors - - //- Construct from faces and points - ensightPartNonMeshFaces - ( - label partNumber, - const string& partDescription, - const faceList& faces, - const pointField& points - ); - - //- Construct as copy - ensightPartNonMeshFaces(const ensightPartNonMeshFaces& part); - - //- Construct from Istream - ensightPartNonMeshFaces(Istream& is); - - //- Construct on freestore from Istream - static autoPtr New(Istream& is) - { - return autoPtr - ( - new ensightPartNonMeshFaces(is) - ); - } - - - //- Destructor - virtual ~ensightPartNonMeshFaces(); - - - // Member Functions - - //- element connectivity - virtual void writeConnectivity - ( - ensightGeoFile& os, - const word& key, - const labelList& idList, - const labelList& pointMap - ) const; - - virtual void writeGeometry(ensightGeoFile& os) const; - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/conversion/ensight/part/ensightPartI.H b/src/conversion/ensight/part/ensightPartTemplates.C similarity index 90% rename from src/conversion/ensight/part/ensightPartI.H rename to src/conversion/ensight/part/ensightPartTemplates.C index 9286273276..5bb80f9622 100644 --- a/src/conversion/ensight/part/ensightPartI.H +++ b/src/conversion/ensight/part/ensightPartTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,14 +30,14 @@ Description // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // -template +template void Foam::ensightPart::writeField ( ensightFile& os, const Field& field ) const { - if (size() && field.size()) + if (this->size() && field.size()) { writeHeader(os); @@ -47,13 +47,13 @@ void Foam::ensightPart::writeField if (idList.size()) { - os.writeKeyword( elementTypes()[elemI] ); + os.writeKeyword(elementTypes()[elemI]); for ( direction cmpt=0; cmpt < pTraits::nComponents; - cmpt++ + ++cmpt ) { writeFieldList(os, field.component(cmpt), idList); diff --git a/src/conversion/ensight/part/ensightParts.C b/src/conversion/ensight/part/ensightParts.C index 76179b4a11..658f41b74c 100644 --- a/src/conversion/ensight/part/ensightParts.C +++ b/src/conversion/ensight/part/ensightParts.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,11 +27,11 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::ensightParts::ensightParts(const polyMesh& pMesh) +Foam::ensightParts::ensightParts(const polyMesh& mesh) : partsList_() { - recalculate(pMesh); + recalculate(mesh); } @@ -52,15 +52,15 @@ Foam::ensightParts::~ensightParts() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::ensightParts::recalculate(const polyMesh& pMesh) +void Foam::ensightParts::recalculate(const polyMesh& mesh) { partsList_.clear(); // extra space for unzoned cells label nPart = ( - pMesh.cellZones().size() - + pMesh.boundaryMesh().size() + mesh.cellZones().size() + + mesh.boundaryMesh().size() + 1 ); @@ -70,9 +70,9 @@ void Foam::ensightParts::recalculate(const polyMesh& pMesh) label nZoneCells = 0; // do cell zones - forAll(pMesh.cellZones(), zoneI) + forAll(mesh.cellZones(), zoneI) { - const cellZone& cZone = pMesh.cellZones()[zoneI]; + const cellZone& cZone = mesh.cellZones()[zoneI]; nZoneCells += cZone.size(); if (cZone.size()) @@ -80,12 +80,7 @@ void Foam::ensightParts::recalculate(const polyMesh& pMesh) partsList_.set ( nPart, - new ensightPartCells - ( - nPart, - pMesh, - cZone - ) + new ensightPartCells(nPart, mesh, cZone) ); nPart++; @@ -100,23 +95,19 @@ void Foam::ensightParts::recalculate(const polyMesh& pMesh) partsList_.set ( nPart, - new ensightPartCells - ( - nPart, - pMesh - ) + new ensightPartCells(nPart, mesh) ); nPart++; } - else if (pMesh.nCells() > nZoneCells) + else if (mesh.nCells() > nZoneCells) { // determine which cells are not in a cellZone - labelList unzoned(pMesh.nCells(), -1); + labelList unzoned(mesh.nCells(), -1); - forAll(pMesh.cellZones(), zoneI) + forAll(mesh.cellZones(), zoneI) { - const labelList& idList = pMesh.cellZones()[zoneI]; + const labelList& idList = mesh.cellZones()[zoneI]; forAll(idList, i) { @@ -140,12 +131,7 @@ void Foam::ensightParts::recalculate(const polyMesh& pMesh) partsList_.set ( nPart, - new ensightPartCells - ( - nPart, - pMesh, - unzoned - ) + new ensightPartCells(nPart, mesh, unzoned) ); nPart++; @@ -154,20 +140,15 @@ void Foam::ensightParts::recalculate(const polyMesh& pMesh) // do boundaries, skipping empty and processor patches - forAll(pMesh.boundaryMesh(), patchI) + forAll(mesh.boundaryMesh(), patchI) { - const polyPatch& pPatch = pMesh.boundaryMesh()[patchI]; - if (pPatch.size() && !isA(pPatch)) + const polyPatch& patch = mesh.boundaryMesh()[patchI]; + if (patch.size() && !isA(patch)) { partsList_.set ( nPart, - new ensightPartFaces - ( - nPart, - pMesh, - pPatch - ) + new ensightPartFaces(nPart, mesh, patch) ); nPart++; @@ -199,7 +180,7 @@ void Foam::ensightParts::renumber } -void Foam::ensightParts::writeGeometry( ensightGeoFile& os) const +void Foam::ensightParts::writeGeometry(ensightGeoFile& os) const { // with some feedback Info<< "write geometry part:" << nl << flush; @@ -225,23 +206,21 @@ bool Foam::ensightParts::writeSummary(Ostream& os) const void Foam::ensightParts::writeData(Ostream& os) const { - // Write size of list - os << nl << partsList_.size(); - - // Write beginning of contents - os << nl << token::BEGIN_LIST; + // Begin write list + os << nl << partsList_.size() + << nl << token::BEGIN_LIST; // Write list contents forAll(partsList_, i) { - os << nl << partsList_[i]; + os << nl << partsList_[i]; } - // Write end of contents - os << nl << token::END_LIST << nl; + // End write list + os << nl << token::END_LIST << nl; // Check state of IOstream - os.check("Ostream& operator<<(Ostream&, const PtrList&)"); + os.check("ensightParts::writeData(Ostream&)"); } diff --git a/src/conversion/ensight/part/ensightParts.H b/src/conversion/ensight/part/ensightParts.H index 3d620192b5..7ef4094259 100644 --- a/src/conversion/ensight/part/ensightParts.H +++ b/src/conversion/ensight/part/ensightParts.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ Description SourceFiles ensightParts.C - ensightPartsI.H + ensightPartsTemplates.C \*---------------------------------------------------------------------------*/ @@ -128,7 +128,7 @@ public: //- write generalized field components - template + template void writeField ( ensightFile&, @@ -138,11 +138,8 @@ public: // Friend Operators - friend ensightGeoFile& operator<< - ( - ensightGeoFile&, - const ensightParts& - ); + //- write geometry + friend ensightGeoFile& operator<<(ensightGeoFile&, const ensightParts&); }; @@ -153,7 +150,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #ifdef NoRepository -# include "ensightPartsI.H" +# include "ensightPartsTemplates.C" #endif #endif diff --git a/src/conversion/ensight/part/ensightPartsI.H b/src/conversion/ensight/part/ensightPartsTemplates.C similarity index 96% rename from src/conversion/ensight/part/ensightPartsI.H rename to src/conversion/ensight/part/ensightPartsTemplates.C index c4848faf2a..5eb8a7aec8 100644 --- a/src/conversion/ensight/part/ensightPartsI.H +++ b/src/conversion/ensight/part/ensightPartsTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,7 +30,7 @@ Description // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -template +template void Foam::ensightParts::writeField ( ensightFile& os, diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C index d705525ebc..641e6a19b2 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C @@ -28,8 +28,7 @@ License #include "OFstream.H" #include "OSspecific.H" #include "IOmanip.H" -#include "ensightGeoFile.H" -#include "ensightPartNonMeshFaces.H" +#include "ensightPartFaces.H" #include "makeSurfaceWriterMethods.H" @@ -153,7 +152,7 @@ void Foam::ensightSurfaceWriter::writeTemplate << timeValue << nl << nl; - ensightPartNonMeshFaces ensPart(0, geomStr.name().name(), faces, points); + ensightPartFaces ensPart(0, geomStr.name().name(), points, faces, true); geomStr << ensPart; // Write field @@ -252,7 +251,7 @@ void Foam::ensightSurfaceWriter::write << timeValue << nl << nl; - ensightPartNonMeshFaces ensPart(0, geomStr.name().name(), faces, points); + ensightPartFaces ensPart(0, geomStr.name().name(), points, faces, true); geomStr << ensPart; } From 2c9433dced8e339dca30179911d2668dfd5ea891 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 26 Jan 2011 16:49:55 +0000 Subject: [PATCH 014/367] ENH: Updated IOobject flag after change in mesh construction --- applications/solvers/combustion/chemFoam/createSingleCellMesh.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H index e9f0272772..71ee8d60f6 100644 --- a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H +++ b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H @@ -23,7 +23,7 @@ fvMesh mesh fvMesh::defaultRegion, runTime.timeName(), runTime, - IOobject::NO_READ + IOobject::MUST_READ ), xferMove >(points), faces.xfer(), From ac3335be533a0a76d9acaca4a28e7f303eccea73 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 26 Jan 2011 16:50:16 +0000 Subject: [PATCH 015/367] STYLE: Added suppressSolverInfo flag to chemFoam tutorial case --- tutorials/combustion/chemFoam/h2/system/controlDict | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tutorials/combustion/chemFoam/h2/system/controlDict b/tutorials/combustion/chemFoam/h2/system/controlDict index 6d9df8d24f..f56ce79ba6 100644 --- a/tutorials/combustion/chemFoam/h2/system/controlDict +++ b/tutorials/combustion/chemFoam/h2/system/controlDict @@ -47,5 +47,7 @@ timePrecision 6; runTimeModifiable yes; +suppressSolverInfo yes; + // ************************************************************************* // From 8ee6502188493999e13ac1331d3f0519f4aee746 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 26 Jan 2011 16:57:31 +0000 Subject: [PATCH 016/367] STYLE: TimeIO : extraneous include file --- src/OpenFOAM/db/Time/TimeIO.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenFOAM/db/Time/TimeIO.C b/src/OpenFOAM/db/Time/TimeIO.C index 8bcb95df9a..da542524b7 100644 --- a/src/OpenFOAM/db/Time/TimeIO.C +++ b/src/OpenFOAM/db/Time/TimeIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,7 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "Time.H" -#include "PstreamReduceOps.H" +#include "Pstream.H" // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // From e260d68e9c8f2ae0f866ffb5d050642a3514953d Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 26 Jan 2011 16:57:44 +0000 Subject: [PATCH 017/367] ENH: Updated chemi.inp tutorial file --- tutorials/combustion/chemFoam/gri/chemkin/chem.inp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutorials/combustion/chemFoam/gri/chemkin/chem.inp b/tutorials/combustion/chemFoam/gri/chemkin/chem.inp index 6c9e031c4c..ee978cd8a2 100644 --- a/tutorials/combustion/chemFoam/gri/chemkin/chem.inp +++ b/tutorials/combustion/chemFoam/gri/chemkin/chem.inp @@ -7,9 +7,9 @@ ELEMENTS O H C N AR END SPECIES -CH CH2O CH3O H O2 H2 O OH H2O HO2 H2O2 +CH4 CH2O CH3O H O2 H2 O OH H2O HO2 H2O2 C CH CH2 CH2(S) CH3 CO CO2 -HCO CH2OH CH3OH C2H C2H2 C2H3 +HCO CH2OH CH3OH C2H C2H2 C2H3 C2H4 C2H5 C2H6 HCCO CH2CO HCCOH N NH NH2 NH3 NNH NO NO2 N2O HNO CN HCN H2CN HCNN HCNO HOCN HNCO NCO N2 @@ -307,7 +307,7 @@ HO2+C3H7<=>O2+C3H8 2.550E+10 0.255 -943.00 HO2+C3H7=>OH+C2H5+CH2O 2.410E+13 .000 .00 CH3+C3H7<=>2C2H5 1.927E+13 -0.320 .00 ! -! + M Reactions +! + M Reactions ! 2O+M<=>O2+M 1.200E+17 -1.000 .00 H2/2.40/ H2O/15.40/ CH4/ 2.00/ CO/ 1.75/ CO2/3.60/ C2H6/ 3.00/ AR/0.83/ From c9d6212006ecac078a9eb7845f82d8926929f5bf Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 26 Jan 2011 16:59:13 +0000 Subject: [PATCH 018/367] ENH: Allwmake : allow easy building of static libraries --- src/Allwmake | 63 ++++++++++---------- src/Pstream/Allwmake | 2 +- src/conversion/Allwmake | 5 +- src/dummyThirdParty/Allwmake | 11 ++-- src/fvAgglomerationMethods/Allwmake | 5 +- src/lagrangian/Allwmake | 17 +++--- src/lagrangian/molecularDynamics/Allwmake | 9 ++- src/mesh/Allwmake | 7 ++- src/parallel/Allwmake | 9 ++- src/parallel/decompose/Allwmake | 9 ++- src/parallel/reconstruct/Allwmake | 5 +- src/postProcessing/Allwmake | 9 ++- src/postProcessing/functionObjects/Allwmake | 15 +++-- src/thermophysicalModels/Allwmake | 37 ++++++------ src/transportModels/Allwmake | 11 ++-- src/turbulenceModels/Allwmake | 6 +- src/turbulenceModels/LES/Allwmake | 7 ++- src/turbulenceModels/compressible/Allwmake | 9 ++- src/turbulenceModels/incompressible/Allwmake | 9 ++- 19 files changed, 148 insertions(+), 97 deletions(-) diff --git a/src/Allwmake b/src/Allwmake index f3c4420474..4dbc726a21 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -1,6 +1,9 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + wmakeCheckPwd "$WM_PROJECT_DIR/src" || { echo "Error: Current directory is not \$WM_PROJECT_DIR/src" echo " The environment variables are inconsistent with the installation." @@ -21,53 +24,53 @@ wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/$WM_OPTIONS/global.? 2>/dev/n wmakeLnInclude OpenFOAM wmakeLnInclude OSspecific/$WM_OSTYPE -Pstream/Allwmake +Pstream/Allwmake $* OSspecific/$WM_OSTYPE/Allwmake -wmake libso OpenFOAM +wmake $makeOption OpenFOAM -wmake libso fileFormats -wmake libso triSurface -wmake libso meshTools -wmake libso edgeMesh -wmake libso surfMesh +wmake $makeOption fileFormats +wmake $makeOption triSurface +wmake $makeOption meshTools +wmake $makeOption edgeMesh +wmake $makeOption surfMesh # Decomposition methods needed by dummyThirdParty parallel/decompose/AllwmakeLnInclude # dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools -dummyThirdParty/Allwmake +dummyThirdParty/Allwmake $* -wmake libso lagrangian/basic -wmake libso finiteVolume -wmake libso genericPatchFields +wmake $makeOption lagrangian/basic +wmake $makeOption finiteVolume +wmake $makeOption genericPatchFields # Build the proper scotchDecomp, metisDecomp etc. -parallel/Allwmake +parallel/Allwmake $* -wmake libso conversion +wmake $makeOption conversion -wmake libso sampling +wmake $makeOption sampling -wmake libso dynamicMesh -wmake libso dynamicFvMesh -wmake libso topoChangerFvMesh +wmake $makeOption dynamicMesh +wmake $makeOption dynamicFvMesh +wmake $makeOption topoChangerFvMesh -wmake libso ODE -wmake libso randomProcesses +wmake $makeOption ODE +wmake $makeOption randomProcesses -thermophysicalModels/Allwmake -transportModels/Allwmake -turbulenceModels/Allwmake -wmake libso surfaceFilmModels -lagrangian/Allwmake -postProcessing/Allwmake -mesh/Allwmake +thermophysicalModels/Allwmake $* +transportModels/Allwmake $* +turbulenceModels/Allwmake $* +wmake $makeOption surfaceFilmModels +lagrangian/Allwmake $* +postProcessing/Allwmake $* +mesh/Allwmake $* -wmake libso errorEstimation +wmake $makeOption errorEstimation -fvAgglomerationMethods/Allwmake +fvAgglomerationMethods/Allwmake $* -wmake libso fvMotionSolver -wmake libso engine +wmake $makeOption fvMotionSolver +wmake $makeOption engine # ----------------------------------------------------------------- end-of-file diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake index ec3b07a859..7a2f2cd308 100755 --- a/src/Pstream/Allwmake +++ b/src/Pstream/Allwmake @@ -18,7 +18,7 @@ case "$WM_MPLIB" in ;; #GAMMA) -# wmake libso gamma +# wmake $makeOption gamma # ;; esac diff --git a/src/conversion/Allwmake b/src/conversion/Allwmake index a7168eeab1..cf1e61d47d 100755 --- a/src/conversion/Allwmake +++ b/src/conversion/Allwmake @@ -2,6 +2,9 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +wmake $makeOption # ----------------------------------------------------------------- end-of-file diff --git a/src/dummyThirdParty/Allwmake b/src/dummyThirdParty/Allwmake index c584d92194..afd49cd5d9 100755 --- a/src/dummyThirdParty/Allwmake +++ b/src/dummyThirdParty/Allwmake @@ -2,10 +2,13 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso scotchDecomp -wmake libso ptscotchDecomp -wmake libso metisDecomp -wmake libso MGridGen +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +wmake $makeOption scotchDecomp +wmake $makeOption ptscotchDecomp +wmake $makeOption metisDecomp +wmake $makeOption MGridGen # ----------------------------------------------------------------- end-of-file diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake index 17118db818..27f2fea53a 100755 --- a/src/fvAgglomerationMethods/Allwmake +++ b/src/fvAgglomerationMethods/Allwmake @@ -2,6 +2,9 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso MGridGenGamgAgglomeration +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +wmake $makeOption MGridGenGamgAgglomeration # ----------------------------------------------------------------- end-of-file diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake index 92993c516f..26fd814f63 100755 --- a/src/lagrangian/Allwmake +++ b/src/lagrangian/Allwmake @@ -2,13 +2,16 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso basic -wmake libso solidParticle -wmake libso intermediate -wmake libso dieselSpray -wmake libso dsmc -wmake libso coalCombustion +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 -molecularDynamics/Allwmake +wmake $makeOption basic +wmake $makeOption solidParticle +wmake $makeOption intermediate +wmake $makeOption dieselSpray +wmake $makeOption dsmc +wmake $makeOption coalCombustion + +molecularDynamics/Allwmake $* # ----------------------------------------------------------------- end-of-file diff --git a/src/lagrangian/molecularDynamics/Allwmake b/src/lagrangian/molecularDynamics/Allwmake index 3f5d397e72..131ec5d458 100755 --- a/src/lagrangian/molecularDynamics/Allwmake +++ b/src/lagrangian/molecularDynamics/Allwmake @@ -2,8 +2,11 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso potential -wmake libso molecularMeasurements -wmake libso molecule +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +wmake $makeOption potential +wmake $makeOption molecularMeasurements +wmake $makeOption molecule # ----------------------------------------------------------------- end-of-file diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake index f967335db3..57df2d57bf 100755 --- a/src/mesh/Allwmake +++ b/src/mesh/Allwmake @@ -2,7 +2,10 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso autoMesh -wmake libso blockMesh +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +wmake $makeOption autoMesh +wmake $makeOption blockMesh # ----------------------------------------------------------------- end-of-file diff --git a/src/parallel/Allwmake b/src/parallel/Allwmake index 08ca4923f2..92d80e20a8 100755 --- a/src/parallel/Allwmake +++ b/src/parallel/Allwmake @@ -2,9 +2,12 @@ cd ${0%/*} || exit 1 # run from this directory set -x -decompose/Allwmake -reconstruct/Allwmake -wmake libso distributed +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +decompose/Allwmake $* +reconstruct/Allwmake $* +wmake $makeOption distributed # ----------------------------------------------------------------- end-of-file diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake index 51c23325cc..93835f6a24 100755 --- a/src/parallel/decompose/Allwmake +++ b/src/parallel/decompose/Allwmake @@ -1,6 +1,9 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + # get SCOTCH_VERSION, SCOTCH_ARCH_PATH settings=`$WM_PROJECT_DIR/bin/foamEtcFile apps/scotch/bashrc` if [ -f "$settings" ] @@ -16,17 +19,17 @@ set -x wmakeLnInclude decompositionMethods -wmake libso scotchDecomp +wmake $makeOption scotchDecomp if [ -d "$FOAM_LIBBIN/$FOAM_MPI" ] then ( WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB - wmake libso ptscotchDecomp + wmake $makeOption ptscotchDecomp ) fi -wmake libso decompositionMethods +wmake $makeOption decompositionMethods # ----------------------------------------------------------------- end-of-file diff --git a/src/parallel/reconstruct/Allwmake b/src/parallel/reconstruct/Allwmake index c4badc5067..453d88f50b 100755 --- a/src/parallel/reconstruct/Allwmake +++ b/src/parallel/reconstruct/Allwmake @@ -2,7 +2,10 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso reconstruct +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +wmake $makeOption reconstruct # ----------------------------------------------------------------- end-of-file diff --git a/src/postProcessing/Allwmake b/src/postProcessing/Allwmake index 169c9c833f..d543c26fe1 100755 --- a/src/postProcessing/Allwmake +++ b/src/postProcessing/Allwmake @@ -2,9 +2,12 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libo postCalc -wmake libso foamCalcFunctions +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 -functionObjects/Allwmake +wmake libo postCalc +wmake $makeOption foamCalcFunctions + +functionObjects/Allwmake $* # ----------------------------------------------------------------- end-of-file diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake index d8cbe09eb9..14bdd330e1 100755 --- a/src/postProcessing/functionObjects/Allwmake +++ b/src/postProcessing/functionObjects/Allwmake @@ -2,11 +2,14 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso field -wmake libso forces -wmake libso IO -wmake libso utilities -wmake libso jobControl -wmake libso systemCall +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +wmake $makeOption field +wmake $makeOption forces +wmake $makeOption IO +wmake $makeOption utilities +wmake $makeOption jobControl +wmake $makeOption systemCall # ----------------------------------------------------------------- end-of-file diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index 7b1b586b56..e622e3c15b 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -2,27 +2,30 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso specie -wmake libso solid -wmake libso thermophysicalFunctions -wmake libso liquids -wmake libso liquidMixture -wmake libso pointSolids -wmake libso pointSolidMixture +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 -wmake libso basic -wmake libso reactionThermo -wmake libso laminarFlameSpeed -wmake libso chemistryModel -wmake libso pdfs -wmake libso radiation -wmake libso barotropicCompressibilityModel -wmake libso thermalPorousZone +wmake $makeOption specie +wmake $makeOption solid +wmake $makeOption thermophysicalFunctions +wmake $makeOption liquids +wmake $makeOption liquidMixture +wmake $makeOption pointSolids +wmake $makeOption pointSolidMixture -wmake libso SLGThermo +wmake $makeOption basic +wmake $makeOption reactionThermo +wmake $makeOption laminarFlameSpeed +wmake $makeOption chemistryModel +wmake $makeOption pdfs +wmake $makeOption radiation +wmake $makeOption barotropicCompressibilityModel +wmake $makeOption thermalPorousZone + +wmake $makeOption SLGThermo # Should be combined with solids&solidMixture -wmake libso basicSolidThermo +wmake $makeOption basicSolidThermo # ----------------------------------------------------------------- end-of-file diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake index 138f265357..703920418d 100755 --- a/src/transportModels/Allwmake +++ b/src/transportModels/Allwmake @@ -2,9 +2,12 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso incompressible -wmake libso interfaceProperties -wmake libso twoPhaseInterfaceProperties -# wmake libso compressible +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +wmake $makeOption incompressible +wmake $makeOption interfaceProperties +wmake $makeOption twoPhaseInterfaceProperties +# wmake $makeOption compressible # ----------------------------------------------------------------- end-of-file diff --git a/src/turbulenceModels/Allwmake b/src/turbulenceModels/Allwmake index 80dc9dc1ee..e78f0c30dd 100755 --- a/src/turbulenceModels/Allwmake +++ b/src/turbulenceModels/Allwmake @@ -2,8 +2,8 @@ cd ${0%/*} || exit 1 # run from this directory set -x -LES/Allwmake -incompressible/Allwmake -compressible/Allwmake +LES/Allwmake $* +incompressible/Allwmake $* +compressible/Allwmake $* # ----------------------------------------------------------------- end-of-file diff --git a/src/turbulenceModels/LES/Allwmake b/src/turbulenceModels/LES/Allwmake index 00f3bf3ada..107251b422 100755 --- a/src/turbulenceModels/LES/Allwmake +++ b/src/turbulenceModels/LES/Allwmake @@ -2,9 +2,12 @@ cd ${0%/*} || exit 1 # run from this directory set -x +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + wmakeLnInclude ../incompressible/LES -wmake libso LESfilters -wmake libso LESdeltas +wmake $makeOption LESfilters +wmake $makeOption LESdeltas # ----------------------------------------------------------------- end-of-file diff --git a/src/turbulenceModels/compressible/Allwmake b/src/turbulenceModels/compressible/Allwmake index ddff417018..a16b5f9c81 100755 --- a/src/turbulenceModels/compressible/Allwmake +++ b/src/turbulenceModels/compressible/Allwmake @@ -2,8 +2,11 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso turbulenceModel -wmake libso RAS -wmake libso LES +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +wmake $makeOption turbulenceModel +wmake $makeOption RAS +wmake $makeOption LES # ----------------------------------------------------------------- end-of-file diff --git a/src/turbulenceModels/incompressible/Allwmake b/src/turbulenceModels/incompressible/Allwmake index ddff417018..a16b5f9c81 100755 --- a/src/turbulenceModels/incompressible/Allwmake +++ b/src/turbulenceModels/incompressible/Allwmake @@ -2,8 +2,11 @@ cd ${0%/*} || exit 1 # run from this directory set -x -wmake libso turbulenceModel -wmake libso RAS -wmake libso LES +makeOption=libso +[ $# -ge 1 ] && makeOption=$1 + +wmake $makeOption turbulenceModel +wmake $makeOption RAS +wmake $makeOption LES # ----------------------------------------------------------------- end-of-file From 07e356574d2b056e519839a72c63d0d38bc52fd2 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 27 Jan 2011 13:01:19 +0000 Subject: [PATCH 019/367] STLE: tweaks to createGraph tutorial scripts --- .../combustion/chemFoam/gri/validation/createGraph | 11 ++++++----- .../combustion/chemFoam/h2/validation/createGraph | 11 ++++++----- .../chemFoam/ic8h18/validation/createGraph | 11 ++++++----- .../chemFoam/nc7h16/validation/createGraph | 13 +++++++------ 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/tutorials/combustion/chemFoam/gri/validation/createGraph b/tutorials/combustion/chemFoam/gri/validation/createGraph index 7f16367984..3cf8188623 100755 --- a/tutorials/combustion/chemFoam/gri/validation/createGraph +++ b/tutorials/combustion/chemFoam/gri/validation/createGraph @@ -1,16 +1,17 @@ #!/bin/sh gnuplot< Date: Thu, 27 Jan 2011 16:22:32 +0100 Subject: [PATCH 020/367] STYLE: set makeOption before 'set -x' (cleaner output) in Allwmake --- src/Allwmake | 4 +--- src/Pstream/Allwmake | 5 ++--- src/conversion/Allwmake | 4 +--- src/dummyThirdParty/Allwmake | 4 +--- src/fvAgglomerationMethods/Allwmake | 4 +--- src/lagrangian/Allwmake | 4 +--- src/lagrangian/molecularDynamics/Allwmake | 4 +--- src/mesh/Allwmake | 4 +--- src/parallel/Allwmake | 4 +--- src/parallel/decompose/Allwmake | 4 +--- src/parallel/reconstruct/Allwmake | 5 +---- src/postProcessing/Allwmake | 4 +--- src/postProcessing/functionObjects/Allwmake | 4 +--- src/thermophysicalModels/Allwmake | 4 +--- src/transportModels/Allwmake | 4 +--- src/turbulenceModels/LES/Allwmake | 4 +--- src/turbulenceModels/compressible/Allwmake | 4 +--- src/turbulenceModels/incompressible/Allwmake | 4 +--- 18 files changed, 19 insertions(+), 55 deletions(-) diff --git a/src/Allwmake b/src/Allwmake index c2815e58c8..00bbf8e5e6 100755 --- a/src/Allwmake +++ b/src/Allwmake @@ -1,8 +1,6 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory - -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso wmakeCheckPwd "$WM_PROJECT_DIR/src" || { echo "Error: Current directory is not \$WM_PROJECT_DIR/src" diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake index 7a2f2cd308..742d3d4478 100755 --- a/src/Pstream/Allwmake +++ b/src/Pstream/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption dummy case "$WM_MPLIB" in @@ -12,6 +10,7 @@ case "$WM_MPLIB" in set +x echo echo "Note: ignore spurious warnings about missing mpicxx.h headers" + echo set -x # force compilation into qualified directory WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB wmake $makeOption mpi diff --git a/src/conversion/Allwmake b/src/conversion/Allwmake index cf1e61d47d..444d3f6549 100755 --- a/src/conversion/Allwmake +++ b/src/conversion/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption # ----------------------------------------------------------------- end-of-file diff --git a/src/dummyThirdParty/Allwmake b/src/dummyThirdParty/Allwmake index afd49cd5d9..5076d8d2b7 100755 --- a/src/dummyThirdParty/Allwmake +++ b/src/dummyThirdParty/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption scotchDecomp wmake $makeOption ptscotchDecomp wmake $makeOption metisDecomp diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake index 27f2fea53a..fcccbcbe9a 100755 --- a/src/fvAgglomerationMethods/Allwmake +++ b/src/fvAgglomerationMethods/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption MGridGenGamgAgglomeration # ----------------------------------------------------------------- end-of-file diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake index 26fd814f63..e04d7480fb 100755 --- a/src/lagrangian/Allwmake +++ b/src/lagrangian/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption basic wmake $makeOption solidParticle wmake $makeOption intermediate diff --git a/src/lagrangian/molecularDynamics/Allwmake b/src/lagrangian/molecularDynamics/Allwmake index 131ec5d458..60b24dea4d 100755 --- a/src/lagrangian/molecularDynamics/Allwmake +++ b/src/lagrangian/molecularDynamics/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption potential wmake $makeOption molecularMeasurements wmake $makeOption molecule diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake index 57df2d57bf..f980e0e73f 100755 --- a/src/mesh/Allwmake +++ b/src/mesh/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption autoMesh wmake $makeOption blockMesh diff --git a/src/parallel/Allwmake b/src/parallel/Allwmake index 92d80e20a8..d3600e13b1 100755 --- a/src/parallel/Allwmake +++ b/src/parallel/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - decompose/Allwmake $* reconstruct/Allwmake $* wmake $makeOption distributed diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake index 93835f6a24..3848e66478 100755 --- a/src/parallel/decompose/Allwmake +++ b/src/parallel/decompose/Allwmake @@ -1,8 +1,6 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory - -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso # get SCOTCH_VERSION, SCOTCH_ARCH_PATH settings=`$WM_PROJECT_DIR/bin/foamEtcFile apps/scotch/bashrc` diff --git a/src/parallel/reconstruct/Allwmake b/src/parallel/reconstruct/Allwmake index 453d88f50b..3d651d5a00 100755 --- a/src/parallel/reconstruct/Allwmake +++ b/src/parallel/reconstruct/Allwmake @@ -1,11 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption reconstruct - # ----------------------------------------------------------------- end-of-file diff --git a/src/postProcessing/Allwmake b/src/postProcessing/Allwmake index d543c26fe1..5a1caf1660 100755 --- a/src/postProcessing/Allwmake +++ b/src/postProcessing/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake libo postCalc wmake $makeOption foamCalcFunctions diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake index 14bdd330e1..9ae9bd3dca 100755 --- a/src/postProcessing/functionObjects/Allwmake +++ b/src/postProcessing/functionObjects/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption field wmake $makeOption forces wmake $makeOption IO diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index e622e3c15b..0695c1fba4 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption specie wmake $makeOption solid wmake $makeOption thermophysicalFunctions diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake index 703920418d..f0eba94263 100755 --- a/src/transportModels/Allwmake +++ b/src/transportModels/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption incompressible wmake $makeOption interfaceProperties wmake $makeOption twoPhaseInterfaceProperties diff --git a/src/turbulenceModels/LES/Allwmake b/src/turbulenceModels/LES/Allwmake index 107251b422..d24309692e 100755 --- a/src/turbulenceModels/LES/Allwmake +++ b/src/turbulenceModels/LES/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmakeLnInclude ../incompressible/LES wmake $makeOption LESfilters diff --git a/src/turbulenceModels/compressible/Allwmake b/src/turbulenceModels/compressible/Allwmake index a16b5f9c81..60605f926d 100755 --- a/src/turbulenceModels/compressible/Allwmake +++ b/src/turbulenceModels/compressible/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption turbulenceModel wmake $makeOption RAS wmake $makeOption LES diff --git a/src/turbulenceModels/incompressible/Allwmake b/src/turbulenceModels/incompressible/Allwmake index a16b5f9c81..60605f926d 100755 --- a/src/turbulenceModels/incompressible/Allwmake +++ b/src/turbulenceModels/incompressible/Allwmake @@ -1,10 +1,8 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 - wmake $makeOption turbulenceModel wmake $makeOption RAS wmake $makeOption LES From d93f3195e69492d854b7a29689d007277e5f166a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 27 Jan 2011 16:41:53 +0100 Subject: [PATCH 021/367] STYLE: use 1-col alphabetical output in reworked doxygen output - avoids overflows in a fixed width boxes --- doc/doxygen/Allwmake | 8 ++++++++ doc/doxygen/Doxyfile | 2 +- doc/doxygen/_Footer | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/doc/doxygen/Allwmake b/doc/doxygen/Allwmake index a34eb3fd7e..fbc20d93fd 100755 --- a/doc/doxygen/Allwmake +++ b/doc/doxygen/Allwmake @@ -1,5 +1,13 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory + +[ -d "$WM_PROJECT_DIR" ] || { + echo "Error: WM_PROJECT_DIR directory does not exist" + echo " Check the OpenFOAM entries in your dot-files and source them." + echo " WM_PROJECT_DIR=$WM_PROJECT_DIR" + exit 1 +} + set -x rm -rf latex man diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile index 51a8ae2b50..a1c4e6a5fc 100644 --- a/doc/doxygen/Doxyfile +++ b/doc/doxygen/Doxyfile @@ -760,7 +760,7 @@ ALPHABETICAL_INDEX = YES # the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns # in which this list will be split (can be a number in the range [1..20]) -COLS_IN_ALPHA_INDEX = 4 +COLS_IN_ALPHA_INDEX = 1 # In case all classes in a project start with a common prefix, all # classes will be put under the same header in the alphabetical index. diff --git a/doc/doxygen/_Footer b/doc/doxygen/_Footer index 11d8da9cb5..f68739e803 100644 --- a/doc/doxygen/_Footer +++ b/doc/doxygen/_Footer @@ -2,7 +2,7 @@

- Copyright © 2000-2010  + Copyright © 2004-2011  OpenCFD Limited | OPENFOAM® and OpenCFD® are registered trademarks of OpenCFD Ltd.

From eb013de3f211f1160eb82ab3d7667e39501f9d01 Mon Sep 17 00:00:00 2001 From: andy Date: Thu, 27 Jan 2011 18:16:27 +0000 Subject: [PATCH 022/367] ENH: using constant pressure approx for particle cell source update --- .../Templates/ReactingParcel/ReactingParcel.C | 67 ++++++++-------- .../Templates/ThermoParcel/ThermoParcel.C | 79 +++++++++++-------- 2 files changed, 77 insertions(+), 69 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index 91f07d24db..968b1cedf6 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -50,16 +50,19 @@ void Foam::ReactingParcel::setCellValues if (pc_ < td.cloud().constProps().pMin()) { - WarningIn - ( - "void Foam::ReactingParcel::setCellValues" - "(" - "TrackData&, " - "const scalar, " - "const label" - ")" - ) << "Limiting observed pressure in cell " << cellI << " to " - << td.cloud().constProps().pMin() << nl << endl; + if (debug) + { + WarningIn + ( + "void Foam::ReactingParcel::setCellValues" + "(" + "TrackData&, " + "const scalar, " + "const label" + ")" + ) << "Limiting observed pressure in cell " << cellI << " to " + << td.cloud().constProps().pMin() << nl << endl; + } pc_ = td.cloud().constProps().pMin(); } @@ -86,54 +89,50 @@ void Foam::ReactingParcel::cellValueSourceCorrection return; } - scalar massCell = this->massCell(cellI); + const scalar massCell = this->massCell(cellI); - const scalar V = td.cloud().pMesh().cellVolumes()[cellI]; - this->rhoc_ += addedMass/V; + this->rhoc_ += addedMass/td.cloud().pMesh().cellVolumes()[cellI]; - scalar massCellNew = massCell + addedMass; + const scalar massCellNew = massCell + addedMass; this->Uc_ += td.cloud().UTrans()[cellI]/massCellNew; scalar CpEff = 0.0; - scalar CsEff = 0.0; - scalar Csc = 0.0; if (addedMass > ROOTVSMALL) { forAll(td.cloud().rhoTrans(), i) { scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass; CpEff += Y*td.cloud().composition().carrier().Cp(i, this->Tc_); - - scalar W = td.cloud().composition().carrier().W(i); - CsEff += td.cloud().rhoTrans(i)[cellI]/V*Y/W; - scalar Yc = td.cloud().composition().carrier().Y(i)[cellI]; - Csc += massCell/V*Yc/W; } } - CsEff = (massCell*Csc + addedMass*CsEff)/massCellNew; const scalar Cpc = td.CpInterp().psi()[cellI]; this->Cpc_ = (massCell*Cpc + addedMass*CpEff)/massCellNew; this->Tc_ += td.cloud().hsTrans()[cellI]/(this->Cpc_*massCellNew); - if (this->Tc_ < td.cloud().constProps().TMin()) + if (debug && (this->Tc_ < td.cloud().constProps().TMin())) { - WarningIn - ( - "void Foam::ReactingParcel::cellValueSourceCorrection" - "(" - "TrackData&, " - "const scalar, " - "const label" - ")" - ) << "Limiting observed temperature in cell " << cellI << " to " - << td.cloud().constProps().TMin() << nl << endl; + if (debug) + { + WarningIn + ( + "void Foam::ReactingParcel::" + "cellValueSourceCorrection" + "(" + "TrackData&, " + "const scalar, " + "const label" + ")" + ) << "Limiting observed temperature in cell " << cellI << " to " + << td.cloud().constProps().TMin() << nl << endl; + } this->Tc_ = td.cloud().constProps().TMin(); } - this->pc_ = CsEff*specie::RR*this->Tc_; +// constant pressure +// this->pc_ = this->pc_; } diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C index b95ba03f8c..153ac45fa6 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C @@ -49,16 +49,19 @@ void Foam::ThermoParcel::setCellValues if (Tc_ < td.cloud().constProps().TMin()) { - WarningIn - ( - "void Foam::ThermoParcel::setCellValues" - "(" - "TrackData&, " - "const scalar, " - "const label" - ")" - ) << "Limiting observed temperature in cell " << cellI << " to " - << td.cloud().constProps().TMin() << nl << endl; + if (debug) + { + WarningIn + ( + "void Foam::ThermoParcel::setCellValues" + "(" + "TrackData&, " + "const scalar, " + "const label" + ")" + ) << "Limiting observed temperature in cell " << cellI << " to " + << td.cloud().constProps().TMin() << nl << endl; + } Tc_ = td.cloud().constProps().TMin(); } @@ -81,16 +84,19 @@ void Foam::ThermoParcel::cellValueSourceCorrection if (Tc_ < td.cloud().constProps().TMin()) { - WarningIn - ( - "void Foam::ThermoParcel::cellValueSourceCorrection" - "(" - "TrackData&, " - "const scalar, " - "const label" - ")" - ) << "Limiting observed temperature in cell " << cellI << " to " - << td.cloud().constProps().TMin() << nl << endl; + if (debug) + { + WarningIn + ( + "void Foam::ThermoParcel::cellValueSourceCorrection" + "(" + "TrackData&, " + "const scalar, " + "const label" + ")" + ) << "Limiting observed temperature in cell " << cellI << " to " + << td.cloud().constProps().TMin() << nl << endl; + } Tc_ = td.cloud().constProps().TMin(); } @@ -116,21 +122,24 @@ void Foam::ThermoParcel::calcSurfaceValues if (Ts < td.cloud().constProps().TMin()) { - WarningIn - ( - "void Foam::ThermoParcel::calcSurfaceValues" - "(" - "TrackData&, " - "const label, " - "const scalar, " - "scalar&, " - "scalar&, " - "scalar&, " - "scalar&, " - "scalar&" - ") const" - ) << "Limiting parcel surface temperature to " - << td.cloud().constProps().TMin() << nl << endl; + if (debug) + { + WarningIn + ( + "void Foam::ThermoParcel::calcSurfaceValues" + "(" + "TrackData&, " + "const label, " + "const scalar, " + "scalar&, " + "scalar&, " + "scalar&, " + "scalar&, " + "scalar&" + ") const" + ) << "Limiting parcel surface temperature to " + << td.cloud().constProps().TMin() << nl << endl; + } Ts = td.cloud().constProps().TMin(); } From a2fe746899c6b6fa2a03da2ed67041bc7230d072 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 28 Jan 2011 13:52:36 +0100 Subject: [PATCH 023/367] ENH: allow -pkg|-package option for wmakePrintBuild - improves the chances of tracking who built OpenFOAM, where, etc ENH: make it easier to parse version/build from OpenFOAM -help output - For example, foamListTimes -help | awk '{ if (/^Using:/) print $2}' foamListTimes -help | awk '{ if (/^Build:/) print $2}' --- src/OpenFOAM/global/argList/argList.C | 19 ++++-- wmake/rules/General/version | 4 +- wmake/wmakePrintBuild | 84 ++++++++++++++++++++------- 3 files changed, 81 insertions(+), 26 deletions(-) diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C index 370f42b2fa..1d23a86c9c 100644 --- a/src/OpenFOAM/global/argList/argList.C +++ b/src/OpenFOAM/global/argList/argList.C @@ -507,13 +507,23 @@ Foam::argList::argList jobInfo.add("startTime", timeString); jobInfo.add("userName", userName()); jobInfo.add("foamVersion", word(FOAMversion)); - jobInfo.add("foamBuild", Foam::FOAMbuild); jobInfo.add("code", executable_); jobInfo.add("argList", argListString); jobInfo.add("currentDir", cwd()); jobInfo.add("PPID", ppid()); jobInfo.add("PGID", pgid()); + // add build information - only use the first word + { + std::string build(Foam::FOAMbuild); + std::string::size_type found = build.find(' '); + if (found != std::string::npos) + { + build.resize(found); + } + jobInfo.add("foamBuild", build); + } + // Case is a single processor run unless it is running parallel int nProcs = 1; @@ -883,9 +893,10 @@ void Foam::argList::printUsage() const printNotes(); Info<< nl - <<"Using OpenFOAM-" << Foam::FOAMversion - <<" (build: " << Foam::FOAMbuild << ") - see www.OpenFOAM.com" - << nl << endl; + <<"Using: OpenFOAM-" << Foam::FOAMversion + << " (see www.OpenFOAM.com)" << nl + <<"Build: " << Foam::FOAMbuild << nl + << endl; } diff --git a/wmake/rules/General/version b/wmake/rules/General/version index 11f83c7b74..19633ffc9d 100644 --- a/wmake/rules/General/version +++ b/wmake/rules/General/version @@ -4,8 +4,8 @@ # update version strings in C++ file and in $WM_PROJECT_DIR/.build file # Cvertoo = \ - sed -e 's/VERSION_STRING/$(shell wmakePrintBuild -major)/' \ - -e 's/BUILD_STRING/$(shell wmakePrintBuild -update)/' \ + sed -e 's!VERSION_STRING!$(shell wmakePrintBuild -major)!' \ + -e 's!BUILD_STRING!$(shell wmakePrintBuild -update)!' \ $$SOURCE > $*.C; \ $(CC) $(c++FLAGS) -c $*.C -o $@ diff --git a/wmake/wmakePrintBuild b/wmake/wmakePrintBuild index 4b70503687..3812bece3e 100755 --- a/wmake/wmakePrintBuild +++ b/wmake/wmakePrintBuild @@ -3,7 +3,7 @@ # ========= | # \\ / F ield | OpenFOAM: The Open Source CFD Toolbox # \\ / O peration | -# \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. +# \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. # \\/ M anipulation | #------------------------------------------------------------------------------- # License @@ -30,6 +30,8 @@ # #------------------------------------------------------------------------------ usage() { + exec 1>&2 + while [ "$#" -ge 1 ]; do echo "$1"; shift; done cat</dev/null) + +# retrieve old values from the $WM_PROJECT_DIR/.build cache, stored as +# version [packager] +set -- $(tail -1 $build 2>/dev/null) + +oldVersion="$1"; shift +oldPackage="$@" +[ "${oldPackage:-none}" = none ] && unset oldPackage + + +# +# printTag - output the build tag +# reuses the old -package tag if needed +# +printTag() +{ + if [ "${package:-${oldPackage:-none}}" = none ] + then + echo "$version" + else + echo "$version ${package:-$oldPackage}" + fi +} + + if [ -n "$version" ] then @@ -115,12 +148,17 @@ else fi +# # update persistent build tag if possible -if [ $rc -eq 0 -a -n "$update" -a "$version" != "$previous" ] +# +if [ $rc -eq 0 -a -n "$update" ] then - if [ -w "$build" -o \( -w "$WM_PROJECT_DIR" -a ! -e "$build" \) ] + if [ "$version:$package" != "$oldVersion:$oldPackage" ] then - echo $version >| "$build" 2>/dev/null + if [ -w "$build" -o \( -w "$WM_PROJECT_DIR" -a ! -e "$build" \) ] + then + printTag >| "$build" 2>/dev/null + fi fi fi @@ -130,32 +168,38 @@ if [ -n "$checkOnly" ] then if [ $rc -eq 0 ] then - test "$version" = "$previous" + test "$version:${package:-$oldPackage}" = "$oldVersion:$oldPackage" rc=$? if [ $rc -eq 0 ] then - echo "same version as previous build" + echo "same version as previous build" 1>&2 else - echo "version changed from previous build" + echo "version changed from previous build" 1>&2 fi else - echo "no git description found" + echo "no git description found" 1>&2 fi exit $rc fi -if [ $rc -eq 0 ] +# +# cannot get git information or -version version +# +if [ $rc -ne 0 ] then - # output the git information or the -version version - echo $version -elif [ -n "$previous" ] -then - # use previous build tag - echo $previous -else - # fallback to WM_PROJECT_VERSION alone - echo ${WM_PROJECT_VERSION:-unknown} + if [ -n "$oldVersion" ] + then + # use previous version info + version="$oldVersion" + else + # fallback to WM_PROJECT_VERSION alone + version="${WM_PROJECT_VERSION:-unknown}" + fi fi + +# output the tag +printTag + #------------------------------------------------------------------------------ From 497b4f0bedce21887435ea10cde10f85eb84e018 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 28 Jan 2011 13:09:10 +0000 Subject: [PATCH 024/367] ENH: Code refactoring to avoing ambiguities + clean-up - pointSolid->solidProperties - pointSolidMixure->solidMixtureProperties - liquids->liquidProperties - liquidMixture->liquidMoxtureProperties --- .../combustion/dieselEngineFoam/Make/options | 8 +- .../combustion/dieselFoam/Make/options | 8 +- .../lagrangian/coalChemistryFoam/Make/options | 16 +- .../Make/options | 16 +- .../reactingParcelFilmFoam/Make/options | 12 +- .../reactingParcelFoam/Make/options | 16 +- .../steadyReactingParcelFoam/Make/options | 16 +- src/lagrangian/coalCombustion/Make/options | 16 +- src/lagrangian/dieselSpray/Make/options | 8 +- .../commonRailInjector/commonRailInjector.C | 4 +- .../commonRailInjector/commonRailInjector.H | 4 +- .../definedInjector/definedInjector.C | 4 +- .../definedInjector/definedInjector.H | 4 +- .../injector/injectorType/injectorType.H | 6 +- .../multiHoleInjector/multiHoleInjector.C | 4 +- .../multiHoleInjector/multiHoleInjector.H | 4 +- .../injector/swirlInjector/swirlInjector.C | 4 +- .../injector/swirlInjector/swirlInjector.H | 4 +- .../injector/unitInjector/unitInjector.C | 4 +- .../injector/unitInjector/unitInjector.H | 4 +- src/lagrangian/dieselSpray/parcel/parcel.C | 6 +- .../dieselSpray/parcel/setRelaxationTimes.C | 4 +- src/lagrangian/dieselSpray/spray/spray.C | 4 +- src/lagrangian/dieselSpray/spray/spray.H | 12 +- src/lagrangian/dieselSpray/spray/sprayI.H | 4 +- .../atomizationModel/LISA/LISA.C | 4 +- .../atomizationModel/LISA/LISA.H | 4 +- .../atomizationModel/atomizationModel.H | 4 +- .../blobsSheetAtomization.C | 4 +- .../blobsSheetAtomization.H | 4 +- .../noAtomization/noAtomization.C | 4 +- .../noAtomization/noAtomization.H | 4 +- .../spraySubModels/breakupModel/ETAB/ETAB.C | 4 +- .../spraySubModels/breakupModel/ETAB/ETAB.H | 4 +- .../spraySubModels/breakupModel/SHF/SHF.C | 4 +- .../spraySubModels/breakupModel/SHF/SHF.H | 4 +- .../spraySubModels/breakupModel/TAB/TAB.C | 4 +- .../spraySubModels/breakupModel/TAB/TAB.H | 4 +- .../breakupModel/breakupModel/breakupModel.C | 4 +- .../breakupModel/breakupModel/breakupModel.H | 6 +- .../breakupModel/breakupModelNew.C | 2 +- .../breakupModel/noBreakup/noBreakup.C | 4 +- .../breakupModel/noBreakup/noBreakup.H | 4 +- .../breakupModel/reitzDiwakar/reitzDiwakar.C | 4 +- .../breakupModel/reitzDiwakar/reitzDiwakar.H | 4 +- .../breakupModel/reitzKHRT/reitzKHRT.C | 4 +- .../breakupModel/reitzKHRT/reitzKHRT.H | 4 +- .../definedPressureSwirl.C | 4 +- .../injectorModel/injectorModel.H | 4 +- src/lagrangian/intermediate/Make/options | 16 +- .../CompositionModel/CompositionModel.C | 8 +- .../CompositionModel/CompositionModel.H | 6 +- .../LiquidEvaporation/LiquidEvaporation.H | 6 +- .../ThermoSurfaceFilm/ThermoSurfaceFilm.C | 6 +- src/surfaceFilmModels/Make/options | 8 +- .../standardPhaseChange/standardPhaseChange.C | 4 +- .../thermoSingleLayer/thermoSingleLayer.C | 5 +- src/thermophysicalModels/Allwmake | 8 +- .../SLGThermo/Make/options | 8 +- .../SLGThermo/SLGThermo/SLGThermo.C | 16 +- .../SLGThermo/SLGThermo/SLGThermo.H | 14 +- .../liquidMixture/Make/files | 6 - .../liquidMixture/liquidMixtureIO.C | 60 --- .../liquidMixtureProperties/Make/files | 3 + .../Make/options | 4 +- .../liquidMixtureProperties.C} | 58 +-- .../liquidMixtureProperties.H} | 35 +- .../{liquids => liquidProperties}/Ar/Ar.C | 20 +- .../{liquids => liquidProperties}/Ar/Ar.H | 14 +- .../{liquids => liquidProperties}/Ar/ArI.H | 2 +- .../C10H22/C10H22.C | 20 +- .../C10H22/C10H22.H | 14 +- .../C10H22/C10H22I.H | 2 +- .../C12H26/C12H26.C | 20 +- .../C12H26/C12H26.H | 14 +- .../C12H26/C12H26I.H | 2 +- .../C13H28/C13H28.C | 20 +- .../C13H28/C13H28.H | 14 +- .../C13H28/C13H28I.H | 2 +- .../C14H30/C14H30.C | 20 +- .../C14H30/C14H30.H | 14 +- .../C14H30/C14H30I.H | 2 +- .../C16H34/C16H34.C | 20 +- .../C16H34/C16H34.H | 14 +- .../C16H34/C16H34I.H | 2 +- .../C2H5OH/C2H5OH.C | 20 +- .../C2H5OH/C2H5OH.H | 14 +- .../C2H5OH/C2H5OHI.H | 2 +- .../{liquids => liquidProperties}/C2H6/C2H6.C | 20 +- .../{liquids => liquidProperties}/C2H6/C2H6.H | 14 +- .../C2H6/C2H6I.H | 2 +- .../C2H6O/C2H6O.C | 20 +- .../C2H6O/C2H6O.H | 14 +- .../C2H6O/C2H6OI.H | 2 +- .../C3H6O/C3H6O.C | 20 +- .../C3H6O/C3H6O.H | 14 +- .../C3H6O/C3H6OI.H | 2 +- .../{liquids => liquidProperties}/C3H8/C3H8.C | 20 +- .../{liquids => liquidProperties}/C3H8/C3H8.H | 14 +- .../C3H8/C3H8I.H | 2 +- .../C4H10O/C4H10O.C | 20 +- .../C4H10O/C4H10O.H | 14 +- .../C4H10O/C4H10OI.H | 2 +- .../C6H14/C6H14.C | 20 +- .../C6H14/C6H14.H | 14 +- .../C6H14/C6H14I.H | 2 +- .../{liquids => liquidProperties}/C6H6/C6H6.C | 20 +- .../{liquids => liquidProperties}/C6H6/C6H6.H | 14 +- .../C6H6/C6H6I.H | 2 +- .../C7H16/C7H16.C | 20 +- .../C7H16/C7H16.H | 14 +- .../C7H16/C7H16I.H | 2 +- .../{liquids => liquidProperties}/C7H8/C7H8.C | 20 +- .../{liquids => liquidProperties}/C7H8/C7H8.H | 14 +- .../C7H8/C7H8I.H | 2 +- .../C8H10/C8H10.C | 20 +- .../C8H10/C8H10.H | 14 +- .../C8H10/C8H10I.H | 2 +- .../C8H18/C8H18.C | 20 +- .../C8H18/C8H18.H | 14 +- .../C8H18/C8H18I.H | 2 +- .../C9H20/C9H20.C | 20 +- .../C9H20/C9H20.H | 14 +- .../C9H20/C9H20I.H | 2 +- .../CH3OH/CH3OH.C | 20 +- .../CH3OH/CH3OH.H | 14 +- .../CH3OH/CH3OHI.H | 2 +- .../CH4N2O/CH4N2O.C | 20 +- .../CH4N2O/CH4N2O.H | 15 +- .../CH4N2O/CH4N2OI.H | 2 +- .../{liquids => liquidProperties}/H2O/H2O.C | 20 +- .../{liquids => liquidProperties}/H2O/H2O.H | 14 +- .../{liquids => liquidProperties}/H2O/H2OI.H | 2 +- .../IC8H18/IC8H18.C | 20 +- .../IC8H18/IC8H18.H | 14 +- .../IC8H18/IC8H18I.H | 2 +- .../{liquids => liquidProperties}/IDEA/IDEA.C | 20 +- .../{liquids => liquidProperties}/IDEA/IDEA.H | 14 +- .../IDEA/IDEA.thermo | 0 .../IDEA/IDEAI.H | 2 +- .../{liquids => liquidProperties}/MB/MB.C | 20 +- .../{liquids => liquidProperties}/MB/MB.H | 14 +- .../{liquids => liquidProperties}/MB/MBI.H | 2 +- .../{liquids => liquidProperties}/Make/files | 4 +- .../Make/options | 0 .../{liquids => liquidProperties}/N2/N2.C | 20 +- .../{liquids => liquidProperties}/N2/N2.H | 14 +- .../{liquids => liquidProperties}/N2/N2I.H | 2 +- .../aC10H7CH3/aC10H7CH3.C | 20 +- .../aC10H7CH3/aC10H7CH3.H | 14 +- .../aC10H7CH3/aC10H7CH3I.H | 2 +- .../bC10H7CH3/bC10H7CH3.C | 20 +- .../bC10H7CH3/bC10H7CH3.H | 14 +- .../bC10H7CH3/bC10H7CH3I.H | 2 +- .../iC3H8O/iC3H8O.C | 20 +- .../iC3H8O/iC3H8O.H | 14 +- .../iC3H8O/iC3H8OI.H | 2 +- .../liquidProperties/liquidProperties.C | 387 ++++++++++++++++++ .../liquidProperties/liquidProperties.H} | 50 +-- .../liquidProperties/liquidPropertiesI.H} | 24 +- .../nC3H8O/nC3H8O.C | 20 +- .../nC3H8O/nC3H8O.H | 14 +- .../nC3H8O/nC3H8OI.H | 2 +- .../liquids/liquid/liquid.C | 340 --------------- .../pointSolidMixture/Make/files | 3 - .../pointSolids/Make/files | 8 - .../solidMixtureProperties/Make/files | 3 + .../Make/options | 2 +- .../solidMixtureProperties.C} | 27 +- .../solidMixtureProperties.H} | 43 +- .../{pointSolids => solidProperties}/C/C.C | 22 +- .../{pointSolids => solidProperties}/C/C.H | 16 +- .../CaCO3/CaCO3.C | 22 +- .../CaCO3/CaCO3.H | 16 +- .../solidProperties/Make/files | 8 + .../Make/options | 0 .../ash/ash.C | 22 +- .../ash/ash.H | 16 +- .../solidProperties/solidProperties.C} | 24 +- .../solidProperties/solidProperties.H} | 58 +-- .../solidProperties/solidPropertiesI.H} | 16 +- .../solidProperties/solidPropertiesNew.C} | 54 +-- 182 files changed, 1408 insertions(+), 1397 deletions(-) delete mode 100644 src/thermophysicalModels/liquidMixture/Make/files delete mode 100644 src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C create mode 100644 src/thermophysicalModels/liquidMixtureProperties/Make/files rename src/thermophysicalModels/{liquidMixture => liquidMixtureProperties}/Make/options (76%) rename src/thermophysicalModels/{liquidMixture/liquidMixture/liquidMixture.C => liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C} (82%) rename src/thermophysicalModels/{liquidMixture/liquidMixture/liquidMixture.H => liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H} (88%) rename src/thermophysicalModels/{liquids => liquidProperties}/Ar/Ar.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/Ar/Ar.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/Ar/ArI.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C10H22/C10H22.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C10H22/C10H22.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C10H22/C10H22I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C12H26/C12H26.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C12H26/C12H26.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C12H26/C12H26I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C13H28/C13H28.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C13H28/C13H28.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C13H28/C13H28I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C14H30/C14H30.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C14H30/C14H30.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C14H30/C14H30I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C16H34/C16H34.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C16H34/C16H34.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C16H34/C16H34I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C2H5OH/C2H5OH.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C2H5OH/C2H5OH.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C2H5OH/C2H5OHI.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6/C2H6.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6/C2H6.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6/C2H6I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6O/C2H6O.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6O/C2H6O.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C2H6O/C2H6OI.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C3H6O/C3H6O.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C3H6O/C3H6O.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C3H6O/C3H6OI.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C3H8/C3H8.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C3H8/C3H8.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C3H8/C3H8I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C4H10O/C4H10O.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C4H10O/C4H10O.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C4H10O/C4H10OI.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C6H14/C6H14.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C6H14/C6H14.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C6H14/C6H14I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C6H6/C6H6.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C6H6/C6H6.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C6H6/C6H6I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C7H16/C7H16.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C7H16/C7H16.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C7H16/C7H16I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C7H8/C7H8.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C7H8/C7H8.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C7H8/C7H8I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C8H10/C8H10.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C8H10/C8H10.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C8H10/C8H10I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C8H18/C8H18.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C8H18/C8H18.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C8H18/C8H18I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/C9H20/C9H20.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/C9H20/C9H20.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/C9H20/C9H20I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/CH3OH/CH3OH.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/CH3OH/CH3OH.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/CH3OH/CH3OHI.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/CH4N2O/CH4N2O.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/CH4N2O/CH4N2O.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/CH4N2O/CH4N2OI.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/H2O/H2O.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/H2O/H2O.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/H2O/H2OI.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/IC8H18/IC8H18.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/IC8H18/IC8H18.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/IC8H18/IC8H18I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/IDEA/IDEA.C (92%) rename src/thermophysicalModels/{liquids => liquidProperties}/IDEA/IDEA.H (95%) rename src/thermophysicalModels/{liquids => liquidProperties}/IDEA/IDEA.thermo (100%) rename src/thermophysicalModels/{liquids => liquidProperties}/IDEA/IDEAI.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/MB/MB.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/MB/MB.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/MB/MBI.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/Make/files (84%) rename src/thermophysicalModels/{liquids => liquidProperties}/Make/options (100%) rename src/thermophysicalModels/{liquids => liquidProperties}/N2/N2.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/N2/N2.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/N2/N2I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/aC10H7CH3/aC10H7CH3.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/aC10H7CH3/aC10H7CH3.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/aC10H7CH3/aC10H7CH3I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/bC10H7CH3/bC10H7CH3.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/bC10H7CH3/bC10H7CH3.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/bC10H7CH3/bC10H7CH3I.H (97%) rename src/thermophysicalModels/{liquids => liquidProperties}/iC3H8O/iC3H8O.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/iC3H8O/iC3H8O.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/iC3H8O/iC3H8OI.H (97%) create mode 100644 src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C rename src/thermophysicalModels/{liquids/liquid/liquid.H => liquidProperties/liquidProperties/liquidProperties.H} (84%) rename src/thermophysicalModels/{liquids/liquid/liquidI.H => liquidProperties/liquidProperties/liquidPropertiesI.H} (67%) rename src/thermophysicalModels/{liquids => liquidProperties}/nC3H8O/nC3H8O.C (91%) rename src/thermophysicalModels/{liquids => liquidProperties}/nC3H8O/nC3H8O.H (94%) rename src/thermophysicalModels/{liquids => liquidProperties}/nC3H8O/nC3H8OI.H (97%) delete mode 100644 src/thermophysicalModels/liquids/liquid/liquid.C delete mode 100644 src/thermophysicalModels/pointSolidMixture/Make/files delete mode 100644 src/thermophysicalModels/pointSolids/Make/files create mode 100644 src/thermophysicalModels/solidMixtureProperties/Make/files rename src/thermophysicalModels/{pointSolidMixture => solidMixtureProperties}/Make/options (50%) rename src/thermophysicalModels/{pointSolidMixture/pointSolidMixture/pointSolidMixture.C => solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C} (77%) rename src/thermophysicalModels/{pointSolidMixture/pointSolidMixture/pointSolidMixture.H => solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H} (75%) rename src/thermophysicalModels/{pointSolids => solidProperties}/C/C.C (81%) rename src/thermophysicalModels/{pointSolids => solidProperties}/C/C.H (87%) rename src/thermophysicalModels/{pointSolids => solidProperties}/CaCO3/CaCO3.C (81%) rename src/thermophysicalModels/{pointSolids => solidProperties}/CaCO3/CaCO3.H (86%) create mode 100644 src/thermophysicalModels/solidProperties/Make/files rename src/thermophysicalModels/{pointSolids => solidProperties}/Make/options (100%) rename src/thermophysicalModels/{pointSolids => solidProperties}/ash/ash.C (81%) rename src/thermophysicalModels/{pointSolids => solidProperties}/ash/ash.H (87%) rename src/thermophysicalModels/{pointSolids/pointSolid/pointSolid.C => solidProperties/solidProperties/solidProperties.C} (78%) rename src/thermophysicalModels/{pointSolids/pointSolid/pointSolid.H => solidProperties/solidProperties/solidProperties.H} (75%) rename src/thermophysicalModels/{pointSolids/pointSolid/pointSolidI.H => solidProperties/solidProperties/solidPropertiesI.H} (75%) rename src/thermophysicalModels/{pointSolids/pointSolid/pointSolidNew.C => solidProperties/solidProperties/solidPropertiesNew.C} (64%) diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options index 9a45247819..9cefdaf996 100644 --- a/applications/solvers/combustion/dieselEngineFoam/Make/options +++ b/applications/solvers/combustion/dieselEngineFoam/Make/options @@ -4,8 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -27,8 +27,8 @@ EXE_LIBS = \ -llagrangian \ -lmeshTools \ -ldieselSpray \ - -lliquids \ - -lliquidMixture \ + -lliquidProperties \ + -lliquidMixtureProperties \ -lthermophysicalFunctions \ -lspecie \ -lbasicThermophysicalModels \ diff --git a/applications/solvers/combustion/dieselFoam/Make/options b/applications/solvers/combustion/dieselFoam/Make/options index 3b1786aa08..1e6ccfa139 100644 --- a/applications/solvers/combustion/dieselFoam/Make/options +++ b/applications/solvers/combustion/dieselFoam/Make/options @@ -5,8 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -24,8 +24,8 @@ EXE_LIBS = \ -llagrangian \ -lmeshTools \ -ldieselSpray \ - -lliquids \ - -lliquidMixture \ + -lliquidProperties \ + -lliquidMixtureProperties \ -lthermophysicalFunctions \ -lspecie \ -lbasicThermophysicalModels \ diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index 329dffc84d..f4a9d0c52d 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -8,10 +8,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ @@ -31,10 +31,10 @@ EXE_LIBS = \ -lcoalCombustion\ -lspecie \ -lbasicThermophysicalModels \ - -lliquids \ - -lliquidMixture \ - -lpointSolids \ - -lpointSolidMixture \ + -lliquidProperties \ + -lliquidMixtureProperties \ + -lsolidProperties \ + -lsolidMixtureProperties \ -lthermophysicalFunctions \ -lreactionThermophysicalModels \ -lSLGThermo \ diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options index 7596b87bbd..eede9724ce 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options @@ -8,10 +8,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ @@ -30,10 +30,10 @@ EXE_LIBS = \ -llagrangianIntermediate \ -lspecie \ -lbasicThermophysicalModels \ - -lliquids \ - -lliquidMixture \ - -lpointSolids \ - -lpointSolidMixture \ + -lliquidProperties \ + -lliquidMixtureProperties \ + -lsolidProperties \ + -lsolidMixtureProperties \ -lthermophysicalFunctions \ -lreactionThermophysicalModels \ -lSLGThermo \ diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options index 34867be0b4..e9d86d977c 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -5,10 +5,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ @@ -26,8 +26,8 @@ EXE_LIBS = \ -lcompressibleLESModels \ -lspecie \ -lbasicThermophysicalModels \ - -lpointSolids \ - -lpointSolidMixture \ + -lsolidProperties \ + -lsolidMixtureProperties \ -lthermophysicalFunctions \ -lreactionThermophysicalModels \ -lSLGThermo \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index 2dbb2590f7..ee3db1695a 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -7,10 +7,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ @@ -29,10 +29,10 @@ EXE_LIBS = \ -llagrangianIntermediate \ -lspecie \ -lbasicThermophysicalModels \ - -lliquids \ - -lliquidMixture \ - -lpointSolids \ - -lpointSolidMixture \ + -lliquidProperties \ + -lliquidMixtureProperties \ + -lsolidProperties \ + -lsolidMixtureProperties \ -lthermophysicalFunctions \ -lreactionThermophysicalModels \ -lSLGThermo \ diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options index 7596b87bbd..eede9724ce 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options @@ -8,10 +8,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ @@ -30,10 +30,10 @@ EXE_LIBS = \ -llagrangianIntermediate \ -lspecie \ -lbasicThermophysicalModels \ - -lliquids \ - -lliquidMixture \ - -lpointSolids \ - -lpointSolidMixture \ + -lliquidProperties \ + -lliquidMixtureProperties \ + -lsolidProperties \ + -lsolidMixtureProperties \ -lthermophysicalFunctions \ -lreactionThermophysicalModels \ -lSLGThermo \ diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options index 763b6cc248..93f4b9d404 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -6,10 +6,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ @@ -28,10 +28,10 @@ LIB_LIBS = \ -lpdf \ -lspecie \ -lbasicThermophysicalModels \ - -lliquids \ - -lliquidMixture \ - -lpointSolids \ - -lpointSolidMixture \ + -lliquidProperties \ + -lliquidMixtureProperties \ + -lsolidProperties \ + -lsolidMixtureProperties \ -lreactionThermophysicalModels \ -lSLGThermo \ -lcompressibleRASModels \ diff --git a/src/lagrangian/dieselSpray/Make/options b/src/lagrangian/dieselSpray/Make/options index 40cb013fbb..9891ba0197 100644 --- a/src/lagrangian/dieselSpray/Make/options +++ b/src/lagrangian/dieselSpray/Make/options @@ -8,8 +8,8 @@ EXE_INC = \ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ @@ -22,8 +22,8 @@ LIB_LIBS = \ -lcompressibleRASModels \ -lcompressibleLESModels \ -lLESdeltas \ - -lliquids \ - -lliquidMixture \ + -lliquidProperties \ + -lliquidMixtureProperties \ -lthermophysicalFunctions \ -lspecie \ -lpdf diff --git a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C index a8c6e02862..e1c722dc09 100644 --- a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C +++ b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -400,7 +400,7 @@ Foam::scalar Foam::commonRailInjector::injectedMass void Foam::commonRailInjector::correctProfiles ( - const liquidMixture& fuel, + const liquidMixtureProperties& fuel, const scalar referencePressure ) { diff --git a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H index e29bbfcf8b..876842b7cd 100644 --- a/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H +++ b/src/lagrangian/dieselSpray/injector/commonRailInjector/commonRailInjector.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -213,7 +213,7 @@ public: void correctProfiles ( - const liquidMixture& fuel, + const liquidMixtureProperties& fuel, const scalar referencePressure ); diff --git a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C index 27b7e4ddd7..c2de30e258 100644 --- a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C +++ b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -366,7 +366,7 @@ Foam::scalar Foam::definedInjector::injectedMass void Foam::definedInjector::correctProfiles ( - const liquidMixture& fuel, + const liquidMixtureProperties& fuel, const scalar referencePressure ) { diff --git a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H index 529eef58f5..c436c1e4fb 100644 --- a/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H +++ b/src/lagrangian/dieselSpray/injector/definedInjector/definedInjector.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -218,7 +218,7 @@ public: void correctProfiles ( - const liquidMixture& fuel, + const liquidMixtureProperties& fuel, const scalar referencePressure ); diff --git a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H index aa3b30611c..148ca0eaf1 100644 --- a/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H +++ b/src/lagrangian/dieselSpray/injector/injectorType/injectorType.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ SourceFiles #include "vector.H" #include "scalarField.H" #include "cachedRandom.H" -#include "liquidMixture.H" +#include "liquidMixtureProperties.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -218,7 +218,7 @@ public: virtual void correctProfiles ( - const liquidMixture& fuel, + const liquidMixtureProperties& fuel, const scalar referencePressure ) = 0; }; diff --git a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C index fbd957ccfb..760c26d118 100644 --- a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C +++ b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -420,7 +420,7 @@ Foam::scalar Foam::multiHoleInjector::injectedMass void Foam::multiHoleInjector::correctProfiles ( - const liquidMixture& fuel, + const liquidMixtureProperties& fuel, const scalar referencePressure ) { diff --git a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H index 4af479631e..d0fd0a2ebb 100644 --- a/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H +++ b/src/lagrangian/dieselSpray/injector/multiHoleInjector/multiHoleInjector.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -223,7 +223,7 @@ public: void correctProfiles ( - const liquidMixture& fuel, + const liquidMixtureProperties& fuel, const scalar referencePressure ); diff --git a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C index 795f548bc3..1c0607dd53 100644 --- a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C +++ b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -409,7 +409,7 @@ Foam::scalar Foam::swirlInjector::injectedMass void Foam::swirlInjector::correctProfiles ( - const liquidMixture& fuel, + const liquidMixtureProperties& fuel, const scalar referencePressure ) { diff --git a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H index 59acf5596e..55ad8276ef 100644 --- a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H +++ b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -232,7 +232,7 @@ public: void correctProfiles ( - const liquidMixture& fuel, + const liquidMixtureProperties& fuel, const scalar referencePressure ); diff --git a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C index 241b7cb113..f7c5c4214a 100644 --- a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C +++ b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -357,7 +357,7 @@ Foam::scalar Foam::unitInjector::injectedMass(const scalar t) const void Foam::unitInjector::correctProfiles ( - const liquidMixture& fuel, + const liquidMixtureProperties& fuel, const scalar referencePressure ) { diff --git a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H index 2df163b402..54fab69d48 100644 --- a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H +++ b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -212,7 +212,7 @@ public: void correctProfiles ( - const liquidMixture& fuel, + const liquidMixtureProperties& fuel, const scalar referencePressure ); diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C index 45f24d0276..2f25168139 100644 --- a/src/lagrangian/dieselSpray/parcel/parcel.C +++ b/src/lagrangian/dieselSpray/parcel/parcel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,7 +99,7 @@ bool Foam::parcel::move(spray& sDB, const scalar trackTime) const polyMesh& mesh = cloud().pMesh(); const polyBoundaryMesh& pbMesh = mesh.boundaryMesh(); - const liquidMixture& fuels = sDB.fuels(); + const liquidMixtureProperties& fuels = sDB.fuels(); label Nf = fuels.components().size(); label Ns = sDB.composition().Y().size(); @@ -333,7 +333,7 @@ void Foam::parcel::updateParcelProperties const label faceI ) { - const liquidMixture& fuels = sDB.fuels(); + const liquidMixtureProperties& fuels = sDB.fuels(); label Nf = sDB.fuels().components().size(); label Ns = sDB.composition().Y().size(); diff --git a/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C b/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C index 6a8d8c6a6b..c1a289c719 100644 --- a/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C +++ b/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,7 @@ void Foam::parcel::setRelaxationTimes const scalar dt ) { - const liquidMixture& fuels = sDB.fuels(); + const liquidMixtureProperties& fuels = sDB.fuels(); scalar mCell = rho*sDB.mesh().V()[cell()]; scalarField mfg(Yfg*mCell); diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C index ef98348187..dbacb3bfa9 100644 --- a/src/lagrangian/dieselSpray/spray/spray.C +++ b/src/lagrangian/dieselSpray/spray/spray.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -169,7 +169,7 @@ Foam::spray::spray fuels_ ( - liquidMixture::New + liquidMixtureProperties::New ( mesh_.lookupObject("thermophysicalProperties") ) diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H index 6eef87400f..9ba9375c80 100644 --- a/src/lagrangian/dieselSpray/spray/spray.H +++ b/src/lagrangian/dieselSpray/spray/spray.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,13 +32,13 @@ Description #ifndef spray_H #define spray_H +#include "autoPtr.H" #include "parcel.H" #include "injector.H" #include "IOPtrList.H" #include "interpolation.H" -#include "liquid.H" -#include "autoPtr.H" -#include "liquidMixture.H" +#include "liquidProperties.H" +#include "liquidMixtureProperties.H" #include "cachedRandom.H" #include "thermoPhysicsTypes.H" @@ -115,7 +115,7 @@ class spray autoPtr breakupModel_; autoPtr collisionModel_; autoPtr dispersionModel_; - autoPtr fuels_; + autoPtr fuels_; autoPtr injectorModel_; @@ -254,7 +254,7 @@ public: inline label subCycles() const; inline const vector& g() const; - inline const liquidMixture& fuels() const; + inline const liquidMixtureProperties& fuels() const; inline const PtrList& gasProperties() const; inline const basicMultiComponentMixture& composition() const; diff --git a/src/lagrangian/dieselSpray/spray/sprayI.H b/src/lagrangian/dieselSpray/spray/sprayI.H index e11bd08532..740d0453c7 100644 --- a/src/lagrangian/dieselSpray/spray/sprayI.H +++ b/src/lagrangian/dieselSpray/spray/sprayI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -236,7 +236,7 @@ inline const Foam::vector& Foam::spray::g() const } -inline const Foam::liquidMixture& Foam::spray::fuels() const +inline const Foam::liquidMixtureProperties& Foam::spray::fuels() const { return fuels_(); } diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C index 682b2ebfaf..b0bf8b74eb 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C +++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,7 +74,7 @@ void Foam::LISA::atomizeParcel parcel& p, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const { const PtrList& Y = spray_.composition().Y(); diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H index eade4f966c..9668e86404 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H +++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,7 @@ public: parcel& parcel, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const; }; diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H index 59b20f929f..55ff9dfc90 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H +++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/atomizationModel/atomizationModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -104,7 +104,7 @@ public: parcel& parcel, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const = 0; }; diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C index 3e24303826..7824e726a2 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C +++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,7 +73,7 @@ void Foam::blobsSheetAtomization::atomizeParcel parcel& p, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const { const PtrList& Y = spray_.composition().Y(); diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H index 2af3301cdb..ee2dfdac28 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H +++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -92,7 +92,7 @@ public: parcel& parcel, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const; }; diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C index 76fa010e5e..68b29c9084 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C +++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,7 +69,7 @@ void Foam::noAtomization::atomizeParcel parcel& p, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const { p.liquidCore() = 0.0; diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H index fbbde6326f..835a4e767f 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H +++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -71,7 +71,7 @@ public: parcel& parcel, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const; }; diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C index 8a16cf6cc2..260740dd98 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -79,7 +79,7 @@ void Foam::ETAB::breakupParcel parcel& p, const scalar deltaT, const vector& Ug, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const { scalar T = p.T(); diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H index 463f47f92e..d1502014ba 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/ETAB/ETAB.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -111,7 +111,7 @@ public: parcel& parcel, const scalar deltaT, const vector& Ug, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const; }; diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C index e8ac0b9079..7e4ba37eeb 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -98,7 +98,7 @@ void Foam::SHF::breakupParcel parcel& p, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const { label cellI = p.cell(); diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H index af3dedaa17..1f7f984a82 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/SHF/SHF.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -133,7 +133,7 @@ public: parcel& parcel, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const; }; diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C index 8b121c622e..2189382e34 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,7 +84,7 @@ void Foam::TAB::breakupParcel parcel& p, const scalar deltaT, const vector& Ug, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const { scalar T = p.T(); diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H index f28eb559ad..7b96b28d15 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/TAB/TAB.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,7 +108,7 @@ public: parcel& parcel, const scalar deltaT, const vector& Ug, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const; }; diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C index 61636ad176..78efbc2ccb 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -78,7 +78,7 @@ void Foam::breakupModel::updateParcelProperties parcel& p, const scalar deltaT, const vector& Ug, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const { if (includeOscillation_) diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H index 6c410479f4..01079023dc 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -126,7 +126,7 @@ public: parcel& p, const scalar deltaT, const vector& Ug, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const; virtual void breakupParcel @@ -134,7 +134,7 @@ public: parcel& parcel, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const = 0; }; diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C index 5bd1443461..f4ef3324c7 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/breakupModel/breakupModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C index 216b51d6fe..5c96b6907e 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,7 +69,7 @@ void Foam::noBreakup::breakupParcel parcel&, const scalar, const vector&, - const liquidMixture& + const liquidMixtureProperties& ) const { // Do nothing diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H index db2b9e627b..f474d86966 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/noBreakup/noBreakup.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,7 +75,7 @@ public: parcel& parcel, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const; }; diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C index aefd1679be..d7798cff98 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -73,7 +73,7 @@ void Foam::reitzDiwakar::breakupParcel parcel& p, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const { const PtrList& Y = spray_.composition().Y(); diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H index c36e4e6916..16459fa522 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -87,7 +87,7 @@ public: parcel& parcel, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const; }; diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C index 7556a97b63..51b714f831 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,7 +75,7 @@ void Foam::reitzKHRT::breakupParcel parcel& p, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const { label cellI = p.cell(); diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H index 7895f8573a..67ebff166c 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H +++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -91,7 +91,7 @@ public: parcel& parcel, const scalar deltaT, const vector& vel, - const liquidMixture& fuels + const liquidMixtureProperties& fuels ) const; }; diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C index 590637f54f..84e4bec6df 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedPressureSwirl/definedPressureSwirl.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -97,7 +97,7 @@ Foam::scalar Foam::definedPressureSwirlInjector::d0 // modifications to take account of flash boiling.... - const liquidMixture& fuels = sm_.fuels(); + const liquidMixtureProperties& fuels = sm_.fuels(); scalar chi = 0.0; scalar Tinj = it.T(t); label Nf = fuels.components().size(); diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H index c0e6998ecc..d17cbc3e9d 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/injectorModel/injectorModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ Description #ifndef injectorModel_H #define injectorModel_H -#include "liquid.H" +#include "liquidProperties.H" #include "injector.H" #include "PtrList.H" #include "IOdictionary.H" diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index db20632300..7ff9a9456a 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -5,10 +5,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ @@ -25,10 +25,10 @@ LIB_LIBS = \ -lmeshTools \ -llagrangian \ -lpdf \ - -lliquids \ - -lliquidMixture \ - -lpointSolids \ - -lpointSolidMixture \ + -lliquidProperties \ + -lliquidMixtureProperties \ + -lsolidProperties \ + -lsolidMixtureProperties \ -lspecie \ -lbasicThermophysicalModels \ -lreactionThermophysicalModels \ diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C index 219e691e3a..2815d5e3d1 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -93,14 +93,16 @@ Foam::CompositionModel::carrier() const template -const Foam::liquidMixture& Foam::CompositionModel::liquids() const +const Foam::liquidMixtureProperties& +Foam::CompositionModel::liquids() const { return thermo_.liquids(); } template -const Foam::pointSolidMixture& Foam::CompositionModel::solids() const +const Foam::solidMixtureProperties& +Foam::CompositionModel::solids() const { return thermo_.solids(); } diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H index 74a4a87a20..04ec177d1c 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -140,10 +140,10 @@ public: const basicMultiComponentMixture& carrier() const; //- Return the global (additional) liquids - const liquidMixture& liquids() const; + const liquidMixtureProperties& liquids() const; //- Return the global (additional) solids - const pointSolidMixture& solids() const; + const solidMixtureProperties& solids() const; //- Return the list of phase properties const phasePropertiesList& phaseProps() const; diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H index dbae15d93d..8c66c4fbbd 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H +++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ Description #define LiquidEvaporation_H #include "PhaseChangeModel.H" -#include "liquidMixture.H" +#include "liquidMixtureProperties.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,7 +54,7 @@ protected: // Protected data //- Global liquid properties data - const liquidMixture& liquids_; + const liquidMixtureProperties& liquids_; //- List of active liquid names List activeLiquids_; diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C index c0d9f69e77..84dc17c90d 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -230,7 +230,7 @@ void Foam::ThermoSurfaceFilm::drySplashInteraction Info<< "Parcel " << p.origId() << " drySplashInteraction" << endl; } - const liquid& liq = thermo_.liquids().properties()[0]; + const liquidProperties& liq = thermo_.liquids().properties()[0]; // Patch face velocity and normal const vector& Up = this->owner().U().boundaryField()[pp.index()][faceI]; @@ -286,7 +286,7 @@ void Foam::ThermoSurfaceFilm::wetSplashInteraction Info<< "Parcel " << p.origId() << " wetSplashInteraction" << endl; } - const liquid& liq = thermo_.liquids().properties()[0]; + const liquidProperties& liq = thermo_.liquids().properties()[0]; // Patch face velocity and normal const vector& Up = this->owner().U().boundaryField()[pp.index()][faceI]; diff --git a/src/surfaceFilmModels/Make/options b/src/surfaceFilmModels/Make/options index 3b0199a09b..dda598200c 100644 --- a/src/surfaceFilmModels/Make/options +++ b/src/surfaceFilmModels/Make/options @@ -3,10 +3,10 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ diff --git a/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C index 29ae7ce8ea..375f0e22fd 100644 --- a/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C +++ b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -106,7 +106,7 @@ void Foam::surfaceFilmModels::standardPhaseChange::correct // set local thermo properties const SLGThermo& thermo = film.thermo(); const label liqId = film.liquidId(); - const liquid& liq = thermo.liquids().properties()[liqId]; + const liquidProperties& liq = thermo.liquids().properties()[liqId]; const label vapId = thermo.carrierId(thermo.liquids().components()[liqId]); // retrieve fields from film model diff --git a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C index 1723c09f71..c6a7e254f8 100644 --- a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C +++ b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,7 +81,8 @@ void Foam::surfaceFilmModels::thermoSingleLayer::correctThermoFields() } case tmSingleComponent: { - const liquid& liq = thermo_.liquids().properties()[liquidId_]; + const liquidProperties& liq = + thermo_.liquids().properties()[liquidId_]; forAll(rho_, cellI) { const scalar T = T_[cellI]; diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index 7b1b586b56..306211ac6a 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -5,10 +5,10 @@ set -x wmake libso specie wmake libso solid wmake libso thermophysicalFunctions -wmake libso liquids -wmake libso liquidMixture -wmake libso pointSolids -wmake libso pointSolidMixture +wmake libso liquidProperties +wmake libso liquidMixtureProperties +wmake libso solidProperties +wmake libso solidMixtureProperties wmake libso basic wmake libso reactionThermo diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options index 6121f1c83e..3eda6c06d5 100644 --- a/src/thermophysicalModels/SLGThermo/Make/options +++ b/src/thermophysicalModels/SLGThermo/Make/options @@ -2,10 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolids/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pointSolidMixture/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude LIB_LIBS = \ diff --git a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C index ce9048a5ac..711dd174c7 100644 --- a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C +++ b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,7 +61,7 @@ Foam::SLGThermo::SLGThermo(const fvMesh& mesh, basicThermo& thermo) if (thermo.found("liquids")) { - liquids_ = liquidMixture::New(thermo.subDict("liquids")); + liquids_ = liquidMixtureProperties::New(thermo.subDict("liquids")); Info<< " liquids - " << liquids_->components().size() << " components" << endl; } @@ -72,7 +72,7 @@ Foam::SLGThermo::SLGThermo(const fvMesh& mesh, basicThermo& thermo) if (thermo.found("solids")) { - solids_ = pointSolidMixture::New(thermo.subDict("solids")); + solids_ = solidMixtureProperties::New(thermo.subDict("solids")); Info<< " solids - " << solids_->components().size() << " components" << endl; } @@ -113,13 +113,14 @@ const Foam::basicMultiComponentMixture& Foam::SLGThermo::carrier() const } -const Foam::liquidMixture& Foam::SLGThermo::liquids() const +const Foam::liquidMixtureProperties& Foam::SLGThermo::liquids() const { if (!liquids_.valid()) { FatalErrorIn ( - "const Foam::liquidMixture& Foam::SLGThermo::liquids() const" + "const Foam::liquidMixtureProperties& " + "Foam::SLGThermo::liquids() const" ) << "liquids requested, but object is not allocated" << abort(FatalError); } @@ -128,13 +129,14 @@ const Foam::liquidMixture& Foam::SLGThermo::liquids() const } -const Foam::pointSolidMixture& Foam::SLGThermo::solids() const +const Foam::solidMixtureProperties& Foam::SLGThermo::solids() const { if (!solids_.valid()) { FatalErrorIn ( - "const Foam::pointSolidtMixture& Foam::SLGThermo::solids() const" + "const Foam::solidMixtureProperties& " + "Foam::SLGThermo::solids() const" ) << "solids requested, but object is not allocated" << abort(FatalError); } diff --git a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H index f4ba8299a8..751a394164 100644 --- a/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H +++ b/src/thermophysicalModels/SLGThermo/SLGThermo/SLGThermo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,8 +48,8 @@ SourceFiles #include "MeshObject.H" #include "basicThermo.H" #include "basicMultiComponentMixture.H" -#include "liquidMixture.H" -#include "pointSolidMixture.H" +#include "liquidMixtureProperties.H" +#include "solidMixtureProperties.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -73,10 +73,10 @@ class SLGThermo basicMultiComponentMixture* carrier_; //- Additional liquid properties data - autoPtr liquids_; + autoPtr liquids_; //- Additional solid properties data - autoPtr solids_; + autoPtr solids_; public: @@ -105,10 +105,10 @@ public: const basicMultiComponentMixture& carrier() const; //- Return reference to the global (additional) liquids - const liquidMixture& liquids() const; + const liquidMixtureProperties& liquids() const; //- Return reference to the global (additional) solids - const pointSolidMixture& solids() const; + const solidMixtureProperties& solids() const; // Index retrieval diff --git a/src/thermophysicalModels/liquidMixture/Make/files b/src/thermophysicalModels/liquidMixture/Make/files deleted file mode 100644 index 5d205229ef..0000000000 --- a/src/thermophysicalModels/liquidMixture/Make/files +++ /dev/null @@ -1,6 +0,0 @@ -liquidMixture = liquidMixture - -$(liquidMixture)/liquidMixture.C -$(liquidMixture)/liquidMixtureIO.C - -LIB = $(FOAM_LIBBIN)/libliquidMixture diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C deleted file mode 100644 index 6d4c2eb765..0000000000 --- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixtureIO.C +++ /dev/null @@ -1,60 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "liquidMixture.H" -//#include "IOstreams.H" - -// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * // -/* -Foam::Istream& Foam::operator>>(Foam::Istream& is, Foam::liquidMixture& l) -{ - is >> l.x_; - - // Check state of Istream - is.check - ( - "Foam::Istream& Foam::operator>>(Foam::Istream&, Foam::liquidMixture&)" - ); - - return is; -} - -Foam::Ostream& Foam::operator<<(Foam::Ostream& os, const Foam::liquidMixture& l) -{ - - os << l.x_; - - // Check state of Ostream - os.check - ( - "Foam::Ostream& Foam::operator<<(Foam::Ostream&, " - "const Foam::liquidMixture&)" - ); - - return os; -} - */ - -// ************************************************************************* // diff --git a/src/thermophysicalModels/liquidMixtureProperties/Make/files b/src/thermophysicalModels/liquidMixtureProperties/Make/files new file mode 100644 index 0000000000..4f0959cfc7 --- /dev/null +++ b/src/thermophysicalModels/liquidMixtureProperties/Make/files @@ -0,0 +1,3 @@ +liquidMixtureProperties/liquidMixtureProperties.C + +LIB = $(FOAM_LIBBIN)/libliquidMixtureProperties diff --git a/src/thermophysicalModels/liquidMixture/Make/options b/src/thermophysicalModels/liquidMixtureProperties/Make/options similarity index 76% rename from src/thermophysicalModels/liquidMixture/Make/options rename to src/thermophysicalModels/liquidMixtureProperties/Make/options index bfa6b569ba..28490cc168 100644 --- a/src/thermophysicalModels/liquidMixture/Make/options +++ b/src/thermophysicalModels/liquidMixtureProperties/Make/options @@ -1,11 +1,11 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude LIB_LIBS = \ - -lliquids \ + -lliquidProperties \ -lthermophysicalFunctions diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C b/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C similarity index 82% rename from src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C rename to src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C index aa573eb1ad..a28d214d99 100644 --- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C +++ b/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,18 +23,18 @@ License \*---------------------------------------------------------------------------*/ -#include "liquidMixture.H" +#include "liquidMixtureProperties.H" #include "dictionary.H" #include "specie.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // -const Foam::scalar Foam::liquidMixture::TrMax = 0.999; +const Foam::scalar Foam::liquidMixtureProperties::TrMax = 0.999; // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::liquidMixture::liquidMixture +Foam::liquidMixtureProperties::liquidMixtureProperties ( const dictionary& thermophysicalProperties ) @@ -57,12 +57,19 @@ Foam::liquidMixture::liquidMixture forAll(components_, i) { - properties_.set(i, liquid::New(props.subDict(components_[i]))); + properties_.set + ( + i, + liquidProperties::New(props.subDict(components_[i])) + ); } } -Foam::liquidMixture::liquidMixture(const liquidMixture& lm) +Foam::liquidMixtureProperties::liquidMixtureProperties +( + const liquidMixtureProperties& lm +) : components_(lm.components_), properties_(lm.properties_.size()) @@ -76,18 +83,21 @@ Foam::liquidMixture::liquidMixture(const liquidMixture& lm) // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::liquidMixture::New +Foam::autoPtr Foam::liquidMixtureProperties::New ( const dictionary& thermophysicalProperties ) { - return autoPtr(new liquidMixture(thermophysicalProperties)); + return autoPtr + ( + new liquidMixtureProperties(thermophysicalProperties) + ); } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::liquidMixture::Tc(const scalarField& x) const +Foam::scalar Foam::liquidMixtureProperties::Tc(const scalarField& x) const { scalar vTc = 0.0; scalar vc = 0.0; @@ -103,7 +113,7 @@ Foam::scalar Foam::liquidMixture::Tc(const scalarField& x) const } -Foam::scalar Foam::liquidMixture::Tpc(const scalarField& x) const +Foam::scalar Foam::liquidMixtureProperties::Tpc(const scalarField& x) const { scalar Tpc = 0.0; forAll(properties_, i) @@ -115,7 +125,7 @@ Foam::scalar Foam::liquidMixture::Tpc(const scalarField& x) const } -Foam::scalar Foam::liquidMixture::Ppc(const scalarField& x) const +Foam::scalar Foam::liquidMixtureProperties::Ppc(const scalarField& x) const { scalar Vc = 0.0; scalar Zc = 0.0; @@ -129,7 +139,7 @@ Foam::scalar Foam::liquidMixture::Ppc(const scalarField& x) const } -Foam::scalar Foam::liquidMixture::omega(const scalarField& x) const +Foam::scalar Foam::liquidMixtureProperties::omega(const scalarField& x) const { scalar omega = 0.0; forAll(properties_, i) @@ -141,7 +151,7 @@ Foam::scalar Foam::liquidMixture::omega(const scalarField& x) const } -Foam::scalarField Foam::liquidMixture::Xs +Foam::scalarField Foam::liquidMixtureProperties::Xs ( const scalar p, const scalar Tg, @@ -162,7 +172,7 @@ Foam::scalarField Foam::liquidMixture::Xs } -Foam::scalar Foam::liquidMixture::W(const scalarField& x) const +Foam::scalar Foam::liquidMixtureProperties::W(const scalarField& x) const { scalar W = 0.0; forAll(properties_, i) @@ -174,7 +184,7 @@ Foam::scalar Foam::liquidMixture::W(const scalarField& x) const } -Foam::scalarField Foam::liquidMixture::Y(const scalarField& X) const +Foam::scalarField Foam::liquidMixtureProperties::Y(const scalarField& X) const { scalarField Y(X/W(X)); @@ -187,7 +197,7 @@ Foam::scalarField Foam::liquidMixture::Y(const scalarField& X) const } -Foam::scalarField Foam::liquidMixture::X(const scalarField& Y) const +Foam::scalarField Foam::liquidMixtureProperties::X(const scalarField& Y) const { scalarField X(Y.size()); scalar Winv = 0.0; @@ -202,7 +212,7 @@ Foam::scalarField Foam::liquidMixture::X(const scalarField& Y) const } -Foam::scalar Foam::liquidMixture::rho +Foam::scalar Foam::liquidMixtureProperties::rho ( const scalar p, const scalar T, @@ -225,7 +235,7 @@ Foam::scalar Foam::liquidMixture::rho } -Foam::scalar Foam::liquidMixture::pv +Foam::scalar Foam::liquidMixtureProperties::pv ( const scalar p, const scalar T, @@ -247,7 +257,7 @@ Foam::scalar Foam::liquidMixture::pv } -Foam::scalar Foam::liquidMixture::hl +Foam::scalar Foam::liquidMixtureProperties::hl ( const scalar p, const scalar T, @@ -269,7 +279,7 @@ Foam::scalar Foam::liquidMixture::hl } -Foam::scalar Foam::liquidMixture::Cp +Foam::scalar Foam::liquidMixtureProperties::Cp ( const scalar p, const scalar T, @@ -291,7 +301,7 @@ Foam::scalar Foam::liquidMixture::Cp } -Foam::scalar Foam::liquidMixture::sigma +Foam::scalar Foam::liquidMixtureProperties::sigma ( const scalar p, const scalar T, @@ -325,7 +335,7 @@ Foam::scalar Foam::liquidMixture::sigma } -Foam::scalar Foam::liquidMixture::mu +Foam::scalar Foam::liquidMixtureProperties::mu ( const scalar p, const scalar T, @@ -347,7 +357,7 @@ Foam::scalar Foam::liquidMixture::mu } -Foam::scalar Foam::liquidMixture::K +Foam::scalar Foam::liquidMixtureProperties::K ( const scalar p, const scalar T, @@ -396,7 +406,7 @@ Foam::scalar Foam::liquidMixture::K } -Foam::scalar Foam::liquidMixture::D +Foam::scalar Foam::liquidMixtureProperties::D ( const scalar p, const scalar T, diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H b/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H similarity index 88% rename from src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H rename to src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H index 186d19e64c..d127478cac 100644 --- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H +++ b/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Class - Foam::liquidMixture + Foam::liquidMixtureProperties Description A mixture of liquids. @@ -40,7 +40,7 @@ Description The @c liquidProperties sub-dictionary entry should be used when possible to avoid conflicts with identically named gas-phase entries. - A simple example of a single-component liquidMixture: + A simple example of a single-component liquidMixtureProperties: @verbatim liquidComponents ( @@ -81,13 +81,13 @@ Description \*---------------------------------------------------------------------------*/ -#ifndef liquidMixture_H -#define liquidMixture_H +#ifndef liquidMixtureProperties_H +#define liquidMixtureProperties_H #include "word.H" #include "scalarField.H" #include "PtrList.H" -#include "liquid.H" +#include "liquidProperties.H" #include "autoPtr.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -96,10 +96,10 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class liquidMixture Declaration + Class liquidMixtureProperties Declaration \*---------------------------------------------------------------------------*/ -class liquidMixture +class liquidMixtureProperties { // Private data @@ -110,7 +110,7 @@ class liquidMixture List components_; //- The liquid properties - PtrList properties_; + PtrList properties_; public: @@ -119,27 +119,30 @@ public: // Constructors //- Construct from dictionary - liquidMixture(const dictionary& dict); + liquidMixtureProperties(const dictionary& dict); //- Construct copy - liquidMixture(const liquidMixture& lm); + liquidMixtureProperties(const liquidMixtureProperties& lm); //- Construct and return a clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new liquidMixture(*this)); + return autoPtr + ( + new liquidMixtureProperties(*this) + ); } //- Destructor - virtual ~liquidMixture() + virtual ~liquidMixtureProperties() {} // Selectors //- Select construct from dictionary - static autoPtr New(const dictionary&); + static autoPtr New(const dictionary&); // Member Functions @@ -151,7 +154,7 @@ public: } //- Return the liquid properties - inline const PtrList& properties() const + inline const PtrList& properties() const { return properties_; } diff --git a/src/thermophysicalModels/liquids/Ar/Ar.C b/src/thermophysicalModels/liquidProperties/Ar/Ar.C similarity index 91% rename from src/thermophysicalModels/liquids/Ar/Ar.C rename to src/thermophysicalModels/liquidProperties/Ar/Ar.C index 113c62d200..167b0d229b 100644 --- a/src/thermophysicalModels/liquids/Ar/Ar.C +++ b/src/thermophysicalModels/liquidProperties/Ar/Ar.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(Ar, 0); - addToRunTimeSelectionTable(liquid, Ar,); - addToRunTimeSelectionTable(liquid, Ar, Istream); - addToRunTimeSelectionTable(liquid, Ar, dictionary); + addToRunTimeSelectionTable(liquidProperties, Ar,); + addToRunTimeSelectionTable(liquidProperties, Ar, Istream); + addToRunTimeSelectionTable(liquidProperties, Ar, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::Ar::Ar() : - liquid + liquidProperties ( 39.948, 150.86, @@ -87,7 +87,7 @@ Foam::Ar::Ar() Foam::Ar::Ar ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -103,7 +103,7 @@ Foam::Ar::Ar const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -122,7 +122,7 @@ Foam::Ar::Ar Foam::Ar::Ar(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -141,7 +141,7 @@ Foam::Ar::Ar(Istream& is) Foam::Ar::Ar(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -160,7 +160,7 @@ Foam::Ar::Ar(const dictionary& dict) Foam::Ar::Ar(const Ar& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/Ar/Ar.H b/src/thermophysicalModels/liquidProperties/Ar/Ar.H similarity index 94% rename from src/thermophysicalModels/liquids/Ar/Ar.H rename to src/thermophysicalModels/liquidProperties/Ar/Ar.H index b5a80e0c5f..dbcce489ce 100644 --- a/src/thermophysicalModels/liquids/Ar/Ar.H +++ b/src/thermophysicalModels/liquidProperties/Ar/Ar.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef Ar_H #define Ar_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class Ar : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components Ar ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: Ar(const Ar& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new Ar(*this)); + return autoPtr(new Ar(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/Ar/ArI.H b/src/thermophysicalModels/liquidProperties/Ar/ArI.H similarity index 97% rename from src/thermophysicalModels/liquids/Ar/ArI.H rename to src/thermophysicalModels/liquidProperties/Ar/ArI.H index 4c0325833e..43f02099d9 100644 --- a/src/thermophysicalModels/liquids/Ar/ArI.H +++ b/src/thermophysicalModels/liquidProperties/Ar/ArI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.C b/src/thermophysicalModels/liquidProperties/C10H22/C10H22.C similarity index 91% rename from src/thermophysicalModels/liquids/C10H22/C10H22.C rename to src/thermophysicalModels/liquidProperties/C10H22/C10H22.C index 9b0fd047c1..c2f153d989 100644 --- a/src/thermophysicalModels/liquids/C10H22/C10H22.C +++ b/src/thermophysicalModels/liquidProperties/C10H22/C10H22.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C10H22, 0); - addToRunTimeSelectionTable(liquid, C10H22,); - addToRunTimeSelectionTable(liquid, C10H22, Istream); - addToRunTimeSelectionTable(liquid, C10H22, dictionary); + addToRunTimeSelectionTable(liquidProperties, C10H22,); + addToRunTimeSelectionTable(liquidProperties, C10H22, Istream); + addToRunTimeSelectionTable(liquidProperties, C10H22, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C10H22::C10H22() : - liquid + liquidProperties ( 142.285, 617.70, @@ -95,7 +95,7 @@ Foam::C10H22::C10H22() Foam::C10H22::C10H22 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C10H22::C10H22 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C10H22::C10H22 Foam::C10H22::C10H22(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C10H22::C10H22(Istream& is) Foam::C10H22::C10H22(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C10H22::C10H22(const dictionary& dict) Foam::C10H22::C10H22(const C10H22& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.H b/src/thermophysicalModels/liquidProperties/C10H22/C10H22.H similarity index 94% rename from src/thermophysicalModels/liquids/C10H22/C10H22.H rename to src/thermophysicalModels/liquidProperties/C10H22/C10H22.H index 3283553295..91abdc41ee 100644 --- a/src/thermophysicalModels/liquids/C10H22/C10H22.H +++ b/src/thermophysicalModels/liquidProperties/C10H22/C10H22.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C10H22_H #define C10H22_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C10H22 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C10H22 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C10H22(const C10H22& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C10H22(*this)); + return autoPtr(new C10H22(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22I.H b/src/thermophysicalModels/liquidProperties/C10H22/C10H22I.H similarity index 97% rename from src/thermophysicalModels/liquids/C10H22/C10H22I.H rename to src/thermophysicalModels/liquidProperties/C10H22/C10H22I.H index 7fad8fdd25..0cb8e4def5 100644 --- a/src/thermophysicalModels/liquids/C10H22/C10H22I.H +++ b/src/thermophysicalModels/liquidProperties/C10H22/C10H22I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.C b/src/thermophysicalModels/liquidProperties/C12H26/C12H26.C similarity index 91% rename from src/thermophysicalModels/liquids/C12H26/C12H26.C rename to src/thermophysicalModels/liquidProperties/C12H26/C12H26.C index cc4880bd7e..a35c62cbf0 100644 --- a/src/thermophysicalModels/liquids/C12H26/C12H26.C +++ b/src/thermophysicalModels/liquidProperties/C12H26/C12H26.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C12H26, 0); - addToRunTimeSelectionTable(liquid, C12H26,); - addToRunTimeSelectionTable(liquid, C12H26, Istream); - addToRunTimeSelectionTable(liquid, C12H26, dictionary); + addToRunTimeSelectionTable(liquidProperties, C12H26,); + addToRunTimeSelectionTable(liquidProperties, C12H26, Istream); + addToRunTimeSelectionTable(liquidProperties, C12H26, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C12H26::C12H26() : - liquid + liquidProperties ( 170.338, 658.0, @@ -87,7 +87,7 @@ Foam::C12H26::C12H26() Foam::C12H26::C12H26 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -103,7 +103,7 @@ Foam::C12H26::C12H26 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -122,7 +122,7 @@ Foam::C12H26::C12H26 Foam::C12H26::C12H26(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -141,7 +141,7 @@ Foam::C12H26::C12H26(Istream& is) Foam::C12H26::C12H26(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -160,7 +160,7 @@ Foam::C12H26::C12H26(const dictionary& dict) Foam::C12H26::C12H26(const C12H26& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.H b/src/thermophysicalModels/liquidProperties/C12H26/C12H26.H similarity index 94% rename from src/thermophysicalModels/liquids/C12H26/C12H26.H rename to src/thermophysicalModels/liquidProperties/C12H26/C12H26.H index 023c886495..1651d288d4 100644 --- a/src/thermophysicalModels/liquids/C12H26/C12H26.H +++ b/src/thermophysicalModels/liquidProperties/C12H26/C12H26.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C12H26_H #define C12H26_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C12H26 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from conponents C12H26 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C12H26(const C12H26& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C12H26(*this)); + return autoPtr(new C12H26(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26I.H b/src/thermophysicalModels/liquidProperties/C12H26/C12H26I.H similarity index 97% rename from src/thermophysicalModels/liquids/C12H26/C12H26I.H rename to src/thermophysicalModels/liquidProperties/C12H26/C12H26I.H index 24bec218b7..b53f6fe8ec 100644 --- a/src/thermophysicalModels/liquids/C12H26/C12H26I.H +++ b/src/thermophysicalModels/liquidProperties/C12H26/C12H26I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.C b/src/thermophysicalModels/liquidProperties/C13H28/C13H28.C similarity index 91% rename from src/thermophysicalModels/liquids/C13H28/C13H28.C rename to src/thermophysicalModels/liquidProperties/C13H28/C13H28.C index 12884c7efb..4278f2bf33 100644 --- a/src/thermophysicalModels/liquids/C13H28/C13H28.C +++ b/src/thermophysicalModels/liquidProperties/C13H28/C13H28.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C13H28, 0); - addToRunTimeSelectionTable(liquid, C13H28,); - addToRunTimeSelectionTable(liquid, C13H28, Istream); - addToRunTimeSelectionTable(liquid, C13H28, dictionary); + addToRunTimeSelectionTable(liquidProperties, C13H28,); + addToRunTimeSelectionTable(liquidProperties, C13H28, Istream); + addToRunTimeSelectionTable(liquidProperties, C13H28, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C13H28::C13H28() : - liquid + liquidProperties ( 184.365, 675.80, @@ -95,7 +95,7 @@ Foam::C13H28::C13H28() Foam::C13H28::C13H28 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C13H28::C13H28 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C13H28::C13H28 Foam::C13H28::C13H28(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C13H28::C13H28(Istream& is) Foam::C13H28::C13H28(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C13H28::C13H28(const dictionary& dict) Foam::C13H28::C13H28(const C13H28& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.H b/src/thermophysicalModels/liquidProperties/C13H28/C13H28.H similarity index 94% rename from src/thermophysicalModels/liquids/C13H28/C13H28.H rename to src/thermophysicalModels/liquidProperties/C13H28/C13H28.H index 1c2e6d3fc4..346a9ef480 100644 --- a/src/thermophysicalModels/liquids/C13H28/C13H28.H +++ b/src/thermophysicalModels/liquidProperties/C13H28/C13H28.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C13H28_H #define C13H28_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C13H28 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C13H28 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C13H28(const C13H28& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C13H28(*this)); + return autoPtr(new C13H28(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28I.H b/src/thermophysicalModels/liquidProperties/C13H28/C13H28I.H similarity index 97% rename from src/thermophysicalModels/liquids/C13H28/C13H28I.H rename to src/thermophysicalModels/liquidProperties/C13H28/C13H28I.H index cb6912e51b..3ce3352b16 100644 --- a/src/thermophysicalModels/liquids/C13H28/C13H28I.H +++ b/src/thermophysicalModels/liquidProperties/C13H28/C13H28I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.C b/src/thermophysicalModels/liquidProperties/C14H30/C14H30.C similarity index 91% rename from src/thermophysicalModels/liquids/C14H30/C14H30.C rename to src/thermophysicalModels/liquidProperties/C14H30/C14H30.C index a50eb7f4f5..434c5c4700 100644 --- a/src/thermophysicalModels/liquids/C14H30/C14H30.C +++ b/src/thermophysicalModels/liquidProperties/C14H30/C14H30.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C14H30, 0); - addToRunTimeSelectionTable(liquid, C14H30,); - addToRunTimeSelectionTable(liquid, C14H30, Istream); - addToRunTimeSelectionTable(liquid, C14H30, dictionary); + addToRunTimeSelectionTable(liquidProperties, C14H30,); + addToRunTimeSelectionTable(liquidProperties, C14H30, Istream); + addToRunTimeSelectionTable(liquidProperties, C14H30, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C14H30::C14H30() : - liquid + liquidProperties ( 198.392, 692.40, @@ -95,7 +95,7 @@ Foam::C14H30::C14H30() Foam::C14H30::C14H30 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C14H30::C14H30 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C14H30::C14H30 Foam::C14H30::C14H30(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C14H30::C14H30(Istream& is) Foam::C14H30::C14H30(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C14H30::C14H30(const dictionary& dict) Foam::C14H30::C14H30(const C14H30& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.H b/src/thermophysicalModels/liquidProperties/C14H30/C14H30.H similarity index 94% rename from src/thermophysicalModels/liquids/C14H30/C14H30.H rename to src/thermophysicalModels/liquidProperties/C14H30/C14H30.H index ec98406e3f..ba8033499f 100644 --- a/src/thermophysicalModels/liquids/C14H30/C14H30.H +++ b/src/thermophysicalModels/liquidProperties/C14H30/C14H30.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C14H30_H #define C14H30_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C14H30 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C14H30 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C14H30(const C14H30& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C14H30(*this)); + return autoPtr(new C14H30(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30I.H b/src/thermophysicalModels/liquidProperties/C14H30/C14H30I.H similarity index 97% rename from src/thermophysicalModels/liquids/C14H30/C14H30I.H rename to src/thermophysicalModels/liquidProperties/C14H30/C14H30I.H index 165c345fc5..fcce331f7c 100644 --- a/src/thermophysicalModels/liquids/C14H30/C14H30I.H +++ b/src/thermophysicalModels/liquidProperties/C14H30/C14H30I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.C b/src/thermophysicalModels/liquidProperties/C16H34/C16H34.C similarity index 91% rename from src/thermophysicalModels/liquids/C16H34/C16H34.C rename to src/thermophysicalModels/liquidProperties/C16H34/C16H34.C index be9df8a310..33c5a7dba3 100644 --- a/src/thermophysicalModels/liquids/C16H34/C16H34.C +++ b/src/thermophysicalModels/liquidProperties/C16H34/C16H34.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C16H34, 0); - addToRunTimeSelectionTable(liquid, C16H34,); - addToRunTimeSelectionTable(liquid, C16H34, Istream); - addToRunTimeSelectionTable(liquid, C16H34, dictionary); + addToRunTimeSelectionTable(liquidProperties, C16H34,); + addToRunTimeSelectionTable(liquidProperties, C16H34, Istream); + addToRunTimeSelectionTable(liquidProperties, C16H34, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C16H34::C16H34() : - liquid + liquidProperties ( 226.446, 720.60, @@ -95,7 +95,7 @@ Foam::C16H34::C16H34() Foam::C16H34::C16H34 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C16H34::C16H34 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C16H34::C16H34 Foam::C16H34::C16H34(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C16H34::C16H34(Istream& is) Foam::C16H34::C16H34(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C16H34::C16H34(const dictionary& dict) Foam::C16H34::C16H34(const C16H34& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.H b/src/thermophysicalModels/liquidProperties/C16H34/C16H34.H similarity index 94% rename from src/thermophysicalModels/liquids/C16H34/C16H34.H rename to src/thermophysicalModels/liquidProperties/C16H34/C16H34.H index 3d14007cf4..de16ec9db6 100644 --- a/src/thermophysicalModels/liquids/C16H34/C16H34.H +++ b/src/thermophysicalModels/liquidProperties/C16H34/C16H34.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C16H34_H #define C16H34_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C16H34 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C16H34 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C16H34(const C16H34& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C16H34(*this)); + return autoPtr(new C16H34(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34I.H b/src/thermophysicalModels/liquidProperties/C16H34/C16H34I.H similarity index 97% rename from src/thermophysicalModels/liquids/C16H34/C16H34I.H rename to src/thermophysicalModels/liquidProperties/C16H34/C16H34I.H index 7b0997a339..5b95693571 100644 --- a/src/thermophysicalModels/liquids/C16H34/C16H34I.H +++ b/src/thermophysicalModels/liquidProperties/C16H34/C16H34I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.C similarity index 91% rename from src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C rename to src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.C index 2b86f73630..5509b6b6a6 100644 --- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C +++ b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C2H5OH, 0); - addToRunTimeSelectionTable(liquid, C2H5OH,); - addToRunTimeSelectionTable(liquid, C2H5OH, Istream); - addToRunTimeSelectionTable(liquid, C2H5OH, dictionary); + addToRunTimeSelectionTable(liquidProperties, C2H5OH,); + addToRunTimeSelectionTable(liquidProperties, C2H5OH, Istream); + addToRunTimeSelectionTable(liquidProperties, C2H5OH, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C2H5OH::C2H5OH() : - liquid + liquidProperties ( 46.069, 516.25, @@ -95,7 +95,7 @@ Foam::C2H5OH::C2H5OH() Foam::C2H5OH::C2H5OH ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C2H5OH::C2H5OH const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C2H5OH::C2H5OH Foam::C2H5OH::C2H5OH(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C2H5OH::C2H5OH(Istream& is) Foam::C2H5OH::C2H5OH(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C2H5OH::C2H5OH(const dictionary& dict) Foam::C2H5OH::C2H5OH(const C2H5OH& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.H similarity index 94% rename from src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H rename to src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.H index 7eaf9679cf..4c282b4ca4 100644 --- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H +++ b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C2H5OH_H #define C2H5OH_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C2H5OH : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C2H5OH ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C2H5OH(const C2H5OH& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C2H5OH(*this)); + return autoPtr(new C2H5OH(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OHI.H similarity index 97% rename from src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H rename to src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OHI.H index cd80214285..993251b8a2 100644 --- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H +++ b/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OHI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.C b/src/thermophysicalModels/liquidProperties/C2H6/C2H6.C similarity index 91% rename from src/thermophysicalModels/liquids/C2H6/C2H6.C rename to src/thermophysicalModels/liquidProperties/C2H6/C2H6.C index f648ba7792..ce2c710da3 100644 --- a/src/thermophysicalModels/liquids/C2H6/C2H6.C +++ b/src/thermophysicalModels/liquidProperties/C2H6/C2H6.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C2H6, 0); - addToRunTimeSelectionTable(liquid, C2H6,); - addToRunTimeSelectionTable(liquid, C2H6, Istream); - addToRunTimeSelectionTable(liquid, C2H6, dictionary); + addToRunTimeSelectionTable(liquidProperties, C2H6,); + addToRunTimeSelectionTable(liquidProperties, C2H6, Istream); + addToRunTimeSelectionTable(liquidProperties, C2H6, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C2H6::C2H6() : - liquid + liquidProperties ( 30.070, 305.32, @@ -86,7 +86,7 @@ Foam::C2H6::C2H6() Foam::C2H6::C2H6 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -102,7 +102,7 @@ Foam::C2H6::C2H6 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -121,7 +121,7 @@ Foam::C2H6::C2H6 Foam::C2H6::C2H6(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -140,7 +140,7 @@ Foam::C2H6::C2H6(Istream& is) Foam::C2H6::C2H6(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -159,7 +159,7 @@ Foam::C2H6::C2H6(const dictionary& dict) Foam::C2H6::C2H6(const C2H6& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.H b/src/thermophysicalModels/liquidProperties/C2H6/C2H6.H similarity index 94% rename from src/thermophysicalModels/liquids/C2H6/C2H6.H rename to src/thermophysicalModels/liquidProperties/C2H6/C2H6.H index ff4e527253..fe5e7b9e52 100644 --- a/src/thermophysicalModels/liquids/C2H6/C2H6.H +++ b/src/thermophysicalModels/liquidProperties/C2H6/C2H6.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C2H6_H #define C2H6_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C2H6 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C2H6 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C2H6(const C2H6& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C2H6(*this)); + return autoPtr(new C2H6(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6I.H b/src/thermophysicalModels/liquidProperties/C2H6/C2H6I.H similarity index 97% rename from src/thermophysicalModels/liquids/C2H6/C2H6I.H rename to src/thermophysicalModels/liquidProperties/C2H6/C2H6I.H index 75e10ddb99..83c83845bf 100644 --- a/src/thermophysicalModels/liquids/C2H6/C2H6I.H +++ b/src/thermophysicalModels/liquidProperties/C2H6/C2H6I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.C similarity index 91% rename from src/thermophysicalModels/liquids/C2H6O/C2H6O.C rename to src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.C index 38e3f06797..9d978cbf97 100644 --- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C +++ b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C2H6O, 0); - addToRunTimeSelectionTable(liquid, C2H6O,); - addToRunTimeSelectionTable(liquid, C2H6O, Istream); - addToRunTimeSelectionTable(liquid, C2H6O, dictionary); + addToRunTimeSelectionTable(liquidProperties, C2H6O,); + addToRunTimeSelectionTable(liquidProperties, C2H6O, Istream); + addToRunTimeSelectionTable(liquidProperties, C2H6O, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C2H6O::C2H6O() : - liquid + liquidProperties ( 46.069, 400.10, @@ -95,7 +95,7 @@ Foam::C2H6O::C2H6O() Foam::C2H6O::C2H6O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C2H6O::C2H6O const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C2H6O::C2H6O Foam::C2H6O::C2H6O(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C2H6O::C2H6O(Istream& is) Foam::C2H6O::C2H6O(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C2H6O::C2H6O(const dictionary& dict) Foam::C2H6O::C2H6O(const C2H6O& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.H similarity index 94% rename from src/thermophysicalModels/liquids/C2H6O/C2H6O.H rename to src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.H index 3fea9b5061..380bdd6dce 100644 --- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H +++ b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C2H6O_H #define C2H6O_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C2H6O : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C2H6O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C2H6O(const C2H6O& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C2H6O(*this)); + return autoPtr(new C2H6O(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6OI.H similarity index 97% rename from src/thermophysicalModels/liquids/C2H6O/C2H6OI.H rename to src/thermophysicalModels/liquidProperties/C2H6O/C2H6OI.H index bd085b1bec..b59c6ec3e3 100644 --- a/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H +++ b/src/thermophysicalModels/liquidProperties/C2H6O/C2H6OI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.C similarity index 91% rename from src/thermophysicalModels/liquids/C3H6O/C3H6O.C rename to src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.C index 307d72b704..c4b8254bb5 100644 --- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C +++ b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C3H6O, 0); - addToRunTimeSelectionTable(liquid, C3H6O,); - addToRunTimeSelectionTable(liquid, C3H6O, Istream); - addToRunTimeSelectionTable(liquid, C3H6O, dictionary); + addToRunTimeSelectionTable(liquidProperties, C3H6O,); + addToRunTimeSelectionTable(liquidProperties, C3H6O, Istream); + addToRunTimeSelectionTable(liquidProperties, C3H6O, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C3H6O::C3H6O() : - liquid + liquidProperties ( 58.08, 508.20, @@ -95,7 +95,7 @@ Foam::C3H6O::C3H6O() Foam::C3H6O::C3H6O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C3H6O::C3H6O const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C3H6O::C3H6O Foam::C3H6O::C3H6O(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C3H6O::C3H6O(Istream& is) Foam::C3H6O::C3H6O(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C3H6O::C3H6O(const dictionary& dict) Foam::C3H6O::C3H6O(const C3H6O& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.H similarity index 94% rename from src/thermophysicalModels/liquids/C3H6O/C3H6O.H rename to src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.H index 1ae3a34d0e..88e6edcdac 100644 --- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H +++ b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C3H6O_H #define C3H6O_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C3H6O : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from compoents C3H6O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C3H6O(const C3H6O& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C3H6O(*this)); + return autoPtr(new C3H6O(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6OI.H similarity index 97% rename from src/thermophysicalModels/liquids/C3H6O/C3H6OI.H rename to src/thermophysicalModels/liquidProperties/C3H6O/C3H6OI.H index 40a455ecb2..6a5ac93036 100644 --- a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H +++ b/src/thermophysicalModels/liquidProperties/C3H6O/C3H6OI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.C b/src/thermophysicalModels/liquidProperties/C3H8/C3H8.C similarity index 91% rename from src/thermophysicalModels/liquids/C3H8/C3H8.C rename to src/thermophysicalModels/liquidProperties/C3H8/C3H8.C index 27bcd05e73..7fa59aa1ba 100644 --- a/src/thermophysicalModels/liquids/C3H8/C3H8.C +++ b/src/thermophysicalModels/liquidProperties/C3H8/C3H8.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C3H8, 0); - addToRunTimeSelectionTable(liquid, C3H8,); - addToRunTimeSelectionTable(liquid, C3H8, Istream); - addToRunTimeSelectionTable(liquid, C3H8, dictionary); + addToRunTimeSelectionTable(liquidProperties, C3H8,); + addToRunTimeSelectionTable(liquidProperties, C3H8, Istream); + addToRunTimeSelectionTable(liquidProperties, C3H8, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C3H8::C3H8() : - liquid + liquidProperties ( 44.096, 369.83, @@ -85,7 +85,7 @@ Foam::C3H8::C3H8() Foam::C3H8::C3H8 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -101,7 +101,7 @@ Foam::C3H8::C3H8 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -120,7 +120,7 @@ Foam::C3H8::C3H8 Foam::C3H8::C3H8(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -139,7 +139,7 @@ Foam::C3H8::C3H8(Istream& is) Foam::C3H8::C3H8(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -158,7 +158,7 @@ Foam::C3H8::C3H8(const dictionary& dict) Foam::C3H8::C3H8(const C3H8& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.H b/src/thermophysicalModels/liquidProperties/C3H8/C3H8.H similarity index 94% rename from src/thermophysicalModels/liquids/C3H8/C3H8.H rename to src/thermophysicalModels/liquidProperties/C3H8/C3H8.H index bb25111b67..b539f4b504 100644 --- a/src/thermophysicalModels/liquids/C3H8/C3H8.H +++ b/src/thermophysicalModels/liquidProperties/C3H8/C3H8.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C3H8_H #define C3H8_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C3H8 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C3H8 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C3H8(const C3H8& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C3H8(*this)); + return autoPtr(new C3H8(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8I.H b/src/thermophysicalModels/liquidProperties/C3H8/C3H8I.H similarity index 97% rename from src/thermophysicalModels/liquids/C3H8/C3H8I.H rename to src/thermophysicalModels/liquidProperties/C3H8/C3H8I.H index e298bae4c9..677d96bfa2 100644 --- a/src/thermophysicalModels/liquids/C3H8/C3H8I.H +++ b/src/thermophysicalModels/liquidProperties/C3H8/C3H8I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.C similarity index 91% rename from src/thermophysicalModels/liquids/C4H10O/C4H10O.C rename to src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.C index c2ce36e90c..34237ac91b 100644 --- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C +++ b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C4H10O, 0); - addToRunTimeSelectionTable(liquid, C4H10O,); - addToRunTimeSelectionTable(liquid, C4H10O, Istream); - addToRunTimeSelectionTable(liquid, C4H10O, dictionary); + addToRunTimeSelectionTable(liquidProperties, C4H10O,); + addToRunTimeSelectionTable(liquidProperties, C4H10O, Istream); + addToRunTimeSelectionTable(liquidProperties, C4H10O, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C4H10O::C4H10O() : - liquid + liquidProperties ( 74.123, 466.70, @@ -95,7 +95,7 @@ Foam::C4H10O::C4H10O() Foam::C4H10O::C4H10O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C4H10O::C4H10O const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C4H10O::C4H10O Foam::C4H10O::C4H10O(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C4H10O::C4H10O(Istream& is) Foam::C4H10O::C4H10O(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C4H10O::C4H10O(const dictionary& dict) Foam::C4H10O::C4H10O(const C4H10O& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.H similarity index 94% rename from src/thermophysicalModels/liquids/C4H10O/C4H10O.H rename to src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.H index f07cdbc8d4..9a1ab395c4 100644 --- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H +++ b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C4H10O_H #define C4H10O_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C4H10O : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C4H10O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C4H10O(const C4H10O& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C4H10O(*this)); + return autoPtr(new C4H10O(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10OI.H similarity index 97% rename from src/thermophysicalModels/liquids/C4H10O/C4H10OI.H rename to src/thermophysicalModels/liquidProperties/C4H10O/C4H10OI.H index e3737774a1..e594fbc550 100644 --- a/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H +++ b/src/thermophysicalModels/liquidProperties/C4H10O/C4H10OI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.C b/src/thermophysicalModels/liquidProperties/C6H14/C6H14.C similarity index 91% rename from src/thermophysicalModels/liquids/C6H14/C6H14.C rename to src/thermophysicalModels/liquidProperties/C6H14/C6H14.C index 810ddfa781..7bb4e2cb68 100644 --- a/src/thermophysicalModels/liquids/C6H14/C6H14.C +++ b/src/thermophysicalModels/liquidProperties/C6H14/C6H14.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C6H14, 0); - addToRunTimeSelectionTable(liquid, C6H14,); - addToRunTimeSelectionTable(liquid, C6H14, Istream); - addToRunTimeSelectionTable(liquid, C6H14, dictionary); + addToRunTimeSelectionTable(liquidProperties, C6H14,); + addToRunTimeSelectionTable(liquidProperties, C6H14, Istream); + addToRunTimeSelectionTable(liquidProperties, C6H14, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C6H14::C6H14() : - liquid + liquidProperties ( 86.177, 507.60, @@ -95,7 +95,7 @@ Foam::C6H14::C6H14() Foam::C6H14::C6H14 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C6H14::C6H14 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C6H14::C6H14 Foam::C6H14::C6H14(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C6H14::C6H14(Istream& is) Foam::C6H14::C6H14(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C6H14::C6H14(const dictionary& dict) Foam::C6H14::C6H14(const C6H14& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.H b/src/thermophysicalModels/liquidProperties/C6H14/C6H14.H similarity index 94% rename from src/thermophysicalModels/liquids/C6H14/C6H14.H rename to src/thermophysicalModels/liquidProperties/C6H14/C6H14.H index 339a7d5e28..3734d712dc 100644 --- a/src/thermophysicalModels/liquids/C6H14/C6H14.H +++ b/src/thermophysicalModels/liquidProperties/C6H14/C6H14.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C6H14_H #define C6H14_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C6H14 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C6H14 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C6H14(const C6H14& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C6H14(*this)); + return autoPtr(new C6H14(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14I.H b/src/thermophysicalModels/liquidProperties/C6H14/C6H14I.H similarity index 97% rename from src/thermophysicalModels/liquids/C6H14/C6H14I.H rename to src/thermophysicalModels/liquidProperties/C6H14/C6H14I.H index 66f3bfe53e..db5ef7878f 100644 --- a/src/thermophysicalModels/liquids/C6H14/C6H14I.H +++ b/src/thermophysicalModels/liquidProperties/C6H14/C6H14I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.C b/src/thermophysicalModels/liquidProperties/C6H6/C6H6.C similarity index 91% rename from src/thermophysicalModels/liquids/C6H6/C6H6.C rename to src/thermophysicalModels/liquidProperties/C6H6/C6H6.C index bb340e8223..2285c1fa7d 100644 --- a/src/thermophysicalModels/liquids/C6H6/C6H6.C +++ b/src/thermophysicalModels/liquidProperties/C6H6/C6H6.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C6H6, 0); - addToRunTimeSelectionTable(liquid, C6H6,); - addToRunTimeSelectionTable(liquid, C6H6, Istream); - addToRunTimeSelectionTable(liquid, C6H6, dictionary); + addToRunTimeSelectionTable(liquidProperties, C6H6,); + addToRunTimeSelectionTable(liquidProperties, C6H6, Istream); + addToRunTimeSelectionTable(liquidProperties, C6H6, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C6H6::C6H6() : - liquid + liquidProperties ( 78.114, 562.16, @@ -95,7 +95,7 @@ Foam::C6H6::C6H6() Foam::C6H6::C6H6 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C6H6::C6H6 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C6H6::C6H6 Foam::C6H6::C6H6(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C6H6::C6H6(Istream& is) Foam::C6H6::C6H6(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C6H6::C6H6(const dictionary& dict) Foam::C6H6::C6H6(const C6H6& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.H b/src/thermophysicalModels/liquidProperties/C6H6/C6H6.H similarity index 94% rename from src/thermophysicalModels/liquids/C6H6/C6H6.H rename to src/thermophysicalModels/liquidProperties/C6H6/C6H6.H index 8364eeb772..0eb4935bf5 100644 --- a/src/thermophysicalModels/liquids/C6H6/C6H6.H +++ b/src/thermophysicalModels/liquidProperties/C6H6/C6H6.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C6H6_H #define C6H6_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C6H6 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Comstruct from components C6H6 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C6H6(const C6H6& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C6H6(*this)); + return autoPtr(new C6H6(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6I.H b/src/thermophysicalModels/liquidProperties/C6H6/C6H6I.H similarity index 97% rename from src/thermophysicalModels/liquids/C6H6/C6H6I.H rename to src/thermophysicalModels/liquidProperties/C6H6/C6H6I.H index e304faf9c9..90eb54e1a1 100644 --- a/src/thermophysicalModels/liquids/C6H6/C6H6I.H +++ b/src/thermophysicalModels/liquidProperties/C6H6/C6H6I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.C b/src/thermophysicalModels/liquidProperties/C7H16/C7H16.C similarity index 91% rename from src/thermophysicalModels/liquids/C7H16/C7H16.C rename to src/thermophysicalModels/liquidProperties/C7H16/C7H16.C index 996a6e8bcb..8a316775bc 100644 --- a/src/thermophysicalModels/liquids/C7H16/C7H16.C +++ b/src/thermophysicalModels/liquidProperties/C7H16/C7H16.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C7H16, 0); - addToRunTimeSelectionTable(liquid, C7H16,); - addToRunTimeSelectionTable(liquid, C7H16, Istream); - addToRunTimeSelectionTable(liquid, C7H16, dictionary); + addToRunTimeSelectionTable(liquidProperties, C7H16,); + addToRunTimeSelectionTable(liquidProperties, C7H16, Istream); + addToRunTimeSelectionTable(liquidProperties, C7H16, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C7H16::C7H16() : - liquid + liquidProperties ( 100.204, 540.20, @@ -94,7 +94,7 @@ Foam::C7H16::C7H16() Foam::C7H16::C7H16 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -110,7 +110,7 @@ Foam::C7H16::C7H16 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -129,7 +129,7 @@ Foam::C7H16::C7H16 Foam::C7H16::C7H16(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -148,7 +148,7 @@ Foam::C7H16::C7H16(Istream& is) Foam::C7H16::C7H16(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -167,7 +167,7 @@ Foam::C7H16::C7H16(const dictionary& dict) Foam::C7H16::C7H16(const C7H16& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.H b/src/thermophysicalModels/liquidProperties/C7H16/C7H16.H similarity index 94% rename from src/thermophysicalModels/liquids/C7H16/C7H16.H rename to src/thermophysicalModels/liquidProperties/C7H16/C7H16.H index bee4f0d3ca..00a0b8a3a2 100644 --- a/src/thermophysicalModels/liquids/C7H16/C7H16.H +++ b/src/thermophysicalModels/liquidProperties/C7H16/C7H16.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C7H16_H #define C7H16_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C7H16 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C7H16 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C7H16(const C7H16& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C7H16(*this)); + return autoPtr(new C7H16(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16I.H b/src/thermophysicalModels/liquidProperties/C7H16/C7H16I.H similarity index 97% rename from src/thermophysicalModels/liquids/C7H16/C7H16I.H rename to src/thermophysicalModels/liquidProperties/C7H16/C7H16I.H index a6fb542505..e258a4595b 100644 --- a/src/thermophysicalModels/liquids/C7H16/C7H16I.H +++ b/src/thermophysicalModels/liquidProperties/C7H16/C7H16I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.C b/src/thermophysicalModels/liquidProperties/C7H8/C7H8.C similarity index 91% rename from src/thermophysicalModels/liquids/C7H8/C7H8.C rename to src/thermophysicalModels/liquidProperties/C7H8/C7H8.C index 7bdfe8a6e6..86f38fc2ca 100644 --- a/src/thermophysicalModels/liquids/C7H8/C7H8.C +++ b/src/thermophysicalModels/liquidProperties/C7H8/C7H8.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C7H8, 0); - addToRunTimeSelectionTable(liquid, C7H8,); - addToRunTimeSelectionTable(liquid, C7H8, Istream); - addToRunTimeSelectionTable(liquid, C7H8, dictionary); + addToRunTimeSelectionTable(liquidProperties, C7H8,); + addToRunTimeSelectionTable(liquidProperties, C7H8, Istream); + addToRunTimeSelectionTable(liquidProperties, C7H8, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C7H8::C7H8() : - liquid + liquidProperties ( 92.141, 591.79, @@ -95,7 +95,7 @@ Foam::C7H8::C7H8() Foam::C7H8::C7H8 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C7H8::C7H8 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C7H8::C7H8 Foam::C7H8::C7H8(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C7H8::C7H8(Istream& is) Foam::C7H8::C7H8(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C7H8::C7H8(const dictionary& dict) Foam::C7H8::C7H8(const C7H8& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.H b/src/thermophysicalModels/liquidProperties/C7H8/C7H8.H similarity index 94% rename from src/thermophysicalModels/liquids/C7H8/C7H8.H rename to src/thermophysicalModels/liquidProperties/C7H8/C7H8.H index 67602dc2c8..6e8541115d 100644 --- a/src/thermophysicalModels/liquids/C7H8/C7H8.H +++ b/src/thermophysicalModels/liquidProperties/C7H8/C7H8.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C7H8_H #define C7H8_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C7H8 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C7H8 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C7H8(const C7H8& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C7H8(*this)); + return autoPtr(new C7H8(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8I.H b/src/thermophysicalModels/liquidProperties/C7H8/C7H8I.H similarity index 97% rename from src/thermophysicalModels/liquids/C7H8/C7H8I.H rename to src/thermophysicalModels/liquidProperties/C7H8/C7H8I.H index 0f22c1bdbd..0ca76b67a7 100644 --- a/src/thermophysicalModels/liquids/C7H8/C7H8I.H +++ b/src/thermophysicalModels/liquidProperties/C7H8/C7H8I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.C b/src/thermophysicalModels/liquidProperties/C8H10/C8H10.C similarity index 91% rename from src/thermophysicalModels/liquids/C8H10/C8H10.C rename to src/thermophysicalModels/liquidProperties/C8H10/C8H10.C index 056d1e3b29..409e3690a9 100644 --- a/src/thermophysicalModels/liquids/C8H10/C8H10.C +++ b/src/thermophysicalModels/liquidProperties/C8H10/C8H10.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C8H10, 0); - addToRunTimeSelectionTable(liquid, C8H10,); - addToRunTimeSelectionTable(liquid, C8H10, Istream); - addToRunTimeSelectionTable(liquid, C8H10, dictionary); + addToRunTimeSelectionTable(liquidProperties, C8H10,); + addToRunTimeSelectionTable(liquidProperties, C8H10, Istream); + addToRunTimeSelectionTable(liquidProperties, C8H10, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C8H10::C8H10() : - liquid + liquidProperties ( 106.167, 617.17, @@ -95,7 +95,7 @@ Foam::C8H10::C8H10() Foam::C8H10::C8H10 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C8H10::C8H10 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C8H10::C8H10 Foam::C8H10::C8H10(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C8H10::C8H10(Istream& is) Foam::C8H10::C8H10(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C8H10::C8H10(const dictionary& dict) Foam::C8H10::C8H10(const C8H10& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.H b/src/thermophysicalModels/liquidProperties/C8H10/C8H10.H similarity index 94% rename from src/thermophysicalModels/liquids/C8H10/C8H10.H rename to src/thermophysicalModels/liquidProperties/C8H10/C8H10.H index 985171794e..1c2b0bc5db 100644 --- a/src/thermophysicalModels/liquids/C8H10/C8H10.H +++ b/src/thermophysicalModels/liquidProperties/C8H10/C8H10.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C8H10_H #define C8H10_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -57,7 +57,7 @@ namespace Foam class C8H10 : - public liquid + public liquidProperties { // Private data @@ -90,7 +90,7 @@ public: // Construct from components C8H10 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -116,9 +116,9 @@ public: C8H10(const C8H10& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C8H10(*this)); + return autoPtr(new C8H10(*this)); } @@ -172,7 +172,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10I.H b/src/thermophysicalModels/liquidProperties/C8H10/C8H10I.H similarity index 97% rename from src/thermophysicalModels/liquids/C8H10/C8H10I.H rename to src/thermophysicalModels/liquidProperties/C8H10/C8H10I.H index 7f1efbb3d2..46eaca6e87 100644 --- a/src/thermophysicalModels/liquids/C8H10/C8H10I.H +++ b/src/thermophysicalModels/liquidProperties/C8H10/C8H10I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.C b/src/thermophysicalModels/liquidProperties/C8H18/C8H18.C similarity index 91% rename from src/thermophysicalModels/liquids/C8H18/C8H18.C rename to src/thermophysicalModels/liquidProperties/C8H18/C8H18.C index 3a51caf792..414bea27f6 100644 --- a/src/thermophysicalModels/liquids/C8H18/C8H18.C +++ b/src/thermophysicalModels/liquidProperties/C8H18/C8H18.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C8H18, 0); - addToRunTimeSelectionTable(liquid, C8H18,); - addToRunTimeSelectionTable(liquid, C8H18, Istream); - addToRunTimeSelectionTable(liquid, C8H18, dictionary); + addToRunTimeSelectionTable(liquidProperties, C8H18,); + addToRunTimeSelectionTable(liquidProperties, C8H18, Istream); + addToRunTimeSelectionTable(liquidProperties, C8H18, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C8H18::C8H18() : - liquid + liquidProperties ( 114.231, 568.70, @@ -95,7 +95,7 @@ Foam::C8H18::C8H18() Foam::C8H18::C8H18 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C8H18::C8H18 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C8H18::C8H18 Foam::C8H18::C8H18(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C8H18::C8H18(Istream& is) Foam::C8H18::C8H18(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C8H18::C8H18(const dictionary& dict) Foam::C8H18::C8H18(const C8H18& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.H b/src/thermophysicalModels/liquidProperties/C8H18/C8H18.H similarity index 94% rename from src/thermophysicalModels/liquids/C8H18/C8H18.H rename to src/thermophysicalModels/liquidProperties/C8H18/C8H18.H index 2be91bf4d5..5b841caa28 100644 --- a/src/thermophysicalModels/liquids/C8H18/C8H18.H +++ b/src/thermophysicalModels/liquidProperties/C8H18/C8H18.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C8H18_H #define C8H18_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C8H18 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C8H18 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C8H18(const C8H18& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C8H18(*this)); + return autoPtr(new C8H18(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18I.H b/src/thermophysicalModels/liquidProperties/C8H18/C8H18I.H similarity index 97% rename from src/thermophysicalModels/liquids/C8H18/C8H18I.H rename to src/thermophysicalModels/liquidProperties/C8H18/C8H18I.H index 5be416de68..ebbb6b78bd 100644 --- a/src/thermophysicalModels/liquids/C8H18/C8H18I.H +++ b/src/thermophysicalModels/liquidProperties/C8H18/C8H18I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.C b/src/thermophysicalModels/liquidProperties/C9H20/C9H20.C similarity index 91% rename from src/thermophysicalModels/liquids/C9H20/C9H20.C rename to src/thermophysicalModels/liquidProperties/C9H20/C9H20.C index 2e321ded79..5090f573b4 100644 --- a/src/thermophysicalModels/liquids/C9H20/C9H20.C +++ b/src/thermophysicalModels/liquidProperties/C9H20/C9H20.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C9H20, 0); - addToRunTimeSelectionTable(liquid, C9H20,); - addToRunTimeSelectionTable(liquid, C9H20, Istream); - addToRunTimeSelectionTable(liquid, C9H20, dictionary); + addToRunTimeSelectionTable(liquidProperties, C9H20,); + addToRunTimeSelectionTable(liquidProperties, C9H20, Istream); + addToRunTimeSelectionTable(liquidProperties, C9H20, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C9H20::C9H20() : - liquid + liquidProperties ( 128.258, 594.60, @@ -95,7 +95,7 @@ Foam::C9H20::C9H20() Foam::C9H20::C9H20 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::C9H20::C9H20 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::C9H20::C9H20 Foam::C9H20::C9H20(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::C9H20::C9H20(Istream& is) Foam::C9H20::C9H20(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::C9H20::C9H20(const dictionary& dict) Foam::C9H20::C9H20(const C9H20& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.H b/src/thermophysicalModels/liquidProperties/C9H20/C9H20.H similarity index 94% rename from src/thermophysicalModels/liquids/C9H20/C9H20.H rename to src/thermophysicalModels/liquidProperties/C9H20/C9H20.H index 5f4f17fd89..9d03c03970 100644 --- a/src/thermophysicalModels/liquids/C9H20/C9H20.H +++ b/src/thermophysicalModels/liquidProperties/C9H20/C9H20.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef C9H20_H #define C9H20_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class C9H20 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components C9H20 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: C9H20(const C9H20& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C9H20(*this)); + return autoPtr(new C9H20(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20I.H b/src/thermophysicalModels/liquidProperties/C9H20/C9H20I.H similarity index 97% rename from src/thermophysicalModels/liquids/C9H20/C9H20I.H rename to src/thermophysicalModels/liquidProperties/C9H20/C9H20I.H index dce3a0f9eb..7c7c63c864 100644 --- a/src/thermophysicalModels/liquids/C9H20/C9H20I.H +++ b/src/thermophysicalModels/liquidProperties/C9H20/C9H20I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.C similarity index 91% rename from src/thermophysicalModels/liquids/CH3OH/CH3OH.C rename to src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.C index 594a867e73..3859bed3ec 100644 --- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C +++ b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(CH3OH, 0); - addToRunTimeSelectionTable(liquid, CH3OH,); - addToRunTimeSelectionTable(liquid, CH3OH, Istream); - addToRunTimeSelectionTable(liquid, CH3OH, dictionary); + addToRunTimeSelectionTable(liquidProperties, CH3OH,); + addToRunTimeSelectionTable(liquidProperties, CH3OH, Istream); + addToRunTimeSelectionTable(liquidProperties, CH3OH, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::CH3OH::CH3OH() : - liquid + liquidProperties ( 32.042, 512.58, @@ -95,7 +95,7 @@ Foam::CH3OH::CH3OH() Foam::CH3OH::CH3OH ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::CH3OH::CH3OH const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::CH3OH::CH3OH Foam::CH3OH::CH3OH(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::CH3OH::CH3OH(Istream& is) Foam::CH3OH::CH3OH(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::CH3OH::CH3OH(const dictionary& dict) Foam::CH3OH::CH3OH(const CH3OH& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.H similarity index 94% rename from src/thermophysicalModels/liquids/CH3OH/CH3OH.H rename to src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.H index 3ba851ba78..d334e240b6 100644 --- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H +++ b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef CH3OH_H #define CH3OH_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class CH3OH : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components CH3OH ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: CH3OH(const CH3OH& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new CH3OH(*this)); + return autoPtr(new CH3OH(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OHI.H similarity index 97% rename from src/thermophysicalModels/liquids/CH3OH/CH3OHI.H rename to src/thermophysicalModels/liquidProperties/CH3OH/CH3OHI.H index 0a3bf14e9e..aece4b536b 100644 --- a/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H +++ b/src/thermophysicalModels/liquidProperties/CH3OH/CH3OHI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.C similarity index 91% rename from src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C rename to src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.C index b40f001006..8d0b407cef 100644 --- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C +++ b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,16 +32,16 @@ License namespace Foam { defineTypeNameAndDebug(CH4N2O, 0); - addToRunTimeSelectionTable(liquid, CH4N2O,); - addToRunTimeSelectionTable(liquid, CH4N2O, Istream); - addToRunTimeSelectionTable(liquid, CH4N2O, dictionary); + addToRunTimeSelectionTable(liquidProperties, CH4N2O,); + addToRunTimeSelectionTable(liquidProperties, CH4N2O, Istream); + addToRunTimeSelectionTable(liquidProperties, CH4N2O, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::CH4N2O::CH4N2O() : - liquid + liquidProperties ( 60.056, 705.0, @@ -80,7 +80,7 @@ Foam::CH4N2O::CH4N2O() Foam::CH4N2O::CH4N2O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc0& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -96,7 +96,7 @@ Foam::CH4N2O::CH4N2O const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -115,7 +115,7 @@ Foam::CH4N2O::CH4N2O Foam::CH4N2O::CH4N2O(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -134,7 +134,7 @@ Foam::CH4N2O::CH4N2O(Istream& is) Foam::CH4N2O::CH4N2O(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -153,7 +153,7 @@ Foam::CH4N2O::CH4N2O(const dictionary& dict) Foam::CH4N2O::CH4N2O(const CH4N2O& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.H similarity index 94% rename from src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H rename to src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.H index 84bfd18954..62d5c8b7eb 100644 --- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H +++ b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ SourceFiles #ifndef CH4N2O_H #define CH4N2O_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -59,7 +59,7 @@ namespace Foam class CH4N2O : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components CH4N2O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc0& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: CH4N2O(const CH4N2O& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new CH4N2O(*this)); + return autoPtr(new CH4N2O(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; @@ -210,4 +210,3 @@ public: #endif // ************************************************************************* // - diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2OI.H similarity index 97% rename from src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H rename to src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2OI.H index 82b06c8586..439644a4ec 100644 --- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H +++ b/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2OI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/H2O/H2O.C b/src/thermophysicalModels/liquidProperties/H2O/H2O.C similarity index 91% rename from src/thermophysicalModels/liquids/H2O/H2O.C rename to src/thermophysicalModels/liquidProperties/H2O/H2O.C index 0f1b2824bb..9edb17df63 100644 --- a/src/thermophysicalModels/liquids/H2O/H2O.C +++ b/src/thermophysicalModels/liquidProperties/H2O/H2O.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(H2O, 0); - addToRunTimeSelectionTable(liquid, H2O,); - addToRunTimeSelectionTable(liquid, H2O, Istream); - addToRunTimeSelectionTable(liquid, H2O, dictionary); + addToRunTimeSelectionTable(liquidProperties, H2O,); + addToRunTimeSelectionTable(liquidProperties, H2O, Istream); + addToRunTimeSelectionTable(liquidProperties, H2O, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::H2O::H2O() : - liquid + liquidProperties ( 18.015, 647.13, @@ -102,7 +102,7 @@ Foam::H2O::H2O() Foam::H2O::H2O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -118,7 +118,7 @@ Foam::H2O::H2O const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -137,7 +137,7 @@ Foam::H2O::H2O Foam::H2O::H2O(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -156,7 +156,7 @@ Foam::H2O::H2O(Istream& is) Foam::H2O::H2O(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -175,7 +175,7 @@ Foam::H2O::H2O(const dictionary& dict) Foam::H2O::H2O(const H2O& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/H2O/H2O.H b/src/thermophysicalModels/liquidProperties/H2O/H2O.H similarity index 94% rename from src/thermophysicalModels/liquids/H2O/H2O.H rename to src/thermophysicalModels/liquidProperties/H2O/H2O.H index 66ab3d33c6..4925bdc819 100644 --- a/src/thermophysicalModels/liquids/H2O/H2O.H +++ b/src/thermophysicalModels/liquidProperties/H2O/H2O.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef H2O_H #define H2O_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -57,7 +57,7 @@ namespace Foam class H2O : - public liquid + public liquidProperties { // Private data @@ -90,7 +90,7 @@ public: //- Construct from components H2O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -116,9 +116,9 @@ public: H2O(const H2O& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new H2O(*this)); + return autoPtr(new H2O(*this)); } @@ -172,7 +172,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/H2O/H2OI.H b/src/thermophysicalModels/liquidProperties/H2O/H2OI.H similarity index 97% rename from src/thermophysicalModels/liquids/H2O/H2OI.H rename to src/thermophysicalModels/liquidProperties/H2O/H2OI.H index dc9346da3f..1b450b6289 100644 --- a/src/thermophysicalModels/liquids/H2O/H2OI.H +++ b/src/thermophysicalModels/liquidProperties/H2O/H2OI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.C similarity index 91% rename from src/thermophysicalModels/liquids/IC8H18/IC8H18.C rename to src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.C index 223d1e4538..1376059422 100644 --- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C +++ b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(IC8H18, 0); - addToRunTimeSelectionTable(liquid, IC8H18,); - addToRunTimeSelectionTable(liquid, IC8H18, Istream); - addToRunTimeSelectionTable(liquid, IC8H18, dictionary); + addToRunTimeSelectionTable(liquidProperties, IC8H18,); + addToRunTimeSelectionTable(liquidProperties, IC8H18, Istream); + addToRunTimeSelectionTable(liquidProperties, IC8H18, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::IC8H18::IC8H18() : - liquid + liquidProperties ( 114.231, 543.96, @@ -95,7 +95,7 @@ Foam::IC8H18::IC8H18() Foam::IC8H18::IC8H18 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::IC8H18::IC8H18 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::IC8H18::IC8H18 Foam::IC8H18::IC8H18(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::IC8H18::IC8H18(Istream& is) Foam::IC8H18::IC8H18(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::IC8H18::IC8H18(const dictionary& dict) Foam::IC8H18::IC8H18(const IC8H18& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.H similarity index 94% rename from src/thermophysicalModels/liquids/IC8H18/IC8H18.H rename to src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.H index 33d67a06ef..500fd6c117 100644 --- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H +++ b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef IC8H18_H #define IC8H18_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class IC8H18 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components IC8H18 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: IC8H18(const IC8H18& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new IC8H18(*this)); + return autoPtr(new IC8H18(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18I.H similarity index 97% rename from src/thermophysicalModels/liquids/IC8H18/IC8H18I.H rename to src/thermophysicalModels/liquidProperties/IC8H18/IC8H18I.H index 12b722922d..806afaf6dc 100644 --- a/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H +++ b/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.C b/src/thermophysicalModels/liquidProperties/IDEA/IDEA.C similarity index 92% rename from src/thermophysicalModels/liquids/IDEA/IDEA.C rename to src/thermophysicalModels/liquidProperties/IDEA/IDEA.C index 49470621e8..3752a3e76f 100644 --- a/src/thermophysicalModels/liquids/IDEA/IDEA.C +++ b/src/thermophysicalModels/liquidProperties/IDEA/IDEA.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(IDEA, 0); - addToRunTimeSelectionTable(liquid, IDEA,); - addToRunTimeSelectionTable(liquid, IDEA, Istream); - addToRunTimeSelectionTable(liquid, IDEA, dictionary); + addToRunTimeSelectionTable(liquidProperties, IDEA,); + addToRunTimeSelectionTable(liquidProperties, IDEA, Istream); + addToRunTimeSelectionTable(liquidProperties, IDEA, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::IDEA::IDEA() : - liquid + liquidProperties ( 142.26, 618.074, @@ -115,7 +115,7 @@ Foam::IDEA::IDEA() Foam::IDEA::IDEA ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -131,7 +131,7 @@ Foam::IDEA::IDEA const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -150,7 +150,7 @@ Foam::IDEA::IDEA Foam::IDEA::IDEA(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -169,7 +169,7 @@ Foam::IDEA::IDEA(Istream& is) Foam::IDEA::IDEA(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -188,7 +188,7 @@ Foam::IDEA::IDEA(const dictionary& dict) Foam::IDEA::IDEA(const IDEA& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.H b/src/thermophysicalModels/liquidProperties/IDEA/IDEA.H similarity index 95% rename from src/thermophysicalModels/liquids/IDEA/IDEA.H rename to src/thermophysicalModels/liquidProperties/IDEA/IDEA.H index 476c7b8478..e3a0ff4c1c 100644 --- a/src/thermophysicalModels/liquids/IDEA/IDEA.H +++ b/src/thermophysicalModels/liquidProperties/IDEA/IDEA.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,7 @@ SourceFiles #ifndef IDEA_H #define IDEA_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -80,7 +80,7 @@ namespace Foam class IDEA : - public liquid + public liquidProperties { // Private data @@ -113,7 +113,7 @@ public: // Construct from components IDEA ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -139,9 +139,9 @@ public: IDEA(const IDEA& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new IDEA(*this)); + return autoPtr(new IDEA(*this)); } @@ -195,7 +195,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.thermo b/src/thermophysicalModels/liquidProperties/IDEA/IDEA.thermo similarity index 100% rename from src/thermophysicalModels/liquids/IDEA/IDEA.thermo rename to src/thermophysicalModels/liquidProperties/IDEA/IDEA.thermo diff --git a/src/thermophysicalModels/liquids/IDEA/IDEAI.H b/src/thermophysicalModels/liquidProperties/IDEA/IDEAI.H similarity index 97% rename from src/thermophysicalModels/liquids/IDEA/IDEAI.H rename to src/thermophysicalModels/liquidProperties/IDEA/IDEAI.H index eb593b097a..b99d39bab2 100644 --- a/src/thermophysicalModels/liquids/IDEA/IDEAI.H +++ b/src/thermophysicalModels/liquidProperties/IDEA/IDEAI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/MB/MB.C b/src/thermophysicalModels/liquidProperties/MB/MB.C similarity index 91% rename from src/thermophysicalModels/liquids/MB/MB.C rename to src/thermophysicalModels/liquidProperties/MB/MB.C index e519492bda..d5a39b1a4c 100644 --- a/src/thermophysicalModels/liquids/MB/MB.C +++ b/src/thermophysicalModels/liquidProperties/MB/MB.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(MB, 0); - addToRunTimeSelectionTable(liquid, MB,); - addToRunTimeSelectionTable(liquid, MB, Istream); - addToRunTimeSelectionTable(liquid, MB, dictionary); + addToRunTimeSelectionTable(liquidProperties, MB,); + addToRunTimeSelectionTable(liquidProperties, MB, Istream); + addToRunTimeSelectionTable(liquidProperties, MB, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::MB::MB() : - liquid + liquidProperties ( 102.133, 554.5, @@ -79,7 +79,7 @@ Foam::MB::MB() Foam::MB::MB ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -95,7 +95,7 @@ Foam::MB::MB const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -114,7 +114,7 @@ Foam::MB::MB Foam::MB::MB(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -133,7 +133,7 @@ Foam::MB::MB(Istream& is) Foam::MB::MB(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -152,7 +152,7 @@ Foam::MB::MB(const dictionary& dict) Foam::MB::MB(const MB& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/MB/MB.H b/src/thermophysicalModels/liquidProperties/MB/MB.H similarity index 94% rename from src/thermophysicalModels/liquids/MB/MB.H rename to src/thermophysicalModels/liquidProperties/MB/MB.H index bcea55a03b..fa91d57f39 100644 --- a/src/thermophysicalModels/liquids/MB/MB.H +++ b/src/thermophysicalModels/liquidProperties/MB/MB.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef MB_H #define MB_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class MB : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components MB ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: MB(const MB& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new MB(*this)); + return autoPtr(new MB(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/MB/MBI.H b/src/thermophysicalModels/liquidProperties/MB/MBI.H similarity index 97% rename from src/thermophysicalModels/liquids/MB/MBI.H rename to src/thermophysicalModels/liquidProperties/MB/MBI.H index 0ad21a6942..c7333766ad 100644 --- a/src/thermophysicalModels/liquids/MB/MBI.H +++ b/src/thermophysicalModels/liquidProperties/MB/MBI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/Make/files b/src/thermophysicalModels/liquidProperties/Make/files similarity index 84% rename from src/thermophysicalModels/liquids/Make/files rename to src/thermophysicalModels/liquidProperties/Make/files index e2f27128d5..9b6347d83e 100644 --- a/src/thermophysicalModels/liquids/Make/files +++ b/src/thermophysicalModels/liquidProperties/Make/files @@ -1,4 +1,4 @@ -liquid/liquid.C +liquidProperties/liquidProperties.C H2O/H2O.C C7H16/C7H16.C C12H26/C12H26.C @@ -30,4 +30,4 @@ CH4N2O/CH4N2O.C nC3H8O/nC3H8O.C iC3H8O/iC3H8O.C -LIB = $(FOAM_LIBBIN)/libliquids +LIB = $(FOAM_LIBBIN)/libliquidProperties diff --git a/src/thermophysicalModels/liquids/Make/options b/src/thermophysicalModels/liquidProperties/Make/options similarity index 100% rename from src/thermophysicalModels/liquids/Make/options rename to src/thermophysicalModels/liquidProperties/Make/options diff --git a/src/thermophysicalModels/liquids/N2/N2.C b/src/thermophysicalModels/liquidProperties/N2/N2.C similarity index 91% rename from src/thermophysicalModels/liquids/N2/N2.C rename to src/thermophysicalModels/liquidProperties/N2/N2.C index dd7f6648df..c6d36feddf 100644 --- a/src/thermophysicalModels/liquids/N2/N2.C +++ b/src/thermophysicalModels/liquidProperties/N2/N2.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(N2, 0); - addToRunTimeSelectionTable(liquid, N2,); - addToRunTimeSelectionTable(liquid, N2, Istream); - addToRunTimeSelectionTable(liquid, N2, dictionary); + addToRunTimeSelectionTable(liquidProperties, N2,); + addToRunTimeSelectionTable(liquidProperties, N2, Istream); + addToRunTimeSelectionTable(liquidProperties, N2, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::N2::N2() : - liquid + liquidProperties ( 28.014, 126.10, @@ -95,7 +95,7 @@ Foam::N2::N2() Foam::N2::N2 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::N2::N2 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::N2::N2 Foam::N2::N2(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::N2::N2(Istream& is) Foam::N2::N2(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::N2::N2(const dictionary& dict) Foam::N2::N2(const N2& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/N2/N2.H b/src/thermophysicalModels/liquidProperties/N2/N2.H similarity index 94% rename from src/thermophysicalModels/liquids/N2/N2.H rename to src/thermophysicalModels/liquidProperties/N2/N2.H index f8a199661e..94412e3beb 100644 --- a/src/thermophysicalModels/liquids/N2/N2.H +++ b/src/thermophysicalModels/liquidProperties/N2/N2.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef N2_H #define N2_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class N2 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components N2 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: N2(const N2& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new N2(*this)); + return autoPtr(new N2(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/N2/N2I.H b/src/thermophysicalModels/liquidProperties/N2/N2I.H similarity index 97% rename from src/thermophysicalModels/liquids/N2/N2I.H rename to src/thermophysicalModels/liquidProperties/N2/N2I.H index 5258c41bdf..14b00cc775 100644 --- a/src/thermophysicalModels/liquids/N2/N2I.H +++ b/src/thermophysicalModels/liquidProperties/N2/N2I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.C similarity index 91% rename from src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C rename to src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.C index ac355d3c00..8297a842ab 100644 --- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C +++ b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(aC10H7CH3, 0); - addToRunTimeSelectionTable(liquid, aC10H7CH3,); - addToRunTimeSelectionTable(liquid, aC10H7CH3, Istream); - addToRunTimeSelectionTable(liquid, aC10H7CH3, dictionary); + addToRunTimeSelectionTable(liquidProperties, aC10H7CH3,); + addToRunTimeSelectionTable(liquidProperties, aC10H7CH3, Istream); + addToRunTimeSelectionTable(liquidProperties, aC10H7CH3, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::aC10H7CH3::aC10H7CH3() : - liquid + liquidProperties ( 142.2, 772.04, @@ -87,7 +87,7 @@ Foam::aC10H7CH3::aC10H7CH3() Foam::aC10H7CH3::aC10H7CH3 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -103,7 +103,7 @@ Foam::aC10H7CH3::aC10H7CH3 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -122,7 +122,7 @@ Foam::aC10H7CH3::aC10H7CH3 Foam::aC10H7CH3::aC10H7CH3(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -141,7 +141,7 @@ Foam::aC10H7CH3::aC10H7CH3(Istream& is) Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -160,7 +160,7 @@ Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict) Foam::aC10H7CH3::aC10H7CH3(const aC10H7CH3& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.H similarity index 94% rename from src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H rename to src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.H index f53343aec0..3f93f4509b 100644 --- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H +++ b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef aC10H7CH3_H #define aC10H7CH3_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class aC10H7CH3 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Constrcut from components aC10H7CH3 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: aC10H7CH3(const aC10H7CH3& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new aC10H7CH3(*this)); + return autoPtr(new aC10H7CH3(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3I.H similarity index 97% rename from src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H rename to src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3I.H index 9ed32f011d..1c858c47c0 100644 --- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H +++ b/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.C similarity index 91% rename from src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C rename to src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.C index b0b5d82cc7..285633e339 100644 --- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C +++ b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(bC10H7CH3, 0); - addToRunTimeSelectionTable(liquid, bC10H7CH3,); - addToRunTimeSelectionTable(liquid, bC10H7CH3, Istream); - addToRunTimeSelectionTable(liquid, bC10H7CH3, dictionary); + addToRunTimeSelectionTable(liquidProperties, bC10H7CH3,); + addToRunTimeSelectionTable(liquidProperties, bC10H7CH3, Istream); + addToRunTimeSelectionTable(liquidProperties, bC10H7CH3, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::bC10H7CH3::bC10H7CH3() : - liquid + liquidProperties ( 142.2, 761.0, @@ -87,7 +87,7 @@ Foam::bC10H7CH3::bC10H7CH3() Foam::bC10H7CH3::bC10H7CH3 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -103,7 +103,7 @@ Foam::bC10H7CH3::bC10H7CH3 const APIdiffCoefFunc& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -122,7 +122,7 @@ Foam::bC10H7CH3::bC10H7CH3 Foam::bC10H7CH3::bC10H7CH3(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -141,7 +141,7 @@ Foam::bC10H7CH3::bC10H7CH3(Istream& is) Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -160,7 +160,7 @@ Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict) Foam::bC10H7CH3::bC10H7CH3(const bC10H7CH3& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.H similarity index 94% rename from src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H rename to src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.H index 6a0c08814c..74989233e8 100644 --- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H +++ b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef bC10H7CH3_H #define bC10H7CH3_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -58,7 +58,7 @@ namespace Foam class bC10H7CH3 : - public liquid + public liquidProperties { // Private data @@ -91,7 +91,7 @@ public: //- Construct from components bC10H7CH3 ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -117,9 +117,9 @@ public: bC10H7CH3(const bC10H7CH3& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new bC10H7CH3(*this)); + return autoPtr(new bC10H7CH3(*this)); } @@ -173,7 +173,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3I.H similarity index 97% rename from src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H rename to src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3I.H index bbe0558393..7308518f99 100644 --- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H +++ b/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3I.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.C similarity index 91% rename from src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C rename to src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.C index 83572b233f..cb6f946aea 100644 --- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C +++ b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(iC3H8O, 0); - addToRunTimeSelectionTable(liquid, iC3H8O,); - addToRunTimeSelectionTable(liquid, iC3H8O, Istream); - addToRunTimeSelectionTable(liquid, iC3H8O, dictionary); + addToRunTimeSelectionTable(liquidProperties, iC3H8O,); + addToRunTimeSelectionTable(liquidProperties, iC3H8O, Istream); + addToRunTimeSelectionTable(liquidProperties, iC3H8O, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::iC3H8O::iC3H8O() : - liquid + liquidProperties ( 60.096, 508.31, @@ -95,7 +95,7 @@ Foam::iC3H8O::iC3H8O() Foam::iC3H8O::iC3H8O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::iC3H8O::iC3H8O const NSRDSfunc1& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::iC3H8O::iC3H8O Foam::iC3H8O::iC3H8O(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::iC3H8O::iC3H8O(Istream& is) Foam::iC3H8O::iC3H8O(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::iC3H8O::iC3H8O(const dictionary& dict) Foam::iC3H8O::iC3H8O(const iC3H8O& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.H similarity index 94% rename from src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H rename to src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.H index 0f3e1b414d..d1dbf718ca 100644 --- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H +++ b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef iC3H8O_H #define iC3H8O_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -57,7 +57,7 @@ namespace Foam class iC3H8O : - public liquid + public liquidProperties { // Private data @@ -89,7 +89,7 @@ public: //- Constrcut from components iC3H8O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -115,9 +115,9 @@ public: iC3H8O(const iC3H8O& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new iC3H8O(*this)); + return autoPtr(new iC3H8O(*this)); } @@ -172,7 +172,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8OI.H similarity index 97% rename from src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H rename to src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8OI.H index 256ba7db2c..81e4d1c20f 100644 --- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H +++ b/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8OI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C new file mode 100644 index 0000000000..5806013778 --- /dev/null +++ b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C @@ -0,0 +1,387 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "liquidProperties.H" +#include "HashTable.H" +#include "Switch.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + defineTypeNameAndDebug(liquidProperties, 0); + defineRunTimeSelectionTable(liquidProperties,); + defineRunTimeSelectionTable(liquidProperties, Istream); + defineRunTimeSelectionTable(liquidProperties, dictionary); +} + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::liquidProperties::liquidProperties +( + scalar W, + scalar Tc, + scalar Pc, + scalar Vc, + scalar Zc, + scalar Tt, + scalar Pt, + scalar Tb, + scalar dipm, + scalar omega, + scalar delta +) +: + W_(W), + Tc_(Tc), + Pc_(Pc), + Vc_(Vc), + Zc_(Zc), + Tt_(Tt), + Pt_(Pt), + Tb_(Tb), + dipm_(dipm), + omega_(omega), + delta_(delta) +{} + + +Foam::liquidProperties::liquidProperties(Istream& is) +: + W_(readScalar(is)), + Tc_(readScalar(is)), + Pc_(readScalar(is)), + Vc_(readScalar(is)), + Zc_(readScalar(is)), + Tt_(readScalar(is)), + Pt_(readScalar(is)), + Tb_(readScalar(is)), + dipm_(readScalar(is)), + omega_(readScalar(is)), + delta_(readScalar(is)) +{} + + +Foam::liquidProperties::liquidProperties(const dictionary& dict) +: + W_(readScalar(dict.lookup("W"))), + Tc_(readScalar(dict.lookup("Tc"))), + Pc_(readScalar(dict.lookup("Pc"))), + Vc_(readScalar(dict.lookup("Vc"))), + Zc_(readScalar(dict.lookup("Zc"))), + Tt_(readScalar(dict.lookup("Tt"))), + Pt_(readScalar(dict.lookup("Pt"))), + Tb_(readScalar(dict.lookup("Tb"))), + dipm_(readScalar(dict.lookup("dipm"))), + omega_(readScalar(dict.lookup("omega"))), + delta_(readScalar(dict.lookup("delta"))) +{} + + +Foam::liquidProperties::liquidProperties(const liquidProperties& liq) +: + W_(liq.W_), + Tc_(liq.Tc_), + Pc_(liq.Pc_), + Vc_(liq.Vc_), + Zc_(liq.Zc_), + Tt_(liq.Tt_), + Pt_(liq.Pt_), + Tb_(liq.Tb_), + dipm_(liq.dipm_), + omega_(liq.omega_), + delta_(liq.delta_) +{} + + +// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // + +Foam::autoPtr Foam::liquidProperties::New(Istream& is) +{ + if (debug) + { + Info<< "liquidProperties::New(Istream&): " + << "constructing liquidProperties" << endl; + } + + const word liquidPropertiesType(is); + const word coeffs(is); + + if (coeffs == "defaultCoeffs") + { + ConstructorTable::iterator cstrIter = + ConstructorTablePtr_->find(liquidPropertiesType); + + if (cstrIter == ConstructorTablePtr_->end()) + { + FatalErrorIn("liquidProperties::New(Istream&)") + << "Unknown liquidProperties type " + << liquidPropertiesType << nl << nl + << "Valid liquidProperties types are:" << nl + << ConstructorTablePtr_->sortedToc() + << abort(FatalError); + } + + return autoPtr(cstrIter()()); + } + else if (coeffs == "coeffs") + { + IstreamConstructorTable::iterator cstrIter = + IstreamConstructorTablePtr_->find(liquidPropertiesType); + + if (cstrIter == IstreamConstructorTablePtr_->end()) + { + FatalErrorIn("liquidProperties::New(Istream&)") + << "Unknown liquidProperties type " + << liquidPropertiesType << nl << nl + << "Valid liquidProperties types are:" << nl + << IstreamConstructorTablePtr_->sortedToc() + << abort(FatalError); + } + + return autoPtr(cstrIter()(is)); + } + else + { + FatalErrorIn("liquidProperties::New(Istream&)") + << "liquidProperties type " << liquidPropertiesType + << ", option " << coeffs << " given" + << ", should be coeffs or defaultCoeffs" + << abort(FatalError); + + return autoPtr(NULL); + } +} + + +Foam::autoPtr Foam::liquidProperties::New +( + const dictionary& dict +) +{ + if (debug) + { + Info<< "liquidProperties::New(const dictionary&):" + << "constructing liquidProperties" << endl; + } + + const word& liquidPropertiesTypeName = dict.dictName(); + + const Switch defaultCoeffs(dict.lookup("defaultCoeffs")); + + if (defaultCoeffs) + { + ConstructorTable::iterator cstrIter = + ConstructorTablePtr_->find(liquidPropertiesTypeName); + + if (cstrIter == ConstructorTablePtr_->end()) + { + FatalErrorIn + ( + "liquidProperties::New(const dictionary&, const word&)" + ) << "Unknown liquidProperties type " + << liquidPropertiesTypeName << nl << nl + << "Valid liquidProperties types are:" << nl + << ConstructorTablePtr_->sortedToc() + << abort(FatalError); + } + + return autoPtr(cstrIter()()); + } + else + { + dictionaryConstructorTable::iterator cstrIter = + dictionaryConstructorTablePtr_->find(liquidPropertiesTypeName); + + if (cstrIter == dictionaryConstructorTablePtr_->end()) + { + FatalErrorIn + ( + "liquidProperties::New(const dictionary&, const word&)" + ) << "Unknown liquidProperties type " + << liquidPropertiesTypeName << nl << nl + << "Valid liquidProperties types are:" << nl + << dictionaryConstructorTablePtr_->sortedToc() + << abort(FatalError); + } + + return autoPtr + ( + cstrIter()(dict.subDict(liquidPropertiesTypeName + "Coeffs")) + ); + } +} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::scalar Foam::liquidProperties::rho(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::rho(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::pv(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::pv(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::hl(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::hl(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::Cp(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::Cp(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::h(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::h(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::Cpg(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::Cpg(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::mu(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::mu(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::mug(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::mug(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::K(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::K(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::Kg(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::Kg(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::sigma(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::sigms(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::D(scalar p, scalar T) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::D(scalar, scalar) const" + ); + return 0.0; +} + + +Foam::scalar Foam::liquidProperties::D(scalar p, scalar T, scalar Wb) const +{ + notImplemented + ( + "Foam::scalar Foam::liquidProperties::D(scalar, scalar) const" + ); + return 0.0; +} + + +void Foam::liquidProperties::writeData(Ostream& os) const +{ + + os << W_ << token::SPACE + << Tc_ << token::SPACE + << Pc_ << token::SPACE + << Vc_ << token::SPACE + << Zc_ << token::SPACE + << Tt_ << token::SPACE + << Pt_ << token::SPACE + << Tb_ << token::SPACE + << dipm_ << token::SPACE + << omega_<< token::SPACE + << delta_; +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/liquids/liquid/liquid.H b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.H similarity index 84% rename from src/thermophysicalModels/liquids/liquid/liquid.H rename to src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.H index aeaf885d44..3d8062a7e5 100644 --- a/src/thermophysicalModels/liquids/liquid/liquid.H +++ b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,18 +22,18 @@ License along with OpenFOAM. If not, see . Class - Foam::liquid + Foam::liquidProperties Description - The thermophysical properties of a liquid + The thermophysical properties of a liquidProperties SourceFiles - liquid.C + liquidProperties.C \*---------------------------------------------------------------------------*/ -#ifndef liquid_H -#define liquid_H +#ifndef liquidProperties_H +#define liquidProperties_H #include "scalar.H" #include "IOstreams.H" @@ -48,10 +48,10 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class liquid Declaration + Class liquidProperties Declaration \*---------------------------------------------------------------------------*/ -class liquid +class liquidProperties { // Private data @@ -91,7 +91,7 @@ class liquid public: - TypeName("liquid"); + TypeName("liquidProperties"); // Declare run-time constructor selection tables @@ -99,7 +99,7 @@ public: declareRunTimeSelectionTable ( autoPtr, - liquid, + liquidProperties, , (), () @@ -108,7 +108,7 @@ public: declareRunTimeSelectionTable ( autoPtr, - liquid, + liquidProperties, Istream, (Istream& is), (is) @@ -117,7 +117,7 @@ public: declareRunTimeSelectionTable ( autoPtr, - liquid, + liquidProperties, dictionary, (const dictionary& dict), (dict) @@ -127,7 +127,7 @@ public: // Constructors //- Construct from components - liquid + liquidProperties ( scalar W, scalar Tc, @@ -143,32 +143,32 @@ public: ); //- Construct from Istream - liquid(Istream& is); + liquidProperties(Istream& is); //- Construct from dictionary - liquid(const dictionary& dict); + liquidProperties(const dictionary& dict); //- Construct copy - liquid(const liquid& liq); + liquidProperties(const liquidProperties& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new liquid(*this)); + return autoPtr(new liquidProperties(*this)); } // Selectors - //- Return a pointer to a new liquid created from input - static autoPtr New(Istream& is); + //- Return a pointer to a new liquidProperties created from input + static autoPtr New(Istream& is); - //- Return a pointer to a new liquid created from dictionary - static autoPtr New(const dictionary& dict); + //- Return a pointer to a new liquidProperties created from dictionary + static autoPtr New(const dictionary& dict); //- Destructor - virtual ~liquid() + virtual ~liquidProperties() {} @@ -258,7 +258,7 @@ public: virtual void writeData(Ostream& os) const; //- Ostream Operator - friend Ostream& operator<<(Ostream& os, const liquid& l) + friend Ostream& operator<<(Ostream& os, const liquidProperties& l) { l.writeData(os); return os; @@ -272,7 +272,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "liquidI.H" +#include "liquidPropertiesI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/liquids/liquid/liquidI.H b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidPropertiesI.H similarity index 67% rename from src/thermophysicalModels/liquids/liquid/liquidI.H rename to src/thermophysicalModels/liquidProperties/liquidProperties/liquidPropertiesI.H index fa86dd41f0..3cb5990fa4 100644 --- a/src/thermophysicalModels/liquids/liquid/liquidI.H +++ b/src/thermophysicalModels/liquidProperties/liquidProperties/liquidPropertiesI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,67 +23,67 @@ License \*---------------------------------------------------------------------------*/ -inline Foam::scalar Foam::liquid::W() const +inline Foam::scalar Foam::liquidProperties::W() const { return W_; } -inline Foam::scalar Foam::liquid::Tc() const +inline Foam::scalar Foam::liquidProperties::Tc() const { return Tc_; } -inline Foam::scalar Foam::liquid::Pc() const +inline Foam::scalar Foam::liquidProperties::Pc() const { return Pc_; } -inline Foam::scalar Foam::liquid::Vc() const +inline Foam::scalar Foam::liquidProperties::Vc() const { return Vc_; } -inline Foam::scalar Foam::liquid::Zc() const +inline Foam::scalar Foam::liquidProperties::Zc() const { return Zc_; } -inline Foam::scalar Foam::liquid::Tt() const +inline Foam::scalar Foam::liquidProperties::Tt() const { return Tt_; } -inline Foam::scalar Foam::liquid::Pt() const +inline Foam::scalar Foam::liquidProperties::Pt() const { return Pt_; } -inline Foam::scalar Foam::liquid::Tb() const +inline Foam::scalar Foam::liquidProperties::Tb() const { return Tb_; } -inline Foam::scalar Foam::liquid::dipm() const +inline Foam::scalar Foam::liquidProperties::dipm() const { return dipm_; } -inline Foam::scalar Foam::liquid::omega() const +inline Foam::scalar Foam::liquidProperties::omega() const { return omega_; } -inline Foam::scalar Foam::liquid::delta() const +inline Foam::scalar Foam::liquidProperties::delta() const { return delta_; } diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.C similarity index 91% rename from src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C rename to src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.C index 9aa51834fb..a06493c137 100644 --- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C +++ b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(nC3H8O, 0); - addToRunTimeSelectionTable(liquid, nC3H8O,); - addToRunTimeSelectionTable(liquid, nC3H8O, Istream); - addToRunTimeSelectionTable(liquid, nC3H8O, dictionary); + addToRunTimeSelectionTable(liquidProperties, nC3H8O,); + addToRunTimeSelectionTable(liquidProperties, nC3H8O, Istream); + addToRunTimeSelectionTable(liquidProperties, nC3H8O, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::nC3H8O::nC3H8O() : - liquid + liquidProperties ( 60.096, 536.71, @@ -95,7 +95,7 @@ Foam::nC3H8O::nC3H8O() Foam::nC3H8O::nC3H8O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -111,7 +111,7 @@ Foam::nC3H8O::nC3H8O const NSRDSfunc1& vapourDiffussivity ) : - liquid(l), + liquidProperties(l), rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), @@ -130,7 +130,7 @@ Foam::nC3H8O::nC3H8O Foam::nC3H8O::nC3H8O(Istream& is) : - liquid(is), + liquidProperties(is), rho_(is), pv_(is), hl_(is), @@ -149,7 +149,7 @@ Foam::nC3H8O::nC3H8O(Istream& is) Foam::nC3H8O::nC3H8O(const dictionary& dict) : - liquid(dict), + liquidProperties(dict), rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), @@ -168,7 +168,7 @@ Foam::nC3H8O::nC3H8O(const dictionary& dict) Foam::nC3H8O::nC3H8O(const nC3H8O& liq) : - liquid(liq), + liquidProperties(liq), rho_(liq.rho_), pv_(liq.pv_), hl_(liq.hl_), diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.H similarity index 94% rename from src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H rename to src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.H index e4a9dee214..69c0e66a6f 100644 --- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H +++ b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef nC3H8O_H #define nC3H8O_H -#include "liquid.H" +#include "liquidProperties.H" #include "NSRDSfunc0.H" #include "NSRDSfunc1.H" #include "NSRDSfunc2.H" @@ -57,7 +57,7 @@ namespace Foam class nC3H8O : - public liquid + public liquidProperties { // Private data @@ -89,7 +89,7 @@ public: //- Construct from components nC3H8O ( - const liquid& l, + const liquidProperties& l, const NSRDSfunc5& density, const NSRDSfunc1& vapourPressure, const NSRDSfunc6& heatOfVapourisation, @@ -115,9 +115,9 @@ public: nC3H8O(const nC3H8O& liq); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new nC3H8O(*this)); + return autoPtr(new nC3H8O(*this)); } @@ -172,7 +172,7 @@ public: //- Write the function coefficients void writeData(Ostream& os) const { - liquid::writeData(os); os << nl; + liquidProperties::writeData(os); os << nl; rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8OI.H similarity index 97% rename from src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H rename to src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8OI.H index f7d788e23e..cd02f67f8c 100644 --- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H +++ b/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8OI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/liquids/liquid/liquid.C b/src/thermophysicalModels/liquids/liquid/liquid.C deleted file mode 100644 index 45da23e3f6..0000000000 --- a/src/thermophysicalModels/liquids/liquid/liquid.C +++ /dev/null @@ -1,340 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -\*---------------------------------------------------------------------------*/ - -#include "liquid.H" -#include "HashTable.H" -#include "Switch.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - defineTypeNameAndDebug(liquid, 0); - defineRunTimeSelectionTable(liquid,); - defineRunTimeSelectionTable(liquid, Istream); - defineRunTimeSelectionTable(liquid, dictionary); -} - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -Foam::liquid::liquid -( - scalar W, - scalar Tc, - scalar Pc, - scalar Vc, - scalar Zc, - scalar Tt, - scalar Pt, - scalar Tb, - scalar dipm, - scalar omega, - scalar delta -) -: - W_(W), - Tc_(Tc), - Pc_(Pc), - Vc_(Vc), - Zc_(Zc), - Tt_(Tt), - Pt_(Pt), - Tb_(Tb), - dipm_(dipm), - omega_(omega), - delta_(delta) -{} - - -Foam::liquid::liquid(Istream& is) -: - W_(readScalar(is)), - Tc_(readScalar(is)), - Pc_(readScalar(is)), - Vc_(readScalar(is)), - Zc_(readScalar(is)), - Tt_(readScalar(is)), - Pt_(readScalar(is)), - Tb_(readScalar(is)), - dipm_(readScalar(is)), - omega_(readScalar(is)), - delta_(readScalar(is)) -{} - - -Foam::liquid::liquid(const dictionary& dict) -: - W_(readScalar(dict.lookup("W"))), - Tc_(readScalar(dict.lookup("Tc"))), - Pc_(readScalar(dict.lookup("Pc"))), - Vc_(readScalar(dict.lookup("Vc"))), - Zc_(readScalar(dict.lookup("Zc"))), - Tt_(readScalar(dict.lookup("Tt"))), - Pt_(readScalar(dict.lookup("Pt"))), - Tb_(readScalar(dict.lookup("Tb"))), - dipm_(readScalar(dict.lookup("dipm"))), - omega_(readScalar(dict.lookup("omega"))), - delta_(readScalar(dict.lookup("delta"))) -{} - - -Foam::liquid::liquid(const liquid& liq) -: - W_(liq.W_), - Tc_(liq.Tc_), - Pc_(liq.Pc_), - Vc_(liq.Vc_), - Zc_(liq.Zc_), - Tt_(liq.Tt_), - Pt_(liq.Pt_), - Tb_(liq.Tb_), - dipm_(liq.dipm_), - omega_(liq.omega_), - delta_(liq.delta_) -{} - - -// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * // - -Foam::autoPtr Foam::liquid::New(Istream& is) -{ - if (debug) - { - Info<< "liquid::New(Istream&) : " << "constructing liquid" << endl; - } - - const word liquidType(is); - const word coeffs(is); - - if (coeffs == "defaultCoeffs") - { - ConstructorTable::iterator cstrIter = - ConstructorTablePtr_->find(liquidType); - - if (cstrIter == ConstructorTablePtr_->end()) - { - FatalErrorIn("liquid::New(Istream&)") - << "Unknown liquid type " - << liquidType << nl << nl - << "Valid liquid types are:" << nl - << ConstructorTablePtr_->sortedToc() - << abort(FatalError); - } - - return autoPtr(cstrIter()()); - } - else if (coeffs == "coeffs") - { - IstreamConstructorTable::iterator cstrIter = - IstreamConstructorTablePtr_->find(liquidType); - - if (cstrIter == IstreamConstructorTablePtr_->end()) - { - FatalErrorIn("liquid::New(Istream&)") - << "Unknown liquid type " - << liquidType << nl << nl - << "Valid liquid types are:" << nl - << IstreamConstructorTablePtr_->sortedToc() - << abort(FatalError); - } - - return autoPtr(cstrIter()(is)); - } - else - { - FatalErrorIn("liquid::New(Istream&)") - << "liquid type " << liquidType - << ", option " << coeffs << " given" - << ", should be coeffs or defaultCoeffs" - << abort(FatalError); - - return autoPtr(NULL); - } -} - - -Foam::autoPtr Foam::liquid::New(const dictionary& dict) -{ - if (debug) - { - Info<< "liquid::New(const dictionary&) : " << "constructing liquid" - << endl; - } - - const word& liquidTypeName = dict.dictName(); - - const Switch defaultCoeffs(dict.lookup("defaultCoeffs")); - - if (defaultCoeffs) - { - ConstructorTable::iterator cstrIter = - ConstructorTablePtr_->find(liquidTypeName); - - if (cstrIter == ConstructorTablePtr_->end()) - { - FatalErrorIn("liquid::New(const dictionary&, const word&)") - << "Unknown liquid type " - << liquidTypeName << nl << nl - << "Valid liquid types are:" << nl - << ConstructorTablePtr_->sortedToc() - << abort(FatalError); - } - - return autoPtr(cstrIter()()); - } - else - { - dictionaryConstructorTable::iterator cstrIter = - dictionaryConstructorTablePtr_->find(liquidTypeName); - - if (cstrIter == dictionaryConstructorTablePtr_->end()) - { - FatalErrorIn("liquid::New(const dictionary&, const word&)") - << "Unknown liquid type " - << liquidTypeName << nl << nl - << "Valid liquid types are:" << nl - << dictionaryConstructorTablePtr_->sortedToc() - << abort(FatalError); - } - - return autoPtr - ( - cstrIter()(dict.subDict(liquidTypeName + "Coeffs")) - ); - } -} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -Foam::scalar Foam::liquid::rho(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::rho(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::pv(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::pv(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::hl(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::hl(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::Cp(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::Cp(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::h(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::h(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::Cpg(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::Cpg(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::mu(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::mu(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::mug(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::mug(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::K(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::K(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::Kg(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::Kg(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::sigma(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::sigms(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::D(scalar p, scalar T) const -{ - notImplemented("Foam::scalar Foam::liquid::D(scalar, scalar) const"); - return 0.0; -} - - -Foam::scalar Foam::liquid::D(scalar p, scalar T, scalar Wb) const -{ - notImplemented("Foam::scalar Foam::liquid::D(scalar, scalar) const"); - return 0.0; -} - - -void Foam::liquid::writeData(Ostream& os) const -{ - - os << W_ << token::SPACE - << Tc_ << token::SPACE - << Pc_ << token::SPACE - << Vc_ << token::SPACE - << Zc_ << token::SPACE - << Tt_ << token::SPACE - << Pt_ << token::SPACE - << Tb_ << token::SPACE - << dipm_ << token::SPACE - << omega_<< token::SPACE - << delta_; -} - - -// ************************************************************************* // diff --git a/src/thermophysicalModels/pointSolidMixture/Make/files b/src/thermophysicalModels/pointSolidMixture/Make/files deleted file mode 100644 index 17cad4937b..0000000000 --- a/src/thermophysicalModels/pointSolidMixture/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -pointSolidMixture/pointSolidMixture.C - -LIB = $(FOAM_LIBBIN)/libpointSolidMixture diff --git a/src/thermophysicalModels/pointSolids/Make/files b/src/thermophysicalModels/pointSolids/Make/files deleted file mode 100644 index 526d251970..0000000000 --- a/src/thermophysicalModels/pointSolids/Make/files +++ /dev/null @@ -1,8 +0,0 @@ -pointSolid/pointSolid.C -pointSolid/pointSolidNew.C - -ash/ash.C -C/C.C -CaCO3/CaCO3.C - -LIB = $(FOAM_LIBBIN)/libpointSolids diff --git a/src/thermophysicalModels/solidMixtureProperties/Make/files b/src/thermophysicalModels/solidMixtureProperties/Make/files new file mode 100644 index 0000000000..e31412ed1d --- /dev/null +++ b/src/thermophysicalModels/solidMixtureProperties/Make/files @@ -0,0 +1,3 @@ +solidMixtureProperties/solidMixtureProperties.C + +LIB = $(FOAM_LIBBIN)/libsolidMixtureProperties diff --git a/src/thermophysicalModels/pointSolidMixture/Make/options b/src/thermophysicalModels/solidMixtureProperties/Make/options similarity index 50% rename from src/thermophysicalModels/pointSolidMixture/Make/options rename to src/thermophysicalModels/solidMixtureProperties/Make/options index db6f1fe921..a7802dcbf8 100644 --- a/src/thermophysicalModels/pointSolidMixture/Make/options +++ b/src/thermophysicalModels/solidMixtureProperties/Make/options @@ -1,3 +1,3 @@ EXE_INC = \ - -I${LIB_SRC}/thermophysicalModels/pointSolids/lnInclude \ + -I${LIB_SRC}/thermophysicalModels/solidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude diff --git a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C b/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C similarity index 77% rename from src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C rename to src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C index 3eb1d15b2e..1d4afd2162 100644 --- a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.C +++ b/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,11 +23,11 @@ License \*---------------------------------------------------------------------------*/ -#include "pointSolidMixture.H" +#include "solidMixtureProperties.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pointSolidMixture::pointSolidMixture +Foam::solidMixtureProperties::solidMixtureProperties ( const dictionary& thermophysicalProperties ) @@ -49,12 +49,15 @@ Foam::pointSolidMixture::pointSolidMixture forAll(components_, i) { - properties_.set(i, pointSolid::New(props.subDict(components_[i]))); + properties_.set(i, solidProperties::New(props.subDict(components_[i]))); } } -Foam::pointSolidMixture::pointSolidMixture(const pointSolidMixture& s) +Foam::solidMixtureProperties::solidMixtureProperties +( + const solidMixtureProperties& s +) : components_(s.components_), properties_(s.properties_.size()) @@ -68,21 +71,21 @@ Foam::pointSolidMixture::pointSolidMixture(const pointSolidMixture& s) // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::pointSolidMixture::New +Foam::autoPtr Foam::solidMixtureProperties::New ( const dictionary& thermophysicalProperties ) { - return autoPtr + return autoPtr ( - new pointSolidMixture(thermophysicalProperties) + new solidMixtureProperties(thermophysicalProperties) ); } // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalarField Foam::pointSolidMixture::X(const scalarField& Y) const +Foam::scalarField Foam::solidMixtureProperties::X(const scalarField& Y) const { scalarField X(Y.size()); scalar rhoInv = 0.0; @@ -92,12 +95,12 @@ Foam::scalarField Foam::pointSolidMixture::X(const scalarField& Y) const X[i] = Y[i]/properties_[i].rho(); } - tmp tfld = X/rhoInv; + tmp tfld(X/rhoInv); return tfld(); } -Foam::scalar Foam::pointSolidMixture::rho(const scalarField& X) const +Foam::scalar Foam::solidMixtureProperties::rho(const scalarField& X) const { scalar val = 0.0; forAll(properties_, i) @@ -108,7 +111,7 @@ Foam::scalar Foam::pointSolidMixture::rho(const scalarField& X) const } -Foam::scalar Foam::pointSolidMixture::Cp(const scalarField& Y) const +Foam::scalar Foam::solidMixtureProperties::Cp(const scalarField& Y) const { scalar val = 0.0; forAll(properties_, i) diff --git a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.H b/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H similarity index 75% rename from src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.H rename to src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H index 0f6b749e86..d84449414c 100644 --- a/src/thermophysicalModels/pointSolidMixture/pointSolidMixture/pointSolidMixture.H +++ b/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,30 +22,30 @@ License along with OpenFOAM. If not, see . Class - Foam::pointSolidMixture + Foam::solidMixtureProperties Description A mixture of solids. Note The dictionary constructor searches for the entry @c solidComponents, - which is a wordList. The pointSolid properties of each component can either + which is a wordList. The solid properties of each component can either be contained within a @c solidProperties sub-dictionary or (for legacy purposes) can be found directly in the dictionary. The @c solidProperties sub-dictionary entry should be used when possible to avoid conflicts with identically named gas-phase entries. SeeAlso - Foam::pointSolidMixture + Foam::solidMixtureProperties \*---------------------------------------------------------------------------*/ -#ifndef pointSolidMixture_H -#define pointSolidMixture_H +#ifndef solidMixtureProperties_H +#define solidMixtureProperties_H #include "scalarField.H" #include "PtrList.H" -#include "pointSolid.H" +#include "solidProperties.H" #include "autoPtr.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -54,18 +54,18 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class pointSolidMixture Declaration + Class solidMixtureProperties Declaration \*---------------------------------------------------------------------------*/ -class pointSolidMixture +class solidMixtureProperties { // Private data //- The names of the solids List components_; - //- The pointSolid properties - PtrList properties_; + //- The solidProperties properties + PtrList properties_; public: @@ -73,39 +73,42 @@ public: // Constructors //- Construct from dictionary - pointSolidMixture(const dictionary&); + solidMixtureProperties(const dictionary&); //- Construct copy - pointSolidMixture(const pointSolidMixture& lm); + solidMixtureProperties(const solidMixtureProperties& lm); //- Construct and return a clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new pointSolidMixture(*this)); + return autoPtr + ( + new solidMixtureProperties(*this) + ); } //- Destructor - virtual ~pointSolidMixture() + virtual ~solidMixtureProperties() {} // Selectors //- Select construct from dictionary - static autoPtr New(const dictionary&); + static autoPtr New(const dictionary&); // Member Functions - //- Return the pointSolid names + //- Return the solidProperties names inline const List& components() const { return components_; } - //- Return the pointSolid properties - inline const PtrList& properties() const + //- Return the solidProperties properties + inline const PtrList& properties() const { return properties_; } diff --git a/src/thermophysicalModels/pointSolids/C/C.C b/src/thermophysicalModels/solidProperties/C/C.C similarity index 81% rename from src/thermophysicalModels/pointSolids/C/C.C rename to src/thermophysicalModels/solidProperties/C/C.C index 1e178dfc44..7a6b313792 100644 --- a/src/thermophysicalModels/pointSolids/C/C.C +++ b/src/thermophysicalModels/solidProperties/C/C.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(C, 0); - addToRunTimeSelectionTable(pointSolid, C,); - addToRunTimeSelectionTable(pointSolid, C, Istream); - addToRunTimeSelectionTable(pointSolid, C, dictionary); + addToRunTimeSelectionTable(solidProperties, C,); + addToRunTimeSelectionTable(solidProperties, C, Istream); + addToRunTimeSelectionTable(solidProperties, C, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::C::C() : - pointSolid(2010, 710, 0.04, 0.0, 1.0) + solidProperties(2010, 710, 0.04, 0.0, 1.0) { if (debug) { @@ -51,27 +51,27 @@ Foam::C::C() } -Foam::C::C(const pointSolid& s) +Foam::C::C(const solidProperties& s) : - pointSolid(s) + solidProperties(s) {} Foam::C::C(Istream& is) : - pointSolid(is) + solidProperties(is) {} Foam::C::C(const dictionary& dict) : - pointSolid(dict) + solidProperties(dict) {} Foam::C::C(const C& s) : - pointSolid(s) + solidProperties(s) {} @@ -79,7 +79,7 @@ Foam::C::C(const C& s) void Foam::C::writeData(Ostream& os) const { - pointSolid::writeData(os); + solidProperties::writeData(os); } diff --git a/src/thermophysicalModels/pointSolids/C/C.H b/src/thermophysicalModels/solidProperties/C/C.H similarity index 87% rename from src/thermophysicalModels/pointSolids/C/C.H rename to src/thermophysicalModels/solidProperties/C/C.H index 614a153206..bd4b4364bc 100644 --- a/src/thermophysicalModels/pointSolids/C/C.H +++ b/src/thermophysicalModels/solidProperties/C/C.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::C Description - Graphite + Graphite solid properties SourceFiles C.C @@ -35,7 +35,7 @@ SourceFiles #ifndef solid_C_H #define solid_C_H -#include "pointSolid.H" +#include "solidProperties.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -57,7 +57,7 @@ Ostream& operator<< class C : - public pointSolid + public solidProperties { public: @@ -70,8 +70,8 @@ public: //- Construct null C(); - //- Construct from pointSolid - C(const pointSolid& s); + //- Construct from solidProperties + C(const solidProperties& s); //- Construct from Istream C(Istream& is); @@ -83,9 +83,9 @@ public: C(const C& s); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new C(*this)); + return autoPtr(new C(*this)); } diff --git a/src/thermophysicalModels/pointSolids/CaCO3/CaCO3.C b/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.C similarity index 81% rename from src/thermophysicalModels/pointSolids/CaCO3/CaCO3.C rename to src/thermophysicalModels/solidProperties/CaCO3/CaCO3.C index d15029f65a..f199c4e0e1 100644 --- a/src/thermophysicalModels/pointSolids/CaCO3/CaCO3.C +++ b/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(CaCO3, 0); - addToRunTimeSelectionTable(pointSolid, CaCO3,); - addToRunTimeSelectionTable(pointSolid, CaCO3, Istream); - addToRunTimeSelectionTable(pointSolid, CaCO3, dictionary); + addToRunTimeSelectionTable(solidProperties, CaCO3,); + addToRunTimeSelectionTable(solidProperties, CaCO3, Istream); + addToRunTimeSelectionTable(solidProperties, CaCO3, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::CaCO3::CaCO3() : - pointSolid(2710, 850, 1.3, 0.0, 1.0) + solidProperties(2710, 850, 1.3, 0.0, 1.0) { if (debug) { @@ -51,27 +51,27 @@ Foam::CaCO3::CaCO3() } -Foam::CaCO3::CaCO3(const pointSolid& s) +Foam::CaCO3::CaCO3(const solidProperties& s) : - pointSolid(s) + solidProperties(s) {} Foam::CaCO3::CaCO3(Istream& is) : - pointSolid(is) + solidProperties(is) {} Foam::CaCO3::CaCO3(const dictionary& dict) : - pointSolid(dict) + solidProperties(dict) {} Foam::CaCO3::CaCO3(const CaCO3& s) : - pointSolid(s) + solidProperties(s) {} @@ -79,7 +79,7 @@ Foam::CaCO3::CaCO3(const CaCO3& s) void Foam::CaCO3::writeData(Ostream& os) const { - pointSolid::writeData(os); + solidProperties::writeData(os); } diff --git a/src/thermophysicalModels/pointSolids/CaCO3/CaCO3.H b/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.H similarity index 86% rename from src/thermophysicalModels/pointSolids/CaCO3/CaCO3.H rename to src/thermophysicalModels/solidProperties/CaCO3/CaCO3.H index d5559500b8..fc47cd1d95 100644 --- a/src/thermophysicalModels/pointSolids/CaCO3/CaCO3.H +++ b/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ SourceFiles #ifndef solid_CaCO3_H #define solid_CaCO3_H -#include "pointSolid.H" +#include "solidProperties.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -52,12 +52,12 @@ Ostream& operator<< /*---------------------------------------------------------------------------*\ - Class CaCO3 Declaration + Class CaCO3 Declaration \*---------------------------------------------------------------------------*/ class CaCO3 : - public pointSolid + public solidProperties { public: @@ -71,8 +71,8 @@ public: //- Construct null CaCO3(); - //- Construct from pointSolid - CaCO3(const pointSolid& s); + //- Construct from solidProperties + CaCO3(const solidProperties& s); //- Construct from Istream CaCO3(Istream& is); @@ -84,9 +84,9 @@ public: CaCO3(const CaCO3& s); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new CaCO3(*this)); + return autoPtr(new CaCO3(*this)); } diff --git a/src/thermophysicalModels/solidProperties/Make/files b/src/thermophysicalModels/solidProperties/Make/files new file mode 100644 index 0000000000..694c379453 --- /dev/null +++ b/src/thermophysicalModels/solidProperties/Make/files @@ -0,0 +1,8 @@ +solidProperties/solidProperties.C +solidProperties/solidPropertiesNew.C + +ash/ash.C +C/C.C +CaCO3/CaCO3.C + +LIB = $(FOAM_LIBBIN)/libsolidProperties diff --git a/src/thermophysicalModels/pointSolids/Make/options b/src/thermophysicalModels/solidProperties/Make/options similarity index 100% rename from src/thermophysicalModels/pointSolids/Make/options rename to src/thermophysicalModels/solidProperties/Make/options diff --git a/src/thermophysicalModels/pointSolids/ash/ash.C b/src/thermophysicalModels/solidProperties/ash/ash.C similarity index 81% rename from src/thermophysicalModels/pointSolids/ash/ash.C rename to src/thermophysicalModels/solidProperties/ash/ash.C index b9672f5bd0..2ab7370ff7 100644 --- a/src/thermophysicalModels/pointSolids/ash/ash.C +++ b/src/thermophysicalModels/solidProperties/ash/ash.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,16 +31,16 @@ License namespace Foam { defineTypeNameAndDebug(ash, 0); - addToRunTimeSelectionTable(pointSolid, ash,); - addToRunTimeSelectionTable(pointSolid, ash, Istream); - addToRunTimeSelectionTable(pointSolid, ash, dictionary); + addToRunTimeSelectionTable(solidProperties, ash,); + addToRunTimeSelectionTable(solidProperties, ash, Istream); + addToRunTimeSelectionTable(solidProperties, ash, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::ash::ash() : - pointSolid(2010, 710, 0.04, 0.0, 1.0) + solidProperties(2010, 710, 0.04, 0.0, 1.0) { if (debug) { @@ -51,27 +51,27 @@ Foam::ash::ash() } -Foam::ash::ash(const pointSolid& s) +Foam::ash::ash(const solidProperties& s) : - pointSolid(s) + solidProperties(s) {} Foam::ash::ash(Istream& is) : - pointSolid(is) + solidProperties(is) {} Foam::ash::ash(const dictionary& dict) : - pointSolid(dict) + solidProperties(dict) {} Foam::ash::ash(const ash& s) : - pointSolid(s) + solidProperties(s) {} @@ -79,7 +79,7 @@ Foam::ash::ash(const ash& s) void Foam::ash::writeData(Ostream& os) const { - pointSolid::writeData(os); + solidProperties::writeData(os); } diff --git a/src/thermophysicalModels/pointSolids/ash/ash.H b/src/thermophysicalModels/solidProperties/ash/ash.H similarity index 87% rename from src/thermophysicalModels/pointSolids/ash/ash.H rename to src/thermophysicalModels/solidProperties/ash/ash.H index fcbfbdeeb9..796cc3b3d8 100644 --- a/src/thermophysicalModels/pointSolids/ash/ash.H +++ b/src/thermophysicalModels/solidProperties/ash/ash.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::ash Description - Coal ash + Coal ash solid properties SourceFiles ash.C @@ -35,7 +35,7 @@ SourceFiles #ifndef solid_ash_H #define solid_ash_H -#include "pointSolid.H" +#include "solidProperties.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -57,7 +57,7 @@ Ostream& operator<< class ash : - public pointSolid + public solidProperties { public: @@ -71,8 +71,8 @@ public: //- Construct null ash(); - //- Construct from pointSolid - ash(const pointSolid& s); + //- Construct from solidProperties + ash(const solidProperties& s); //- Construct from Istream ash(Istream& is); @@ -84,9 +84,9 @@ public: ash(const ash& s); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new ash(*this)); + return autoPtr(new ash(*this)); } diff --git a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.C b/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.C similarity index 78% rename from src/thermophysicalModels/pointSolids/pointSolid/pointSolid.C rename to src/thermophysicalModels/solidProperties/solidProperties/solidProperties.C index 6c53900fc0..e3c0f8ed0e 100644 --- a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.C +++ b/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,21 +23,21 @@ License \*---------------------------------------------------------------------------*/ -#include "pointSolid.H" +#include "solidProperties.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - defineTypeNameAndDebug(pointSolid, 0); - defineRunTimeSelectionTable(pointSolid,); - defineRunTimeSelectionTable(pointSolid, Istream); - defineRunTimeSelectionTable(pointSolid, dictionary); + defineTypeNameAndDebug(solidProperties, 0); + defineRunTimeSelectionTable(solidProperties,); + defineRunTimeSelectionTable(solidProperties, Istream); + defineRunTimeSelectionTable(solidProperties, dictionary); } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pointSolid::pointSolid +Foam::solidProperties::solidProperties ( scalar rho, scalar Cp, @@ -54,7 +54,7 @@ Foam::pointSolid::pointSolid {} -Foam::pointSolid::pointSolid(Istream& is) +Foam::solidProperties::solidProperties(Istream& is) : rho_(readScalar(is)), Cp_(readScalar(is)), @@ -64,7 +64,7 @@ Foam::pointSolid::pointSolid(Istream& is) {} -Foam::pointSolid::pointSolid(const dictionary& dict) +Foam::solidProperties::solidProperties(const dictionary& dict) : rho_(readScalar(dict.lookup("rho"))), Cp_(readScalar(dict.lookup("Cp"))), @@ -74,7 +74,7 @@ Foam::pointSolid::pointSolid(const dictionary& dict) {} -Foam::pointSolid::pointSolid(const pointSolid& s) +Foam::solidProperties::solidProperties(const solidProperties& s) : rho_(s.rho_), Cp_(s.Cp_), @@ -86,7 +86,7 @@ Foam::pointSolid::pointSolid(const pointSolid& s) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::pointSolid::writeData(Ostream& os) const +void Foam::solidProperties::writeData(Ostream& os) const { os << rho_ << token::SPACE << Cp_ << token::SPACE @@ -98,7 +98,7 @@ void Foam::pointSolid::writeData(Ostream& os) const // * * * * * * * * * * * * * * IOStream operators * * * * * * * * * * * * * // -Foam::Ostream& Foam::operator<<(Ostream& os, const pointSolid& s) +Foam::Ostream& Foam::operator<<(Ostream& os, const solidProperties& s) { s.writeData(os); return os; diff --git a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H b/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.H similarity index 75% rename from src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H rename to src/thermophysicalModels/solidProperties/solidProperties/solidProperties.H index 2b660c9537..7ed4e03f14 100644 --- a/src/thermophysicalModels/pointSolids/pointSolid/pointSolid.H +++ b/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,18 +22,18 @@ License along with OpenFOAM. If not, see . Class - Foam::pointSolid + Foam::solidProperties Description - The thermophysical properties of a pointSolid + The thermophysical properties of a solid SourceFiles - pointSolid.C + solidProperties.C \*---------------------------------------------------------------------------*/ -#ifndef pointSolid_H -#define pointSolid_H +#ifndef solidProperties_H +#define solidProperties_H #include "typeInfo.H" #include "autoPtr.H" @@ -45,20 +45,20 @@ SourceFiles namespace Foam { -class pointSolid; +class solidProperties; Ostream& operator<< ( Ostream&, - const pointSolid& + const solidProperties& ); /*---------------------------------------------------------------------------*\ - Class pointSolid Declaration + Class solidProperties Declaration \*---------------------------------------------------------------------------*/ -class pointSolid +class solidProperties { // Private data @@ -82,7 +82,7 @@ class pointSolid public: //- Runtime type information - TypeName("pointSolid"); + TypeName("solidProperties"); // Declare run-time constructor selection tables @@ -90,7 +90,7 @@ public: declareRunTimeSelectionTable ( autoPtr, - pointSolid, + solidProperties, , (), () @@ -99,7 +99,7 @@ public: declareRunTimeSelectionTable ( autoPtr, - pointSolid, + solidProperties, Istream, (Istream& is), (is) @@ -108,7 +108,7 @@ public: declareRunTimeSelectionTable ( autoPtr, - pointSolid, + solidProperties, dictionary, (const dictionary& dict), (dict) @@ -118,7 +118,7 @@ public: // Constructors //- Construct from components - pointSolid + solidProperties ( scalar rho, scalar Cp, @@ -128,38 +128,38 @@ public: ); //- Construct from Istream - pointSolid(Istream& is); + solidProperties(Istream& is); //- Construct from dictionary - pointSolid(const dictionary& dict); + solidProperties(const dictionary& dict); //- Construct copy - pointSolid(const pointSolid& s); + solidProperties(const solidProperties& s); //- Construct and return clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new pointSolid(*this)); + return autoPtr(new solidProperties(*this)); } // Selectors - //- Return a pointer to a new pointSolid created from input - static autoPtr New(Istream& is); + //- Return a pointer to a new solidProperties created from input + static autoPtr New(Istream& is); - //- Return a pointer to a new pointSolid created from dictionary - static autoPtr New(const dictionary& dict); + //- Return a pointer to a new solidProperties created from dictionary + static autoPtr New(const dictionary& dict); //- Destructor - virtual ~pointSolid() + virtual ~solidProperties() {} // Member Functions - // Physical constants which define the pointSolid + // Physical constants which define the solidProperties //- Density [kg/m3] inline scalar rho() const; @@ -185,13 +185,13 @@ public: // I-O - //- Write the pointSolid properties + //- Write the solidProperties properties virtual void writeData(Ostream& os) const; // Ostream Operator - friend Ostream& operator<<(Ostream& os, const pointSolid& s); + friend Ostream& operator<<(Ostream& os, const solidProperties& s); }; @@ -201,7 +201,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -#include "pointSolidI.H" +#include "solidPropertiesI.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/thermophysicalModels/pointSolids/pointSolid/pointSolidI.H b/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesI.H similarity index 75% rename from src/thermophysicalModels/pointSolids/pointSolid/pointSolidI.H rename to src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesI.H index 6aa0aab563..252977569d 100644 --- a/src/thermophysicalModels/pointSolids/pointSolid/pointSolidI.H +++ b/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,43 +27,43 @@ License // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -inline Foam::scalar Foam::pointSolid::rho() const +inline Foam::scalar Foam::solidProperties::rho() const { return rho_; } -inline Foam::scalar Foam::pointSolid::Cp() const +inline Foam::scalar Foam::solidProperties::Cp() const { return Cp_; } -inline Foam::scalar Foam::pointSolid::K() const +inline Foam::scalar Foam::solidProperties::K() const { return K_; } -inline Foam::scalar Foam::pointSolid::Hf() const +inline Foam::scalar Foam::solidProperties::Hf() const { return Hf_; } -inline Foam::scalar Foam::pointSolid::H(const scalar T) const +inline Foam::scalar Foam::solidProperties::H(const scalar T) const { return Hs(T) + Hf_; } -inline Foam::scalar Foam::pointSolid::Hs(const scalar T) const +inline Foam::scalar Foam::solidProperties::Hs(const scalar T) const { return Cp_*(T - specie::Tstd); } -inline Foam::scalar Foam::pointSolid::emissivity() const +inline Foam::scalar Foam::solidProperties::emissivity() const { return emissivity_; } diff --git a/src/thermophysicalModels/pointSolids/pointSolid/pointSolidNew.C b/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesNew.C similarity index 64% rename from src/thermophysicalModels/pointSolids/pointSolid/pointSolidNew.C rename to src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesNew.C index f93ededc45..9e2e0d675d 100644 --- a/src/thermophysicalModels/pointSolids/pointSolid/pointSolidNew.C +++ b/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,16 +23,17 @@ License \*---------------------------------------------------------------------------*/ -#include "pointSolid.H" +#include "solidProperties.H" #include "Switch.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::pointSolid::New(Istream& is) +Foam::autoPtr Foam::solidProperties::New(Istream& is) { if (debug) { - Info<< "pointSolid::New(Istream&): constructing pointSolid" << endl; + Info<< "solidProperties::New(Istream&): constructing solid" + << endl; } const word solidType(is); @@ -45,14 +46,14 @@ Foam::autoPtr Foam::pointSolid::New(Istream& is) if (cstrIter == ConstructorTablePtr_->end()) { - FatalErrorIn("pointSolid::New(Istream&)") - << "Unknown pointSolid type " << solidType << nl << nl - << "Valid pointSolid types are :" << endl + FatalErrorIn("solidProperties::New(Istream&)") + << "Unknown solidProperties type " << solidType << nl << nl + << "Valid solidProperties types are :" << endl << ConstructorTablePtr_->sortedToc() << exit(FatalError); } - return autoPtr(cstrIter()()); + return autoPtr(cstrIter()()); } else if (coeffs == "coeffs") { @@ -61,33 +62,36 @@ Foam::autoPtr Foam::pointSolid::New(Istream& is) if (cstrIter == IstreamConstructorTablePtr_->end()) { - FatalErrorIn("pointSolid::New(Istream&)") - << "Unknown pointSolid type " << solidType << nl << nl - << "Valid pointSolid types are :" << endl + FatalErrorIn("solidProperties::New(Istream&)") + << "Unknown solidProperties type " << solidType << nl << nl + << "Valid solidProperties types are :" << endl << IstreamConstructorTablePtr_->sortedToc() << exit(FatalError); } - return autoPtr(cstrIter()(is)); + return autoPtr(cstrIter()(is)); } else { - FatalErrorIn("pointSolid::New(Istream&)") - << "pointSolid type " << solidType + FatalErrorIn("solidProperties::New(Istream&)") + << "solidProperties type " << solidType << ", option " << coeffs << " given" << ", should be coeffs or defaultCoeffs" << exit(FatalError); - return autoPtr(NULL); + return autoPtr(NULL); } } -Foam::autoPtr Foam::pointSolid::New(const dictionary& dict) +Foam::autoPtr Foam::solidProperties::New +( + const dictionary& dict +) { if (debug) { - Info<< "pointSolid::New(const dictionary&): constructing pointSolid" + Info<< "solidProperties::New(const dictionary&): constructing solid" << endl; } @@ -101,14 +105,14 @@ Foam::autoPtr Foam::pointSolid::New(const dictionary& dict) if (cstrIter == ConstructorTablePtr_->end()) { - FatalErrorIn("pointSolid::New(const dictionary&)") - << "Unknown pointSolid type " << solidType << nl << nl - << "Valid pointSolid types are :" << endl + FatalErrorIn("solidProperties::New(const dictionary&)") + << "Unknown solidProperties type " << solidType << nl << nl + << "Valid solidProperties types are :" << endl << ConstructorTablePtr_->sortedToc() << exit(FatalError); } - return autoPtr(cstrIter()()); + return autoPtr(cstrIter()()); } else { @@ -117,14 +121,14 @@ Foam::autoPtr Foam::pointSolid::New(const dictionary& dict) if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("pointSolid::New(const dictionary&)") - << "Unknown pointSolid type " << solidType << nl << nl - << "Valid pointSolid types are :" << endl + FatalErrorIn("solidProperties::New(const dictionary&)") + << "Unknown solidProperties type " << solidType << nl << nl + << "Valid solidProperties types are :" << endl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } - return autoPtr(cstrIter()(dict)); + return autoPtr(cstrIter()(dict)); } } From fba9ffeeb2c1cdaf3a8031fef123f569c207cf40 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 28 Jan 2011 14:13:01 +0000 Subject: [PATCH 025/367] ENH: removed TABs --- tutorials/combustion/chemFoam/gri/chemkin/chem.inp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tutorials/combustion/chemFoam/gri/chemkin/chem.inp b/tutorials/combustion/chemFoam/gri/chemkin/chem.inp index ee978cd8a2..eb5d63d388 100644 --- a/tutorials/combustion/chemFoam/gri/chemkin/chem.inp +++ b/tutorials/combustion/chemFoam/gri/chemkin/chem.inp @@ -7,9 +7,9 @@ ELEMENTS O H C N AR END SPECIES -CH4 CH2O CH3O H O2 H2 O OH H2O HO2 H2O2 +CH4 CH2O CH3O H O2 H2 O OH H2O HO2 H2O2 C CH CH2 CH2(S) CH3 CO CO2 -HCO CH2OH CH3OH C2H C2H2 C2H3 +HCO CH2OH CH3OH C2H C2H2 C2H3 C2H4 C2H5 C2H6 HCCO CH2CO HCCOH N NH NH2 NH3 NNH NO NO2 N2O HNO CN HCN H2CN HCNN HCNO HOCN HNCO NCO N2 @@ -307,7 +307,7 @@ HO2+C3H7<=>O2+C3H8 2.550E+10 0.255 -943.00 HO2+C3H7=>OH+C2H5+CH2O 2.410E+13 .000 .00 CH3+C3H7<=>2C2H5 1.927E+13 -0.320 .00 ! -! + M Reactions +! + M Reactions ! 2O+M<=>O2+M 1.200E+17 -1.000 .00 H2/2.40/ H2O/15.40/ CH4/ 2.00/ CO/ 1.75/ CO2/3.60/ C2H6/ 3.00/ AR/0.83/ From 08680b8b3547c14c97df483e2c2489bb202a45c6 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 28 Jan 2011 16:32:08 +0100 Subject: [PATCH 026/367] STYLE: rename Polynomial method evaluate() to value() for consistency with DataEntry STYLE: move DataEntry to OpenFOAM/primitives/functions --- applications/test/dataEntry/Test-DataEntry.C | 4 ++-- src/OpenFOAM/Make/files | 6 ++++++ .../functions}/DataEntry/Constant/Constant.C | 2 +- .../functions}/DataEntry/Constant/Constant.H | 2 +- .../functions}/DataEntry/Constant/ConstantIO.C | 2 +- .../functions}/DataEntry/DataEntry/DataEntry.C | 2 +- .../functions}/DataEntry/DataEntry/DataEntry.H | 2 +- .../functions}/DataEntry/DataEntry/DataEntryIO.C | 2 +- .../functions}/DataEntry/DataEntry/DataEntryNew.C | 2 +- .../primitives/functions}/DataEntry/Table/Table.C | 2 +- .../primitives/functions}/DataEntry/Table/Table.H | 2 +- .../primitives/functions}/DataEntry/Table/TableIO.C | 2 +- .../primitives/functions}/DataEntry/makeDataEntries.C | 2 +- .../functions}/DataEntry/polynomial/polynomial.C | 2 +- .../functions}/DataEntry/polynomial/polynomial.H | 2 +- .../functions}/DataEntry/polynomial/polynomialIO.C | 2 +- .../primitives/functions/Polynomial/Polynomial.C | 6 +++--- .../primitives/functions/Polynomial/Polynomial.H | 6 +++--- .../primitives/functions/Polynomial/PolynomialIO.C | 2 +- src/lagrangian/intermediate/Make/files | 6 ------ .../equationOfState/icoPolynomial/icoPolynomialI.H | 4 ++-- .../specie/thermo/hPolynomial/hPolynomialThermo.C | 10 +++++----- .../specie/thermo/hPolynomial/hPolynomialThermoI.H | 8 ++++---- .../specie/transport/polynomial/polynomialTransportI.H | 6 +++--- 24 files changed, 43 insertions(+), 43 deletions(-) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Constant/Constant.C (97%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Constant/Constant.H (98%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Constant/ConstantIO.C (96%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/DataEntry/DataEntry.C (97%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/DataEntry/DataEntry.H (98%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/DataEntry/DataEntryIO.C (95%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/DataEntry/DataEntryNew.C (97%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Table/Table.C (98%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Table/Table.H (98%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/Table/TableIO.C (96%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/makeDataEntries.C (96%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/polynomial/polynomial.C (97%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/polynomial/polynomial.H (98%) rename src/{lagrangian/intermediate/submodels/IO => OpenFOAM/primitives/functions}/DataEntry/polynomial/polynomialIO.C (96%) diff --git a/applications/test/dataEntry/Test-DataEntry.C b/applications/test/dataEntry/Test-DataEntry.C index f9b76db9f1..631cc03e02 100644 --- a/applications/test/dataEntry/Test-DataEntry.C +++ b/applications/test/dataEntry/Test-DataEntry.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Application testDataEntry Description - Tests lagrangian/intermediate/submodels/IO/DataEntry + Tests DataEntry \*---------------------------------------------------------------------------*/ diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index 372ce59ff2..8f5966e927 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -47,6 +47,12 @@ primitives/globalIndexAndTransform/vectorTensorTransform/vectorTensorTransform.C primitives/quaternion/quaternion.C primitives/septernion/septernion.C +/* functions, data entries */ +primitives/functions/DataEntry/makeDataEntries.C +primitives/functions/DataEntry/polynomial/polynomial.C +primitives/functions/DataEntry/polynomial/polynomialIO.C + + strings = primitives/strings $(strings)/string/string.C $(strings)/string/stringIO.C diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C similarity index 97% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C rename to src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C index 789c6a5d48..6eeafc583b 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H similarity index 98% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H rename to src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H index f58739afc7..f7a1bb902e 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H +++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/Constant.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C similarity index 96% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C rename to src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C index de383f9707..eca4a677a2 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/Constant/ConstantIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C similarity index 97% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C rename to src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C index 7e13f4bddd..825d8c8400 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H similarity index 98% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H rename to src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H index 4cb66725a6..405b8889a4 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H +++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntry.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryIO.C similarity index 95% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C rename to src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryIO.C index cbe3fe87cf..99a781a937 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C similarity index 97% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C rename to src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C index 947d86753f..fac7d6c4de 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryNew.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/DataEntry/DataEntryNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C similarity index 98% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C rename to src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C index 3e14479f35..71212250ff 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H similarity index 98% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H rename to src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H index ef58482c80..5fe73deccb 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H +++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/Table.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableIO.C similarity index 96% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C rename to src/OpenFOAM/primitives/functions/DataEntry/Table/TableIO.C index c32e673f38..b312469b6b 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/Table/TableIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/makeDataEntries.C b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C similarity index 96% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/makeDataEntries.C rename to src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C index 39d164a681..114658753a 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/makeDataEntries.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/makeDataEntries.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C similarity index 97% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C rename to src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C index f142458397..859440c6dc 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H similarity index 98% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H rename to src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H index 78c55c7870..0b4d18a4bb 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H +++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomialIO.C similarity index 96% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C rename to src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomialIO.C index e50f08bb1e..ab5c0c2e90 100644 --- a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomialIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C index d8569a536c..7f9ae731f6 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C +++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -149,7 +149,7 @@ Foam::scalar& Foam::Polynomial::logCoeff() template -Foam::scalar Foam::Polynomial::evaluate(const scalar x) const +Foam::scalar Foam::Polynomial::value(const scalar x) const { scalar y = this->v_[0]; @@ -192,7 +192,7 @@ Foam::scalar Foam::Polynomial::integrateLimits intPolyType poly = this->integrate(); - return poly.evaluate(x2) - poly.evaluate(x1); + return poly.value(x2) - poly.value(x1); } diff --git a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H index ace90a0bc8..06511b0003 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H +++ b/src/OpenFOAM/primitives/functions/Polynomial/Polynomial.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description where 0 \<= i \<= n - integer powers, starting at zero - - evaluate(x) to evaluate the poly for a given value + - value(x) to evaluate the poly for a given value - integrate(x1, x2) between two scalar values - integrate() to return a new, intergated coeff polynomial - increases the size (order) @@ -134,7 +134,7 @@ public: // Evaluation //- Return polynomial value - scalar evaluate(const scalar x) const; + scalar value(const scalar x) const; //- Return integrated polynomial coefficients // argument becomes zeroth element (constant of integration) diff --git a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C index f3fad20edd..9b99c7a483 100644 --- a/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C +++ b/src/OpenFOAM/primitives/functions/Polynomial/PolynomialIO.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files index 068400f0d7..63fa90db0d 100644 --- a/src/lagrangian/intermediate/Make/files +++ b/src/lagrangian/intermediate/Make/files @@ -74,12 +74,6 @@ $(REACTINGMPINJECTION)/ReactingMultiphaseLookupTableInjection/reactingMultiphase $(REACTINGMPINJECTION)/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.C -/* data entries */ -submodels/IO/DataEntry/makeDataEntries.C -submodels/IO/DataEntry/polynomial/polynomial.C -submodels/IO/DataEntry/polynomial/polynomialIO.C - - /* integration schemes */ IntegrationScheme/makeIntegrationSchemes.C diff --git a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H index f1eeacef9e..b81ab6f80d 100644 --- a/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H +++ b/src/thermophysicalModels/specie/equationOfState/icoPolynomial/icoPolynomialI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -99,7 +99,7 @@ Foam::icoPolynomial::New(const dictionary& dict) template inline Foam::scalar Foam::icoPolynomial::rho(scalar, scalar T) const { - return rhoCoeffs_.evaluate(T)/this->W(); + return rhoCoeffs_.value(T)/this->W(); } diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C index 1b04a9d47c..15269f6ce2 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,10 +49,10 @@ Foam::hPolynomialThermo::hPolynomialThermo sCoeffs_ = CpCoeffs_.integrateMinus1(); // Offset h poly so that it is relative to the enthalpy at Tstd - hCoeffs_[0] += Hf_ - hCoeffs_.evaluate(specie::Tstd); + hCoeffs_[0] += Hf_ - hCoeffs_.value(specie::Tstd); // Offset s poly so that it is relative to the entropy at Tstd - sCoeffs_[0] += Sf_ - sCoeffs_.evaluate(specie::Tstd); + sCoeffs_[0] += Sf_ - sCoeffs_.value(specie::Tstd); } @@ -77,10 +77,10 @@ Foam::hPolynomialThermo::hPolynomialThermo sCoeffs_ = CpCoeffs_.integrateMinus1(); // Offset h poly so that it is relative to the enthalpy at Tstd - hCoeffs_[0] += Hf_ - hCoeffs_.evaluate(specie::Tstd); + hCoeffs_[0] += Hf_ - hCoeffs_.value(specie::Tstd); // Offset s poly so that it is relative to the entropy at Tstd - sCoeffs_[0] += Sf_ - sCoeffs_.evaluate(specie::Tstd); + sCoeffs_[0] += Sf_ - sCoeffs_.value(specie::Tstd); } diff --git a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H index 1576c646d0..b41de9b877 100644 --- a/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H +++ b/src/thermophysicalModels/specie/thermo/hPolynomial/hPolynomialThermoI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -88,7 +88,7 @@ inline Foam::scalar Foam::hPolynomialThermo::cp const scalar T ) const { - return CpCoeffs_.evaluate(T); + return CpCoeffs_.value(T); } @@ -98,7 +98,7 @@ inline Foam::scalar Foam::hPolynomialThermo::h const scalar T ) const { - return hCoeffs_.evaluate(T); + return hCoeffs_.value(T); } @@ -126,7 +126,7 @@ inline Foam::scalar Foam::hPolynomialThermo::s const scalar T ) const { - return sCoeffs_.evaluate(T); + return sCoeffs_.value(T); } diff --git a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H index 52094247fb..d87dcd5657 100644 --- a/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H +++ b/src/thermophysicalModels/specie/transport/polynomial/polynomialTransportI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -107,7 +107,7 @@ inline Foam::scalar Foam::polynomialTransport::mu const scalar T ) const { - return muCoeffs_.evaluate(T)/this->W(); + return muCoeffs_.value(T)/this->W(); } @@ -117,7 +117,7 @@ inline Foam::scalar Foam::polynomialTransport::kappa const scalar T ) const { - return kappaCoeffs_.evaluate(T)/this->W(); + return kappaCoeffs_.value(T)/this->W(); } From 0be6ba87fc8c1fbc2d1b036ad537d995fb21fd5a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 28 Jan 2011 18:26:14 +0100 Subject: [PATCH 027/367] ENH: add perNode field writing to ensight/part/ensightPart* - simplify the ensightSurfaceWriter accordingly --- src/conversion/ensight/part/ensightPart.C | 6 +- src/conversion/ensight/part/ensightPart.H | 21 ++- .../ensight/part/ensightPartCells.C | 28 ++-- .../ensight/part/ensightPartCells.H | 10 +- .../ensight/part/ensightPartFaces.C | 16 +-- .../ensight/part/ensightPartFaces.H | 8 +- src/conversion/ensight/part/ensightPartIO.C | 93 ++++++++---- .../ensight/part/ensightPartTemplates.C | 43 ++++-- src/conversion/ensight/part/ensightParts.C | 21 ++- src/conversion/ensight/part/ensightParts.H | 20 ++- .../sampledSurfaces/sampledSurfaces.C | 4 +- .../writers/ensight/ensightSurfaceWriter.C | 134 ++++-------------- .../writers/ensight/ensightSurfaceWriter.H | 10 +- .../sampledSurface/writers/surfaceWriter.H | 2 +- 14 files changed, 205 insertions(+), 211 deletions(-) diff --git a/src/conversion/ensight/part/ensightPart.C b/src/conversion/ensight/part/ensightPart.C index d87eb239bb..303c417ac7 100644 --- a/src/conversion/ensight/part/ensightPart.C +++ b/src/conversion/ensight/part/ensightPart.C @@ -45,11 +45,11 @@ bool Foam::ensightPart::isFieldDefined(const List& field) const { forAll(elemLists_, elemI) { - const labelList& idList = elemLists_[elemI]; + const labelUList& idList = elemLists_[elemI]; forAll(idList, i) { - label id = idList[i]; + const label id = idList[i]; if (id >= field.size() || isnan(field[id])) { @@ -159,7 +159,7 @@ Foam::ensightPart::~ensightPart() // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::ensightPart::renumber(const labelList& origId) +void Foam::ensightPart::renumber(const labelUList& origId) { // transform to global values first if (offset_) diff --git a/src/conversion/ensight/part/ensightPart.H b/src/conversion/ensight/part/ensightPart.H index b2074f55b9..0d1770f412 100644 --- a/src/conversion/ensight/part/ensightPart.H +++ b/src/conversion/ensight/part/ensightPart.H @@ -134,6 +134,7 @@ protected: void writeHeader(ensightFile&, bool withDescription=false) const; //- write a scalar field for idList + // A null reference for idList writes the perNode values void writeFieldList ( ensightFile& os, @@ -150,10 +151,10 @@ protected: //- write connectivities virtual void writeConnectivity ( - ensightGeoFile& os, + ensightGeoFile&, const word& key, - const labelList& idList, - const labelList& pointMap + const labelUList& idList, + const labelUList& pointMap ) const {} @@ -287,7 +288,7 @@ public: // Edit //- renumber elements - void renumber(const labelList&); + void renumber(const labelUList&); //- write summary information about the object bool writeSummary(Ostream&) const; @@ -303,28 +304,34 @@ public: void writeGeometry(ensightGeoFile&, const pointField&) const; //- write scalar field + // optionally write data per node void writeScalarField ( ensightFile&, - const List& field + const List& field, + const bool perNode = false ) const; //- write vector field components + // optionally write data per node void writeVectorField ( ensightFile&, const List& field0, const List& field1, - const List& field2 + const List& field2, + const bool perNode = false ) const; //- write generalized field components + // optionally write data per node template void writeField ( ensightFile&, - const Field& + const Field&, + const bool perNode = false ) const; diff --git a/src/conversion/ensight/part/ensightPartCells.C b/src/conversion/ensight/part/ensightPartCells.C index 8bd8465c41..a05b70bcef 100644 --- a/src/conversion/ensight/part/ensightPartCells.C +++ b/src/conversion/ensight/part/ensightPartCells.C @@ -52,7 +52,7 @@ const Foam::List Foam::ensightPartCells::elemTypes_ void Foam::ensightPartCells::classify ( const polyMesh& mesh, - const labelList& idList + const labelUList& idList ) { // References to cell shape models @@ -203,7 +203,7 @@ Foam::ensightPartCells::ensightPartCells ( label partNumber, const polyMesh& mesh, - const labelList& idList + const labelUList& idList ) : ensightPart(partNumber, "cells", mesh.points()), @@ -259,13 +259,13 @@ Foam::ensightPart::localPoints Foam::ensightPartCells::calcLocalPoints() const forAll(elemLists_, typeI) { - const labelList& idList = elemLists_[typeI]; + const labelUList& idList = elemLists_[typeI]; // add all points from cells forAll(idList, i) { - label id = idList[i] + offset_; - const labelList& cFaces = mesh_.cells()[id]; + const label id = idList[i] + offset_; + const labelUList& cFaces = mesh_.cells()[id]; forAll(cFaces, cFaceI) { @@ -301,8 +301,8 @@ void Foam::ensightPartCells::writeConnectivity ( ensightGeoFile& os, const word& key, - const labelList& idList, - const labelList& pointMap + const labelUList& idList, + const labelUList& pointMap ) const { os.writeKeyword(key); @@ -317,8 +317,8 @@ void Foam::ensightPartCells::writeConnectivity // write the number of faces per element forAll(idList, i) { - label id = idList[i] + offset_; - const labelList& cFace = mesh_.cells()[id]; + const label id = idList[i] + offset_; + const labelUList& cFace = mesh_.cells()[id]; os.write(cFace.size()); os.newline(); @@ -327,8 +327,8 @@ void Foam::ensightPartCells::writeConnectivity // write the number of points per element face forAll(idList, i) { - label id = idList[i] + offset_; - const labelList& cFace = mesh_.cells()[id]; + const label id = idList[i] + offset_; + const labelUList& cFace = mesh_.cells()[id]; forAll(cFace, faceI) { @@ -342,8 +342,8 @@ void Foam::ensightPartCells::writeConnectivity // write the points describing each element face forAll(idList, i) { - label id = idList[i] + offset_; - const labelList& cFace = mesh_.cells()[id]; + const label id = idList[i] + offset_; + const labelUList& cFace = mesh_.cells()[id]; forAll(cFace, faceI) { @@ -366,7 +366,7 @@ void Foam::ensightPartCells::writeConnectivity forAll(idList, i) { - label id = idList[i] + offset_; + const label id = idList[i] + offset_; const cellShape& cellPoints = cellShapes[id]; // convert global -> local index diff --git a/src/conversion/ensight/part/ensightPartCells.H b/src/conversion/ensight/part/ensightPartCells.H index bf6bf951a7..cd79c029b6 100644 --- a/src/conversion/ensight/part/ensightPartCells.H +++ b/src/conversion/ensight/part/ensightPartCells.H @@ -60,7 +60,7 @@ class ensightPartCells void classify ( const polyMesh&, - const labelList& idLabels = labelList::null() + const labelUList& idLabels = labelUList::null() ); //- track points used @@ -72,10 +72,10 @@ class ensightPartCells //- element connectivity virtual void writeConnectivity ( - ensightGeoFile& os, + ensightGeoFile&, const word& key, - const labelList& idList, - const labelList& pointMap + const labelUList& idList, + const labelUList& pointMap ) const; @@ -121,7 +121,7 @@ public: ( label partNumber, const polyMesh&, - const labelList& + const labelUList& ); //- Construct from polyMesh and cellZone diff --git a/src/conversion/ensight/part/ensightPartFaces.C b/src/conversion/ensight/part/ensightPartFaces.C index 250be573c6..c8bfaa00df 100644 --- a/src/conversion/ensight/part/ensightPartFaces.C +++ b/src/conversion/ensight/part/ensightPartFaces.C @@ -217,12 +217,12 @@ Foam::ensightPart::localPoints Foam::ensightPartFaces::calcLocalPoints() const forAll(elemLists_, typeI) { - const labelList& idList = elemLists_[typeI]; + const labelUList& idList = elemLists_[typeI]; // add all points from faces forAll(idList, i) { - label id = idList[i] + offset_; + const label id = idList[i] + offset_; const face& f = faces_[id]; forAll(f, fp) @@ -255,8 +255,8 @@ void Foam::ensightPartFaces::writeConnectivity ensightGeoFile& os, const word& key, const faceList& faces, - const labelList& idList, - const labelList& pointMap + const labelUList& idList, + const labelUList& pointMap ) const { os.writeKeyword(key); @@ -269,7 +269,7 @@ void Foam::ensightPartFaces::writeConnectivity // write the number of points per face forAll(idList, i) { - label id = idList[i] + offset_; + const label id = idList[i] + offset_; const face& f = faces[id]; os.write(f.size()); @@ -280,7 +280,7 @@ void Foam::ensightPartFaces::writeConnectivity // write the points describing the face forAll(idList, i) { - label id = idList[i] + offset_; + const label id = idList[i] + offset_; const face& f = faces[id]; // convert global -> local index @@ -298,8 +298,8 @@ void Foam::ensightPartFaces::writeConnectivity ( ensightGeoFile& os, const word& key, - const labelList& idList, - const labelList& pointMap + const labelUList& idList, + const labelUList& pointMap ) const { writeConnectivity diff --git a/src/conversion/ensight/part/ensightPartFaces.H b/src/conversion/ensight/part/ensightPartFaces.H index 78d5cf6d16..1b64688d9c 100644 --- a/src/conversion/ensight/part/ensightPartFaces.H +++ b/src/conversion/ensight/part/ensightPartFaces.H @@ -63,8 +63,8 @@ class ensightPartFaces ( ensightGeoFile&, const word& key, - const labelList& idList, - const labelList& pointMap + const labelUList& idList, + const labelUList& pointMap ) const; @@ -104,8 +104,8 @@ protected: ensightGeoFile&, const word& key, const faceList&, - const labelList& idList, - const labelList& pointMap + const labelUList& idList, + const labelUList& pointMap ) const; diff --git a/src/conversion/ensight/part/ensightPartIO.C b/src/conversion/ensight/part/ensightPartIO.C index 7760b7b07f..bc893b8411 100644 --- a/src/conversion/ensight/part/ensightPartIO.C +++ b/src/conversion/ensight/part/ensightPartIO.C @@ -59,22 +59,43 @@ void Foam::ensightPart::writeFieldList const labelUList& idList ) const { - forAll(idList, i) + if (&idList) { - if (idList[i] >= field.size() || isnan(field[idList[i]])) + forAll(idList, i) { - os.writeUndef(); - } - else - { - os.write(field[idList[i]]); - } + if (idList[i] >= field.size() || isnan(field[idList[i]])) + { + os.writeUndef(); + } + else + { + os.write(field[idList[i]]); + } - os.newline(); + os.newline(); + } + } + else + { + // no idList => perNode + forAll(field, i) + { + if (isnan(field[i])) + { + os.writeUndef(); + } + else + { + os.write(field[i]); + } + + os.newline(); + } } } + // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void Foam::ensightPart::reconstruct(Istream& is) @@ -153,7 +174,7 @@ void Foam::ensightPart::writeGeometry if (size()) { const localPoints ptList = calcLocalPoints(); - const labelList& pointMap = ptList.list; + const labelUList& pointMap = ptList.list; writeHeader(os, true); @@ -195,21 +216,30 @@ void Foam::ensightPart::writeGeometry void Foam::ensightPart::writeScalarField ( ensightFile& os, - const List& field + const List& field, + const bool perNode ) const { if (size() && field.size() && (os.allowUndef() || isFieldDefined(field))) { writeHeader(os); - forAll(elementTypes(), elemI) + if (perNode) { - const labelList& idList = elemLists_[elemI]; - - if (idList.size()) + os.writeKeyword("coordinates"); + writeFieldList(os, field, labelUList::null()); + } + else + { + forAll(elementTypes(), elemI) { - os.writeKeyword(elementTypes()[elemI]); - writeFieldList(os, field, idList); + const labelUList& idList = elemLists_[elemI]; + + if (idList.size()) + { + os.writeKeyword(elementTypes()[elemI]); + writeFieldList(os, field, idList); + } } } } @@ -221,23 +251,34 @@ void Foam::ensightPart::writeVectorField ensightFile& os, const List& field0, const List& field1, - const List& field2 + const List& field2, + const bool perNode ) const { if (size() && field0.size() && (os.allowUndef() || isFieldDefined(field0))) { writeHeader(os); - forAll(elementTypes(), elemI) + if (perNode) { - const labelList& idList = elemLists_[elemI]; - - if (idList.size()) + os.writeKeyword("coordinates"); + writeFieldList(os, field0, labelUList::null()); + writeFieldList(os, field1, labelUList::null()); + writeFieldList(os, field2, labelUList::null()); + } + else + { + forAll(elementTypes(), elemI) { - os.writeKeyword(elementTypes()[elemI]); - writeFieldList(os, field0, idList); - writeFieldList(os, field1, idList); - writeFieldList(os, field2, idList); + const labelUList& idList = elemLists_[elemI]; + + if (idList.size()) + { + os.writeKeyword(elementTypes()[elemI]); + writeFieldList(os, field0, idList); + writeFieldList(os, field1, idList); + writeFieldList(os, field2, idList); + } } } } diff --git a/src/conversion/ensight/part/ensightPartTemplates.C b/src/conversion/ensight/part/ensightPartTemplates.C index 5bb80f9622..2f3f4a5994 100644 --- a/src/conversion/ensight/part/ensightPartTemplates.C +++ b/src/conversion/ensight/part/ensightPartTemplates.C @@ -34,29 +34,46 @@ template void Foam::ensightPart::writeField ( ensightFile& os, - const Field& field + const Field& field, + const bool perNode ) const { if (this->size() && field.size()) { writeHeader(os); - forAll(elementTypes(), elemI) + if (perNode) { - const labelList& idList = elemLists_[elemI]; - - if (idList.size()) + os.writeKeyword("coordinates"); + for + ( + direction cmpt=0; + cmpt < pTraits::nComponents; + ++cmpt + ) { - os.writeKeyword(elementTypes()[elemI]); + writeFieldList(os, field.component(cmpt), labelUList::null()); + } + } + else + { + forAll(elementTypes(), elemI) + { + const labelUList& idList = elemLists_[elemI]; - for - ( - direction cmpt=0; - cmpt < pTraits::nComponents; - ++cmpt - ) + if (idList.size()) { - writeFieldList(os, field.component(cmpt), idList); + os.writeKeyword(elementTypes()[elemI]); + + for + ( + direction cmpt=0; + cmpt < pTraits::nComponents; + ++cmpt + ) + { + writeFieldList(os, field.component(cmpt), idList); + } } } } diff --git a/src/conversion/ensight/part/ensightParts.C b/src/conversion/ensight/part/ensightParts.C index 658f41b74c..240b9fb859 100644 --- a/src/conversion/ensight/part/ensightParts.C +++ b/src/conversion/ensight/part/ensightParts.C @@ -107,7 +107,7 @@ void Foam::ensightParts::recalculate(const polyMesh& mesh) forAll(mesh.cellZones(), zoneI) { - const labelList& idList = mesh.cellZones()[zoneI]; + const labelUList& idList = mesh.cellZones()[zoneI]; forAll(idList, i) { @@ -162,8 +162,8 @@ void Foam::ensightParts::recalculate(const polyMesh& mesh) void Foam::ensightParts::renumber ( - const labelList& origCellId, - const labelList& origFaceId + const labelUList& origCellId, + const labelUList& origFaceId ) { forAll(partsList_, partI) @@ -228,7 +228,8 @@ void Foam::ensightParts::writeScalarField ( ensightFile& os, const List& field, - bool useFaceData + const bool useFaceData, + const bool perNode ) const { forAll(partsList_, partI) @@ -240,7 +241,7 @@ void Foam::ensightParts::writeScalarField : partsList_[partI].isCellData() ) { - partsList_[partI].writeScalarField(os,field); + partsList_[partI].writeScalarField(os, field, perNode); } } } @@ -252,7 +253,8 @@ void Foam::ensightParts::writeVectorField const List& field0, const List& field1, const List& field2, - bool useFaceData + const bool useFaceData, + const bool perNode ) const { forAll(partsList_, partI) @@ -264,7 +266,12 @@ void Foam::ensightParts::writeVectorField : partsList_[partI].isCellData() ) { - partsList_[partI].writeVectorField(os, field0, field1, field2); + partsList_[partI].writeVectorField + ( + os, + field0, field1, field2, + perNode + ); } } } diff --git a/src/conversion/ensight/part/ensightParts.H b/src/conversion/ensight/part/ensightParts.H index 7ef4094259..6b4f49eef9 100644 --- a/src/conversion/ensight/part/ensightParts.H +++ b/src/conversion/ensight/part/ensightParts.H @@ -89,8 +89,8 @@ public: //- renumber elements void renumber ( - const labelList& origCellId, - const labelList& origFaceId + const labelUList& origCellId, + const labelUList& origFaceId ); //- number of parts @@ -108,26 +108,32 @@ public: //- write the lists void writeData(Ostream&) const; - //- write scalar field + //- write (volume) scalar field + // optionally write data for face parts + // optionally write data per node void writeScalarField ( ensightFile&, const List& field, - bool useFaceData = false + const bool useFaceData = false, + const bool perNode = false ) const; - //- write vector field components + //- write (volume) vector field components + // optionally write data for face parts + // optionally write data per node void writeVectorField ( ensightFile&, const List& field0, const List& field1, const List& field2, - bool useFaceData = false + const bool useFaceData = false, + const bool perNode = false ) const; - //- write generalized field components + //- write generalized volume field components template void writeField ( diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C index 97a753e596..a4c3413214 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C @@ -221,10 +221,10 @@ void Foam::sampledSurfaces::read(const dictionary& dict) dict.lookup("interpolationScheme") >> interpolationScheme_; - word writeFormat(dict.lookup("surfaceFormat")); + word writeType(dict.lookup("surfaceFormat")); // define the surface formatter - formatter_ = surfaceWriter::New(writeFormat); + formatter_ = surfaceWriter::New(writeType); PtrList newList ( diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C index 641e6a19b2..135d566db0 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C @@ -42,44 +42,6 @@ namespace Foam // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -namespace Foam -{ - - // Write scalarField in ensight format - template<> - inline void Foam::ensightSurfaceWriter::writeData - ( - Ostream& os, - const Field& values - ) - { - forAll(values, i) - { - os << values[i] << nl; - } - } -} - - -// Write generic field in ensight format -template -inline void Foam::ensightSurfaceWriter::writeData -( - Ostream& os, - const Field& values -) -{ - for (direction cmpt = 0; cmpt < vector::nComponents; ++cmpt) - { - scalarField v(values.component(cmpt)); - forAll(v, i) - { - os << v[i] << nl; - } - } -} - - template void Foam::ensightSurfaceWriter::writeTemplate ( @@ -101,47 +63,35 @@ void Foam::ensightSurfaceWriter::writeTemplate // const scalar timeValue = Foam::name(this->mesh().time().timeValue()); const scalar timeValue = 0.0; - OFstream caseStr(outputDir/fieldName/surfaceName + ".case"); - ensightGeoFile geomStr + OFstream osCase(outputDir/fieldName/surfaceName + ".case"); + ensightGeoFile osGeom ( outputDir/fieldName/surfaceName + ".000.mesh", - IOstream::ASCII + writeFormat_ ); - ensightFile fieldStr + ensightFile osField ( outputDir/fieldName/surfaceName + ".000." + fieldName, - IOstream::ASCII + writeFormat_ ); if (verbose) { - Info<< "Writing case file to " << caseStr.name() << endl; + Info<< "Writing case file to " << osCase.name() << endl; } - caseStr + osCase << "FORMAT" << nl << "type: ensight gold" << nl << nl << "GEOMETRY" << nl - << "model: 1 " << geomStr.name().name() << nl + << "model: 1 " << osGeom.name().name() << nl << nl - << "VARIABLE" << nl; - if (isNodeValues) - { - caseStr - << pTraits::typeName << " per node:" << setw(10) << 1 - << " " << fieldName - << " " << surfaceName.c_str() << ".***." << fieldName << nl; - } - else - { - caseStr - << pTraits::typeName << " per element:" << setw(10) << 1 - << " " << fieldName - << " " << surfaceName.c_str() << ".***." << fieldName << nl; - } - - caseStr + << "VARIABLE" << nl + << pTraits::typeName << " per " + << word(isNodeValues ? "node:" : "element:") << setw(10) << 1 + << " " << fieldName + << " " << surfaceName.c_str() << ".***." << fieldName << nl << nl << "TIME" << nl << "time set: 1" << nl @@ -152,40 +102,12 @@ void Foam::ensightSurfaceWriter::writeTemplate << timeValue << nl << nl; - ensightPartFaces ensPart(0, geomStr.name().name(), points, faces, true); - geomStr << ensPart; + ensightPartFaces ensPart(0, osGeom.name().name(), points, faces, true); + osGeom << ensPart; // Write field - fieldStr - << pTraits::typeName << nl - << "part" << nl - << setw(10) << 1 << nl; - - if (isNodeValues) - { - fieldStr << "coordinates" << nl; - writeData(fieldStr, values); - } - else - { - // ensPart.writeField(fieldStr, values); - forAll(ensPart.elementTypes(), elemI) - { - if (ensPart.elemLists()[elemI].size()) - { - fieldStr.writeKeyword(ensPart.elementTypes()[elemI]); - writeData - ( - fieldStr, - Field - ( - values, - ensPart.elemLists()[elemI] - ) - ); - } - } - } + osField.writeKeyword(pTraits::typeName); + ensPart.writeField(osField, values, isNodeValues); } @@ -193,7 +115,8 @@ void Foam::ensightSurfaceWriter::writeTemplate Foam::ensightSurfaceWriter::ensightSurfaceWriter() : - surfaceWriter() + surfaceWriter(), + writeFormat_(IOstream::ASCII) {} @@ -219,28 +142,27 @@ void Foam::ensightSurfaceWriter::write mkDir(outputDir); } - //const scalar timeValue = Foam::name(this->mesh().time().timeValue()); + // const scalar timeValue = Foam::name(this->mesh().time().timeValue()); const scalar timeValue = 0.0; - - OFstream caseStr(outputDir/surfaceName + ".case"); - ensightGeoFile geomStr + OFstream osCase(outputDir/surfaceName + ".case"); + ensightGeoFile osGeom ( outputDir/surfaceName + ".000.mesh", - IOstream::ASCII + writeFormat_ ); if (verbose) { - Info<< "Writing case file to " << caseStr.name() << endl; + Info<< "Writing case file to " << osCase.name() << endl; } - caseStr + osCase << "FORMAT" << nl << "type: ensight gold" << nl << nl << "GEOMETRY" << nl - << "model: 1 " << geomStr.name().name() << nl + << "model: 1 " << osGeom.name().name() << nl << nl << "TIME" << nl << "time set: 1" << nl @@ -251,8 +173,8 @@ void Foam::ensightSurfaceWriter::write << timeValue << nl << nl; - ensightPartFaces ensPart(0, geomStr.name().name(), points, faces, true); - geomStr << ensPart; + ensightPartFaces ensPart(0, osGeom.name().name(), points, faces, true); + osGeom << ensPart; } diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H index 4d2bf47b90..891947ffb4 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H @@ -52,18 +52,12 @@ class ensightSurfaceWriter { // Private data -// fileName caseFileName_; -// fileName surfaceName_; -// fileName geomName_; -// DynamicList varNames_; -// DynamicList varFileNames_; + //- Write option (default is IOstream::ASCII + IOstream::streamFormat writeFormat_; // Private Member Functions - template - static inline void writeData(Ostream&, const Field&); - //- Templated write operation template void writeTemplate diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.H b/src/sampling/sampledSurface/writers/surfaceWriter.H index 1057a187bd..8e24418d39 100644 --- a/src/sampling/sampledSurface/writers/surfaceWriter.H +++ b/src/sampling/sampledSurface/writers/surfaceWriter.H @@ -74,7 +74,7 @@ public: // Selectors //- Return a reference to the selected surfaceWriter - static autoPtr New(const word& writeFormat); + static autoPtr New(const word& writeType); // Constructors From faac56c1de44bb88f4246d8903ff5fffdcf6f7d0 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 28 Jan 2011 19:20:22 +0100 Subject: [PATCH 028/367] ENH: ensight binary surface output, formatOptions in sampleDict - For example, // optionally define extra controls for the output formats formatOptions { ensight { format binary; } } These are passed to the writer that support a dictionary of options. Otherwise the normal null constructor is used. --- .../postProcessing/sampling/sample/sampleDict | 10 ++++++++++ .../sampledSurfaces/sampledSurfaces.C | 10 +++++++--- .../writers/ensight/ensightSurfaceWriter.C | 14 ++++++++++++++ .../writers/ensight/ensightSurfaceWriter.H | 3 +++ .../sampledSurface/writers/surfaceWriter.C | 18 ++++++++++++++++++ .../sampledSurface/writers/surfaceWriter.H | 19 +++++++++++++++++++ 6 files changed, 71 insertions(+), 3 deletions(-) diff --git a/applications/utilities/postProcessing/sampling/sample/sampleDict b/applications/utilities/postProcessing/sampling/sample/sampleDict index cd0ae63fe4..c34ce71daf 100644 --- a/applications/utilities/postProcessing/sampling/sample/sampleDict +++ b/applications/utilities/postProcessing/sampling/sample/sampleDict @@ -38,6 +38,16 @@ setFormat raw; // but without any values! surfaceFormat vtk; +// optionally define extra controls for the output formats +formatOptions +{ + ensight + { + format ascii; + } +} + + // interpolationScheme. choice of // cell : use cell-centre value only; constant over cells (default) // cellPoint : use cell-centre and vertex values diff --git a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C index a4c3413214..581b7e206b 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C @@ -220,11 +220,15 @@ void Foam::sampledSurfaces::read(const dictionary& dict) clearFieldGroups(); dict.lookup("interpolationScheme") >> interpolationScheme_; - - word writeType(dict.lookup("surfaceFormat")); + const word writeType(dict.lookup("surfaceFormat")); // define the surface formatter - formatter_ = surfaceWriter::New(writeType); + // optionally defined extra controls for the output formats + formatter_ = surfaceWriter::New + ( + writeType, + dict.subOrEmptyDict("formatOptions").subOrEmptyDict(writeType) + ); PtrList newList ( diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C index 135d566db0..d83ec611a1 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C @@ -37,6 +37,7 @@ License namespace Foam { makeSurfaceWriterType(ensightSurfaceWriter); + addToRunTimeSelectionTable(surfaceWriter, ensightSurfaceWriter, wordDict); } @@ -120,6 +121,19 @@ Foam::ensightSurfaceWriter::ensightSurfaceWriter() {} +Foam::ensightSurfaceWriter::ensightSurfaceWriter(const dictionary& options) +: + surfaceWriter(), + writeFormat_(IOstream::ASCII) +{ + // choose ascii or binary format + if (options.found("format")) + { + writeFormat_ = IOstream::formatEnum(options.lookup("format")); + } +} + + // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // Foam::ensightSurfaceWriter::~ensightSurfaceWriter() diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H index 891947ffb4..628c178d4e 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H @@ -84,6 +84,9 @@ public: //- Construct null ensightSurfaceWriter(); + //- Construct with some output options + ensightSurfaceWriter(const dictionary& options); + //- Destructor virtual ~ensightSurfaceWriter(); diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.C b/src/sampling/sampledSurface/writers/surfaceWriter.C index 0f52c6f4aa..f297e0934f 100644 --- a/src/sampling/sampledSurface/writers/surfaceWriter.C +++ b/src/sampling/sampledSurface/writers/surfaceWriter.C @@ -38,6 +38,7 @@ namespace Foam { defineTypeNameAndDebug(surfaceWriter, 0); defineRunTimeSelectionTable(surfaceWriter, word); + defineRunTimeSelectionTable(surfaceWriter, wordDict); addNamedToRunTimeSelectionTable ( surfaceWriter, @@ -83,6 +84,23 @@ Foam::surfaceWriter::New(const word& writeType) } +Foam::autoPtr +Foam::surfaceWriter::New(const word& writeType, const dictionary& optDict) +{ + // find constructors with dictionary options + wordDictConstructorTable::iterator cstrIter = + wordDictConstructorTablePtr_->find(writeType); + + if (cstrIter == wordDictConstructorTablePtr_->end()) + { + // revert to versions without options + return Foam::surfaceWriter::New(writeType); + } + + return autoPtr(cstrIter()(optDict)); +} + + // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // Foam::surfaceWriter::surfaceWriter() diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.H b/src/sampling/sampledSurface/writers/surfaceWriter.H index 8e24418d39..be26517849 100644 --- a/src/sampling/sampledSurface/writers/surfaceWriter.H +++ b/src/sampling/sampledSurface/writers/surfaceWriter.H @@ -70,12 +70,31 @@ public: () ); + declareRunTimeSelectionTable + ( + autoPtr, + surfaceWriter, + wordDict, + ( + const dictionary& optDict + ), + (optDict) + ); + // Selectors //- Return a reference to the selected surfaceWriter static autoPtr New(const word& writeType); + //- Return a reference to the selected surfaceWriter + // Select with extra write option + static autoPtr New + ( + const word& writeType, + const dictionary& writeOptions + ); + // Constructors From e3b9d3b6a431058f008c8ecd824142ca8a1b1c69 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 31 Jan 2011 12:47:49 +0100 Subject: [PATCH 029/367] STYLE: organize primitives/Lists into their respective subdirs --- src/OpenFOAM/Make/files | 30 +++++++++---------- .../{Lists => Scalar/lists}/scalarIOList.C | 2 +- .../{Lists => Scalar/lists}/scalarIOList.H | 2 +- .../{Lists => Scalar/lists}/scalarList.C | 2 +- .../{Lists => Scalar/lists}/scalarList.H | 2 +- .../lists}/scalarListIOList.C | 2 +- .../lists}/scalarListIOList.H | 2 +- .../lists}/sphericalTensorList.C | 2 +- .../lists}/sphericalTensorList.H | 2 +- .../{Lists => Tensor/lists}/symmTensorList.C | 2 +- .../{Lists => Tensor/lists}/symmTensorList.H | 2 +- .../{Lists => Tensor/lists}/tensorList.C | 2 +- .../{Lists => Tensor/lists}/tensorList.H | 2 +- .../{Lists => Vector/lists}/vectorIOList.C | 2 +- .../{Lists => Vector/lists}/vectorIOList.H | 2 +- .../{Lists => Vector/lists}/vectorList.C | 2 +- .../{Lists => Vector/lists}/vectorList.H | 2 +- .../lists}/vectorListIOList.C | 2 +- .../lists}/vectorListIOList.H | 2 +- .../{Lists => bools/lists}/boolList.C | 2 +- .../{Lists => bools/lists}/boolList.H | 2 +- .../{Lists => ints/lists}/labelIOList.C | 2 +- .../{Lists => ints/lists}/labelIOList.H | 2 +- .../{Lists => ints/lists}/labelList.H | 2 +- .../{Lists => ints/lists}/labelListIOList.C | 2 +- .../{Lists => ints/lists}/labelListIOList.H | 2 +- .../{Lists => strings/lists}/fileNameList.H | 2 +- .../{Lists => strings/lists}/hashedWordList.C | 2 +- .../{Lists => strings/lists}/hashedWordList.H | 2 +- .../lists}/hashedWordListI.H | 2 +- .../{Lists => strings/lists}/stringList.H | 2 +- .../{Lists => strings/lists}/stringListOps.H | 2 +- .../lists}/stringListOpsTemplates.C | 2 +- .../{Lists => strings/lists}/wordList.H | 2 +- .../{Lists => strings/lists}/wordReList.H | 2 +- .../lists}/wordReListMatcher.H | 2 +- .../lists}/wordReListMatcherI.H | 2 +- 37 files changed, 51 insertions(+), 51 deletions(-) rename src/OpenFOAM/primitives/{Lists => Scalar/lists}/scalarIOList.C (95%) rename src/OpenFOAM/primitives/{Lists => Scalar/lists}/scalarIOList.H (96%) rename src/OpenFOAM/primitives/{Lists => Scalar/lists}/scalarList.C (96%) rename src/OpenFOAM/primitives/{Lists => Scalar/lists}/scalarList.H (96%) rename src/OpenFOAM/primitives/{Lists => Scalar/lists}/scalarListIOList.C (96%) rename src/OpenFOAM/primitives/{Lists => Scalar/lists}/scalarListIOList.H (96%) rename src/OpenFOAM/primitives/{Lists => Tensor/lists}/sphericalTensorList.C (96%) rename src/OpenFOAM/primitives/{Lists => Tensor/lists}/sphericalTensorList.H (96%) rename src/OpenFOAM/primitives/{Lists => Tensor/lists}/symmTensorList.C (96%) rename src/OpenFOAM/primitives/{Lists => Tensor/lists}/symmTensorList.H (96%) rename src/OpenFOAM/primitives/{Lists => Tensor/lists}/tensorList.C (96%) rename src/OpenFOAM/primitives/{Lists => Tensor/lists}/tensorList.H (96%) rename src/OpenFOAM/primitives/{Lists => Vector/lists}/vectorIOList.C (95%) rename src/OpenFOAM/primitives/{Lists => Vector/lists}/vectorIOList.H (96%) rename src/OpenFOAM/primitives/{Lists => Vector/lists}/vectorList.C (96%) rename src/OpenFOAM/primitives/{Lists => Vector/lists}/vectorList.H (96%) rename src/OpenFOAM/primitives/{Lists => Vector/lists}/vectorListIOList.C (96%) rename src/OpenFOAM/primitives/{Lists => Vector/lists}/vectorListIOList.H (96%) rename src/OpenFOAM/primitives/{Lists => bools/lists}/boolList.C (96%) rename src/OpenFOAM/primitives/{Lists => bools/lists}/boolList.H (96%) rename src/OpenFOAM/primitives/{Lists => ints/lists}/labelIOList.C (96%) rename src/OpenFOAM/primitives/{Lists => ints/lists}/labelIOList.H (96%) rename src/OpenFOAM/primitives/{Lists => ints/lists}/labelList.H (96%) rename src/OpenFOAM/primitives/{Lists => ints/lists}/labelListIOList.C (96%) rename src/OpenFOAM/primitives/{Lists => ints/lists}/labelListIOList.H (96%) rename src/OpenFOAM/primitives/{Lists => strings/lists}/fileNameList.H (96%) rename src/OpenFOAM/primitives/{Lists => strings/lists}/hashedWordList.C (98%) rename src/OpenFOAM/primitives/{Lists => strings/lists}/hashedWordList.H (98%) rename src/OpenFOAM/primitives/{Lists => strings/lists}/hashedWordListI.H (96%) rename src/OpenFOAM/primitives/{Lists => strings/lists}/stringList.H (96%) rename src/OpenFOAM/primitives/{Lists => strings/lists}/stringListOps.H (99%) rename src/OpenFOAM/primitives/{Lists => strings/lists}/stringListOpsTemplates.C (97%) rename src/OpenFOAM/primitives/{Lists => strings/lists}/wordList.H (96%) rename src/OpenFOAM/primitives/{Lists => strings/lists}/wordReList.H (96%) rename src/OpenFOAM/primitives/{Lists => strings/lists}/wordReListMatcher.H (97%) rename src/OpenFOAM/primitives/{Lists => strings/lists}/wordReListMatcherI.H (96%) diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index 8f5966e927..bf4c345bec 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -9,6 +9,7 @@ $(bools)/bool/bool.C $(bools)/bool/boolIO.C $(bools)/Switch/Switch.C $(bools)/Switch/SwitchIO.C +$(bools)/lists/boolList.C chars = primitives/chars $(chars)/char/charIO.C @@ -22,10 +23,16 @@ $(ints)/longLong/longLongIO.C $(ints)/ulong/ulongIO.C $(ints)/label/label.C $(ints)/uLabel/uLabel.C +$(ints)/lists/labelIOList.C +$(ints)/lists/labelListIOList.C primitives/Scalar/doubleScalar/doubleScalar.C primitives/Scalar/floatScalar/floatScalar.C primitives/Scalar/scalar/scalar.C +primitives/Scalar/lists/scalarList.C +primitives/Scalar/lists/scalarIOList.C +primitives/Scalar/lists/scalarListIOList.C + primitives/DiagTensor/diagTensor/diagTensor.C primitives/SphericalTensor/sphericalTensor/sphericalTensor.C primitives/SphericalTensor/labelSphericalTensor/labelSphericalTensor.C @@ -33,9 +40,16 @@ primitives/SymmTensor/labelSymmTensor/labelSymmTensor.C primitives/SymmTensor/symmTensor/symmTensor.C primitives/Tensor/labelTensor/labelTensor.C primitives/Tensor/tensor/tensor.C +primitives/Tensor/lists/sphericalTensorList.C +primitives/Tensor/lists/symmTensorList.C +primitives/Tensor/lists/tensorList.C + primitives/Vector/complexVector/complexVector.C primitives/Vector/labelVector/labelVector.C primitives/Vector/vector/vector.C +primitives/Vector/lists/vectorList.C +primitives/Vector/lists/vectorIOList.C +primitives/Vector/lists/vectorListIOList.C primitives/Tensor2D/tensor2D/tensor2D.C primitives/SphericalTensor2D/sphericalTensor2D/sphericalTensor2D.C @@ -62,6 +76,7 @@ $(strings)/fileName/fileName.C $(strings)/fileName/fileNameIO.C $(strings)/keyType/keyType.C $(strings)/wordRe/wordRe.C +$(strings)/lists/hashedWordList.C primitives/hashes/Hasher/Hasher.C @@ -88,21 +103,6 @@ containers/Lists/ListOps/ListOps.C containers/LinkedLists/linkTypes/SLListBase/SLListBase.C containers/LinkedLists/linkTypes/DLListBase/DLListBase.C -primitiveLists = primitives/Lists -$(primitiveLists)/boolList.C -$(primitiveLists)/labelIOList.C -$(primitiveLists)/labelListIOList.C -$(primitiveLists)/scalarList.C -$(primitiveLists)/scalarIOList.C -$(primitiveLists)/scalarListIOList.C -$(primitiveLists)/vectorList.C -$(primitiveLists)/vectorIOList.C -$(primitiveLists)/vectorListIOList.C -$(primitiveLists)/sphericalTensorList.C -$(primitiveLists)/symmTensorList.C -$(primitiveLists)/tensorList.C -$(primitiveLists)/hashedWordList.C - Streams = db/IOstreams $(Streams)/token/tokenIO.C diff --git a/src/OpenFOAM/primitives/Lists/scalarIOList.C b/src/OpenFOAM/primitives/Scalar/lists/scalarIOList.C similarity index 95% rename from src/OpenFOAM/primitives/Lists/scalarIOList.C rename to src/OpenFOAM/primitives/Scalar/lists/scalarIOList.C index 60fd9a55d1..97d4d8f94d 100644 --- a/src/OpenFOAM/primitives/Lists/scalarIOList.C +++ b/src/OpenFOAM/primitives/Scalar/lists/scalarIOList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/scalarIOList.H b/src/OpenFOAM/primitives/Scalar/lists/scalarIOList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/scalarIOList.H rename to src/OpenFOAM/primitives/Scalar/lists/scalarIOList.H index e27e970d30..312378f8a7 100644 --- a/src/OpenFOAM/primitives/Lists/scalarIOList.H +++ b/src/OpenFOAM/primitives/Scalar/lists/scalarIOList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/scalarList.C b/src/OpenFOAM/primitives/Scalar/lists/scalarList.C similarity index 96% rename from src/OpenFOAM/primitives/Lists/scalarList.C rename to src/OpenFOAM/primitives/Scalar/lists/scalarList.C index bf2c6d8ac9..38871e6646 100644 --- a/src/OpenFOAM/primitives/Lists/scalarList.C +++ b/src/OpenFOAM/primitives/Scalar/lists/scalarList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/scalarList.H b/src/OpenFOAM/primitives/Scalar/lists/scalarList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/scalarList.H rename to src/OpenFOAM/primitives/Scalar/lists/scalarList.H index b73fb47d83..9c8c9c6a33 100644 --- a/src/OpenFOAM/primitives/Lists/scalarList.H +++ b/src/OpenFOAM/primitives/Scalar/lists/scalarList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/scalarListIOList.C b/src/OpenFOAM/primitives/Scalar/lists/scalarListIOList.C similarity index 96% rename from src/OpenFOAM/primitives/Lists/scalarListIOList.C rename to src/OpenFOAM/primitives/Scalar/lists/scalarListIOList.C index caf9e04b6a..ce71f70703 100644 --- a/src/OpenFOAM/primitives/Lists/scalarListIOList.C +++ b/src/OpenFOAM/primitives/Scalar/lists/scalarListIOList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/scalarListIOList.H b/src/OpenFOAM/primitives/Scalar/lists/scalarListIOList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/scalarListIOList.H rename to src/OpenFOAM/primitives/Scalar/lists/scalarListIOList.H index b06c6240e2..63f688fc8d 100644 --- a/src/OpenFOAM/primitives/Lists/scalarListIOList.H +++ b/src/OpenFOAM/primitives/Scalar/lists/scalarListIOList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/sphericalTensorList.C b/src/OpenFOAM/primitives/Tensor/lists/sphericalTensorList.C similarity index 96% rename from src/OpenFOAM/primitives/Lists/sphericalTensorList.C rename to src/OpenFOAM/primitives/Tensor/lists/sphericalTensorList.C index 233d0d2f09..083c5b4c06 100644 --- a/src/OpenFOAM/primitives/Lists/sphericalTensorList.C +++ b/src/OpenFOAM/primitives/Tensor/lists/sphericalTensorList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/sphericalTensorList.H b/src/OpenFOAM/primitives/Tensor/lists/sphericalTensorList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/sphericalTensorList.H rename to src/OpenFOAM/primitives/Tensor/lists/sphericalTensorList.H index 9182eb5fd1..bb5a5e11b3 100644 --- a/src/OpenFOAM/primitives/Lists/sphericalTensorList.H +++ b/src/OpenFOAM/primitives/Tensor/lists/sphericalTensorList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/symmTensorList.C b/src/OpenFOAM/primitives/Tensor/lists/symmTensorList.C similarity index 96% rename from src/OpenFOAM/primitives/Lists/symmTensorList.C rename to src/OpenFOAM/primitives/Tensor/lists/symmTensorList.C index a703e3ccea..45b3b729b0 100644 --- a/src/OpenFOAM/primitives/Lists/symmTensorList.C +++ b/src/OpenFOAM/primitives/Tensor/lists/symmTensorList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/symmTensorList.H b/src/OpenFOAM/primitives/Tensor/lists/symmTensorList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/symmTensorList.H rename to src/OpenFOAM/primitives/Tensor/lists/symmTensorList.H index 9691df46a9..f9b99b65f0 100644 --- a/src/OpenFOAM/primitives/Lists/symmTensorList.H +++ b/src/OpenFOAM/primitives/Tensor/lists/symmTensorList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/tensorList.C b/src/OpenFOAM/primitives/Tensor/lists/tensorList.C similarity index 96% rename from src/OpenFOAM/primitives/Lists/tensorList.C rename to src/OpenFOAM/primitives/Tensor/lists/tensorList.C index 6a1b65243f..e655718895 100644 --- a/src/OpenFOAM/primitives/Lists/tensorList.C +++ b/src/OpenFOAM/primitives/Tensor/lists/tensorList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/tensorList.H b/src/OpenFOAM/primitives/Tensor/lists/tensorList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/tensorList.H rename to src/OpenFOAM/primitives/Tensor/lists/tensorList.H index 0139d9512b..b08120f758 100644 --- a/src/OpenFOAM/primitives/Lists/tensorList.H +++ b/src/OpenFOAM/primitives/Tensor/lists/tensorList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/vectorIOList.C b/src/OpenFOAM/primitives/Vector/lists/vectorIOList.C similarity index 95% rename from src/OpenFOAM/primitives/Lists/vectorIOList.C rename to src/OpenFOAM/primitives/Vector/lists/vectorIOList.C index 95c31db6d5..16b424f589 100644 --- a/src/OpenFOAM/primitives/Lists/vectorIOList.C +++ b/src/OpenFOAM/primitives/Vector/lists/vectorIOList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/vectorIOList.H b/src/OpenFOAM/primitives/Vector/lists/vectorIOList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/vectorIOList.H rename to src/OpenFOAM/primitives/Vector/lists/vectorIOList.H index 4410bdac14..1b1d43c665 100644 --- a/src/OpenFOAM/primitives/Lists/vectorIOList.H +++ b/src/OpenFOAM/primitives/Vector/lists/vectorIOList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/vectorList.C b/src/OpenFOAM/primitives/Vector/lists/vectorList.C similarity index 96% rename from src/OpenFOAM/primitives/Lists/vectorList.C rename to src/OpenFOAM/primitives/Vector/lists/vectorList.C index fd4c074065..95c8049729 100644 --- a/src/OpenFOAM/primitives/Lists/vectorList.C +++ b/src/OpenFOAM/primitives/Vector/lists/vectorList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/vectorList.H b/src/OpenFOAM/primitives/Vector/lists/vectorList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/vectorList.H rename to src/OpenFOAM/primitives/Vector/lists/vectorList.H index a60c3a81d3..9b93b077b1 100644 --- a/src/OpenFOAM/primitives/Lists/vectorList.H +++ b/src/OpenFOAM/primitives/Vector/lists/vectorList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/vectorListIOList.C b/src/OpenFOAM/primitives/Vector/lists/vectorListIOList.C similarity index 96% rename from src/OpenFOAM/primitives/Lists/vectorListIOList.C rename to src/OpenFOAM/primitives/Vector/lists/vectorListIOList.C index 22e5ecc346..de2317e50d 100644 --- a/src/OpenFOAM/primitives/Lists/vectorListIOList.C +++ b/src/OpenFOAM/primitives/Vector/lists/vectorListIOList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/vectorListIOList.H b/src/OpenFOAM/primitives/Vector/lists/vectorListIOList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/vectorListIOList.H rename to src/OpenFOAM/primitives/Vector/lists/vectorListIOList.H index 699249c1e7..c1f371c648 100644 --- a/src/OpenFOAM/primitives/Lists/vectorListIOList.H +++ b/src/OpenFOAM/primitives/Vector/lists/vectorListIOList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/boolList.C b/src/OpenFOAM/primitives/bools/lists/boolList.C similarity index 96% rename from src/OpenFOAM/primitives/Lists/boolList.C rename to src/OpenFOAM/primitives/bools/lists/boolList.C index 4663a90e1b..b51c228eff 100644 --- a/src/OpenFOAM/primitives/Lists/boolList.C +++ b/src/OpenFOAM/primitives/bools/lists/boolList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/boolList.H b/src/OpenFOAM/primitives/bools/lists/boolList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/boolList.H rename to src/OpenFOAM/primitives/bools/lists/boolList.H index ab48e70453..a70bbc18dd 100644 --- a/src/OpenFOAM/primitives/Lists/boolList.H +++ b/src/OpenFOAM/primitives/bools/lists/boolList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/labelIOList.C b/src/OpenFOAM/primitives/ints/lists/labelIOList.C similarity index 96% rename from src/OpenFOAM/primitives/Lists/labelIOList.C rename to src/OpenFOAM/primitives/ints/lists/labelIOList.C index 1f98f57297..bb833f7861 100644 --- a/src/OpenFOAM/primitives/Lists/labelIOList.C +++ b/src/OpenFOAM/primitives/ints/lists/labelIOList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/labelIOList.H b/src/OpenFOAM/primitives/ints/lists/labelIOList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/labelIOList.H rename to src/OpenFOAM/primitives/ints/lists/labelIOList.H index 56447682eb..176ad339fd 100644 --- a/src/OpenFOAM/primitives/Lists/labelIOList.H +++ b/src/OpenFOAM/primitives/ints/lists/labelIOList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/labelList.H b/src/OpenFOAM/primitives/ints/lists/labelList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/labelList.H rename to src/OpenFOAM/primitives/ints/lists/labelList.H index 694b923b4b..01d006af0f 100644 --- a/src/OpenFOAM/primitives/Lists/labelList.H +++ b/src/OpenFOAM/primitives/ints/lists/labelList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/labelListIOList.C b/src/OpenFOAM/primitives/ints/lists/labelListIOList.C similarity index 96% rename from src/OpenFOAM/primitives/Lists/labelListIOList.C rename to src/OpenFOAM/primitives/ints/lists/labelListIOList.C index 7a06638a53..90095022c8 100644 --- a/src/OpenFOAM/primitives/Lists/labelListIOList.C +++ b/src/OpenFOAM/primitives/ints/lists/labelListIOList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/labelListIOList.H b/src/OpenFOAM/primitives/ints/lists/labelListIOList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/labelListIOList.H rename to src/OpenFOAM/primitives/ints/lists/labelListIOList.H index 2ca6d5350e..98610c5563 100644 --- a/src/OpenFOAM/primitives/Lists/labelListIOList.H +++ b/src/OpenFOAM/primitives/ints/lists/labelListIOList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/fileNameList.H b/src/OpenFOAM/primitives/strings/lists/fileNameList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/fileNameList.H rename to src/OpenFOAM/primitives/strings/lists/fileNameList.H index a8e3d40c52..13e77381c8 100644 --- a/src/OpenFOAM/primitives/Lists/fileNameList.H +++ b/src/OpenFOAM/primitives/strings/lists/fileNameList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/hashedWordList.C b/src/OpenFOAM/primitives/strings/lists/hashedWordList.C similarity index 98% rename from src/OpenFOAM/primitives/Lists/hashedWordList.C rename to src/OpenFOAM/primitives/strings/lists/hashedWordList.C index e9206bda8e..332ecbcf96 100644 --- a/src/OpenFOAM/primitives/Lists/hashedWordList.C +++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/hashedWordList.H b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H similarity index 98% rename from src/OpenFOAM/primitives/Lists/hashedWordList.H rename to src/OpenFOAM/primitives/strings/lists/hashedWordList.H index f0c51da1d6..4c5c1c43fd 100644 --- a/src/OpenFOAM/primitives/Lists/hashedWordList.H +++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/hashedWordListI.H b/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/hashedWordListI.H rename to src/OpenFOAM/primitives/strings/lists/hashedWordListI.H index 1e736aa6c5..e4585e85bc 100644 --- a/src/OpenFOAM/primitives/Lists/hashedWordListI.H +++ b/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/stringList.H b/src/OpenFOAM/primitives/strings/lists/stringList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/stringList.H rename to src/OpenFOAM/primitives/strings/lists/stringList.H index b87495911c..109c526535 100644 --- a/src/OpenFOAM/primitives/Lists/stringList.H +++ b/src/OpenFOAM/primitives/strings/lists/stringList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/stringListOps.H b/src/OpenFOAM/primitives/strings/lists/stringListOps.H similarity index 99% rename from src/OpenFOAM/primitives/Lists/stringListOps.H rename to src/OpenFOAM/primitives/strings/lists/stringListOps.H index 12143b4317..3bfbc7ade6 100644 --- a/src/OpenFOAM/primitives/Lists/stringListOps.H +++ b/src/OpenFOAM/primitives/strings/lists/stringListOps.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/stringListOpsTemplates.C b/src/OpenFOAM/primitives/strings/lists/stringListOpsTemplates.C similarity index 97% rename from src/OpenFOAM/primitives/Lists/stringListOpsTemplates.C rename to src/OpenFOAM/primitives/strings/lists/stringListOpsTemplates.C index 28bd3a31a8..34d1268432 100644 --- a/src/OpenFOAM/primitives/Lists/stringListOpsTemplates.C +++ b/src/OpenFOAM/primitives/strings/lists/stringListOpsTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/wordList.H b/src/OpenFOAM/primitives/strings/lists/wordList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/wordList.H rename to src/OpenFOAM/primitives/strings/lists/wordList.H index ce46a9e357..f7b7dbff4d 100644 --- a/src/OpenFOAM/primitives/Lists/wordList.H +++ b/src/OpenFOAM/primitives/strings/lists/wordList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/wordReList.H b/src/OpenFOAM/primitives/strings/lists/wordReList.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/wordReList.H rename to src/OpenFOAM/primitives/strings/lists/wordReList.H index 31a4793655..33b557c126 100644 --- a/src/OpenFOAM/primitives/Lists/wordReList.H +++ b/src/OpenFOAM/primitives/strings/lists/wordReList.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/wordReListMatcher.H b/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.H similarity index 97% rename from src/OpenFOAM/primitives/Lists/wordReListMatcher.H rename to src/OpenFOAM/primitives/strings/lists/wordReListMatcher.H index a2afd0c2d2..580f888014 100644 --- a/src/OpenFOAM/primitives/Lists/wordReListMatcher.H +++ b/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/OpenFOAM/primitives/Lists/wordReListMatcherI.H b/src/OpenFOAM/primitives/strings/lists/wordReListMatcherI.H similarity index 96% rename from src/OpenFOAM/primitives/Lists/wordReListMatcherI.H rename to src/OpenFOAM/primitives/strings/lists/wordReListMatcherI.H index ec41a80c35..ae2065bc12 100644 --- a/src/OpenFOAM/primitives/Lists/wordReListMatcherI.H +++ b/src/OpenFOAM/primitives/strings/lists/wordReListMatcherI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License From 7528e579a157add887e0237fefa5ed02ae1af72b Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 31 Jan 2011 12:05:39 +0000 Subject: [PATCH 030/367] ENH: foamUpgradeCyclics : warning message --- .../preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C index 89cf00cd1b..84f3c5652b 100644 --- a/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C +++ b/applications/utilities/preProcessing/foamUpgradeCyclics/foamUpgradeCyclics.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -311,8 +311,9 @@ void rewriteField { IOWarningIn("rewriteField(..)", patchDict) << "Cyclic patch " << patchName - << " has value entry. Please remove this and rerun." + << " has value entry. This will be removed." << endl; + patchDict.remove("value"); } From d91269488093aa9dfd61454c9939cd770a9cfb70 Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 31 Jan 2011 12:06:57 +0000 Subject: [PATCH 031/367] ENH: etc/ : removed FOAM_LIB environment var. alias 'lib' now goes to FOAM_LIBBIN --- etc/aliases.csh | 2 +- etc/aliases.sh | 2 +- etc/settings.csh | 2 +- etc/settings.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/aliases.csh b/etc/aliases.csh index 6e1deee991..9005f180dd 100644 --- a/etc/aliases.csh +++ b/etc/aliases.csh @@ -52,7 +52,7 @@ alias foamPV 'source `$WM_PROJECT_DIR/etc/apps/paraview3/cshrc` ParaView_VERSION # Change directory aliases # ~~~~~~~~~~~~~~~~~~~~~~~~ alias src 'cd $FOAM_SRC' -alias lib 'cd $FOAM_LIB' +alias lib 'cd $FOAM_LIBBIN' alias run 'cd $FOAM_RUN' alias foam 'cd $WM_PROJECT_DIR' alias foamsrc 'cd $FOAM_SRC/$WM_PROJECT' diff --git a/etc/aliases.sh b/etc/aliases.sh index 2f049825ec..870b457f5f 100644 --- a/etc/aliases.sh +++ b/etc/aliases.sh @@ -57,7 +57,7 @@ foamPV() # Change directory aliases # ~~~~~~~~~~~~~~~~~~~~~~~~ alias src='cd $FOAM_SRC' -alias lib='cd $FOAM_LIB' +alias lib='cd $FOAM_LIBBIN' alias run='cd $FOAM_RUN' alias foam='cd $WM_PROJECT_DIR' alias foamsrc='cd $FOAM_SRC/$WM_PROJECT' diff --git a/etc/settings.csh b/etc/settings.csh index a3f9a743c0..27bb9563cc 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -65,7 +65,7 @@ setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/platforms/$WM_OPTIONS/lib # convenience setenv FOAM_APP $WM_PROJECT_DIR/applications -setenv FOAM_LIB $WM_PROJECT_DIR/lib +#setenv FOAM_LIB $WM_PROJECT_DIR/lib setenv FOAM_SRC $WM_PROJECT_DIR/src setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials setenv FOAM_UTILITIES $FOAM_APP/utilities diff --git a/etc/settings.sh b/etc/settings.sh index 46c39f59de..728b197720 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -88,7 +88,7 @@ export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/platforms/$WM_OPTIONS/lib # convenience export FOAM_APP=$WM_PROJECT_DIR/applications -export FOAM_LIB=$WM_PROJECT_DIR/lib +#export FOAM_LIB=$WM_PROJECT_DIR/lib export FOAM_SRC=$WM_PROJECT_DIR/src export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials export FOAM_UTILITIES=$FOAM_APP/utilities From 4212b1159d0349ba213c2e6e99e56bd2f26ba02e Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 31 Jan 2011 12:11:19 +0000 Subject: [PATCH 032/367] BUG: LUscalarMatrix : assembly of master proc matrix With processorCyclics there can now be multiple interfaces between two processors --- .../matrices/LUscalarMatrix/LUscalarMatrix.C | 14 +++++++++++--- .../matrices/LUscalarMatrix/procLduInterface.C | 12 ++++++++---- .../matrices/LUscalarMatrix/procLduInterface.H | 3 ++- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C index 03dc2d5536..121f016c2f 100644 --- a/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C +++ b/src/OpenFOAM/matrices/LUscalarMatrix/LUscalarMatrix.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -260,6 +260,11 @@ void Foam::LUscalarMatrix::convert } else if (interface.myProcNo_ < interface.neighbProcNo_) { + // Interface to neighbour proc. Find on neighbour proc the + // corresponding interface. The problem is that there can + // be multiple interfaces between two processors (from + // processorCyclics) so also compare the communication tag + const PtrList& neiInterfaces = lduMatrices[interface.neighbProcNo_].interfaces_; @@ -269,8 +274,11 @@ void Foam::LUscalarMatrix::convert { if ( - neiInterfaces[ninti].neighbProcNo_ - == interface.myProcNo_ + ( + neiInterfaces[ninti].neighbProcNo_ + == interface.myProcNo_ + ) + && (neiInterfaces[ninti].tag_ == interface.tag_) ) { neiInterfacei = ninti; diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.C b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.C index 0a4b713202..979ef37027 100644 --- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.C +++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,8 @@ Foam::procLduInterface::procLduInterface faceCells_(interface.interface().faceCells()), coeffs_(coeffs), myProcNo_(-1), - neighbProcNo_(-1) + neighbProcNo_(-1), + tag_(-1) { if (isA(interface.interface())) { @@ -48,6 +49,7 @@ Foam::procLduInterface::procLduInterface myProcNo_ = pldui.myProcNo(); neighbProcNo_ = pldui.neighbProcNo(); + tag_ = pldui.tag(); } else if (isA(interface.interface())) { @@ -70,7 +72,8 @@ Foam::procLduInterface::procLduInterface(Istream& is) faceCells_(is), coeffs_(is), myProcNo_(readLabel(is)), - neighbProcNo_(readLabel(is)) + neighbProcNo_(readLabel(is)), + tag_(readLabel(is)) {} @@ -81,7 +84,8 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const procLduInterface& cldui) os << cldui.faceCells_ << cldui.coeffs_ << cldui.myProcNo_ - << cldui.neighbProcNo_; + << cldui.neighbProcNo_ + << cldui.tag_; return os; } diff --git a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H index 0e03bfdb37..defaa331ff 100644 --- a/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H +++ b/src/OpenFOAM/matrices/LUscalarMatrix/procLduInterface.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,6 +57,7 @@ class procLduInterface scalarField coeffs_; label myProcNo_; label neighbProcNo_; + label tag_; // Private Member Functions From 6b90a6c235ebfc9e05fde5cc41d0b0b6ec35a7e4 Mon Sep 17 00:00:00 2001 From: mattijs Date: Mon, 31 Jan 2011 12:12:32 +0000 Subject: [PATCH 033/367] ENH: mapDistribute : added whichTransform to find transform from local index --- .../polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C | 7 +++++++ .../polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H | 3 +++ 2 files changed, 10 insertions(+) diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C index 25e7727c8e..95c2d1d232 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.C @@ -29,6 +29,7 @@ License #include "globalIndex.H" #include "globalIndexAndTransform.H" #include "transformField.H" +#include "ListOps.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -1104,6 +1105,12 @@ Foam::mapDistribute::mapDistribute(const Xfer& map) // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // +Foam::label Foam::mapDistribute::whichTransform(const label index) const +{ + return findLower(transformStart_, index+1); +} + + void Foam::mapDistribute::transfer(mapDistribute& rhs) { constructSize_ = rhs.constructSize_; diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H index 6e1a26468c..99a31d3d7d 100644 --- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H +++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistribute.H @@ -385,6 +385,9 @@ public: return transformStart_; } + //- Find transform from transformElements + label whichTransform(const label index) const; + //- Calculate a schedule. See above. static List schedule ( From 117a0faa8c8be6bd48d62f70f559693d8c93f7e5 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 1 Feb 2011 15:34:13 +0000 Subject: [PATCH 034/367] STYLE: globalPoints.C : reference to struct instead of copy. --- src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C index e481fc4c49..800ca8ba82 100644 --- a/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C +++ b/src/OpenFOAM/meshes/polyMesh/globalMeshData/globalPoints.C @@ -1066,7 +1066,7 @@ void Foam::globalPoints::calculateSharedPoints for (label i = 1; i < pointInfo.size(); i++) { - labelPair info = pointInfo[i]; + const labelPair& info = pointInfo[i]; label procI = globalIndexAndTransform::processor(info); label index = globalIndexAndTransform::index(info); label transform = globalIndexAndTransform::transformIndex From 1e4b16072dbfcec878bb78728cede07016a88480 Mon Sep 17 00:00:00 2001 From: mattijs Date: Tue, 1 Feb 2011 15:34:52 +0000 Subject: [PATCH 035/367] BUG: etc/settings.csh : csh syntax error --- etc/settings.csh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/settings.csh b/etc/settings.csh index 27bb9563cc..a9c7db7118 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -90,7 +90,7 @@ unsetenv MPFR_ARCH_PATH # Location of compiler installation # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ if ( ! $?foamCompiler ) then - foamCompiler=system + set foamCompiler=system echo "Warning in $WM_PROJECT_DIR/etc/settings.csh:" echo " foamCompiler not set, using '$foamCompiler'" endif From 9da43d1558b5ce755f8d5c006b41798d5a1dfb81 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 1 Feb 2011 16:00:27 +0000 Subject: [PATCH 036/367] STYLE: consistency - moved radiation->radiation models --- applications/solvers/combustion/fireFoam/Make/options | 4 ++-- .../heatTransfer/buoyantSimpleRadiationFoam/Make/options | 4 ++-- .../solvers/lagrangian/coalChemistryFoam/Make/options | 4 ++-- .../Make/options | 4 ++-- .../incompressibleUncoupledKinematicParcelFoam/Make/options | 4 ++-- .../porousExplicitSourceReactingParcelFoam/Make/options | 4 ++-- .../solvers/lagrangian/reactingParcelFilmFoam/Make/options | 4 ++-- .../solvers/lagrangian/reactingParcelFoam/Make/options | 4 ++-- .../solvers/lagrangian/steadyReactingParcelFoam/Make/options | 4 ++-- .../lagrangian/uncoupledKinematicParcelFoam/Make/options | 4 ++-- applications/test/dataEntry/Make/options | 4 ++-- .../utilities/miscellaneous/foamDebugSwitches/Make/options | 2 +- src/lagrangian/coalCombustion/Make/options | 2 +- src/lagrangian/intermediate/Make/options | 4 ++-- src/thermophysicalModels/Allwmake | 2 +- .../{radiation => radiationModels}/Make/files | 2 +- .../{radiation => radiationModels}/Make/options | 0 .../MarshakRadiationMixedFvPatchScalarField.C | 0 .../MarshakRadiationMixedFvPatchScalarField.H | 0 .../MarshakRadiationFixedTMixedFvPatchScalarField.C | 0 .../MarshakRadiationFixedTMixedFvPatchScalarField.H | 0 .../greyDiffusiveRadiationMixedFvPatchScalarField.C | 0 .../greyDiffusiveRadiationMixedFvPatchScalarField.H | 0 .../wideBandDiffusiveRadiationMixedFvPatchScalarField.C | 0 .../wideBandDiffusiveRadiationMixedFvPatchScalarField.H | 0 .../include/createRadiationModel.H | 0 .../{radiation => radiationModels}/radiationModel/P1/P1.C | 0 .../{radiation => radiationModels}/radiationModel/P1/P1.H | 0 .../radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C | 0 .../radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H | 0 .../radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H | 0 .../fvDOM/blackBodyEmission/blackBodyEmission.C | 0 .../fvDOM/blackBodyEmission/blackBodyEmission.H | 0 .../radiationModel/fvDOM/fvDOM/fvDOM.C | 0 .../radiationModel/fvDOM/fvDOM/fvDOM.H | 0 .../radiationModel/fvDOM/fvDOM/fvDOMI.H | 0 .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.C | 0 .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.H | 0 .../fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H | 0 .../radiationModel/noRadiation/noRadiation.C | 0 .../radiationModel/noRadiation/noRadiation.H | 0 .../radiationModel/radiationModel/radiationModel.C | 0 .../radiationModel/radiationModel/radiationModel.H | 0 .../radiationModel/radiationModel/radiationModelNew.C | 0 .../absorptionEmissionModel/absorptionEmissionModel.C | 0 .../absorptionEmissionModel/absorptionEmissionModel.H | 0 .../absorptionEmissionModel/absorptionEmissionModelNew.C | 0 .../binaryAbsorptionEmission/binaryAbsorptionEmission.C | 0 .../binaryAbsorptionEmission/binaryAbsorptionEmission.H | 0 .../constantAbsorptionEmission/constantAbsorptionEmission.C | 0 .../constantAbsorptionEmission/constantAbsorptionEmission.H | 0 .../greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C | 0 .../greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H | 0 .../noAbsorptionEmission/noAbsorptionEmission.C | 0 .../noAbsorptionEmission/noAbsorptionEmission.H | 0 .../wideBandAbsorptionEmission/wideBandAbsorptionEmission.C | 0 .../wideBandAbsorptionEmission/wideBandAbsorptionEmission.H | 0 .../submodels/scatterModel/constantScatter/constantScatter.C | 0 .../submodels/scatterModel/constantScatter/constantScatter.H | 0 .../submodels/scatterModel/scatterModel/scatterModel.C | 0 .../submodels/scatterModel/scatterModel/scatterModel.H | 0 .../submodels/scatterModel/scatterModel/scatterModelNew.C | 0 .../rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options | 4 ++-- 63 files changed, 30 insertions(+), 30 deletions(-) rename src/thermophysicalModels/{radiation => radiationModels}/Make/files (97%) rename src/thermophysicalModels/{radiation => radiationModels}/Make/options (100%) rename src/thermophysicalModels/{radiation => radiationModels}/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/include/createRadiationModel.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/P1/P1.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/P1/P1.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/fvDOM/fvDOM/fvDOM.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/fvDOM/fvDOM/fvDOM.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/fvDOM/fvDOM/fvDOMI.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/noRadiation/noRadiation.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/noRadiation/noRadiation.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/radiationModel/radiationModel.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/radiationModel/radiationModel.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/radiationModel/radiationModel/radiationModelNew.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/scatterModel/constantScatter/constantScatter.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/scatterModel/constantScatter/constantScatter.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/scatterModel/scatterModel/scatterModel.C (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/scatterModel/scatterModel/scatterModel.H (100%) rename src/thermophysicalModels/{radiation => radiationModels}/submodels/scatterModel/scatterModel/scatterModelNew.C (100%) diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index cba08b2629..045e37a344 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude EXE_LIBS = \ @@ -17,4 +17,4 @@ EXE_LIBS = \ -lcompressibleTurbulenceModel \ -lcompressibleLESModels \ -lcompressibleRASModels \ - -lradiation + -lradiationModels diff --git a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options index 7058e8a503..96c99816d0 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options +++ b/applications/solvers/heatTransfer/buoyantSimpleRadiationFoam/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I../buoyantSimpleFoam \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \ -I$(LIB_SRC)/turbulenceModels/RAS \ @@ -11,7 +11,7 @@ EXE_INC = \ EXE_LIBS = \ -lbasicThermophysicalModels \ -lspecie \ - -lradiation \ + -lradiationModels \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ -lfiniteVolume \ diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index f4a9d0c52d..ff78384881 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -16,7 +16,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude @@ -39,6 +39,6 @@ EXE_LIBS = \ -lreactionThermophysicalModels \ -lSLGThermo \ -lchemistryModel \ - -lradiation \ + -lradiationModels \ -lsurfaceFilmModels \ -lODE diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/Make/options index 3c4206dc24..34ba95f0dc 100644 --- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/Make/options +++ b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelDyMFoam/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ @@ -21,7 +21,7 @@ EXE_LIBS = \ -lthermophysicalFunctions \ -lbasicThermophysicalModels \ -lspecie \ - -lradiation \ + -lradiationModels \ -lincompressibleRASModels \ -lincompressibleLESModels \ -lincompressibleTransportModels \ diff --git a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/options index 1ad3529232..5e7b8b3518 100644 --- a/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/incompressibleUncoupledKinematicParcelFoam/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \ @@ -18,7 +18,7 @@ EXE_LIBS = \ -lthermophysicalFunctions \ -lbasicThermophysicalModels \ -lspecie \ - -lradiation \ + -lradiationModels \ -lincompressibleRASModels \ -lincompressibleLESModels \ -lincompressibleTransportModels \ diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options index eede9724ce..1cf2738a50 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options @@ -16,7 +16,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/surfaceFilmModels/lnInclude @@ -38,6 +38,6 @@ EXE_LIBS = \ -lreactionThermophysicalModels \ -lSLGThermo \ -lchemistryModel \ - -lradiation \ + -lradiationModels \ -lODE \ -lsurfaceFilmModels diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options index e9d86d977c..687401ef78 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -13,7 +13,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/surfaceFilmModels/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ @@ -32,7 +32,7 @@ EXE_LIBS = \ -lreactionThermophysicalModels \ -lSLGThermo \ -lchemistryModel \ - -lradiation \ + -lradiationModels \ -lsurfaceFilmModels \ -llagrangianIntermediate \ -lODE diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index ee3db1695a..88e49525d3 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -15,7 +15,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/surfaceFilmModels/lnInclude @@ -37,6 +37,6 @@ EXE_LIBS = \ -lreactionThermophysicalModels \ -lSLGThermo \ -lchemistryModel \ - -lradiation \ + -lradiationModels \ -lODE \ -lsurfaceFilmModels diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options index eede9724ce..1cf2738a50 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options @@ -16,7 +16,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/surfaceFilmModels/lnInclude @@ -38,6 +38,6 @@ EXE_LIBS = \ -lreactionThermophysicalModels \ -lSLGThermo \ -lchemistryModel \ - -lradiation \ + -lradiationModels \ -lODE \ -lsurfaceFilmModels diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options index 35a21df21a..5d6abe8613 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ @@ -16,7 +16,7 @@ EXE_LIBS = \ -lthermophysicalFunctions \ -lbasicThermophysicalModels \ -lspecie \ - -lradiation \ + -lradiationModels \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ -lcompressibleLESModels \ diff --git a/applications/test/dataEntry/Make/options b/applications/test/dataEntry/Make/options index 79fef3bb93..a4d63bfba8 100644 --- a/applications/test/dataEntry/Make/options +++ b/applications/test/dataEntry/Make/options @@ -1,11 +1,11 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude EXE_LIBS = \ -lfiniteVolume \ -llagrangianIntermediate \ - -lradiation \ + -lradiationModels \ -lthermophysicalFunctions diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index 804d519386..dca91f271f 100644 --- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options +++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options @@ -43,7 +43,7 @@ EXE_LIBS = \ -lOpenFOAM \ -lpdf \ -lpotential \ - -lradiation \ + -lradiationModels \ -lrandomProcesses \ -lreactionThermophysicalModels \ -lsampling \ diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options index 93f4b9d404..140890fce2 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -12,7 +12,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \ diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index 7ff9a9456a..00a2974127 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -11,7 +11,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \ @@ -34,7 +34,7 @@ LIB_LIBS = \ -lreactionThermophysicalModels \ -lSLGThermo \ -lchemistryModel \ - -lradiation \ + -lradiationModels \ -lODE \ -lcompressibleRASModels \ -lcompressibleLESModels \ diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index 9160970d75..9af7348683 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -18,7 +18,7 @@ wmake $makeOption reactionThermo wmake $makeOption laminarFlameSpeed wmake $makeOption chemistryModel wmake $makeOption pdfs -wmake $makeOption radiation +wmake $makeOption radiationModels wmake $makeOption barotropicCompressibilityModel wmake $makeOption thermalPorousZone diff --git a/src/thermophysicalModels/radiation/Make/files b/src/thermophysicalModels/radiationModels/Make/files similarity index 97% rename from src/thermophysicalModels/radiation/Make/files rename to src/thermophysicalModels/radiationModels/Make/files index 5c77d42f12..2a8b05a84d 100644 --- a/src/thermophysicalModels/radiation/Make/files +++ b/src/thermophysicalModels/radiationModels/Make/files @@ -30,4 +30,4 @@ derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchSc derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C -LIB = $(FOAM_LIBBIN)/libradiation +LIB = $(FOAM_LIBBIN)/libradiationModels diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiationModels/Make/options similarity index 100% rename from src/thermophysicalModels/radiation/Make/options rename to src/thermophysicalModels/radiationModels/Make/options diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C similarity index 100% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H similarity index 100% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C similarity index 100% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H similarity index 100% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C similarity index 100% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H similarity index 100% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C similarity index 100% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C diff --git a/src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H similarity index 100% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H diff --git a/src/thermophysicalModels/radiation/include/createRadiationModel.H b/src/thermophysicalModels/radiationModels/include/createRadiationModel.H similarity index 100% rename from src/thermophysicalModels/radiation/include/createRadiationModel.H rename to src/thermophysicalModels/radiationModels/include/createRadiationModel.H diff --git a/src/thermophysicalModels/radiation/radiationModel/P1/P1.C b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/P1/P1.C rename to src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C diff --git a/src/thermophysicalModels/radiation/radiationModel/P1/P1.H b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/P1/P1.H rename to src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOMI.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOMI.H similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOMI.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOMI.H diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H diff --git a/src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H diff --git a/src/thermophysicalModels/radiation/radiationModel/noRadiation/noRadiation.C b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/noRadiation/noRadiation.C rename to src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C diff --git a/src/thermophysicalModels/radiation/radiationModel/noRadiation/noRadiation.H b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/noRadiation/noRadiation.H rename to src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C rename to src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H rename to src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H diff --git a/src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModelNew.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C similarity index 100% rename from src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModelNew.C rename to src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H similarity index 100% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C similarity index 100% rename from src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C rename to src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H similarity index 100% rename from src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H rename to src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C similarity index 100% rename from src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.C rename to src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.H b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H similarity index 100% rename from src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.H rename to src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H diff --git a/src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C similarity index 100% rename from src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C rename to src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options index 5e0052eb1d..345c5148f7 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options @@ -11,7 +11,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfaceFilmModels/lnInclude @@ -26,7 +26,7 @@ EXE_LIBS = \ -lreactionThermophysicalModels \ -lSLGThermo \ -lspecie \ - -lradiation \ + -lradiationModels \ -lcompressibleRASModels \ -lcompressibleLESModels \ -lsurfaceFilmModels From 1a263e3f0e7962ed07b53581dd3d9e75006c85e2 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 1 Feb 2011 17:03:15 +0000 Subject: [PATCH 037/367] STYLE: re-located elemental thermo properties --- .../solvers/combustion/dieselEngineFoam/Make/options | 4 ++-- .../solvers/combustion/dieselFoam/Make/options | 4 ++-- .../lagrangian/coalChemistryFoam/Make/options | 8 ++++---- .../Make/options | 8 ++++---- .../lagrangian/reactingParcelFilmFoam/Make/options | 8 ++++---- .../lagrangian/reactingParcelFoam/Make/options | 8 ++++---- .../lagrangian/steadyReactingParcelFoam/Make/options | 8 ++++---- .../miscellaneous/foamDebugSwitches/Make/options | 8 ++++---- src/lagrangian/coalCombustion/Make/options | 8 ++++---- src/lagrangian/dieselSpray/Make/options | 4 ++-- src/lagrangian/intermediate/Make/options | 8 ++++---- src/surfaceFilmModels/Make/options | 8 ++++---- src/thermophysicalModels/Allwmake | 5 +---- src/thermophysicalModels/SLGThermo/Make/options | 8 ++++---- src/thermophysicalModels/properties/Allwmake | 12 ++++++++++++ .../liquidMixtureProperties/Make/files | 0 .../liquidMixtureProperties/Make/options | 2 +- .../liquidMixtureProperties.C | 0 .../liquidMixtureProperties.H | 0 .../{ => properties}/liquidProperties/Ar/Ar.C | 0 .../{ => properties}/liquidProperties/Ar/Ar.H | 0 .../{ => properties}/liquidProperties/Ar/ArI.H | 0 .../liquidProperties/C10H22/C10H22.C | 0 .../liquidProperties/C10H22/C10H22.H | 0 .../liquidProperties/C10H22/C10H22I.H | 0 .../liquidProperties/C12H26/C12H26.C | 0 .../liquidProperties/C12H26/C12H26.H | 0 .../liquidProperties/C12H26/C12H26I.H | 0 .../liquidProperties/C13H28/C13H28.C | 0 .../liquidProperties/C13H28/C13H28.H | 0 .../liquidProperties/C13H28/C13H28I.H | 0 .../liquidProperties/C14H30/C14H30.C | 0 .../liquidProperties/C14H30/C14H30.H | 0 .../liquidProperties/C14H30/C14H30I.H | 0 .../liquidProperties/C16H34/C16H34.C | 0 .../liquidProperties/C16H34/C16H34.H | 0 .../liquidProperties/C16H34/C16H34I.H | 0 .../liquidProperties/C2H5OH/C2H5OH.C | 0 .../liquidProperties/C2H5OH/C2H5OH.H | 0 .../liquidProperties/C2H5OH/C2H5OHI.H | 0 .../{ => properties}/liquidProperties/C2H6/C2H6.C | 0 .../{ => properties}/liquidProperties/C2H6/C2H6.H | 0 .../{ => properties}/liquidProperties/C2H6/C2H6I.H | 0 .../{ => properties}/liquidProperties/C2H6O/C2H6O.C | 0 .../{ => properties}/liquidProperties/C2H6O/C2H6O.H | 0 .../{ => properties}/liquidProperties/C2H6O/C2H6OI.H | 0 .../{ => properties}/liquidProperties/C3H6O/C3H6O.C | 0 .../{ => properties}/liquidProperties/C3H6O/C3H6O.H | 0 .../{ => properties}/liquidProperties/C3H6O/C3H6OI.H | 0 .../{ => properties}/liquidProperties/C3H8/C3H8.C | 0 .../{ => properties}/liquidProperties/C3H8/C3H8.H | 0 .../{ => properties}/liquidProperties/C3H8/C3H8I.H | 0 .../liquidProperties/C4H10O/C4H10O.C | 0 .../liquidProperties/C4H10O/C4H10O.H | 0 .../liquidProperties/C4H10O/C4H10OI.H | 0 .../{ => properties}/liquidProperties/C6H14/C6H14.C | 0 .../{ => properties}/liquidProperties/C6H14/C6H14.H | 0 .../{ => properties}/liquidProperties/C6H14/C6H14I.H | 0 .../{ => properties}/liquidProperties/C6H6/C6H6.C | 0 .../{ => properties}/liquidProperties/C6H6/C6H6.H | 0 .../{ => properties}/liquidProperties/C6H6/C6H6I.H | 0 .../{ => properties}/liquidProperties/C7H16/C7H16.C | 0 .../{ => properties}/liquidProperties/C7H16/C7H16.H | 0 .../{ => properties}/liquidProperties/C7H16/C7H16I.H | 0 .../{ => properties}/liquidProperties/C7H8/C7H8.C | 0 .../{ => properties}/liquidProperties/C7H8/C7H8.H | 0 .../{ => properties}/liquidProperties/C7H8/C7H8I.H | 0 .../{ => properties}/liquidProperties/C8H10/C8H10.C | 0 .../{ => properties}/liquidProperties/C8H10/C8H10.H | 0 .../{ => properties}/liquidProperties/C8H10/C8H10I.H | 0 .../{ => properties}/liquidProperties/C8H18/C8H18.C | 0 .../{ => properties}/liquidProperties/C8H18/C8H18.H | 0 .../{ => properties}/liquidProperties/C8H18/C8H18I.H | 0 .../{ => properties}/liquidProperties/C9H20/C9H20.C | 0 .../{ => properties}/liquidProperties/C9H20/C9H20.H | 0 .../{ => properties}/liquidProperties/C9H20/C9H20I.H | 0 .../{ => properties}/liquidProperties/CH3OH/CH3OH.C | 0 .../{ => properties}/liquidProperties/CH3OH/CH3OH.H | 0 .../{ => properties}/liquidProperties/CH3OH/CH3OHI.H | 0 .../liquidProperties/CH4N2O/CH4N2O.C | 0 .../liquidProperties/CH4N2O/CH4N2O.H | 0 .../liquidProperties/CH4N2O/CH4N2OI.H | 0 .../{ => properties}/liquidProperties/H2O/H2O.C | 0 .../{ => properties}/liquidProperties/H2O/H2O.H | 0 .../{ => properties}/liquidProperties/H2O/H2OI.H | 0 .../liquidProperties/IC8H18/IC8H18.C | 0 .../liquidProperties/IC8H18/IC8H18.H | 0 .../liquidProperties/IC8H18/IC8H18I.H | 0 .../{ => properties}/liquidProperties/IDEA/IDEA.C | 0 .../{ => properties}/liquidProperties/IDEA/IDEA.H | 0 .../liquidProperties/IDEA/IDEA.thermo | 0 .../{ => properties}/liquidProperties/IDEA/IDEAI.H | 0 .../{ => properties}/liquidProperties/MB/MB.C | 0 .../{ => properties}/liquidProperties/MB/MB.H | 0 .../{ => properties}/liquidProperties/MB/MBI.H | 0 .../{ => properties}/liquidProperties/Make/files | 0 .../{ => properties}/liquidProperties/Make/options | 0 .../{ => properties}/liquidProperties/N2/N2.C | 0 .../{ => properties}/liquidProperties/N2/N2.H | 0 .../{ => properties}/liquidProperties/N2/N2I.H | 0 .../liquidProperties/aC10H7CH3/aC10H7CH3.C | 0 .../liquidProperties/aC10H7CH3/aC10H7CH3.H | 0 .../liquidProperties/aC10H7CH3/aC10H7CH3I.H | 0 .../liquidProperties/bC10H7CH3/bC10H7CH3.C | 0 .../liquidProperties/bC10H7CH3/bC10H7CH3.H | 0 .../liquidProperties/bC10H7CH3/bC10H7CH3I.H | 0 .../liquidProperties/iC3H8O/iC3H8O.C | 0 .../liquidProperties/iC3H8O/iC3H8O.H | 0 .../liquidProperties/iC3H8O/iC3H8OI.H | 0 .../liquidProperties/liquidProperties.C | 0 .../liquidProperties/liquidProperties.H | 0 .../liquidProperties/liquidPropertiesI.H | 0 .../liquidProperties/nC3H8O/nC3H8O.C | 0 .../liquidProperties/nC3H8O/nC3H8O.H | 0 .../liquidProperties/nC3H8O/nC3H8OI.H | 0 .../solidMixtureProperties/Make/files | 0 .../properties/solidMixtureProperties/Make/options | 3 +++ .../solidMixtureProperties/solidMixtureProperties.C | 0 .../solidMixtureProperties/solidMixtureProperties.H | 0 .../{ => properties}/solidProperties/C/C.C | 0 .../{ => properties}/solidProperties/C/C.H | 0 .../{ => properties}/solidProperties/CaCO3/CaCO3.C | 0 .../{ => properties}/solidProperties/CaCO3/CaCO3.H | 0 .../{ => properties}/solidProperties/Make/files | 0 .../{ => properties}/solidProperties/Make/options | 0 .../{ => properties}/solidProperties/ash/ash.C | 0 .../{ => properties}/solidProperties/ash/ash.H | 0 .../solidProperties/solidProperties.C | 0 .../solidProperties/solidProperties.H | 0 .../solidProperties/solidPropertiesI.H | 0 .../solidProperties/solidPropertiesNew.C | 0 .../solidMixtureProperties/Make/options | 3 --- 132 files changed, 63 insertions(+), 54 deletions(-) create mode 100755 src/thermophysicalModels/properties/Allwmake rename src/thermophysicalModels/{ => properties}/liquidMixtureProperties/Make/files (100%) rename src/thermophysicalModels/{ => properties}/liquidMixtureProperties/Make/options (80%) rename src/thermophysicalModels/{ => properties}/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C (100%) rename src/thermophysicalModels/{ => properties}/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/Ar/Ar.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/Ar/Ar.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/Ar/ArI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C10H22/C10H22.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C10H22/C10H22.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C10H22/C10H22I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C12H26/C12H26.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C12H26/C12H26.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C12H26/C12H26I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C13H28/C13H28.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C13H28/C13H28.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C13H28/C13H28I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C14H30/C14H30.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C14H30/C14H30.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C14H30/C14H30I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C16H34/C16H34.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C16H34/C16H34.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C16H34/C16H34I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C2H5OH/C2H5OH.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C2H5OH/C2H5OH.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C2H5OH/C2H5OHI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C2H6/C2H6.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C2H6/C2H6.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C2H6/C2H6I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C2H6O/C2H6O.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C2H6O/C2H6O.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C2H6O/C2H6OI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C3H6O/C3H6O.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C3H6O/C3H6O.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C3H6O/C3H6OI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C3H8/C3H8.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C3H8/C3H8.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C3H8/C3H8I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C4H10O/C4H10O.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C4H10O/C4H10O.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C4H10O/C4H10OI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C6H14/C6H14.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C6H14/C6H14.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C6H14/C6H14I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C6H6/C6H6.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C6H6/C6H6.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C6H6/C6H6I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C7H16/C7H16.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C7H16/C7H16.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C7H16/C7H16I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C7H8/C7H8.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C7H8/C7H8.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C7H8/C7H8I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C8H10/C8H10.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C8H10/C8H10.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C8H10/C8H10I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C8H18/C8H18.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C8H18/C8H18.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C8H18/C8H18I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C9H20/C9H20.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C9H20/C9H20.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/C9H20/C9H20I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/CH3OH/CH3OH.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/CH3OH/CH3OH.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/CH3OH/CH3OHI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/CH4N2O/CH4N2O.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/CH4N2O/CH4N2O.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/CH4N2O/CH4N2OI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/H2O/H2O.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/H2O/H2O.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/H2O/H2OI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/IC8H18/IC8H18.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/IC8H18/IC8H18.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/IC8H18/IC8H18I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/IDEA/IDEA.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/IDEA/IDEA.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/IDEA/IDEA.thermo (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/IDEA/IDEAI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/MB/MB.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/MB/MB.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/MB/MBI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/Make/files (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/Make/options (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/N2/N2.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/N2/N2.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/N2/N2I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/aC10H7CH3/aC10H7CH3.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/aC10H7CH3/aC10H7CH3.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/aC10H7CH3/aC10H7CH3I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/bC10H7CH3/bC10H7CH3.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/bC10H7CH3/bC10H7CH3.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/bC10H7CH3/bC10H7CH3I.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/iC3H8O/iC3H8O.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/iC3H8O/iC3H8O.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/iC3H8O/iC3H8OI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/liquidProperties/liquidProperties.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/liquidProperties/liquidProperties.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/liquidProperties/liquidPropertiesI.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/nC3H8O/nC3H8O.C (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/nC3H8O/nC3H8O.H (100%) rename src/thermophysicalModels/{ => properties}/liquidProperties/nC3H8O/nC3H8OI.H (100%) rename src/thermophysicalModels/{ => properties}/solidMixtureProperties/Make/files (100%) create mode 100644 src/thermophysicalModels/properties/solidMixtureProperties/Make/options rename src/thermophysicalModels/{ => properties}/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C (100%) rename src/thermophysicalModels/{ => properties}/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/C/C.C (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/C/C.H (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/CaCO3/CaCO3.C (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/CaCO3/CaCO3.H (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/Make/files (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/Make/options (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/ash/ash.C (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/ash/ash.H (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/solidProperties/solidProperties.C (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/solidProperties/solidProperties.H (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/solidProperties/solidPropertiesI.H (100%) rename src/thermophysicalModels/{ => properties}/solidProperties/solidProperties/solidPropertiesNew.C (100%) delete mode 100644 src/thermophysicalModels/solidMixtureProperties/Make/options diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options index 9cefdaf996..5f047de258 100644 --- a/applications/solvers/combustion/dieselEngineFoam/Make/options +++ b/applications/solvers/combustion/dieselEngineFoam/Make/options @@ -4,8 +4,8 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/applications/solvers/combustion/dieselFoam/Make/options b/applications/solvers/combustion/dieselFoam/Make/options index 1e6ccfa139..427ccfc98b 100644 --- a/applications/solvers/combustion/dieselFoam/Make/options +++ b/applications/solvers/combustion/dieselFoam/Make/options @@ -5,8 +5,8 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/dieselSpray/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index ff78384881..17cd096198 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -8,10 +8,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options index 1cf2738a50..063236d23e 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options @@ -8,10 +8,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options index 687401ef78..9b9f551e8d 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -5,10 +5,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index 88e49525d3..579a6e47db 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -7,10 +7,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options index 1cf2738a50..063236d23e 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options @@ -8,10 +8,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index dca91f271f..9641909235 100644 --- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options +++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options @@ -34,8 +34,8 @@ EXE_LIBS = \ -llaminarFlameSpeedModels \ -lLESdeltas \ -lLESfilters \ - -lliquidMixture \ - -lliquids \ + -lliquidMixtureProperties \ + -lliquidProperties \ -lmeshTools \ -lmolecularMeasurements \ -lmolecule \ @@ -47,9 +47,9 @@ EXE_LIBS = \ -lrandomProcesses \ -lreactionThermophysicalModels \ -lsampling \ - -lpointSolidMixture \ + -lsolidMixtureProperties \ -lsolidParticle \ - -lpointSolids \ + -lsolidProperties \ -lspecie \ -lsurfMesh \ -lsystemCall \ diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options index 140890fce2..dc7db16ea7 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -6,10 +6,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ diff --git a/src/lagrangian/dieselSpray/Make/options b/src/lagrangian/dieselSpray/Make/options index 9891ba0197..8465ce4ed2 100644 --- a/src/lagrangian/dieselSpray/Make/options +++ b/src/lagrangian/dieselSpray/Make/options @@ -8,8 +8,8 @@ EXE_INC = \ -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index 00a2974127..e2c807106f 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -5,10 +5,10 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ diff --git a/src/surfaceFilmModels/Make/options b/src/surfaceFilmModels/Make/options index dda598200c..d3439c4c3a 100644 --- a/src/surfaceFilmModels/Make/options +++ b/src/surfaceFilmModels/Make/options @@ -3,10 +3,10 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index b62c36aa5d..9e9514e528 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -6,10 +6,7 @@ set -x wmake $makeOption specie wmake $makeOption solid wmake $makeOption thermophysicalFunctions -wmake $makeOption liquidProperties -wmake $makeOption liquidMixtureProperties -wmake $makeOption solidProperties -wmake $makeOption solidMixtureProperties +./properties/Allwmake $* wmake $makeOption basic wmake $makeOption reactionThermo diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options index 3eda6c06d5..7102ea2c61 100644 --- a/src/thermophysicalModels/SLGThermo/Make/options +++ b/src/thermophysicalModels/SLGThermo/Make/options @@ -2,10 +2,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidMixtureProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/solidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidMixtureProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude LIB_LIBS = \ diff --git a/src/thermophysicalModels/properties/Allwmake b/src/thermophysicalModels/properties/Allwmake new file mode 100755 index 0000000000..da66ba8d47 --- /dev/null +++ b/src/thermophysicalModels/properties/Allwmake @@ -0,0 +1,12 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso +set -x + +wmake $makeOption liquidProperties +wmake $makeOption liquidMixtureProperties +wmake $makeOption solidProperties +wmake $makeOption solidMixtureProperties + + +# ----------------------------------------------------------------- end-of-file diff --git a/src/thermophysicalModels/liquidMixtureProperties/Make/files b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/files similarity index 100% rename from src/thermophysicalModels/liquidMixtureProperties/Make/files rename to src/thermophysicalModels/properties/liquidMixtureProperties/Make/files diff --git a/src/thermophysicalModels/liquidMixtureProperties/Make/options b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options similarity index 80% rename from src/thermophysicalModels/liquidMixtureProperties/Make/options rename to src/thermophysicalModels/properties/liquidMixtureProperties/Make/options index 28490cc168..138f439935 100644 --- a/src/thermophysicalModels/liquidMixtureProperties/Make/options +++ b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options @@ -1,7 +1,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/liquidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude diff --git a/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C b/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C similarity index 100% rename from src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C rename to src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.C diff --git a/src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H b/src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H similarity index 100% rename from src/thermophysicalModels/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H rename to src/thermophysicalModels/properties/liquidMixtureProperties/liquidMixtureProperties/liquidMixtureProperties.H diff --git a/src/thermophysicalModels/liquidProperties/Ar/Ar.C b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/Ar/Ar.C rename to src/thermophysicalModels/properties/liquidProperties/Ar/Ar.C diff --git a/src/thermophysicalModels/liquidProperties/Ar/Ar.H b/src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/Ar/Ar.H rename to src/thermophysicalModels/properties/liquidProperties/Ar/Ar.H diff --git a/src/thermophysicalModels/liquidProperties/Ar/ArI.H b/src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/Ar/ArI.H rename to src/thermophysicalModels/properties/liquidProperties/Ar/ArI.H diff --git a/src/thermophysicalModels/liquidProperties/C10H22/C10H22.C b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C10H22/C10H22.C rename to src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.C diff --git a/src/thermophysicalModels/liquidProperties/C10H22/C10H22.H b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C10H22/C10H22.H rename to src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22.H diff --git a/src/thermophysicalModels/liquidProperties/C10H22/C10H22I.H b/src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C10H22/C10H22I.H rename to src/thermophysicalModels/properties/liquidProperties/C10H22/C10H22I.H diff --git a/src/thermophysicalModels/liquidProperties/C12H26/C12H26.C b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C12H26/C12H26.C rename to src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.C diff --git a/src/thermophysicalModels/liquidProperties/C12H26/C12H26.H b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C12H26/C12H26.H rename to src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26.H diff --git a/src/thermophysicalModels/liquidProperties/C12H26/C12H26I.H b/src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C12H26/C12H26I.H rename to src/thermophysicalModels/properties/liquidProperties/C12H26/C12H26I.H diff --git a/src/thermophysicalModels/liquidProperties/C13H28/C13H28.C b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C13H28/C13H28.C rename to src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.C diff --git a/src/thermophysicalModels/liquidProperties/C13H28/C13H28.H b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C13H28/C13H28.H rename to src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28.H diff --git a/src/thermophysicalModels/liquidProperties/C13H28/C13H28I.H b/src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C13H28/C13H28I.H rename to src/thermophysicalModels/properties/liquidProperties/C13H28/C13H28I.H diff --git a/src/thermophysicalModels/liquidProperties/C14H30/C14H30.C b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C14H30/C14H30.C rename to src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.C diff --git a/src/thermophysicalModels/liquidProperties/C14H30/C14H30.H b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C14H30/C14H30.H rename to src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30.H diff --git a/src/thermophysicalModels/liquidProperties/C14H30/C14H30I.H b/src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C14H30/C14H30I.H rename to src/thermophysicalModels/properties/liquidProperties/C14H30/C14H30I.H diff --git a/src/thermophysicalModels/liquidProperties/C16H34/C16H34.C b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C16H34/C16H34.C rename to src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.C diff --git a/src/thermophysicalModels/liquidProperties/C16H34/C16H34.H b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C16H34/C16H34.H rename to src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34.H diff --git a/src/thermophysicalModels/liquidProperties/C16H34/C16H34I.H b/src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C16H34/C16H34I.H rename to src/thermophysicalModels/properties/liquidProperties/C16H34/C16H34I.H diff --git a/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.C b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.C rename to src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.C diff --git a/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.H b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OH.H rename to src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OH.H diff --git a/src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H5OH/C2H5OHI.H rename to src/thermophysicalModels/properties/liquidProperties/C2H5OH/C2H5OHI.H diff --git a/src/thermophysicalModels/liquidProperties/C2H6/C2H6.C b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6/C2H6.C rename to src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.C diff --git a/src/thermophysicalModels/liquidProperties/C2H6/C2H6.H b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6/C2H6.H rename to src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6.H diff --git a/src/thermophysicalModels/liquidProperties/C2H6/C2H6I.H b/src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6/C2H6I.H rename to src/thermophysicalModels/properties/liquidProperties/C2H6/C2H6I.H diff --git a/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.C b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.C rename to src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.C diff --git a/src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.H b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6O/C2H6O.H rename to src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6O.H diff --git a/src/thermophysicalModels/liquidProperties/C2H6O/C2H6OI.H b/src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C2H6O/C2H6OI.H rename to src/thermophysicalModels/properties/liquidProperties/C2H6O/C2H6OI.H diff --git a/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.C b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.C rename to src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.C diff --git a/src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.H b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H6O/C3H6O.H rename to src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6O.H diff --git a/src/thermophysicalModels/liquidProperties/C3H6O/C3H6OI.H b/src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H6O/C3H6OI.H rename to src/thermophysicalModels/properties/liquidProperties/C3H6O/C3H6OI.H diff --git a/src/thermophysicalModels/liquidProperties/C3H8/C3H8.C b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H8/C3H8.C rename to src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.C diff --git a/src/thermophysicalModels/liquidProperties/C3H8/C3H8.H b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H8/C3H8.H rename to src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8.H diff --git a/src/thermophysicalModels/liquidProperties/C3H8/C3H8I.H b/src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C3H8/C3H8I.H rename to src/thermophysicalModels/properties/liquidProperties/C3H8/C3H8I.H diff --git a/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.C b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.C rename to src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.C diff --git a/src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.H b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C4H10O/C4H10O.H rename to src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10O.H diff --git a/src/thermophysicalModels/liquidProperties/C4H10O/C4H10OI.H b/src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C4H10O/C4H10OI.H rename to src/thermophysicalModels/properties/liquidProperties/C4H10O/C4H10OI.H diff --git a/src/thermophysicalModels/liquidProperties/C6H14/C6H14.C b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H14/C6H14.C rename to src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.C diff --git a/src/thermophysicalModels/liquidProperties/C6H14/C6H14.H b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H14/C6H14.H rename to src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14.H diff --git a/src/thermophysicalModels/liquidProperties/C6H14/C6H14I.H b/src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H14/C6H14I.H rename to src/thermophysicalModels/properties/liquidProperties/C6H14/C6H14I.H diff --git a/src/thermophysicalModels/liquidProperties/C6H6/C6H6.C b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H6/C6H6.C rename to src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.C diff --git a/src/thermophysicalModels/liquidProperties/C6H6/C6H6.H b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H6/C6H6.H rename to src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6.H diff --git a/src/thermophysicalModels/liquidProperties/C6H6/C6H6I.H b/src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C6H6/C6H6I.H rename to src/thermophysicalModels/properties/liquidProperties/C6H6/C6H6I.H diff --git a/src/thermophysicalModels/liquidProperties/C7H16/C7H16.C b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H16/C7H16.C rename to src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.C diff --git a/src/thermophysicalModels/liquidProperties/C7H16/C7H16.H b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H16/C7H16.H rename to src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16.H diff --git a/src/thermophysicalModels/liquidProperties/C7H16/C7H16I.H b/src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H16/C7H16I.H rename to src/thermophysicalModels/properties/liquidProperties/C7H16/C7H16I.H diff --git a/src/thermophysicalModels/liquidProperties/C7H8/C7H8.C b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H8/C7H8.C rename to src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.C diff --git a/src/thermophysicalModels/liquidProperties/C7H8/C7H8.H b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H8/C7H8.H rename to src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8.H diff --git a/src/thermophysicalModels/liquidProperties/C7H8/C7H8I.H b/src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C7H8/C7H8I.H rename to src/thermophysicalModels/properties/liquidProperties/C7H8/C7H8I.H diff --git a/src/thermophysicalModels/liquidProperties/C8H10/C8H10.C b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H10/C8H10.C rename to src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.C diff --git a/src/thermophysicalModels/liquidProperties/C8H10/C8H10.H b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H10/C8H10.H rename to src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10.H diff --git a/src/thermophysicalModels/liquidProperties/C8H10/C8H10I.H b/src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H10/C8H10I.H rename to src/thermophysicalModels/properties/liquidProperties/C8H10/C8H10I.H diff --git a/src/thermophysicalModels/liquidProperties/C8H18/C8H18.C b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H18/C8H18.C rename to src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.C diff --git a/src/thermophysicalModels/liquidProperties/C8H18/C8H18.H b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H18/C8H18.H rename to src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18.H diff --git a/src/thermophysicalModels/liquidProperties/C8H18/C8H18I.H b/src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C8H18/C8H18I.H rename to src/thermophysicalModels/properties/liquidProperties/C8H18/C8H18I.H diff --git a/src/thermophysicalModels/liquidProperties/C9H20/C9H20.C b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/C9H20/C9H20.C rename to src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.C diff --git a/src/thermophysicalModels/liquidProperties/C9H20/C9H20.H b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C9H20/C9H20.H rename to src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20.H diff --git a/src/thermophysicalModels/liquidProperties/C9H20/C9H20I.H b/src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/C9H20/C9H20I.H rename to src/thermophysicalModels/properties/liquidProperties/C9H20/C9H20I.H diff --git a/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.C b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.C rename to src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.C diff --git a/src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.H b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH3OH/CH3OH.H rename to src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OH.H diff --git a/src/thermophysicalModels/liquidProperties/CH3OH/CH3OHI.H b/src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH3OH/CH3OHI.H rename to src/thermophysicalModels/properties/liquidProperties/CH3OH/CH3OHI.H diff --git a/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.C b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.C rename to src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.C diff --git a/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.H b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2O.H rename to src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2O.H diff --git a/src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/CH4N2O/CH4N2OI.H rename to src/thermophysicalModels/properties/liquidProperties/CH4N2O/CH4N2OI.H diff --git a/src/thermophysicalModels/liquidProperties/H2O/H2O.C b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/H2O/H2O.C rename to src/thermophysicalModels/properties/liquidProperties/H2O/H2O.C diff --git a/src/thermophysicalModels/liquidProperties/H2O/H2O.H b/src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/H2O/H2O.H rename to src/thermophysicalModels/properties/liquidProperties/H2O/H2O.H diff --git a/src/thermophysicalModels/liquidProperties/H2O/H2OI.H b/src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/H2O/H2OI.H rename to src/thermophysicalModels/properties/liquidProperties/H2O/H2OI.H diff --git a/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.C b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.C rename to src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.C diff --git a/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.H b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/IC8H18/IC8H18.H rename to src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18.H diff --git a/src/thermophysicalModels/liquidProperties/IC8H18/IC8H18I.H b/src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/IC8H18/IC8H18I.H rename to src/thermophysicalModels/properties/liquidProperties/IC8H18/IC8H18I.H diff --git a/src/thermophysicalModels/liquidProperties/IDEA/IDEA.C b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/IDEA/IDEA.C rename to src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.C diff --git a/src/thermophysicalModels/liquidProperties/IDEA/IDEA.H b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/IDEA/IDEA.H rename to src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.H diff --git a/src/thermophysicalModels/liquidProperties/IDEA/IDEA.thermo b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.thermo similarity index 100% rename from src/thermophysicalModels/liquidProperties/IDEA/IDEA.thermo rename to src/thermophysicalModels/properties/liquidProperties/IDEA/IDEA.thermo diff --git a/src/thermophysicalModels/liquidProperties/IDEA/IDEAI.H b/src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/IDEA/IDEAI.H rename to src/thermophysicalModels/properties/liquidProperties/IDEA/IDEAI.H diff --git a/src/thermophysicalModels/liquidProperties/MB/MB.C b/src/thermophysicalModels/properties/liquidProperties/MB/MB.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/MB/MB.C rename to src/thermophysicalModels/properties/liquidProperties/MB/MB.C diff --git a/src/thermophysicalModels/liquidProperties/MB/MB.H b/src/thermophysicalModels/properties/liquidProperties/MB/MB.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/MB/MB.H rename to src/thermophysicalModels/properties/liquidProperties/MB/MB.H diff --git a/src/thermophysicalModels/liquidProperties/MB/MBI.H b/src/thermophysicalModels/properties/liquidProperties/MB/MBI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/MB/MBI.H rename to src/thermophysicalModels/properties/liquidProperties/MB/MBI.H diff --git a/src/thermophysicalModels/liquidProperties/Make/files b/src/thermophysicalModels/properties/liquidProperties/Make/files similarity index 100% rename from src/thermophysicalModels/liquidProperties/Make/files rename to src/thermophysicalModels/properties/liquidProperties/Make/files diff --git a/src/thermophysicalModels/liquidProperties/Make/options b/src/thermophysicalModels/properties/liquidProperties/Make/options similarity index 100% rename from src/thermophysicalModels/liquidProperties/Make/options rename to src/thermophysicalModels/properties/liquidProperties/Make/options diff --git a/src/thermophysicalModels/liquidProperties/N2/N2.C b/src/thermophysicalModels/properties/liquidProperties/N2/N2.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/N2/N2.C rename to src/thermophysicalModels/properties/liquidProperties/N2/N2.C diff --git a/src/thermophysicalModels/liquidProperties/N2/N2.H b/src/thermophysicalModels/properties/liquidProperties/N2/N2.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/N2/N2.H rename to src/thermophysicalModels/properties/liquidProperties/N2/N2.H diff --git a/src/thermophysicalModels/liquidProperties/N2/N2I.H b/src/thermophysicalModels/properties/liquidProperties/N2/N2I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/N2/N2I.H rename to src/thermophysicalModels/properties/liquidProperties/N2/N2I.H diff --git a/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.C rename to src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.C diff --git a/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3.H rename to src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3.H diff --git a/src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/aC10H7CH3/aC10H7CH3I.H rename to src/thermophysicalModels/properties/liquidProperties/aC10H7CH3/aC10H7CH3I.H diff --git a/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.C rename to src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.C diff --git a/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3.H rename to src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3.H diff --git a/src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/bC10H7CH3/bC10H7CH3I.H rename to src/thermophysicalModels/properties/liquidProperties/bC10H7CH3/bC10H7CH3I.H diff --git a/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.C rename to src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.C diff --git a/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8O.H rename to src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8O.H diff --git a/src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/iC3H8O/iC3H8OI.H rename to src/thermophysicalModels/properties/liquidProperties/iC3H8O/iC3H8OI.H diff --git a/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.C rename to src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.C diff --git a/src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/liquidProperties/liquidProperties.H rename to src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidProperties.H diff --git a/src/thermophysicalModels/liquidProperties/liquidProperties/liquidPropertiesI.H b/src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/liquidProperties/liquidPropertiesI.H rename to src/thermophysicalModels/properties/liquidProperties/liquidProperties/liquidPropertiesI.H diff --git a/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.C b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C similarity index 100% rename from src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.C rename to src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.C diff --git a/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.H b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8O.H rename to src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8O.H diff --git a/src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H similarity index 100% rename from src/thermophysicalModels/liquidProperties/nC3H8O/nC3H8OI.H rename to src/thermophysicalModels/properties/liquidProperties/nC3H8O/nC3H8OI.H diff --git a/src/thermophysicalModels/solidMixtureProperties/Make/files b/src/thermophysicalModels/properties/solidMixtureProperties/Make/files similarity index 100% rename from src/thermophysicalModels/solidMixtureProperties/Make/files rename to src/thermophysicalModels/properties/solidMixtureProperties/Make/files diff --git a/src/thermophysicalModels/properties/solidMixtureProperties/Make/options b/src/thermophysicalModels/properties/solidMixtureProperties/Make/options new file mode 100644 index 0000000000..f2d8f809d5 --- /dev/null +++ b/src/thermophysicalModels/properties/solidMixtureProperties/Make/options @@ -0,0 +1,3 @@ +EXE_INC = \ + -I${LIB_SRC}/thermophysicalModels/properties/solidProperties/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude diff --git a/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C b/src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C similarity index 100% rename from src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C rename to src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.C diff --git a/src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H b/src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H similarity index 100% rename from src/thermophysicalModels/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H rename to src/thermophysicalModels/properties/solidMixtureProperties/solidMixtureProperties/solidMixtureProperties.H diff --git a/src/thermophysicalModels/solidProperties/C/C.C b/src/thermophysicalModels/properties/solidProperties/C/C.C similarity index 100% rename from src/thermophysicalModels/solidProperties/C/C.C rename to src/thermophysicalModels/properties/solidProperties/C/C.C diff --git a/src/thermophysicalModels/solidProperties/C/C.H b/src/thermophysicalModels/properties/solidProperties/C/C.H similarity index 100% rename from src/thermophysicalModels/solidProperties/C/C.H rename to src/thermophysicalModels/properties/solidProperties/C/C.H diff --git a/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.C b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C similarity index 100% rename from src/thermophysicalModels/solidProperties/CaCO3/CaCO3.C rename to src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.C diff --git a/src/thermophysicalModels/solidProperties/CaCO3/CaCO3.H b/src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H similarity index 100% rename from src/thermophysicalModels/solidProperties/CaCO3/CaCO3.H rename to src/thermophysicalModels/properties/solidProperties/CaCO3/CaCO3.H diff --git a/src/thermophysicalModels/solidProperties/Make/files b/src/thermophysicalModels/properties/solidProperties/Make/files similarity index 100% rename from src/thermophysicalModels/solidProperties/Make/files rename to src/thermophysicalModels/properties/solidProperties/Make/files diff --git a/src/thermophysicalModels/solidProperties/Make/options b/src/thermophysicalModels/properties/solidProperties/Make/options similarity index 100% rename from src/thermophysicalModels/solidProperties/Make/options rename to src/thermophysicalModels/properties/solidProperties/Make/options diff --git a/src/thermophysicalModels/solidProperties/ash/ash.C b/src/thermophysicalModels/properties/solidProperties/ash/ash.C similarity index 100% rename from src/thermophysicalModels/solidProperties/ash/ash.C rename to src/thermophysicalModels/properties/solidProperties/ash/ash.C diff --git a/src/thermophysicalModels/solidProperties/ash/ash.H b/src/thermophysicalModels/properties/solidProperties/ash/ash.H similarity index 100% rename from src/thermophysicalModels/solidProperties/ash/ash.H rename to src/thermophysicalModels/properties/solidProperties/ash/ash.H diff --git a/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C similarity index 100% rename from src/thermophysicalModels/solidProperties/solidProperties/solidProperties.C rename to src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.C diff --git a/src/thermophysicalModels/solidProperties/solidProperties/solidProperties.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H similarity index 100% rename from src/thermophysicalModels/solidProperties/solidProperties/solidProperties.H rename to src/thermophysicalModels/properties/solidProperties/solidProperties/solidProperties.H diff --git a/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesI.H b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H similarity index 100% rename from src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesI.H rename to src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesI.H diff --git a/src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesNew.C b/src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C similarity index 100% rename from src/thermophysicalModels/solidProperties/solidProperties/solidPropertiesNew.C rename to src/thermophysicalModels/properties/solidProperties/solidProperties/solidPropertiesNew.C diff --git a/src/thermophysicalModels/solidMixtureProperties/Make/options b/src/thermophysicalModels/solidMixtureProperties/Make/options deleted file mode 100644 index a7802dcbf8..0000000000 --- a/src/thermophysicalModels/solidMixtureProperties/Make/options +++ /dev/null @@ -1,3 +0,0 @@ -EXE_INC = \ - -I${LIB_SRC}/thermophysicalModels/solidProperties/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude From 7b5670073762d656dd9f0ef92e2057972fd43d0d Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 1 Feb 2011 17:05:43 +0000 Subject: [PATCH 038/367] ENH: Moved pdfs to lagrangian models --- src/lagrangian/Allwmake | 1 + src/{thermophysicalModels => lagrangian}/pdfs/Make/files | 0 src/{thermophysicalModels => lagrangian}/pdfs/Make/options | 0 .../pdfs/RosinRammler/RosinRammler.C | 0 .../pdfs/RosinRammler/RosinRammler.H | 0 .../pdfs/exponential/exponential.C | 0 .../pdfs/exponential/exponential.H | 0 .../pdfs/fixedValue/fixedValue.C | 0 .../pdfs/fixedValue/fixedValue.H | 0 src/{thermophysicalModels => lagrangian}/pdfs/general/general.C | 0 src/{thermophysicalModels => lagrangian}/pdfs/general/general.H | 0 .../pdfs/multiNormal/multiNormal.C | 0 .../pdfs/multiNormal/multiNormal.H | 0 src/{thermophysicalModels => lagrangian}/pdfs/normal/normal.C | 0 src/{thermophysicalModels => lagrangian}/pdfs/normal/normal.H | 0 src/{thermophysicalModels => lagrangian}/pdfs/pdf/pdf.C | 0 src/{thermophysicalModels => lagrangian}/pdfs/pdf/pdf.H | 0 src/{thermophysicalModels => lagrangian}/pdfs/pdf/pdfNew.C | 0 src/{thermophysicalModels => lagrangian}/pdfs/uniform/uniform.C | 0 src/{thermophysicalModels => lagrangian}/pdfs/uniform/uniform.H | 0 src/thermophysicalModels/Allwmake | 1 - 21 files changed, 1 insertion(+), 1 deletion(-) rename src/{thermophysicalModels => lagrangian}/pdfs/Make/files (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/Make/options (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/RosinRammler/RosinRammler.C (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/RosinRammler/RosinRammler.H (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/exponential/exponential.C (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/exponential/exponential.H (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/fixedValue/fixedValue.C (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/fixedValue/fixedValue.H (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/general/general.C (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/general/general.H (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/multiNormal/multiNormal.C (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/multiNormal/multiNormal.H (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/normal/normal.C (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/normal/normal.H (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/pdf/pdf.C (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/pdf/pdf.H (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/pdf/pdfNew.C (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/uniform/uniform.C (100%) rename src/{thermophysicalModels => lagrangian}/pdfs/uniform/uniform.H (100%) diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake index e04d7480fb..93d014f5cb 100755 --- a/src/lagrangian/Allwmake +++ b/src/lagrangian/Allwmake @@ -3,6 +3,7 @@ cd ${0%/*} || exit 1 # run from this directory [ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x +wmake $makeOption pdfs wmake $makeOption basic wmake $makeOption solidParticle wmake $makeOption intermediate diff --git a/src/thermophysicalModels/pdfs/Make/files b/src/lagrangian/pdfs/Make/files similarity index 100% rename from src/thermophysicalModels/pdfs/Make/files rename to src/lagrangian/pdfs/Make/files diff --git a/src/thermophysicalModels/pdfs/Make/options b/src/lagrangian/pdfs/Make/options similarity index 100% rename from src/thermophysicalModels/pdfs/Make/options rename to src/lagrangian/pdfs/Make/options diff --git a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C b/src/lagrangian/pdfs/RosinRammler/RosinRammler.C similarity index 100% rename from src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C rename to src/lagrangian/pdfs/RosinRammler/RosinRammler.C diff --git a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H b/src/lagrangian/pdfs/RosinRammler/RosinRammler.H similarity index 100% rename from src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H rename to src/lagrangian/pdfs/RosinRammler/RosinRammler.H diff --git a/src/thermophysicalModels/pdfs/exponential/exponential.C b/src/lagrangian/pdfs/exponential/exponential.C similarity index 100% rename from src/thermophysicalModels/pdfs/exponential/exponential.C rename to src/lagrangian/pdfs/exponential/exponential.C diff --git a/src/thermophysicalModels/pdfs/exponential/exponential.H b/src/lagrangian/pdfs/exponential/exponential.H similarity index 100% rename from src/thermophysicalModels/pdfs/exponential/exponential.H rename to src/lagrangian/pdfs/exponential/exponential.H diff --git a/src/thermophysicalModels/pdfs/fixedValue/fixedValue.C b/src/lagrangian/pdfs/fixedValue/fixedValue.C similarity index 100% rename from src/thermophysicalModels/pdfs/fixedValue/fixedValue.C rename to src/lagrangian/pdfs/fixedValue/fixedValue.C diff --git a/src/thermophysicalModels/pdfs/fixedValue/fixedValue.H b/src/lagrangian/pdfs/fixedValue/fixedValue.H similarity index 100% rename from src/thermophysicalModels/pdfs/fixedValue/fixedValue.H rename to src/lagrangian/pdfs/fixedValue/fixedValue.H diff --git a/src/thermophysicalModels/pdfs/general/general.C b/src/lagrangian/pdfs/general/general.C similarity index 100% rename from src/thermophysicalModels/pdfs/general/general.C rename to src/lagrangian/pdfs/general/general.C diff --git a/src/thermophysicalModels/pdfs/general/general.H b/src/lagrangian/pdfs/general/general.H similarity index 100% rename from src/thermophysicalModels/pdfs/general/general.H rename to src/lagrangian/pdfs/general/general.H diff --git a/src/thermophysicalModels/pdfs/multiNormal/multiNormal.C b/src/lagrangian/pdfs/multiNormal/multiNormal.C similarity index 100% rename from src/thermophysicalModels/pdfs/multiNormal/multiNormal.C rename to src/lagrangian/pdfs/multiNormal/multiNormal.C diff --git a/src/thermophysicalModels/pdfs/multiNormal/multiNormal.H b/src/lagrangian/pdfs/multiNormal/multiNormal.H similarity index 100% rename from src/thermophysicalModels/pdfs/multiNormal/multiNormal.H rename to src/lagrangian/pdfs/multiNormal/multiNormal.H diff --git a/src/thermophysicalModels/pdfs/normal/normal.C b/src/lagrangian/pdfs/normal/normal.C similarity index 100% rename from src/thermophysicalModels/pdfs/normal/normal.C rename to src/lagrangian/pdfs/normal/normal.C diff --git a/src/thermophysicalModels/pdfs/normal/normal.H b/src/lagrangian/pdfs/normal/normal.H similarity index 100% rename from src/thermophysicalModels/pdfs/normal/normal.H rename to src/lagrangian/pdfs/normal/normal.H diff --git a/src/thermophysicalModels/pdfs/pdf/pdf.C b/src/lagrangian/pdfs/pdf/pdf.C similarity index 100% rename from src/thermophysicalModels/pdfs/pdf/pdf.C rename to src/lagrangian/pdfs/pdf/pdf.C diff --git a/src/thermophysicalModels/pdfs/pdf/pdf.H b/src/lagrangian/pdfs/pdf/pdf.H similarity index 100% rename from src/thermophysicalModels/pdfs/pdf/pdf.H rename to src/lagrangian/pdfs/pdf/pdf.H diff --git a/src/thermophysicalModels/pdfs/pdf/pdfNew.C b/src/lagrangian/pdfs/pdf/pdfNew.C similarity index 100% rename from src/thermophysicalModels/pdfs/pdf/pdfNew.C rename to src/lagrangian/pdfs/pdf/pdfNew.C diff --git a/src/thermophysicalModels/pdfs/uniform/uniform.C b/src/lagrangian/pdfs/uniform/uniform.C similarity index 100% rename from src/thermophysicalModels/pdfs/uniform/uniform.C rename to src/lagrangian/pdfs/uniform/uniform.C diff --git a/src/thermophysicalModels/pdfs/uniform/uniform.H b/src/lagrangian/pdfs/uniform/uniform.H similarity index 100% rename from src/thermophysicalModels/pdfs/uniform/uniform.H rename to src/lagrangian/pdfs/uniform/uniform.H diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index 9e9514e528..a3cb03d44c 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -12,7 +12,6 @@ wmake $makeOption basic wmake $makeOption reactionThermo wmake $makeOption laminarFlameSpeed wmake $makeOption chemistryModel -wmake $makeOption pdfs wmake $makeOption radiationModels wmake $makeOption barotropicCompressibilityModel wmake $makeOption thermalPorousZone From 161991032ef3822fed883759406ccdc82d8cd3b9 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 1 Feb 2011 18:23:08 +0100 Subject: [PATCH 039/367] STYLE: deactivate coco-cpp until its future is clearer --- src/OpenFOAM/Make/files | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index bf4c345bec..7e293fc7eb 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -164,11 +164,16 @@ $(functionEntries)/includeIfPresentEntry/includeIfPresentEntry.C $(functionEntries)/inputModeEntry/inputModeEntry.C $(functionEntries)/removeEntry/removeEntry.C -calcEntry = $(functionEntries)/calcEntry -$(calcEntry)/calcEntryParser.atg -$(calcEntry)/calcEntryInternal.C -$(calcEntry)/calcEntry.C - +/* + * Requires customized coco-cpp + * could be dropped or activated in the future + */ +/* + calcEntry = $(functionEntries)/calcEntry + $(calcEntry)/calcEntryParser.atg + $(calcEntry)/calcEntryInternal.C + $(calcEntry)/calcEntry.C +*/ IOdictionary = db/IOobjects/IOdictionary $(IOdictionary)/IOdictionary.C From 1129edaf53da3fd313d894d4317ed1a5df0f9ad0 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 1 Feb 2011 18:34:19 +0100 Subject: [PATCH 040/367] STYLE: apps/paraview3/bashrc-EXAMPLE to guide people with non-standard paraview --- etc/apps/paraview3/bashrc-EXAMPLE | 46 +++++++++++++++++++++++++++++++ etc/bashrc | 12 ++++---- 2 files changed, 52 insertions(+), 6 deletions(-) create mode 100644 etc/apps/paraview3/bashrc-EXAMPLE diff --git a/etc/apps/paraview3/bashrc-EXAMPLE b/etc/apps/paraview3/bashrc-EXAMPLE new file mode 100644 index 0000000000..8db47a9ec7 --- /dev/null +++ b/etc/apps/paraview3/bashrc-EXAMPLE @@ -0,0 +1,46 @@ +#----------------------------------*-sh-*-------------------------------------- +# ========= | +# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox +# \\ / O peration | +# \\ / A nd | Copyright (C) 2011-2011 OpenCFD Ltd. +# \\/ M anipulation | +#------------------------------------------------------------------------------ +# License +# This file is part of OpenFOAM. +# +# OpenFOAM is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# OpenFOAM is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +# for more details. +# +# You should have received a copy of the GNU General Public License +# along with OpenFOAM. If not, see . +# +# File +# paraview3/bashrc-EXAMPLE +# +# Description +# Example of chaining to the standard paraview3/bashrc with a +# different ParaView_VERSION +# +# Note +# This file could be copied to a user or site location, but should never +# replace the default shipped version as this will cause an infinite loop +# +#------------------------------------------------------------------------------ + +# +# Use other (shipped) bashrc with a different ParaView_VERSION +# + +foamFile=$($WM_PROJECT_DIR/bin/foamEtcFile -mode o apps/paraview3/bashrc 2>/dev/null) +[ $? -eq 0 ] && . $foamFile ParaView_VERSION=3.9.0 + +unset foamFile + +# ----------------------------------------------------------------------------- diff --git a/etc/bashrc b/etc/bashrc index 95c83e82f8..310d5fe00d 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -122,12 +122,12 @@ export WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION # Source files, possibly with some verbosity _foamSource() { - while [ $# -ge 1 ] - do - [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "Sourcing: $1" - . $1 - shift - done + while [ $# -ge 1 ] + do + [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "Sourcing: $1" + . $1 + shift + done } # Evaluate command-line parameters From 1a03d43b57f3ec5788d16e79269e1227abe0d039 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 1 Feb 2011 18:50:19 +0100 Subject: [PATCH 041/367] STYLE: remove comments referring to '' or ' ' --- .../manipulation/insideCells/insideCells.C | 30 +++++++++++-------- .../writers/dx/dxSurfaceWriter.H | 10 +++---- .../writers/ensight/ensightSurfaceWriter.H | 10 +++---- .../writers/foamFile/foamFileSurfaceWriter.H | 10 +++---- .../writers/raw/rawSurfaceWriter.H | 10 +++---- .../writers/starcd/starcdSurfaceWriter.H | 6 ++-- .../sampledSurface/writers/surfaceWriter.H | 12 ++++---- .../writers/vtk/vtkSurfaceWriter.H | 10 +++---- 8 files changed, 52 insertions(+), 46 deletions(-) diff --git a/applications/utilities/mesh/manipulation/insideCells/insideCells.C b/applications/utilities/mesh/manipulation/insideCells/insideCells.C index 967240701e..16a37594d8 100644 --- a/applications/utilities/mesh/manipulation/insideCells/insideCells.C +++ b/applications/utilities/mesh/manipulation/insideCells/insideCells.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,8 +22,8 @@ License along with OpenFOAM. If not, see . Description - Picks up cells with cell centre 'inside' of surface. Requires surface - to be closed and singly connected. + Picks up cells with cell centre 'inside' of surface. + Requires surface to be closed and singly connected. \*---------------------------------------------------------------------------*/ @@ -42,9 +42,16 @@ using namespace Foam; int main(int argc, char *argv[]) { + argList::addNote + ( + "Create a cellSet for cells with their centres inside the defined " + "surface.\n" + "Surface must be closed and singly connected." + ); + argList::noParallel(); - argList::validArgs.append("surface file"); - argList::validArgs.append("destination cellSet"); + argList::validArgs.append("surfaceFile"); + argList::validArgs.append("cellSet"); # include "setRootCase.H" # include "createTime.H" @@ -75,14 +82,13 @@ int main(int argc, char *argv[]) } - Info<< "Selected " << insideCells.size() - << " cells out of " << mesh.nCells() << endl - << endl + Info<< "Selected " << insideCells.size() << " of " << mesh.nCells() + << " cells" << nl << nl << "Writing selected cells to cellSet " << insideCells.name() - << endl << endl - << "Use this cellSet e.g. with subsetMesh : " << endl << endl - << " subsetMesh " << insideCells.name() - << endl << endl; + << nl << nl + << "Use this cellSet e.g. with subsetMesh : " << nl << nl + << " subsetMesh " << insideCells.name() + << nl << endl; insideCells.write(); diff --git a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H index e4e3af67e6..6ff54c775f 100644 --- a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/dx/dxSurfaceWriter.H @@ -96,7 +96,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -110,7 +110,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -124,7 +124,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -138,7 +138,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -152,7 +152,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, diff --git a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H index 628c178d4e..ca42fa8f08 100644 --- a/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.H @@ -117,7 +117,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -131,7 +131,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -145,7 +145,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -159,7 +159,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -173,7 +173,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, diff --git a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H index ce19c21455..7912a65acf 100644 --- a/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/foamFile/foamFileSurfaceWriter.H @@ -107,7 +107,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -121,7 +121,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -135,7 +135,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -149,7 +149,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -163,7 +163,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, diff --git a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H index 5ec4d1ac30..c08b0eee5e 100644 --- a/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/raw/rawSurfaceWriter.H @@ -128,7 +128,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -142,7 +142,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -156,7 +156,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -170,7 +170,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -184,7 +184,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, diff --git a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H index bf0a0eb824..be537abed0 100644 --- a/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/starcd/starcdSurfaceWriter.H @@ -129,7 +129,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -143,7 +143,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -157,7 +157,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, diff --git a/src/sampling/sampledSurface/writers/surfaceWriter.H b/src/sampling/sampledSurface/writers/surfaceWriter.H index be26517849..f9d0587164 100644 --- a/src/sampling/sampledSurface/writers/surfaceWriter.H +++ b/src/sampling/sampledSurface/writers/surfaceWriter.H @@ -119,7 +119,7 @@ public: //- Write single surface geometry to file. virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -132,7 +132,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -147,7 +147,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -162,7 +162,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -177,7 +177,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -192,7 +192,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, diff --git a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H index 322159094b..75af4a347e 100644 --- a/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H +++ b/src/sampling/sampledSurface/writers/vtk/vtkSurfaceWriter.H @@ -105,7 +105,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -119,7 +119,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -133,7 +133,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -147,7 +147,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, @@ -161,7 +161,7 @@ public: // One value per face or vertex (isNodeValues = true) virtual void write ( - const fileName& outputDir, // //surface/TIME + const fileName& outputDir, // /surface/TIME const fileName& surfaceName, // name of surface const pointField& points, const faceList& faces, From 6c1e58605bc39e5c432a29c98eecbd77d21f6c5d Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 2 Feb 2011 09:28:44 +0000 Subject: [PATCH 042/367] ENH: moved thermo/pdfs->lagrangian/distributionModels --- .../combustion/dieselEngineFoam/Make/options | 2 +- .../combustion/dieselFoam/Make/options | 2 +- .../lagrangian/coalChemistryFoam/Make/options | 2 +- .../Make/options | 2 +- .../reactingParcelFilmFoam/Make/options | 2 +- .../reactingParcelFoam/Make/options | 2 +- .../steadyReactingParcelFoam/Make/options | 2 +- .../foamDebugSwitches/Make/options | 2 +- .../miscellaneous/pdfPlot/Make/options | 4 +- .../miscellaneous/pdfPlot/createFields.H | 9 ++- .../miscellaneous/pdfPlot/pdfPlot.C | 4 +- src/lagrangian/Allwmake | 2 +- src/lagrangian/coalCombustion/Make/options | 4 +- src/lagrangian/dieselSpray/Make/options | 4 +- .../injectorModel/Chomiak/Chomiak.C | 14 ++--- .../injectorModel/Chomiak/Chomiak.H | 8 +-- .../definedHollowCone/definedHollowCone.C | 12 ++-- .../definedHollowCone/definedHollowCone.H | 8 +-- .../injectorModel/hollowCone/hollowCone.C | 10 +-- .../injectorModel/hollowCone/hollowCone.H | 6 +- .../{pdfs => distributionModels}/Make/files | 6 +- .../{pdfs => distributionModels}/Make/options | 0 .../RosinRammler/RosinRammler.C | 30 ++++----- .../RosinRammler/RosinRammler.H | 20 +++--- .../distributionModel/distributionModel.C} | 61 ++++++++++++------- .../distributionModel/distributionModel.H} | 61 +++++++++++-------- .../distributionModel/distributionModelNew.C} | 26 +++++--- .../exponential/exponential.C | 28 ++++----- .../exponential/exponential.H | 18 +++--- .../fixedValue/fixedValue.C | 28 +++++---- .../fixedValue/fixedValue.H | 20 +++--- .../general/general.C | 30 +++++---- .../general/general.H | 18 +++--- .../multiNormal/multiNormal.C | 32 +++++----- .../multiNormal/multiNormal.H | 20 +++--- .../normal/normal.C | 36 ++++++----- .../normal/normal.H | 22 +++---- .../uniform/uniform.C | 30 +++++---- .../uniform/uniform.H | 18 +++--- src/lagrangian/intermediate/Make/options | 4 +- .../ConeInjection/ConeInjection.C | 10 +-- .../ConeInjection/ConeInjection.H | 10 +-- .../ConeInjectionMP/ConeInjectionMP.C | 10 +-- .../ConeInjectionMP/ConeInjectionMP.H | 10 +-- .../FieldActivatedInjection.C | 12 ++-- .../FieldActivatedInjection.H | 8 +-- .../InflationInjection/InflationInjection.C | 22 +++---- .../InflationInjection/InflationInjection.H | 8 +-- .../ManualInjection/ManualInjection.C | 12 ++-- .../ManualInjection/ManualInjection.H | 10 +-- .../PatchInjection/PatchInjection.C | 16 +++-- .../PatchInjection/PatchInjection.H | 10 +-- src/surfaceFilmModels/Make/options | 4 +- .../cloudInjection/cloudInjection.C | 15 +++-- .../cloudInjection/cloudInjection.H | 7 ++- .../aachenBomb/constant/sprayProperties | 6 +- .../constant/coalCloud1Properties | 4 +- .../constant/limestoneCloud1Properties | 4 +- .../constant/reactingCloud1Properties | 4 +- .../constant/reactingCloud1Properties | 4 +- .../constant/reactingCloud1Properties | 4 +- .../hotBoxes/constant/surfaceFilmProperties | 4 +- .../constant/reactingCloud1Properties | 4 +- .../constant/surfaceFilmProperties | 4 +- .../constant/reactingCloud1Properties | 4 +- .../constant/kinematicCloud1Properties | 4 +- .../constant/thermoCloud1Properties | 4 +- .../constant/reactingCloud1Properties | 4 +- 68 files changed, 447 insertions(+), 380 deletions(-) rename src/lagrangian/{pdfs => distributionModels}/Make/files (56%) rename src/lagrangian/{pdfs => distributionModels}/Make/options (100%) rename src/lagrangian/{pdfs => distributionModels}/RosinRammler/RosinRammler.C (69%) rename src/lagrangian/{pdfs => distributionModels}/RosinRammler/RosinRammler.H (86%) rename src/lagrangian/{pdfs/pdf/pdf.C => distributionModels/distributionModel/distributionModel.C} (54%) rename src/lagrangian/{pdfs/pdf/pdf.H => distributionModels/distributionModel/distributionModel.H} (68%) rename src/lagrangian/{pdfs/pdf/pdfNew.C => distributionModels/distributionModel/distributionModelNew.C} (68%) rename src/lagrangian/{pdfs => distributionModels}/exponential/exponential.C (70%) rename src/lagrangian/{pdfs => distributionModels}/exponential/exponential.H (86%) rename src/lagrangian/{pdfs => distributionModels}/fixedValue/fixedValue.C (69%) rename src/lagrangian/{pdfs => distributionModels}/fixedValue/fixedValue.H (84%) rename src/lagrangian/{pdfs => distributionModels}/general/general.C (81%) rename src/lagrangian/{pdfs => distributionModels}/general/general.H (87%) rename src/lagrangian/{pdfs => distributionModels}/multiNormal/multiNormal.C (76%) rename src/lagrangian/{pdfs => distributionModels}/multiNormal/multiNormal.H (85%) rename src/lagrangian/{pdfs => distributionModels}/normal/normal.C (75%) rename src/lagrangian/{pdfs => distributionModels}/normal/normal.H (83%) rename src/lagrangian/{pdfs => distributionModels}/uniform/uniform.C (70%) rename src/lagrangian/{pdfs => distributionModels}/uniform/uniform.H (86%) diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options index 5f047de258..c4d65fa137 100644 --- a/applications/solvers/combustion/dieselEngineFoam/Make/options +++ b/applications/solvers/combustion/dieselEngineFoam/Make/options @@ -35,4 +35,4 @@ EXE_LIBS = \ -llaminarFlameSpeedModels \ -lchemistryModel \ -lODE \ - -lpdf + -ldistributionModels diff --git a/applications/solvers/combustion/dieselFoam/Make/options b/applications/solvers/combustion/dieselFoam/Make/options index 427ccfc98b..124371575d 100644 --- a/applications/solvers/combustion/dieselFoam/Make/options +++ b/applications/solvers/combustion/dieselFoam/Make/options @@ -32,5 +32,5 @@ EXE_LIBS = \ -llaminarFlameSpeedModels \ -lchemistryModel \ -lODE \ - -lpdf \ + -ldistributionModels \ -lfiniteVolume diff --git a/applications/solvers/lagrangian/coalChemistryFoam/Make/options b/applications/solvers/lagrangian/coalChemistryFoam/Make/options index 17cd096198..a2e3c13d24 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options index 063236d23e..e679c15b7e 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options index 9b9f551e8d..ba7c9544a8 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -2,7 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ - -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/solidProperties/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index 579a6e47db..062f9fbd28 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ diff --git a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options index 063236d23e..e679c15b7e 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/coalCombustion/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index 9641909235..826bc4c144 100644 --- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options +++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options @@ -41,7 +41,7 @@ EXE_LIBS = \ -lmolecule \ -lODE \ -lOpenFOAM \ - -lpdf \ + -ldistributionModels \ -lpotential \ -lradiationModels \ -lrandomProcesses \ diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options b/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options index a140053895..0cb69c876f 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/Make/options @@ -1,8 +1,8 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude EXE_LIBS = \ - -lpdf \ + -ldistributionModels \ -lsampling diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H index 8e9d055d74..a269ef7448 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H @@ -22,7 +22,14 @@ cachedRandom rndGen(label(0), -1); - autoPtr p(pdfs::pdf::New(pdfDictionary, rndGen)); + autoPtr p + ( + distributionModels::distributionModel::New + ( + pdfDictionary, + rndGen + ) + ); const scalar xMin = p->minValue(); const scalar xMax = p->maxValue(); diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C index d9c9388adc..1a92c004a2 100644 --- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C +++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/pdfPlot.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,7 +27,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "pdf.H" +#include "distributionModel.H" #include "makeGraph.H" #include "OFstream.H" diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake index 93d014f5cb..908338e62f 100755 --- a/src/lagrangian/Allwmake +++ b/src/lagrangian/Allwmake @@ -3,7 +3,7 @@ cd ${0%/*} || exit 1 # run from this directory [ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -wmake $makeOption pdfs +wmake $makeOption distributionModels wmake $makeOption basic wmake $makeOption solidParticle wmake $makeOption intermediate diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options index dc7db16ea7..33cc415fdf 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -3,7 +3,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ @@ -25,7 +25,7 @@ LIB_LIBS = \ -lmeshTools \ -llagrangian \ -llagrangianIntermediate \ - -lpdf \ + -ldistributionModels \ -lspecie \ -lbasicThermophysicalModels \ -lliquidProperties \ diff --git a/src/lagrangian/dieselSpray/Make/options b/src/lagrangian/dieselSpray/Make/options index 8465ce4ed2..4d4eba8a2d 100644 --- a/src/lagrangian/dieselSpray/Make/options +++ b/src/lagrangian/dieselSpray/Make/options @@ -13,7 +13,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude LIB_LIBS = \ -llagrangian \ @@ -26,4 +26,4 @@ LIB_LIBS = \ -lliquidMixtureProperties \ -lthermophysicalFunctions \ -lspecie \ - -lpdf + -ldistributionModels diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C index 4f80e0c577..0318dbb1fa 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,11 +52,11 @@ Foam::ChomiakInjector::ChomiakInjector : injectorModel(dict, sm), ChomiakDict_(dict.subDict(typeName + "Coeffs")), - dropletPDF_ + dropletDistributionModel_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - ChomiakDict_.subDict("dropletPDF"), + ChomiakDict_.subDict("dropletDistributionModel"), sm.rndGen() ) ), @@ -101,7 +101,7 @@ Foam::scalar Foam::ChomiakInjector::d0 const scalar ) const { - return dropletPDF_->sample(); + return dropletDistributionModel_->sample(); } @@ -113,8 +113,8 @@ Foam::vector Foam::ChomiakInjector::direction const scalar d ) const { - scalar dMin = dropletPDF_->minValue(); - scalar dMax = dropletPDF_->maxValue(); + scalar dMin = dropletDistributionModel_->minValue(); + scalar dMax = dropletDistributionModel_->maxValue(); scalar angle = (d - dMax)*maxSprayAngle_[n] diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H index 41ca27335d..2803334068 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -27,7 +27,7 @@ Class Description Injector model based on an idea of Jerzy Chomiak. - Given the initial droplet size pdf in an interval d = (d0, d1), + Given the initial droplet size distributionModel in an interval d = (d0, d1), the spray angle phi = phi(d), such that the largest droplets have zero spray angle and the smallest droplets have maximum spray angle. @@ -41,7 +41,7 @@ Description #include "injectorModel.H" #include "scalarList.H" -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -63,7 +63,7 @@ private: dictionary ChomiakDict_; - autoPtr dropletPDF_; + autoPtr dropletDistributionModel_; scalarList maxSprayAngle_; diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C index 1fc417ba6f..17e65d4d5d 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,11 +52,11 @@ Foam::definedHollowConeInjector::definedHollowConeInjector : injectorModel(dict, sm), definedHollowConeDict_(dict.subDict(typeName + "Coeffs")), - dropletPDF_ + dropletDistributionModel_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - definedHollowConeDict_.subDict("dropletPDF"), + definedHollowConeDict_.subDict("dropletDistributionModel"), sm.rndGen() ) ), @@ -137,8 +137,8 @@ Foam::scalar Foam::definedHollowConeInjector::d0 ) const { // swallow function arguments - not used - // return value sampled from PDF - return dropletPDF_->sample(); + // return value sampled from distribution model + return dropletDistributionModel_->sample(); } diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H index 469b0e0ae5..ec08e64aea 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -29,7 +29,7 @@ Description - user defined: - inner/outer cone angle vs. time - - droplet PDF + - droplet distribution model \*---------------------------------------------------------------------------*/ @@ -38,7 +38,7 @@ Description #include "injectorModel.H" #include "vector.H" -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -60,7 +60,7 @@ private: typedef VectorSpace, scalar, 2> pair; dictionary definedHollowConeDict_; - autoPtr dropletPDF_; + autoPtr dropletDistributionModel_; // inner and outer cone angle time histories // 2 column vectors = (time, coneAngle) diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C index 3be1a660f1..198c30eaa8 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,11 +52,11 @@ Foam::hollowConeInjector::hollowConeInjector : injectorModel(dict, sm), hollowConeDict_(dict.subDict(typeName + "Coeffs")), - dropletPDF_ + dropletDistributionModel_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - hollowConeDict_.subDict("dropletPDF"), + hollowConeDict_.subDict("dropletDistributionModel"), sm.rndGen() ) ), @@ -112,7 +112,7 @@ Foam::scalar Foam::hollowConeInjector::d0 const scalar ) const { - return dropletPDF_->sample(); + return dropletDistributionModel_->sample(); } diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H index 6c956df465..3c80c2b2d4 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ Description #include "injectorModel.H" #include "scalarList.H" -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -58,7 +58,7 @@ private: dictionary hollowConeDict_; - autoPtr dropletPDF_; + autoPtr dropletDistributionModel_; scalarList innerAngle_; scalarList outerAngle_; diff --git a/src/lagrangian/pdfs/Make/files b/src/lagrangian/distributionModels/Make/files similarity index 56% rename from src/lagrangian/pdfs/Make/files rename to src/lagrangian/distributionModels/Make/files index e032b86bc5..c7b621cf58 100644 --- a/src/lagrangian/pdfs/Make/files +++ b/src/lagrangian/distributionModels/Make/files @@ -1,5 +1,5 @@ -pdf/pdf.C -pdf/pdfNew.C +distributionModel/distributionModel.C +distributionModel/distributionModelNew.C exponential/exponential.C fixedValue/fixedValue.C @@ -9,4 +9,4 @@ normal/normal.C RosinRammler/RosinRammler.C uniform/uniform.C -LIB = $(FOAM_LIBBIN)/libpdf +LIB = $(FOAM_LIBBIN)/libdistributionModels diff --git a/src/lagrangian/pdfs/Make/options b/src/lagrangian/distributionModels/Make/options similarity index 100% rename from src/lagrangian/pdfs/Make/options rename to src/lagrangian/distributionModels/Make/options diff --git a/src/lagrangian/pdfs/RosinRammler/RosinRammler.C b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C similarity index 69% rename from src/lagrangian/pdfs/RosinRammler/RosinRammler.C rename to src/lagrangian/distributionModels/RosinRammler/RosinRammler.C index a39d48aa69..f3338f92ef 100644 --- a/src/lagrangian/pdfs/RosinRammler/RosinRammler.C +++ b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,34 +30,34 @@ License namespace Foam { - namespace pdfs + namespace distributionModels { defineTypeNameAndDebug(RosinRammler, 0); - addToRunTimeSelectionTable(pdf, RosinRammler, dictionary); + addToRunTimeSelectionTable(distributionModel, RosinRammler, dictionary); } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pdfs::RosinRammler::RosinRammler +Foam::distributionModels::RosinRammler::RosinRammler ( const dictionary& dict, cachedRandom& rndGen ) : - pdf(typeName, dict, rndGen), - minValue_(readScalar(pdfDict_.lookup("minValue"))), - maxValue_(readScalar(pdfDict_.lookup("maxValue"))), - d_(readScalar(pdfDict_.lookup("d"))), - n_(readScalar(pdfDict_.lookup("n"))) + distributionModel(typeName, dict, rndGen), + minValue_(readScalar(distributionModelDict_.lookup("minValue"))), + maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))), + d_(readScalar(distributionModelDict_.lookup("d"))), + n_(readScalar(distributionModelDict_.lookup("n"))) { check(); } -Foam::pdfs::RosinRammler::RosinRammler(const RosinRammler& p) +Foam::distributionModels::RosinRammler::RosinRammler(const RosinRammler& p) : - pdf(p), + distributionModel(p), minValue_(p.minValue_), maxValue_(p.maxValue_), d_(p.d_), @@ -67,13 +67,13 @@ Foam::pdfs::RosinRammler::RosinRammler(const RosinRammler& p) // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::pdfs::RosinRammler::~RosinRammler() +Foam::distributionModels::RosinRammler::~RosinRammler() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::pdfs::RosinRammler::sample() const +Foam::scalar Foam::distributionModels::RosinRammler::sample() const { scalar K = 1.0 - exp(-pow((maxValue_ - minValue_)/d_, n_)); scalar y = rndGen_.sample01(); @@ -82,13 +82,13 @@ Foam::scalar Foam::pdfs::RosinRammler::sample() const } -Foam::scalar Foam::pdfs::RosinRammler::minValue() const +Foam::scalar Foam::distributionModels::RosinRammler::minValue() const { return minValue_; } -Foam::scalar Foam::pdfs::RosinRammler::maxValue() const +Foam::scalar Foam::distributionModels::RosinRammler::maxValue() const { return maxValue_; } diff --git a/src/lagrangian/pdfs/RosinRammler/RosinRammler.H b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H similarity index 86% rename from src/lagrangian/pdfs/RosinRammler/RosinRammler.H rename to src/lagrangian/distributionModels/RosinRammler/RosinRammler.H index eb03127686..8fd67cc5a4 100644 --- a/src/lagrangian/pdfs/RosinRammler/RosinRammler.H +++ b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,10 +25,10 @@ Class Foam::RosinRammler Description - Rosin-Rammler pdf + Rosin-Rammler distributionModel @f[ - cumulative pdf = + cumulative model = (1.0 - exp( -(( x - d0)/d)^n ) / (1.0 - exp( -((d1 - d0)/d)^n ) @f] @@ -42,13 +42,13 @@ SourceFiles #ifndef RosinRammler_H #define RosinRammler_H -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -namespace pdfs +namespace distributionModels { /*---------------------------------------------------------------------------*\ @@ -57,7 +57,7 @@ namespace pdfs class RosinRammler : - public pdf + public distributionModel { // Private data @@ -88,9 +88,9 @@ public: RosinRammler(const RosinRammler& p); //- Construct and return a clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new RosinRammler(*this)); + return autoPtr(new RosinRammler(*this)); } @@ -100,7 +100,7 @@ public: // Member Functions - //- Sample the pdf + //- Sample the distributionModel virtual scalar sample() const; //- Return the minimum value @@ -113,7 +113,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace pdfs +} // End namespace distributionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/pdfs/pdf/pdf.C b/src/lagrangian/distributionModels/distributionModel/distributionModel.C similarity index 54% rename from src/lagrangian/pdfs/pdf/pdf.C rename to src/lagrangian/distributionModels/distributionModel/distributionModel.C index 14f6d659c0..e2be585969 100644 --- a/src/lagrangian/pdfs/pdf/pdf.C +++ b/src/lagrangian/distributionModels/distributionModel/distributionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,36 +23,36 @@ License \*---------------------------------------------------------------------------*/ -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - namespace pdfs + namespace distributionModels { - defineTypeNameAndDebug(pdf, 0); - defineRunTimeSelectionTable(pdf, dictionary); + defineTypeNameAndDebug(distributionModel, 0); + defineRunTimeSelectionTable(distributionModel, dictionary); } } // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // -void Foam::pdfs::pdf::check() const +void Foam::distributionModels::distributionModel::check() const { if (minValue() < 0) { - FatalErrorIn("pdfs::pdf::check() const") - << type() << "PDF: Minimum value must be greater than zero." << nl - << "Supplied minValue = " << minValue() + FatalErrorIn("distributionModels::distributionModel::check() const") + << type() << "distribution: Minimum value must be greater than " + << "zero." << nl << "Supplied minValue = " << minValue() << abort(FatalError); } if (maxValue() < minValue()) { - FatalErrorIn("pdfs::pdf::check() const") - << type() << "PDF: Maximum value is smaller than the minimum value:" - << nl << " maxValue = " << maxValue() + FatalErrorIn("distributionModels::distributionModel::check() const") + << type() << "distribution: Maximum value is smaller than the " + << "minimum value:" << nl << " maxValue = " << maxValue() << ", minValue = " << minValue() << abort(FatalError); } @@ -61,50 +61,65 @@ void Foam::pdfs::pdf::check() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pdfs::pdf::pdf +Foam::distributionModels::distributionModel::distributionModel ( const word& name, const dictionary& dict, cachedRandom& rndGen ) : - pdfDict_(dict.subDict(name + "PDF")), + distributionModelDict_(dict.subDict(name + "Distribution")), rndGen_(rndGen) {} -Foam::pdfs::pdf::pdf(const pdf& p) +Foam::distributionModels::distributionModel::distributionModel +( + const distributionModel& p +) : - pdfDict_(p.pdfDict_), + distributionModelDict_(p.distributionModelDict_), rndGen_(p.rndGen_) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::pdfs::pdf::~pdf() +Foam::distributionModels::distributionModel::~distributionModel() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::pdfs::pdf::sample() const +Foam::scalar Foam::distributionModels::distributionModel::sample() const { - notImplemented("Foam::scalar Foam::pdfs::pdf::sample() const"); + notImplemented + ( + "Foam::scalar " + "Foam::distributionModels::distributionModel::sample() const" + ); return 0.0; } -Foam::scalar Foam::pdfs::pdf::minValue() const +Foam::scalar Foam::distributionModels::distributionModel::minValue() const { - notImplemented("Foam::scalar Foam::pdfs::pdf::minValue() const"); + notImplemented + ( + "Foam::scalar " + "Foam::distributionModels::distributionModel::minValue() const" + ); return 0.0; } -Foam::scalar Foam::pdfs::pdf::maxValue() const +Foam::scalar Foam::distributionModels::distributionModel::maxValue() const { - notImplemented("Foam::scalar Foam::pdfs::pdf::maxValue() const"); + notImplemented + ( + "Foam::scalar " + "Foam::distributionModels::distributionModel::maxValue() const" + ); return 0.0; } diff --git a/src/lagrangian/pdfs/pdf/pdf.H b/src/lagrangian/distributionModels/distributionModel/distributionModel.H similarity index 68% rename from src/lagrangian/pdfs/pdf/pdf.H rename to src/lagrangian/distributionModels/distributionModel/distributionModel.H index d61ace2649..26c6eaa5a4 100644 --- a/src/lagrangian/pdfs/pdf/pdf.H +++ b/src/lagrangian/distributionModels/distributionModel/distributionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,14 +22,14 @@ License along with OpenFOAM. If not, see . Class - Foam::pdf + Foam::distributionModel Description - A library of runtime-selectable PDF's. + A library of runtime-selectable distribution models. Returns a sampled value given the expectation (nu) and variance (sigma^2) - Current PDF's include: + Current distribution models include: - exponential - fixedValue - general @@ -38,19 +38,19 @@ Description - Rosin-Rammler - uniform - The pdf is tabulated in equidistant nPoints, in an interval. - These values are integrated to obtain the cumulated PDF, + The distributionModel is tabulated in equidistant nPoints, in an interval. + These values are integrated to obtain the cumulated distribution model, which is then used to change the distribution from unifrom to - the actual pdf. + the actual distributionModel. SourceFiles - pdf.C - pdfNew.C + distributionModel.C + distributionModelNew.C \*---------------------------------------------------------------------------*/ -#ifndef pdf_H -#define pdf_H +#ifndef distributionModel_H +#define distributionModel_H #include "IOdictionary.H" #include "autoPtr.H" @@ -60,14 +60,14 @@ SourceFiles namespace Foam { -namespace pdfs +namespace distributionModels { /*---------------------------------------------------------------------------*\ - Class pdf Declaration + Class distributionModel Declaration \*---------------------------------------------------------------------------*/ -class pdf +class distributionModel { protected: @@ -75,7 +75,7 @@ protected: // Protected data //- Coefficients dictionary - const dictionary pdfDict_; + const dictionary distributionModelDict_; //- Reference to the random number generator cachedRandom& rndGen_; @@ -83,21 +83,21 @@ protected: // Protected Member Functions - //- Check that the PDF is valid + //- Check that the distribution model is valid virtual void check() const; public: //-Runtime type information - TypeName("pdf"); + TypeName("distributionModel"); //- Declare runtime constructor selection table declareRunTimeSelectionTable ( autoPtr, - pdf, + distributionModel, dictionary, ( const dictionary& dict, @@ -110,29 +110,38 @@ public: // Constructors //- Construct from dictionary - pdf(const word& name, const dictionary& dict, cachedRandom& rndGen); + distributionModel + ( + const word& name, + const dictionary& dict, + cachedRandom& rndGen + ); //- Construct copy - pdf(const pdf& p); + distributionModel(const distributionModel& p); //- Construct and return a clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new pdf(*this)); + return autoPtr(new distributionModel(*this)); } //- Selector - static autoPtr New(const dictionary& dict, cachedRandom& rndGen); + static autoPtr New + ( + const dictionary& dict, + cachedRandom& rndGen + ); //- Destructor - virtual ~pdf(); + virtual ~distributionModel(); // Member Functions - //- Sample the pdf + //- Sample the distributionModel virtual scalar sample() const; //- Return the minimum value @@ -145,7 +154,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace pdfs +} // End namespace distributionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/pdfs/pdf/pdfNew.C b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C similarity index 68% rename from src/lagrangian/pdfs/pdf/pdfNew.C rename to src/lagrangian/distributionModels/distributionModel/distributionModelNew.C index 634972ceb7..7084be4275 100644 --- a/src/lagrangian/pdfs/pdf/pdfNew.C +++ b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -23,33 +23,41 @@ License \*---------------------------------------------------------------------------*/ -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * // -Foam::autoPtr Foam::pdfs::pdf::New +Foam::autoPtr +Foam::distributionModels::distributionModel::New ( const dictionary& dict, cachedRandom& rndGen ) { - const word modelType(dict.lookup("pdfType")); + const word modelType(dict.lookup("distributionModelType")); - Info<< "Selecting pdfType " << modelType << endl; + Info<< "Selecting distributionModelType " << modelType << endl; dictionaryConstructorTable::iterator cstrIter = dictionaryConstructorTablePtr_->find(modelType); if (cstrIter == dictionaryConstructorTablePtr_->end()) { - FatalErrorIn("pdfs::pdf::New(const dictionary&, cachedRandom&)") - << "Unknown pdf type " << modelType << nl << nl - << "Valid pdf types are:" << nl + FatalErrorIn + ( + "distributionModels::distributionModel::New" + "(" + "const dictionary&, " + "cachedRandom&" + ")" + ) + << "Unknown distributionModel type " << modelType << nl << nl + << "Valid distributionModel types are:" << nl << dictionaryConstructorTablePtr_->sortedToc() << exit(FatalError); } - return autoPtr(cstrIter()(dict, rndGen)); + return autoPtr(cstrIter()(dict, rndGen)); } diff --git a/src/lagrangian/pdfs/exponential/exponential.C b/src/lagrangian/distributionModels/exponential/exponential.C similarity index 70% rename from src/lagrangian/pdfs/exponential/exponential.C rename to src/lagrangian/distributionModels/exponential/exponential.C index 2eba8cef5c..e9bc6f4edf 100644 --- a/src/lagrangian/pdfs/exponential/exponential.C +++ b/src/lagrangian/distributionModels/exponential/exponential.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,33 +30,33 @@ License namespace Foam { - namespace pdfs + namespace distributionModels { defineTypeNameAndDebug(exponential, 0); - addToRunTimeSelectionTable(pdf, exponential, dictionary); + addToRunTimeSelectionTable(distributionModel, exponential, dictionary); } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pdfs::exponential::exponential +Foam::distributionModels::exponential::exponential ( const dictionary& dict, cachedRandom& rndGen ) : - pdf(typeName, dict, rndGen), - minValue_(readScalar(pdfDict_.lookup("minValue"))), - maxValue_(readScalar(pdfDict_.lookup("maxValue"))), - lambda_(readScalar(pdfDict_.lookup("lambda"))) + distributionModel(typeName, dict, rndGen), + minValue_(readScalar(distributionModelDict_.lookup("minValue"))), + maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))), + lambda_(readScalar(distributionModelDict_.lookup("lambda"))) { check(); } -Foam::pdfs::exponential::exponential(const exponential& p) +Foam::distributionModels::exponential::exponential(const exponential& p) : - pdf(p), + distributionModel(p), minValue_(p.minValue_), maxValue_(p.maxValue_), lambda_(p.lambda_) @@ -65,13 +65,13 @@ Foam::pdfs::exponential::exponential(const exponential& p) // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::pdfs::exponential::~exponential() +Foam::distributionModels::exponential::~exponential() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::pdfs::exponential::sample() const +Foam::scalar Foam::distributionModels::exponential::sample() const { scalar y = rndGen_.sample01(); scalar K = exp(-lambda_*maxValue_) - exp(-lambda_*minValue_); @@ -79,13 +79,13 @@ Foam::scalar Foam::pdfs::exponential::sample() const } -Foam::scalar Foam::pdfs::exponential::minValue() const +Foam::scalar Foam::distributionModels::exponential::minValue() const { return minValue_; } -Foam::scalar Foam::pdfs::exponential::maxValue() const +Foam::scalar Foam::distributionModels::exponential::maxValue() const { return maxValue_; } diff --git a/src/lagrangian/pdfs/exponential/exponential.H b/src/lagrangian/distributionModels/exponential/exponential.H similarity index 86% rename from src/lagrangian/pdfs/exponential/exponential.H rename to src/lagrangian/distributionModels/exponential/exponential.H index 6b012c3c64..c0211d3550 100644 --- a/src/lagrangian/pdfs/exponential/exponential.H +++ b/src/lagrangian/distributionModels/exponential/exponential.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::exponential Description - exponential pdf + exponential distribution model SourceFiles exponential.C @@ -35,13 +35,13 @@ SourceFiles #ifndef exponential_H #define exponential_H -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -namespace pdfs +namespace distributionModels { /*---------------------------------------------------------------------------*\ @@ -50,7 +50,7 @@ namespace pdfs class exponential : - public pdf + public distributionModel { // Private data @@ -81,9 +81,9 @@ public: exponential(const exponential& p); //- Construct and return a clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new exponential(*this)); + return autoPtr(new exponential(*this)); } @@ -93,7 +93,7 @@ public: // Member Functions - //- Sample the pdf + //- Sample the distributionModel virtual scalar sample() const; //- Return the minimum value @@ -106,7 +106,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace pdfs +} // End namespace distributionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/pdfs/fixedValue/fixedValue.C b/src/lagrangian/distributionModels/fixedValue/fixedValue.C similarity index 69% rename from src/lagrangian/pdfs/fixedValue/fixedValue.C rename to src/lagrangian/distributionModels/fixedValue/fixedValue.C index 5808c5dbb5..e990b1479b 100644 --- a/src/lagrangian/pdfs/fixedValue/fixedValue.C +++ b/src/lagrangian/distributionModels/fixedValue/fixedValue.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,50 +30,54 @@ License namespace Foam { - namespace pdfs + namespace distributionModels { defineTypeNameAndDebug(fixedValue, 0); - addToRunTimeSelectionTable(pdf, fixedValue, dictionary); + addToRunTimeSelectionTable(distributionModel, fixedValue, dictionary); } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pdfs::fixedValue::fixedValue(const dictionary& dict, cachedRandom& rndGen) +Foam::distributionModels::fixedValue::fixedValue +( + const dictionary& dict, + cachedRandom& rndGen +) : - pdf(typeName, dict, rndGen), - value_(readScalar(pdfDict_.lookup("value"))) + distributionModel(typeName, dict, rndGen), + value_(readScalar(distributionModelDict_.lookup("value"))) {} -Foam::pdfs::fixedValue::fixedValue(const fixedValue& p) +Foam::distributionModels::fixedValue::fixedValue(const fixedValue& p) : - pdf(p), + distributionModel(p), value_(p.value_) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::pdfs::fixedValue::~fixedValue() +Foam::distributionModels::fixedValue::~fixedValue() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::pdfs::fixedValue::fixedValue::sample() const +Foam::scalar Foam::distributionModels::fixedValue::fixedValue::sample() const { return value_; } -Foam::scalar Foam::pdfs::fixedValue::fixedValue::minValue() const +Foam::scalar Foam::distributionModels::fixedValue::fixedValue::minValue() const { return value_; } -Foam::scalar Foam::pdfs::fixedValue::fixedValue::maxValue() const +Foam::scalar Foam::distributionModels::fixedValue::fixedValue::maxValue() const { return value_; } diff --git a/src/lagrangian/pdfs/fixedValue/fixedValue.H b/src/lagrangian/distributionModels/fixedValue/fixedValue.H similarity index 84% rename from src/lagrangian/pdfs/fixedValue/fixedValue.H rename to src/lagrangian/distributionModels/fixedValue/fixedValue.H index c290511428..4385f96c5e 100644 --- a/src/lagrangian/pdfs/fixedValue/fixedValue.H +++ b/src/lagrangian/distributionModels/fixedValue/fixedValue.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,16 +32,16 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef pdfFixedValue_H -#define pdfFixedValue_H +#ifndef distributionModelFixedValue_H +#define distributionModelFixedValue_H -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -namespace pdfs +namespace distributionModels { /*---------------------------------------------------------------------------*\ Class fixedValue Declaration @@ -49,7 +49,7 @@ namespace pdfs class fixedValue : - public pdf + public distributionModel { // Private data @@ -72,9 +72,9 @@ public: fixedValue(const fixedValue& p); //- Construct and return a clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new fixedValue(*this)); + return autoPtr(new fixedValue(*this)); } @@ -84,7 +84,7 @@ public: // Member Functions - //- Sample the pdf + //- Sample the distributionModel virtual scalar sample() const; //- Return the minimum value @@ -97,7 +97,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace pdfs +} // End namespace distributionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/pdfs/general/general.C b/src/lagrangian/distributionModels/general/general.C similarity index 81% rename from src/lagrangian/pdfs/general/general.C rename to src/lagrangian/distributionModels/general/general.C index 8f8224ed6b..6e5aad7a7b 100644 --- a/src/lagrangian/pdfs/general/general.C +++ b/src/lagrangian/distributionModels/general/general.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,19 +30,23 @@ License namespace Foam { - namespace pdfs + namespace distributionModels { defineTypeNameAndDebug(general, 0); - addToRunTimeSelectionTable(pdf, general, dictionary); + addToRunTimeSelectionTable(distributionModel, general, dictionary); } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pdfs::general::general(const dictionary& dict, cachedRandom& rndGen) +Foam::distributionModels::general::general +( + const dictionary& dict, + cachedRandom& rndGen +) : - pdf(typeName, dict, rndGen), - xy_(pdfDict_.lookup("distribution")), + distributionModel(typeName, dict, rndGen), + xy_(distributionModelDict_.lookup("distribution")), nEntries_(xy_.size()), minValue_(xy_[0][0]), maxValue_(xy_[nEntries_-1][0]), @@ -50,7 +54,7 @@ Foam::pdfs::general::general(const dictionary& dict, cachedRandom& rndGen) { check(); - // normalize the cumulative pdf + // normalize the cumulative distributionModel integral_[0] = 0.0; for (label i=1; i(); @@ -137,13 +141,13 @@ Foam::scalar Foam::pdfs::general::sample() const } -Foam::scalar Foam::pdfs::general::minValue() const +Foam::scalar Foam::distributionModels::general::minValue() const { return minValue_; } -Foam::scalar Foam::pdfs::general::maxValue() const +Foam::scalar Foam::distributionModels::general::maxValue() const { return maxValue_; } diff --git a/src/lagrangian/pdfs/general/general.H b/src/lagrangian/distributionModels/general/general.H similarity index 87% rename from src/lagrangian/pdfs/general/general.H rename to src/lagrangian/distributionModels/general/general.H index c212f92aea..9201ec143e 100644 --- a/src/lagrangian/pdfs/general/general.H +++ b/src/lagrangian/distributionModels/general/general.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::general Description - general pdf + general distribution model SourceFiles general.C @@ -35,7 +35,7 @@ SourceFiles #ifndef general_H #define general_H -#include "pdf.H" +#include "distributionModel.H" #include "Vector.H" #include "VectorSpace.H" @@ -43,7 +43,7 @@ SourceFiles namespace Foam { -namespace pdfs +namespace distributionModels { /*---------------------------------------------------------------------------*\ @@ -52,7 +52,7 @@ namespace pdfs class general : - public pdf + public distributionModel { // Private data @@ -84,9 +84,9 @@ public: general(const general& p); //- Construct and return a clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new general(*this)); + return autoPtr(new general(*this)); } @@ -96,7 +96,7 @@ public: // Member Functions - //- Sample the pdf + //- Sample the distributionModel virtual scalar sample() const; //- Return the minimum value @@ -109,7 +109,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace pdfs +} // End namespace distributionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/pdfs/multiNormal/multiNormal.C b/src/lagrangian/distributionModels/multiNormal/multiNormal.C similarity index 76% rename from src/lagrangian/pdfs/multiNormal/multiNormal.C rename to src/lagrangian/distributionModels/multiNormal/multiNormal.C index 554063bdbf..2f06f898e3 100644 --- a/src/lagrangian/pdfs/multiNormal/multiNormal.C +++ b/src/lagrangian/distributionModels/multiNormal/multiNormal.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,28 +30,28 @@ License namespace Foam { - namespace pdfs + namespace distributionModels { defineTypeNameAndDebug(multiNormal, 0); - addToRunTimeSelectionTable(pdf, multiNormal, dictionary); + addToRunTimeSelectionTable(distributionModel, multiNormal, dictionary); } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pdfs::multiNormal::multiNormal +Foam::distributionModels::multiNormal::multiNormal ( const dictionary& dict, cachedRandom& rndGen ) : - pdf(typeName, dict, rndGen), - minValue_(readScalar(pdfDict_.lookup("minValue"))), - maxValue_(readScalar(pdfDict_.lookup("maxValue"))), + distributionModel(typeName, dict, rndGen), + minValue_(readScalar(distributionModelDict_.lookup("minValue"))), + maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))), range_(maxValue_ - minValue_), - expectation_(pdfDict_.lookup("expectation")), - variance_(pdfDict_.lookup("variance")), - strength_(pdfDict_.lookup("strength")) + expectation_(distributionModelDict_.lookup("expectation")), + variance_(distributionModelDict_.lookup("variance")), + strength_(distributionModelDict_.lookup("strength")) { check(); @@ -81,9 +81,9 @@ Foam::pdfs::multiNormal::multiNormal } -Foam::pdfs::multiNormal::multiNormal(const multiNormal& p) +Foam::distributionModels::multiNormal::multiNormal(const multiNormal& p) : - pdf(p), + distributionModel(p), minValue_(p.minValue_), maxValue_(p.maxValue_), range_(p.range_), @@ -95,13 +95,13 @@ Foam::pdfs::multiNormal::multiNormal(const multiNormal& p) // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::pdfs::multiNormal::~multiNormal() +Foam::distributionModels::multiNormal::~multiNormal() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::pdfs::multiNormal::sample() const +Foam::scalar Foam::distributionModels::multiNormal::sample() const { scalar y = 0; scalar x = 0; @@ -133,13 +133,13 @@ Foam::scalar Foam::pdfs::multiNormal::sample() const } -Foam::scalar Foam::pdfs::multiNormal::minValue() const +Foam::scalar Foam::distributionModels::multiNormal::minValue() const { return minValue_; } -Foam::scalar Foam::pdfs::multiNormal::maxValue() const +Foam::scalar Foam::distributionModels::multiNormal::maxValue() const { return maxValue_; } diff --git a/src/lagrangian/pdfs/multiNormal/multiNormal.H b/src/lagrangian/distributionModels/multiNormal/multiNormal.H similarity index 85% rename from src/lagrangian/pdfs/multiNormal/multiNormal.H rename to src/lagrangian/distributionModels/multiNormal/multiNormal.H index 4b8a9dc731..6af776a728 100644 --- a/src/lagrangian/pdfs/multiNormal/multiNormal.H +++ b/src/lagrangian/distributionModels/multiNormal/multiNormal.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,10 +25,10 @@ Class Foam::multiNormal Description - A multiNormal pdf + A multiNormal distribution model @verbatim - pdf = sum_i strength_i * exp(-0.5*((x - expectation_i)/variance_i)^2 ) + model = sum_i strength_i * exp(-0.5*((x - expectation_i)/variance_i)^2 ) @endverbatim @@ -40,13 +40,13 @@ SourceFiles #ifndef multiNormal_H #define multiNormal_H -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -namespace pdfs +namespace distributionModels { /*---------------------------------------------------------------------------*\ @@ -55,7 +55,7 @@ namespace pdfs class multiNormal : - public pdf + public distributionModel { // Private data @@ -91,9 +91,9 @@ public: multiNormal(const multiNormal& p); //- Construct and return a clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new multiNormal(*this)); + return autoPtr(new multiNormal(*this)); } @@ -103,7 +103,7 @@ public: // Member Functions - //- Sample the pdf + //- Sample the distributionModel virtual scalar sample() const; //- Return the minimum value @@ -116,7 +116,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace pdfs +} // End namespace distributionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/pdfs/normal/normal.C b/src/lagrangian/distributionModels/normal/normal.C similarity index 75% rename from src/lagrangian/pdfs/normal/normal.C rename to src/lagrangian/distributionModels/normal/normal.C index f8e9f7716e..1a629100ac 100644 --- a/src/lagrangian/pdfs/normal/normal.C +++ b/src/lagrangian/distributionModels/normal/normal.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,22 +31,26 @@ License namespace Foam { - namespace pdfs + namespace distributionModels { defineTypeNameAndDebug(normal, 0); - addToRunTimeSelectionTable(pdf, normal, dictionary); + addToRunTimeSelectionTable(distributionModel, normal, dictionary); } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pdfs::normal::normal(const dictionary& dict, cachedRandom& rndGen) +Foam::distributionModels::normal::normal +( + const dictionary& dict, + cachedRandom& rndGen +) : - pdf(typeName, dict, rndGen), - minValue_(readScalar(pdfDict_.lookup("minValue"))), - maxValue_(readScalar(pdfDict_.lookup("maxValue"))), - expectation_(readScalar(pdfDict_.lookup("expectation"))), - variance_(readScalar(pdfDict_.lookup("variance"))), + distributionModel(typeName, dict, rndGen), + minValue_(readScalar(distributionModelDict_.lookup("minValue"))), + maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))), + expectation_(readScalar(distributionModelDict_.lookup("expectation"))), + variance_(readScalar(distributionModelDict_.lookup("variance"))), a_(0.147) { if (minValue_ < 0) @@ -67,9 +71,9 @@ Foam::pdfs::normal::normal(const dictionary& dict, cachedRandom& rndGen) } -Foam::pdfs::normal::normal(const normal& p) +Foam::distributionModels::normal::normal(const normal& p) : - pdf(p), + distributionModel(p), minValue_(p.minValue_), maxValue_(p.maxValue_), expectation_(p.expectation_), @@ -80,13 +84,13 @@ Foam::pdfs::normal::normal(const normal& p) // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::pdfs::normal::~normal() +Foam::distributionModels::normal::~normal() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::pdfs::normal::sample() const +Foam::scalar Foam::distributionModels::normal::sample() const { scalar a = erf((minValue_ - expectation_)/variance_); @@ -104,19 +108,19 @@ Foam::scalar Foam::pdfs::normal::sample() const } -Foam::scalar Foam::pdfs::normal::minValue() const +Foam::scalar Foam::distributionModels::normal::minValue() const { return minValue_; } -Foam::scalar Foam::pdfs::normal::maxValue() const +Foam::scalar Foam::distributionModels::normal::maxValue() const { return maxValue_; } -Foam::scalar Foam::pdfs::normal::erfInv(const scalar y) const +Foam::scalar Foam::distributionModels::normal::erfInv(const scalar y) const { scalar k = 2.0/(constant::mathematical::pi*a_) + 0.5*log(1.0 - y*y); scalar h = log(1.0 - y*y)/a_; diff --git a/src/lagrangian/pdfs/normal/normal.H b/src/lagrangian/distributionModels/normal/normal.H similarity index 83% rename from src/lagrangian/pdfs/normal/normal.H rename to src/lagrangian/distributionModels/normal/normal.H index 9767398cbe..60c39f1059 100644 --- a/src/lagrangian/pdfs/normal/normal.H +++ b/src/lagrangian/distributionModels/normal/normal.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,13 +25,13 @@ Class Foam::normal Description - A normal pdf + A normal distribution model @verbatim - pdf = strength * exp(-0.5*((x - expectation)/variance)^2 ) + model = strength * exp(-0.5*((x - expectation)/variance)^2 ) @endverbatim - strength only has meaning if there's more than one pdf + strength only has meaning if there's more than one distribution model SourceFiles normal.C @@ -41,13 +41,13 @@ SourceFiles #ifndef normal_H #define normal_H -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -namespace pdfs +namespace distributionModels { /*---------------------------------------------------------------------------*\ @@ -56,7 +56,7 @@ namespace pdfs class normal : - public pdf + public distributionModel { // Private data @@ -91,9 +91,9 @@ public: normal(const normal& p); //- Construct and return a clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new normal(*this)); + return autoPtr(new normal(*this)); } @@ -103,7 +103,7 @@ public: // Member Functions - //- Sample the pdf + //- Sample the distributionModel virtual scalar sample() const; //- Return the minimum value @@ -118,7 +118,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace pdfs +} // End namespace distributionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/pdfs/uniform/uniform.C b/src/lagrangian/distributionModels/uniform/uniform.C similarity index 70% rename from src/lagrangian/pdfs/uniform/uniform.C rename to src/lagrangian/distributionModels/uniform/uniform.C index 1493fe1e6b..7f00a05a93 100644 --- a/src/lagrangian/pdfs/uniform/uniform.C +++ b/src/lagrangian/distributionModels/uniform/uniform.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -30,29 +30,33 @@ License namespace Foam { - namespace pdfs + namespace distributionModels { defineTypeNameAndDebug(uniform, 0); - addToRunTimeSelectionTable(pdf, uniform, dictionary); + addToRunTimeSelectionTable(distributionModel, uniform, dictionary); } } // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::pdfs::uniform::uniform(const dictionary& dict, cachedRandom& rndGen) +Foam::distributionModels::uniform::uniform +( + const dictionary& dict, + cachedRandom& rndGen +) : - pdf(typeName, dict, rndGen), - minValue_(readScalar(pdfDict_.lookup("minValue"))), - maxValue_(readScalar(pdfDict_.lookup("maxValue"))), + distributionModel(typeName, dict, rndGen), + minValue_(readScalar(distributionModelDict_.lookup("minValue"))), + maxValue_(readScalar(distributionModelDict_.lookup("maxValue"))), range_(maxValue_ - minValue_) { check(); } -Foam::pdfs::uniform::uniform(const uniform& p) +Foam::distributionModels::uniform::uniform(const uniform& p) : - pdf(p), + distributionModel(p), minValue_(p.minValue_), maxValue_(p.maxValue_) {} @@ -60,25 +64,25 @@ Foam::pdfs::uniform::uniform(const uniform& p) // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // -Foam::pdfs::uniform::~uniform() +Foam::distributionModels::uniform::~uniform() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -Foam::scalar Foam::pdfs::uniform::sample() const +Foam::scalar Foam::distributionModels::uniform::sample() const { return rndGen_.position(minValue_, maxValue_); } -Foam::scalar Foam::pdfs::uniform::minValue() const +Foam::scalar Foam::distributionModels::uniform::minValue() const { return minValue_; } -Foam::scalar Foam::pdfs::uniform::maxValue() const +Foam::scalar Foam::distributionModels::uniform::maxValue() const { return maxValue_; } diff --git a/src/lagrangian/pdfs/uniform/uniform.H b/src/lagrangian/distributionModels/uniform/uniform.H similarity index 86% rename from src/lagrangian/pdfs/uniform/uniform.H rename to src/lagrangian/distributionModels/uniform/uniform.H index db0e44ddbf..2872e88f3c 100644 --- a/src/lagrangian/pdfs/uniform/uniform.H +++ b/src/lagrangian/distributionModels/uniform/uniform.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ Class Foam::uniform Description - uniform pdf + Uniform/equally-weighted distribution model SourceFiles uniform.C @@ -35,13 +35,13 @@ SourceFiles #ifndef uniform_H #define uniform_H -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { -namespace pdfs +namespace distributionModels { /*---------------------------------------------------------------------------*\ @@ -50,7 +50,7 @@ namespace pdfs class uniform : - public pdf + public distributionModel { // Private data @@ -79,9 +79,9 @@ public: uniform(const uniform& p); //- Construct and return a clone - virtual autoPtr clone() const + virtual autoPtr clone() const { - return autoPtr(new uniform(*this)); + return autoPtr(new uniform(*this)); } @@ -91,7 +91,7 @@ public: // Member Functions - //- Sample the pdf + //- Sample the distributionModel virtual scalar sample() const; //- Return the minimum value @@ -104,7 +104,7 @@ public: // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -} // End namespace pdfs +} // End namespace distributionModels } // End namespace Foam // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index e2c807106f..0d45fdda60 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -2,7 +2,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ @@ -24,7 +24,7 @@ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -llagrangian \ - -lpdf \ + -ldistributionModels \ -lliquidProperties \ -lliquidMixtureProperties \ -lsolidProperties \ diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C index 53e0056739..d8675f0fd0 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,9 +95,9 @@ Foam::ConeInjection::ConeInjection Umag_(DataEntry::New("Umag", this->coeffDict())), thetaInner_(DataEntry::New("thetaInner", this->coeffDict())), thetaOuter_(DataEntry::New("thetaOuter", this->coeffDict())), - parcelPDF_ + parcelDistributionModel_ ( - pdfs::pdf::New(this->coeffDict().subDict("parcelPDF"), owner.rndGen()) + distributionModels::distributionModel::New(this->coeffDict().subDict("parcelDistributionModel"), owner.rndGen()) ), tanVec1_(vector::zero), tanVec2_(vector::zero) @@ -153,7 +153,7 @@ Foam::ConeInjection::ConeInjection Umag_(im.Umag_().clone().ptr()), thetaInner_(im.thetaInner_().clone().ptr()), thetaOuter_(im.thetaOuter_().clone().ptr()), - parcelPDF_(im.parcelPDF_().clone().ptr()), + parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()), tanVec1_(im.tanVec1_), tanVec2_(im.tanVec2_) {} @@ -222,7 +222,7 @@ void Foam::ConeInjection::setProperties parcel.U() = Umag_().value(t)*dirVec; // set particle diameter - parcel.d() = parcelPDF_().sample(); + parcel.d() = parcelDistributionModel_().sample(); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H index 31768d223f..60b751bb68 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ Description - parcel flow rate - parcel velocity - inner and outer cone angles - - Parcel diameters obtained by PDF model + - Parcel diameters obtained by distribution model model SourceFiles ConeInjection.C @@ -45,7 +45,7 @@ SourceFiles #define ConeInjection_H #include "InjectionModel.H" -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -101,8 +101,8 @@ class ConeInjection //- Outer cone angle relative to SOI [deg] const autoPtr > thetaOuter_; - //- Parcel size PDF model - const autoPtr parcelPDF_; + //- Parcel size distribution model model + const autoPtr parcelDistributionModel_; // Tangential vectors to the direction vector diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C index 122ebea145..faff5d7a39 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -126,9 +126,9 @@ Foam::ConeInjectionMP::ConeInjectionMP Umag_(DataEntry::New("Umag", this->coeffDict())), thetaInner_(DataEntry::New("thetaInner", this->coeffDict())), thetaOuter_(DataEntry::New("thetaOuter", this->coeffDict())), - parcelPDF_ + parcelDistributionModel_ ( - pdfs::pdf::New(this->coeffDict().subDict("parcelPDF"), owner.rndGen()) + distributionModels::distributionModel::New(this->coeffDict().subDict("parcelDistributionModel"), owner.rndGen()) ), nInjected_(this->parcelsAddedTotal()), tanVec1_(positions_.size()), @@ -193,7 +193,7 @@ Foam::ConeInjectionMP::ConeInjectionMP Umag_(im.Umag_().clone().ptr()), thetaInner_(im.thetaInner_().clone().ptr()), thetaOuter_(im.thetaOuter_().clone().ptr()), - parcelPDF_(im.parcelPDF_().clone().ptr()), + parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()), nInjected_(im.nInjected_), tanVec1_(im.tanVec1_), tanVec2_(im.tanVec2_) @@ -268,7 +268,7 @@ void Foam::ConeInjectionMP::setProperties parcel.U() = Umag_().value(t)*dirVec; // set particle diameter - parcel.d() = parcelPDF_().sample(); + parcel.d() = parcelDistributionModel_().sample(); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H index 47b19de6d3..d986e86a49 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -34,7 +34,7 @@ Description - parcel flow rate - parcel velocities - inner and outer cone angles - - Parcel diameters obtained by PDF model + - Parcel diameters obtained by distribution model model SourceFiles ConeInjectionMP.C @@ -45,7 +45,7 @@ SourceFiles #define ConeInjectionMP_H #include "InjectionModel.H" -#include "pdf.H" +#include "distributionModel.H" #include "vectorList.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -108,8 +108,8 @@ class ConeInjectionMP //- Outer cone angle relative to SOI [deg] const autoPtr > thetaOuter_; - //- Parcel size PDF model - const autoPtr parcelPDF_; + //- Parcel size distribution model model + const autoPtr parcelDistributionModel_; //- Number of parcels per injector already injected mutable label nInjected_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C index 75f34af8eb..95209cea06 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -114,11 +114,11 @@ Foam::FieldActivatedInjection::FieldActivatedInjection nParcelsInjected_(positions_.size(), 0), U0_(this->coeffDict().lookup("U0")), diameters_(positions_.size()), - parcelPDF_ + parcelDistributionModel_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelPDF"), + this->coeffDict().subDict("parcelDistributionModel"), owner.rndGen() ) ) @@ -126,7 +126,7 @@ Foam::FieldActivatedInjection::FieldActivatedInjection // Construct parcel diameters - one per injector cell forAll(diameters_, i) { - diameters_[i] = parcelPDF_->sample(); + diameters_[i] = parcelDistributionModel_->sample(); } // Determine total volume of particles to inject @@ -166,7 +166,7 @@ Foam::FieldActivatedInjection::FieldActivatedInjection nParcelsInjected_(im.nParcelsInjected_), U0_(im.U0_), diameters_(im.diameters_), - parcelPDF_(im.parcelPDF_().clone().ptr()) + parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H index b7d76873e0..91a570e440 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ SourceFiles #define FieldActivatedInjection_H #include "InjectionModel.H" -#include "pdf.H" +#include "distributionModel.H" #include "volFieldsFwd.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -110,8 +110,8 @@ class FieldActivatedInjection //- List of parcel diameters scalarList diameters_; - //- Parcel size PDF model - const autoPtr parcelPDF_; + //- Parcel size distribution model model + const autoPtr parcelDistributionModel_; protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C index 3cf8114164..b6107751f3 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -90,7 +90,7 @@ Foam::label Foam::InflationInjection::parcelsToInject ( 1, (10*volumeAccumulator_) - /CloudType::parcelType::volume(parcelPDF_().minValue()) + /CloudType::parcelType::volume(parcelDistributionModel_().minValue()) ); label iterationNo = 0; @@ -128,7 +128,7 @@ Foam::label Foam::InflationInjection::parcelsToInject { if (selfSeed_ && !cellCentresUsed.found(cI)) { - scalar dNew = parcelPDF_().sample(); + scalar dNew = parcelDistributionModel_().sample(); newParticles_.append ( @@ -191,7 +191,7 @@ Foam::label Foam::InflationInjection::parcelsToInject scalar R = sqrt(3.0)*a/(2.0*sqrt(2.0)); scalar d = a/(2.0*sqrt(3.0)); - scalar dNew = parcelPDF_().sample(); + scalar dNew = parcelDistributionModel_().sample(); scalar volNew = CloudType::parcelType::volume(dNew); newParticles_.append @@ -204,7 +204,7 @@ Foam::label Foam::InflationInjection::parcelsToInject ); volumeAccumulator_ -= volNew; - dNew = parcelPDF_().sample(); + dNew = parcelDistributionModel_().sample(); newParticles_.append ( vectorPairScalarPair @@ -215,7 +215,7 @@ Foam::label Foam::InflationInjection::parcelsToInject ); volumeAccumulator_ -= volNew; - dNew = parcelPDF_().sample(); + dNew = parcelDistributionModel_().sample(); newParticles_.append ( vectorPairScalarPair @@ -226,7 +226,7 @@ Foam::label Foam::InflationInjection::parcelsToInject ); volumeAccumulator_ -= volNew; - dNew = parcelPDF_().sample(); + dNew = parcelDistributionModel_().sample(); newParticles_.append ( vectorPairScalarPair @@ -341,11 +341,11 @@ Foam::InflationInjection::InflationInjection fraction_(1.0), selfSeed_(this->coeffDict().lookupOrDefault("selfSeed", false)), dSeed_(SMALL), - parcelPDF_ + parcelDistributionModel_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelPDF"), + this->coeffDict().subDict("parcelDistributionModel"), owner.rndGen() ) ) @@ -409,7 +409,7 @@ Foam::InflationInjection::InflationInjection fraction_(im.fraction_), selfSeed_(im.selfSeed_), dSeed_(im.dSeed_), - parcelPDF_(im.parcelPDF_().clone().ptr()) + parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H index b10c8e17d9..730c4acec1 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,7 @@ SourceFiles #define InflationInjection_H #include "InjectionModel.H" -#include "pdf.H" +#include "distributionModel.H" #include "Switch.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -107,8 +107,8 @@ class InflationInjection //- Diameter with which to create new seed particles scalar dSeed_; - //- Parcel size PDF model - const autoPtr parcelPDF_; + //- Parcel size distribution model model + const autoPtr parcelDistributionModel_; protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C index fa816d2e17..5f23df32cc 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -96,11 +96,11 @@ Foam::ManualInjection::ManualInjection injectorTetFaces_(positions_.size(), -1), injectorTetPts_(positions_.size(), -1), U0_(this->coeffDict().lookup("U0")), - parcelPDF_ + parcelDistributionModel_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelPDF"), + this->coeffDict().subDict("parcelDistributionModel"), owner.rndGen() ) ) @@ -149,7 +149,7 @@ Foam::ManualInjection::ManualInjection // Construct parcel diameters forAll(diameters_, i) { - diameters_[i] = parcelPDF_->sample(); + diameters_[i] = parcelDistributionModel_->sample(); } // Determine volume of particles to inject @@ -171,7 +171,7 @@ Foam::ManualInjection::ManualInjection injectorTetFaces_(im.injectorTetFaces_), injectorTetPts_(im.injectorTetPts_), U0_(im.U0_), - parcelPDF_(im.parcelPDF_().clone().ptr()) + parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H index bf7616b71a..215a8da2f1 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -31,7 +31,7 @@ Description - Total mass to inject - Parcel positions in file @c positionsFile - Initial parcel velocity - - Parcel diameters obtained by PDF model + - Parcel diameters obtained by distribution model model - All parcels introduced at SOI SourceFiles @@ -43,7 +43,7 @@ SourceFiles #define ManualInjection_H #include "InjectionModel.H" -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -82,8 +82,8 @@ class ManualInjection //- Initial parcel velocity const vector U0_; - //- Parcel size PDF model - const autoPtr parcelPDF_; + //- Parcel size distribution model model + const autoPtr parcelDistributionModel_; protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C index c124977e5a..a762bf3316 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,7 @@ License #include "PatchInjection.H" #include "DataEntry.H" -#include "pdf.H" +#include "distributionModel.H" // * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // @@ -104,9 +104,13 @@ Foam::PatchInjection::PatchInjection ( DataEntry::New("flowRateProfile", this->coeffDict()) ), - parcelPDF_ + parcelDistributionModel_ ( - pdfs::pdf::New(this->coeffDict().subDict("parcelPDF"), owner.rndGen()) + distributionModels::distributionModel::New + ( + this->coeffDict().subDict("parcelDistributionModel"), + owner.rndGen() + ) ), cellOwners_(), fraction_(1.0) @@ -153,7 +157,7 @@ Foam::PatchInjection::PatchInjection parcelsPerSecond_(im.parcelsPerSecond_), U0_(im.U0_), flowRateProfile_(im.flowRateProfile_().clone().ptr()), - parcelPDF_(im.parcelPDF_().clone().ptr()), + parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()), cellOwners_(im.cellOwners_), fraction_(im.fraction_) {} @@ -236,7 +240,7 @@ void Foam::PatchInjection::setProperties parcel.U() = U0_; // set particle diameter - parcel.d() = parcelPDF_->sample(); + parcel.d() = parcelDistributionModel_->sample(); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H index 05b1236a8a..2245ad8b9c 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,7 +33,7 @@ Description - Injection duration - Initial parcel velocity - Injection volume flow rate - - Parcel diameters obtained by PDF model + - Parcel diameters obtained by distribution model model - Parcels injected at cell centres adjacent to patch SourceFiles @@ -54,7 +54,7 @@ namespace Foam template class DataEntry; -class pdf; +class distributionModel; /*---------------------------------------------------------------------------*\ Class PatchInjection Declaration @@ -85,8 +85,8 @@ class PatchInjection //- Flow rate profile relative to SOI [] const autoPtr > flowRateProfile_; - //- Parcel size PDF model - const autoPtr parcelPDF_; + //- Parcel size distribution model model + const autoPtr parcelDistributionModel_; //- List of cell labels corresponding to injector positions labelList cellOwners_; diff --git a/src/surfaceFilmModels/Make/options b/src/surfaceFilmModels/Make/options index d3439c4c3a..9863502e9c 100644 --- a/src/surfaceFilmModels/Make/options +++ b/src/surfaceFilmModels/Make/options @@ -9,7 +9,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/properties/solidMixtureProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \ + -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude @@ -18,6 +18,6 @@ EXE_LIBS = \ -lSLGThermo \ -lfiniteVolume \ -lmeshTools \ - -lpdf \ + -ldistributionModels \ -lcompressibleRASModels \ -lcompressibleLESModels diff --git a/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.C b/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.C index 9102720a40..213405957a 100644 --- a/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.C +++ b/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -53,12 +53,19 @@ Foam::surfaceFilmModels::cloudInjection::cloudInjection injectionModel(type(), owner, dict), particlesPerParcel_(readScalar(coeffs_.lookup("particlesPerParcel"))), rndGen_(label(0), -1), - parcelPDF_(pdfs::pdf::New(coeffs_.subDict("parcelPDF"), rndGen_)), + parcelDistribution_ + ( + distributionModels::distributionModel::New + ( + coeffs_.subDict("parcelDistribution"), + rndGen_ + ) + ), diameter_(owner.film().nCells(), 0.0) { forAll(diameter_, faceI) { - diameter_[faceI] = parcelPDF_->sample(); + diameter_[faceI] = parcelDistribution_->sample(); } } @@ -95,7 +102,7 @@ void Foam::surfaceFilmModels::cloudInjection::inject diameterToInject[cellI] = diameter_[cellI]; // Retrieve new particle diameter sample - diameter_[cellI] = parcelPDF_->sample(); + diameter_[cellI] = parcelDistribution_->sample(); } else { diff --git a/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.H b/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.H index 4f9aa08fc6..d2484f7422 100644 --- a/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.H +++ b/src/surfaceFilmModels/submodels/kinematic/injectionModel/cloudInjection/cloudInjection.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ SourceFiles #define cloudInjection_H #include "injectionModel.H" -#include "pdf.H" +#include "distributionModel.H" #include "cachedRandom.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -76,7 +76,8 @@ protected: cachedRandom rndGen_; //- Parcel size PDF model - const autoPtr parcelPDF_; + const autoPtr + parcelDistribution_; //- Diameters of particles to inject into the cloud scalarList diameter_; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties index c8cfa62f0b..ea38b2c4a4 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties @@ -120,10 +120,10 @@ RanzMarshallCoeffs hollowConeInjectorCoeffs { - dropletPDF + dropletDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 1e-06; maxValue 0.00015; @@ -131,7 +131,7 @@ hollowConeInjectorCoeffs n 3; } - exponentialPDF + exponentialDistribution { minValue 0.0001; maxValue 0.001; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index b831323c0c..746e73e254 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -131,10 +131,10 @@ subModels SOI 0; positionsFile "coalCloud1Positions"; U0 ( 0 -10 0 ); - parcelPDF + parcelDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-06; maxValue 0.0005; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 84ddb4faa3..2f97343b5c 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -107,10 +107,10 @@ subModels SOI 0; positionsFile "limestonePositions"; U0 ( 0 0 0 ); - parcelPDF + parcelDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-06; maxValue 0.000565; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index 37dc1c8917..433b3082fe 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -130,10 +130,10 @@ subModels SOI 0; positionsFile "reactingCloud1Positions"; U0 (0 0 0); - parcelPDF + parcelDistribution { pdfType uniform; - uniformPDF + uniformDistribution { minValue 100e-06; maxValue 100e-06; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index e2532ac365..2eaf9f11d7 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -133,10 +133,10 @@ subModels parcelsPerSecond 1e5; U0 (40 0 0); flowRateProfile constant 1; - parcelPDF + parcelDistribution { pdfType general; - generalPDF + generalDistribution { distribution ( diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index cf178e2faa..49f09ba2db 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -131,10 +131,10 @@ subModels thetaInner constant 0; thetaOuter constant 45; - parcelPDF + parcelDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-04; maxValue 0.0012; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties index 4099a1fff3..20743a48b8 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties @@ -59,10 +59,10 @@ thermoSingleLayerCoeffs particlesPerParcel 100.0; - parcelPDF + parcelDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-04; maxValue 0.0012; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties index afd89ec9ea..4f1f754edb 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties @@ -131,10 +131,10 @@ subModels thetaInner constant 0; thetaOuter constant 45; - parcelPDF + parcelDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-04; maxValue 0.0012; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties index 5b45e08691..bf07405f41 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties @@ -61,10 +61,10 @@ thermoSingleLayerCoeffs particlesPerParcel 100.0; - parcelPDF + parcelDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-04; maxValue 0.0012; diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index ea65dea920..93b2bfa516 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -123,10 +123,10 @@ subModels SOI 0; positionsFile "reactingCloud1Positions"; U0 ( 0 0 0 ); - parcelPDF + parcelDistribution { pdfType uniform; - uniformPDF + uniformDistribution { minValue 1e-04; maxValue 1e-04; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index 22c787b2ab..ad33dc46d3 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -87,10 +87,10 @@ subModels SOI 0; positionsFile "kinematicCloud1Positions"; U0 ( 0 0 0 ); - parcelPDF + parcelDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-05; maxValue 0.0001; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 99f68b618b..72d096b370 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -106,10 +106,10 @@ subModels SOI 0; positionsFile "thermoCloud1Positions"; U0 ( 0 0 0 ); - parcelPDF + parcelDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-06; maxValue 0.0005; diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 65952342c9..003816f8a7 100644 --- a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -144,10 +144,10 @@ subModels duration 1; // NOTE: set to 1 for steady state U0 (0 40 0); flowRateProfile constant 1; - parcelPDF + parcelDistribution { pdfType general; - generalPDF + generalDistribution { distribution ( From bad4e382af97e2303355f3a5b759b06b2155b862 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 2 Feb 2011 09:32:46 +0000 Subject: [PATCH 043/367] ENH: Updated copyrights --- .../MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C | 2 +- .../MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H | 2 +- .../MarshakRadiationFixedTMixedFvPatchScalarField.C | 2 +- .../MarshakRadiationFixedTMixedFvPatchScalarField.H | 2 +- .../greyDiffusiveRadiationMixedFvPatchScalarField.C | 2 +- .../greyDiffusiveRadiationMixedFvPatchScalarField.H | 2 +- .../wideBandDiffusiveRadiationMixedFvPatchScalarField.C | 2 +- .../wideBandDiffusiveRadiationMixedFvPatchScalarField.H | 2 +- src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C | 2 +- src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H | 2 +- .../radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C | 2 +- .../radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H | 2 +- .../radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H | 2 +- .../radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C | 2 +- .../radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H | 2 +- .../radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C | 2 +- .../radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H | 2 +- .../radiationModels/radiationModel/fvDOM/fvDOM/fvDOMI.H | 2 +- .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.C | 2 +- .../fvDOM/radiativeIntensityRay/radiativeIntensityRay.H | 2 +- .../fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H | 2 +- .../radiationModels/radiationModel/noRadiation/noRadiation.C | 2 +- .../radiationModels/radiationModel/noRadiation/noRadiation.H | 2 +- .../radiationModel/radiationModel/radiationModel.C | 2 +- .../radiationModel/radiationModel/radiationModel.H | 2 +- .../radiationModel/radiationModel/radiationModelNew.C | 2 +- .../absorptionEmissionModel/absorptionEmissionModel.C | 2 +- .../absorptionEmissionModel/absorptionEmissionModel.H | 2 +- .../absorptionEmissionModel/absorptionEmissionModelNew.C | 2 +- .../binaryAbsorptionEmission/binaryAbsorptionEmission.C | 2 +- .../binaryAbsorptionEmission/binaryAbsorptionEmission.H | 2 +- .../constantAbsorptionEmission/constantAbsorptionEmission.C | 2 +- .../constantAbsorptionEmission/constantAbsorptionEmission.H | 2 +- .../greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C | 2 +- .../greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H | 2 +- .../noAbsorptionEmission/noAbsorptionEmission.C | 2 +- .../noAbsorptionEmission/noAbsorptionEmission.H | 2 +- .../wideBandAbsorptionEmission/wideBandAbsorptionEmission.C | 2 +- .../wideBandAbsorptionEmission/wideBandAbsorptionEmission.H | 2 +- .../submodels/scatterModel/constantScatter/constantScatter.C | 2 +- .../submodels/scatterModel/constantScatter/constantScatter.H | 2 +- .../submodels/scatterModel/scatterModel/scatterModel.C | 2 +- .../submodels/scatterModel/scatterModel/scatterModel.H | 2 +- .../submodels/scatterModel/scatterModel/scatterModelNew.C | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C index e972def14d..5ef5f62f86 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H index e770b20fd6..9a5f880042 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C index 5b2bca8e93..d5bc52360a 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H index 2fa538af91..5a77b6f246 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C index 766f01cce3..850ea09543 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H index a951362c84..1cf290ec79 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C index 77d8849832..efe439d69b 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H index 8f5db7f851..87048d767a 100644 --- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H +++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C index 55390c5238..f59b5632f4 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H index 39da278e1d..d06fb70b2f 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H +++ b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C index 4b62fd554a..76361fa861 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H index 378dda514a..f5279d54b9 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H index d971dda8d5..3fbce17326 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C index d10678a6c8..2ab677fbf1 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H index 93d39bfa71..58b0db59ed 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C index dca6315cb7..17cdab82b4 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H index 1ae3a4c4b4..9c2ba167a8 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOMI.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOMI.H index ae28b450a6..844f93ae03 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOMI.H +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOMI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C index 89b8e5725c..8da1d9a7ae 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H index a795052305..d2b928dbf2 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H index 3891ae9a7d..0ef6cf36c9 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H +++ b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C index 8bbd4ad5c4..045a420611 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H index c9a75b8a61..f383a99122 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H +++ b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C index 95e37a5a62..13fefd9bc9 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H index ddbdcad590..5af7733d16 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H +++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C index fcc34c566a..3c55165157 100644 --- a/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C +++ b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C index 0db3555988..6f95a84b2f 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H index 317772cb07..d515c63d0f 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C index 5d7bf58808..92a4f876a2 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C index e15c6e67eb..3ee2c15be3 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H index 6d350b04d7..9d2d437746 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C index bc29d02cb2..1ecc37d589 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H index 89bc9d14ef..34460e491a 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C index 04ad376ee6..62c491b104 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H index 0ac653c9c0..7f72d79a02 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C index 4eef20f86c..eeb2dff45f 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H index dbcef424e1..1eacbda555 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C index 0620ba27a9..474d8df17e 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H index 1283eb8b5c..053928f762 100644 --- a/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H +++ b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2008-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C index 712c6ef1f0..f2ed95e128 100644 --- a/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C +++ b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H index 429fd3dd37..f508a979ab 100644 --- a/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H +++ b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C index e35bd321ca..76641957ed 100644 --- a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C +++ b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H index f37744bfe6..128b68a45f 100644 --- a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H +++ b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C index f03469bafd..8d10e0d07e 100644 --- a/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C +++ b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License From 8eb9dcd547e4cbbccc1a9f03af06410d4788540b Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 2 Feb 2011 09:48:14 +0000 Subject: [PATCH 044/367] ENH: corrections DataEntry polynomial (reverted back to arbitrary powers) - added canIntegrate flag - issues warning if false and debug flag set --- .../DataEntry/polynomial/polynomial.C | 53 +++++++++++++------ .../DataEntry/polynomial/polynomial.H | 3 ++ 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C index 859440c6dc..87d3acc881 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C @@ -37,13 +37,33 @@ namespace Foam Foam::polynomial::polynomial(const word& entryName, Istream& is) : DataEntry(entryName), - coeffs_(is) + coeffs_(is), + canIntegrate_(true) { if (!coeffs_.size()) { FatalErrorIn("Foam::polynomial::polynomial(const word&, Istream&)") << "polynomial coefficients for entry " << this->name_ - << " is invalid (empty)" << nl << exit(FatalError); + << " are invalid (empty)" << nl << exit(FatalError); + } + + forAll(coeffs_, i) + { + if (mag(coeffs_[i].second() + 1) < ROOTVSMALL) + { + canIntegrate_ = false; + break; + } + } + + if (debug) + { + if (!canIntegrate_) + { + WarningIn("Foam::polynomial::polynomial(const word&, Istream&)") + << "Polynomial " << this->name_ << " cannot be integrated" + << endl; + } } } @@ -51,7 +71,8 @@ Foam::polynomial::polynomial(const word& entryName, Istream& is) Foam::polynomial::polynomial(const polynomial& poly) : DataEntry(poly), - coeffs_(poly.coeffs_) + coeffs_(poly.coeffs_), + canIntegrate_(poly.canIntegrate_) {} @@ -65,13 +86,10 @@ Foam::polynomial::~polynomial() Foam::scalar Foam::polynomial::value(const scalar x) const { - scalar y = coeffs_[0].first(); - scalar powX = x; - - for (label i = 1; i < coeffs_.size(); i++) + scalar y = 0.0; + forAll(coeffs_, i) { - y += coeffs_[i].first()*powX; - powX *= x; + y += coeffs_[i].first()*pow(x, coeffs_[i].second()); } return y; @@ -82,14 +100,17 @@ Foam::scalar Foam::polynomial::integrate(const scalar x1, const scalar x2) const { scalar intx = 0.0; - forAll(coeffs_, i) + if (canIntegrate_) { - intx += - coeffs_[i].first()/(coeffs_[i].second() + 1) - *( - pow(x2, coeffs_[i].second() + 1) - - pow(x1, coeffs_[i].second() + 1) - ); + forAll(coeffs_, i) + { + intx += + coeffs_[i].first()/(coeffs_[i].second() + 1) + *( + pow(x2, coeffs_[i].second() + 1) + - pow(x1, coeffs_[i].second() + 1) + ); + } } return intx; diff --git a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H index 0b4d18a4bb..e336068020 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H +++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H @@ -76,6 +76,9 @@ class polynomial //- Polynomial coefficients - list of prefactor, exponent List > coeffs_; + //- Flag to indicate whether poly can be integrated + bool canIntegrate_; + // Private Member Functions From 3bf2984e352ad7448b2bf8b1f6f4f3ccdecb260e Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 2 Feb 2011 10:26:53 +0000 Subject: [PATCH 045/367] ENH: Deactivate face/cell sources if no faces/cells present --- .../field/fieldValues/cellSource/cellSource.C | 19 +++++++++++++++++-- .../field/fieldValues/faceSource/faceSource.C | 16 +++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C index 896026c356..31b96f7e98 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C +++ b/src/postProcessing/functionObjects/field/fieldValues/cellSource/cellSource.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -122,7 +122,22 @@ void Foam::fieldValues::cellSource::initialise(const dictionary& dict) { setCellZoneCells(); - Info<< type() << " " << name_ << ":" << nl + if (nCells_ == 0) + { + WarningIn + ( + "Foam::fieldValues::cellSource::initialise(const dictionary&)" + ) + << type() << " " << name_ << ": " + << sourceTypeNames_[source_] << "(" << sourceName_ << "):" << nl + << " Source has no cells - deactivating" << endl; + + active_ = false; + return; + } + + Info<< type() << " " << name_ << ":" + << sourceTypeNames_[source_] << "(" << sourceName_ << "):" << nl << " total cells = " << nCells_ << nl << " total volume = " << gSum(filterField(mesh().V())) << nl << endl; diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C index 838658d1a2..259692c5f9 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C +++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSource.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2009-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -249,6 +249,20 @@ void Foam::fieldValues::faceSource::initialise(const dictionary& dict) } } + if (nFaces_ == 0) + { + WarningIn + ( + "Foam::fieldValues::faceSource::initialise(const dictionary&)" + ) + << type() << " " << name_ << ": " + << sourceTypeNames_[source_] << "(" << sourceName_ << "):" << nl + << " Source has no faces - deactivating" << endl; + + active_ = false; + return; + } + scalar totalArea; if (surfacePtr_.valid()) From e3dc7cf66726b28882553c8908d688eee200b0a3 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 2 Feb 2011 10:40:34 +0000 Subject: [PATCH 046/367] STYLE: diesel lib: dropletDistributionModel->sizeDistribution --- .../spraySubModels/injectorModel/Chomiak/Chomiak.C | 10 +++++----- .../spraySubModels/injectorModel/Chomiak/Chomiak.H | 2 +- .../definedHollowCone/definedHollowCone.C | 6 +++--- .../definedHollowCone/definedHollowCone.H | 2 +- .../injectorModel/hollowCone/hollowCone.C | 6 +++--- .../injectorModel/hollowCone/hollowCone.H | 2 +- .../dieselFoam/aachenBomb/constant/sprayProperties | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C index 0318dbb1fa..9332f97b5a 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.C @@ -52,11 +52,11 @@ Foam::ChomiakInjector::ChomiakInjector : injectorModel(dict, sm), ChomiakDict_(dict.subDict(typeName + "Coeffs")), - dropletDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - ChomiakDict_.subDict("dropletDistributionModel"), + ChomiakDict_.subDict("sizeDistribution"), sm.rndGen() ) ), @@ -101,7 +101,7 @@ Foam::scalar Foam::ChomiakInjector::d0 const scalar ) const { - return dropletDistributionModel_->sample(); + return sizeDistribution_->sample(); } @@ -113,8 +113,8 @@ Foam::vector Foam::ChomiakInjector::direction const scalar d ) const { - scalar dMin = dropletDistributionModel_->minValue(); - scalar dMax = dropletDistributionModel_->maxValue(); + scalar dMin = sizeDistribution_->minValue(); + scalar dMax = sizeDistribution_->maxValue(); scalar angle = (d - dMax)*maxSprayAngle_[n] diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H index 2803334068..bcda0e5df7 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H @@ -63,7 +63,7 @@ private: dictionary ChomiakDict_; - autoPtr dropletDistributionModel_; + autoPtr sizeDistribution_; scalarList maxSprayAngle_; diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C index 17e65d4d5d..4282d5ec63 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C @@ -52,11 +52,11 @@ Foam::definedHollowConeInjector::definedHollowConeInjector : injectorModel(dict, sm), definedHollowConeDict_(dict.subDict(typeName + "Coeffs")), - dropletDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - definedHollowConeDict_.subDict("dropletDistributionModel"), + definedHollowConeDict_.subDict("sizeDistribution"), sm.rndGen() ) ), @@ -138,7 +138,7 @@ Foam::scalar Foam::definedHollowConeInjector::d0 { // swallow function arguments - not used // return value sampled from distribution model - return dropletDistributionModel_->sample(); + return sizeDistribution_->sample(); } diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H index ec08e64aea..8da81dcd2c 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H @@ -60,7 +60,7 @@ private: typedef VectorSpace, scalar, 2> pair; dictionary definedHollowConeDict_; - autoPtr dropletDistributionModel_; + autoPtr sizeDistribution_; // inner and outer cone angle time histories // 2 column vectors = (time, coneAngle) diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C index 198c30eaa8..eb358ae7b4 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.C @@ -52,11 +52,11 @@ Foam::hollowConeInjector::hollowConeInjector : injectorModel(dict, sm), hollowConeDict_(dict.subDict(typeName + "Coeffs")), - dropletDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - hollowConeDict_.subDict("dropletDistributionModel"), + hollowConeDict_.subDict("sizeDistribution"), sm.rndGen() ) ), @@ -112,7 +112,7 @@ Foam::scalar Foam::hollowConeInjector::d0 const scalar ) const { - return dropletDistributionModel_->sample(); + return sizeDistribution_->sample(); } diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H index 3c80c2b2d4..abb59667b9 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/hollowCone/hollowCone.H @@ -58,7 +58,7 @@ private: dictionary hollowConeDict_; - autoPtr dropletDistributionModel_; + autoPtr sizeDistribution_; scalarList innerAngle_; scalarList outerAngle_; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties index ea38b2c4a4..f9c1ae9b09 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties @@ -120,7 +120,7 @@ RanzMarshallCoeffs hollowConeInjectorCoeffs { - dropletDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution From f4f38c3ccb1829bd1dc1e68a02bc6671de7552d0 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 2 Feb 2011 10:45:55 +0000 Subject: [PATCH 047/367] STYLE: intermediate lib: parcelDistributionModel->sizeDistribution --- .../ConeInjection/ConeInjection.C | 11 +++++++---- .../ConeInjection/ConeInjection.H | 2 +- .../ConeInjectionMP/ConeInjectionMP.C | 11 +++++++---- .../ConeInjectionMP/ConeInjectionMP.H | 2 +- .../FieldActivatedInjection.C | 8 ++++---- .../FieldActivatedInjection.H | 3 ++- .../InflationInjection/InflationInjection.C | 18 +++++++++--------- .../InflationInjection/InflationInjection.H | 2 +- .../ManualInjection/ManualInjection.C | 8 ++++---- .../ManualInjection/ManualInjection.H | 2 +- .../PatchInjection/PatchInjection.C | 8 ++++---- .../PatchInjection/PatchInjection.H | 2 +- .../constant/coalCloud1Properties | 2 +- .../constant/limestoneCloud1Properties | 2 +- .../constant/reactingCloud1Properties | 2 +- .../constant/reactingCloud1Properties | 2 +- .../hotBoxes/constant/reactingCloud1Properties | 2 +- .../hotBoxes/constant/surfaceFilmProperties | 2 +- .../constant/reactingCloud1Properties | 2 +- .../constant/surfaceFilmProperties | 2 +- .../constant/reactingCloud1Properties | 2 +- .../constant/kinematicCloud1Properties | 2 +- .../constant/thermoCloud1Properties | 2 +- .../constant/reactingCloud1Properties | 2 +- 24 files changed, 54 insertions(+), 47 deletions(-) diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C index d8675f0fd0..711c41e87b 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C @@ -95,9 +95,12 @@ Foam::ConeInjection::ConeInjection Umag_(DataEntry::New("Umag", this->coeffDict())), thetaInner_(DataEntry::New("thetaInner", this->coeffDict())), thetaOuter_(DataEntry::New("thetaOuter", this->coeffDict())), - parcelDistributionModel_ + sizeDistribution_ ( - distributionModels::distributionModel::New(this->coeffDict().subDict("parcelDistributionModel"), owner.rndGen()) + distributionModels::distributionModel::New + ( + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() + ) ), tanVec1_(vector::zero), tanVec2_(vector::zero) @@ -153,7 +156,7 @@ Foam::ConeInjection::ConeInjection Umag_(im.Umag_().clone().ptr()), thetaInner_(im.thetaInner_().clone().ptr()), thetaOuter_(im.thetaOuter_().clone().ptr()), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()), + sizeDistribution_(im.sizeDistribution_().clone().ptr()), tanVec1_(im.tanVec1_), tanVec2_(im.tanVec2_) {} @@ -222,7 +225,7 @@ void Foam::ConeInjection::setProperties parcel.U() = Umag_().value(t)*dirVec; // set particle diameter - parcel.d() = parcelDistributionModel_().sample(); + parcel.d() = sizeDistribution_().sample(); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H index 60b751bb68..278b2a1bdd 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H @@ -102,7 +102,7 @@ class ConeInjection const autoPtr > thetaOuter_; //- Parcel size distribution model model - const autoPtr parcelDistributionModel_; + const autoPtr sizeDistribution_; // Tangential vectors to the direction vector diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C index faff5d7a39..a7645b0bc2 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C @@ -126,9 +126,12 @@ Foam::ConeInjectionMP::ConeInjectionMP Umag_(DataEntry::New("Umag", this->coeffDict())), thetaInner_(DataEntry::New("thetaInner", this->coeffDict())), thetaOuter_(DataEntry::New("thetaOuter", this->coeffDict())), - parcelDistributionModel_ + sizeDistribution_ ( - distributionModels::distributionModel::New(this->coeffDict().subDict("parcelDistributionModel"), owner.rndGen()) + distributionModels::distributionModel::New + ( + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() + ) ), nInjected_(this->parcelsAddedTotal()), tanVec1_(positions_.size()), @@ -193,7 +196,7 @@ Foam::ConeInjectionMP::ConeInjectionMP Umag_(im.Umag_().clone().ptr()), thetaInner_(im.thetaInner_().clone().ptr()), thetaOuter_(im.thetaOuter_().clone().ptr()), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()), + sizeDistribution_(im.sizeDistribution_().clone().ptr()), nInjected_(im.nInjected_), tanVec1_(im.tanVec1_), tanVec2_(im.tanVec2_) @@ -268,7 +271,7 @@ void Foam::ConeInjectionMP::setProperties parcel.U() = Umag_().value(t)*dirVec; // set particle diameter - parcel.d() = parcelDistributionModel_().sample(); + parcel.d() = sizeDistribution_().sample(); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H index d986e86a49..806799bb7e 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H @@ -109,7 +109,7 @@ class ConeInjectionMP const autoPtr > thetaOuter_; //- Parcel size distribution model model - const autoPtr parcelDistributionModel_; + const autoPtr sizeDistribution_; //- Number of parcels per injector already injected mutable label nInjected_; diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C index 95209cea06..03fe941dab 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C @@ -114,11 +114,11 @@ Foam::FieldActivatedInjection::FieldActivatedInjection nParcelsInjected_(positions_.size(), 0), U0_(this->coeffDict().lookup("U0")), diameters_(positions_.size()), - parcelDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelDistributionModel"), + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) ) @@ -126,7 +126,7 @@ Foam::FieldActivatedInjection::FieldActivatedInjection // Construct parcel diameters - one per injector cell forAll(diameters_, i) { - diameters_[i] = parcelDistributionModel_->sample(); + diameters_[i] = sizeDistribution_->sample(); } // Determine total volume of particles to inject @@ -166,7 +166,7 @@ Foam::FieldActivatedInjection::FieldActivatedInjection nParcelsInjected_(im.nParcelsInjected_), U0_(im.U0_), diameters_(im.diameters_), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()) + sizeDistribution_(im.sizeDistribution_().clone().ptr()) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H index 91a570e440..cf5b023995 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H @@ -111,7 +111,8 @@ class FieldActivatedInjection scalarList diameters_; //- Parcel size distribution model model - const autoPtr parcelDistributionModel_; + const autoPtr + sizeDistribution_; protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C index b6107751f3..8930fa85e8 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C @@ -90,7 +90,7 @@ Foam::label Foam::InflationInjection::parcelsToInject ( 1, (10*volumeAccumulator_) - /CloudType::parcelType::volume(parcelDistributionModel_().minValue()) + /CloudType::parcelType::volume(sizeDistribution_().minValue()) ); label iterationNo = 0; @@ -128,7 +128,7 @@ Foam::label Foam::InflationInjection::parcelsToInject { if (selfSeed_ && !cellCentresUsed.found(cI)) { - scalar dNew = parcelDistributionModel_().sample(); + scalar dNew = sizeDistribution_().sample(); newParticles_.append ( @@ -191,7 +191,7 @@ Foam::label Foam::InflationInjection::parcelsToInject scalar R = sqrt(3.0)*a/(2.0*sqrt(2.0)); scalar d = a/(2.0*sqrt(3.0)); - scalar dNew = parcelDistributionModel_().sample(); + scalar dNew = sizeDistribution_().sample(); scalar volNew = CloudType::parcelType::volume(dNew); newParticles_.append @@ -204,7 +204,7 @@ Foam::label Foam::InflationInjection::parcelsToInject ); volumeAccumulator_ -= volNew; - dNew = parcelDistributionModel_().sample(); + dNew = sizeDistribution_().sample(); newParticles_.append ( vectorPairScalarPair @@ -215,7 +215,7 @@ Foam::label Foam::InflationInjection::parcelsToInject ); volumeAccumulator_ -= volNew; - dNew = parcelDistributionModel_().sample(); + dNew = sizeDistribution_().sample(); newParticles_.append ( vectorPairScalarPair @@ -226,7 +226,7 @@ Foam::label Foam::InflationInjection::parcelsToInject ); volumeAccumulator_ -= volNew; - dNew = parcelDistributionModel_().sample(); + dNew = sizeDistribution_().sample(); newParticles_.append ( vectorPairScalarPair @@ -341,11 +341,11 @@ Foam::InflationInjection::InflationInjection fraction_(1.0), selfSeed_(this->coeffDict().lookupOrDefault("selfSeed", false)), dSeed_(SMALL), - parcelDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelDistributionModel"), + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) ) @@ -409,7 +409,7 @@ Foam::InflationInjection::InflationInjection fraction_(im.fraction_), selfSeed_(im.selfSeed_), dSeed_(im.dSeed_), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()) + sizeDistribution_(im.sizeDistribution_().clone().ptr()) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H index 730c4acec1..ab3f3d1822 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H @@ -108,7 +108,7 @@ class InflationInjection scalar dSeed_; //- Parcel size distribution model model - const autoPtr parcelDistributionModel_; + const autoPtr sizeDistribution_; protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C index 5f23df32cc..f5255106fd 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C @@ -96,11 +96,11 @@ Foam::ManualInjection::ManualInjection injectorTetFaces_(positions_.size(), -1), injectorTetPts_(positions_.size(), -1), U0_(this->coeffDict().lookup("U0")), - parcelDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelDistributionModel"), + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) ) @@ -149,7 +149,7 @@ Foam::ManualInjection::ManualInjection // Construct parcel diameters forAll(diameters_, i) { - diameters_[i] = parcelDistributionModel_->sample(); + diameters_[i] = sizeDistribution_->sample(); } // Determine volume of particles to inject @@ -171,7 +171,7 @@ Foam::ManualInjection::ManualInjection injectorTetFaces_(im.injectorTetFaces_), injectorTetPts_(im.injectorTetPts_), U0_(im.U0_), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()) + sizeDistribution_(im.sizeDistribution_().clone().ptr()) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H index 215a8da2f1..972995a458 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H @@ -83,7 +83,7 @@ class ManualInjection const vector U0_; //- Parcel size distribution model model - const autoPtr parcelDistributionModel_; + const autoPtr sizeDistribution_; protected: diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C index a762bf3316..1f6a275027 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C @@ -104,11 +104,11 @@ Foam::PatchInjection::PatchInjection ( DataEntry::New("flowRateProfile", this->coeffDict()) ), - parcelDistributionModel_ + sizeDistribution_ ( distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelDistributionModel"), + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) ), @@ -157,7 +157,7 @@ Foam::PatchInjection::PatchInjection parcelsPerSecond_(im.parcelsPerSecond_), U0_(im.U0_), flowRateProfile_(im.flowRateProfile_().clone().ptr()), - parcelDistributionModel_(im.parcelDistributionModel_().clone().ptr()), + sizeDistribution_(im.sizeDistribution_().clone().ptr()), cellOwners_(im.cellOwners_), fraction_(im.fraction_) {} @@ -240,7 +240,7 @@ void Foam::PatchInjection::setProperties parcel.U() = U0_; // set particle diameter - parcel.d() = parcelDistributionModel_->sample(); + parcel.d() = sizeDistribution_->sample(); } diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H index 2245ad8b9c..4ee540c7bf 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H @@ -86,7 +86,7 @@ class PatchInjection const autoPtr > flowRateProfile_; //- Parcel size distribution model model - const autoPtr parcelDistributionModel_; + const autoPtr sizeDistribution_; //- List of cell labels corresponding to injector positions labelList cellOwners_; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 746e73e254..cd5f105401 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -131,7 +131,7 @@ subModels SOI 0; positionsFile "coalCloud1Positions"; U0 ( 0 -10 0 ); - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 2f97343b5c..699ce6d46b 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -107,7 +107,7 @@ subModels SOI 0; positionsFile "limestonePositions"; U0 ( 0 0 0 ); - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index 433b3082fe..60b93e7d13 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -130,7 +130,7 @@ subModels SOI 0; positionsFile "reactingCloud1Positions"; U0 (0 0 0); - parcelDistribution + sizeDistribution { pdfType uniform; uniformDistribution diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 2eaf9f11d7..e28b21992b 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -133,7 +133,7 @@ subModels parcelsPerSecond 1e5; U0 (40 0 0); flowRateProfile constant 1; - parcelDistribution + sizeDistribution { pdfType general; generalDistribution diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index 49f09ba2db..ff99c3fba9 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -131,7 +131,7 @@ subModels thetaInner constant 0; thetaOuter constant 45; - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties index 20743a48b8..9a2aa28a68 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties @@ -59,7 +59,7 @@ thermoSingleLayerCoeffs particlesPerParcel 100.0; - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties index 4f1f754edb..2b4877e8d1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties @@ -131,7 +131,7 @@ subModels thetaInner constant 0; thetaOuter constant 45; - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties index bf07405f41..7c745789b7 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties @@ -61,7 +61,7 @@ thermoSingleLayerCoeffs particlesPerParcel 100.0; - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index 93b2bfa516..823e4111ab 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -123,7 +123,7 @@ subModels SOI 0; positionsFile "reactingCloud1Positions"; U0 ( 0 0 0 ); - parcelDistribution + sizeDistribution { pdfType uniform; uniformDistribution diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index ad33dc46d3..4896ab3e80 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -87,7 +87,7 @@ subModels SOI 0; positionsFile "kinematicCloud1Positions"; U0 ( 0 0 0 ); - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 72d096b370..451e2419c7 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -106,7 +106,7 @@ subModels SOI 0; positionsFile "thermoCloud1Positions"; U0 ( 0 0 0 ); - parcelDistribution + sizeDistribution { pdfType RosinRammler; RosinRammlerDistribution diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 003816f8a7..1201e96908 100644 --- a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -144,7 +144,7 @@ subModels duration 1; // NOTE: set to 1 for steady state U0 (0 40 0); flowRateProfile constant 1; - parcelDistribution + sizeDistribution { pdfType general; generalDistribution From 07e114be7915bcf07af83a4d7804de04ae18e4bc Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 2 Feb 2011 10:58:03 +0000 Subject: [PATCH 048/367] STYLE: corrected comment line format for 80 char limit --- .../dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H index bcda0e5df7..861b19b72c 100644 --- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H +++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/Chomiak/Chomiak.H @@ -27,7 +27,7 @@ Class Description Injector model based on an idea of Jerzy Chomiak. - Given the initial droplet size distributionModel in an interval d = (d0, d1), + Given the initial droplet size distribution in an interval d = (d0, d1), the spray angle phi = phi(d), such that the largest droplets have zero spray angle and the smallest droplets have maximum spray angle. From 83a2a831600cd33b5a34f2f11c96bdf5c782c16d Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 2 Feb 2011 11:25:06 +0000 Subject: [PATCH 049/367] ENH: staticLinkage.txt : how to link static --- doc/changes/staticLinkage.txt | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 doc/changes/staticLinkage.txt diff --git a/doc/changes/staticLinkage.txt b/doc/changes/staticLinkage.txt new file mode 100644 index 0000000000..916a5107ed --- /dev/null +++ b/doc/changes/staticLinkage.txt @@ -0,0 +1,35 @@ +http://www.openfoam.com +Copyright (c) 2011 OpenCFD Ltd. + +Static linkage: + +- compile libraries as static objects: + src; ./Allwmake libo +- in the desired application (e.g. interFoam) adapt Make/options + to link all indirect and direct dependencies as .o files: + + sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB) + sinclude $(RULES)/mplib$(WM_MPLIB) + + EXE_LIBS = \ + -lz $(PLIBS) \ + $(FOAM_LIBBIN)/$(FOAM_MPI)/libPstream.o \ + $(FOAM_LIBBIN)/libOSspecific.o \ + $(FOAM_LIBBIN)/libtwoPhaseInterfaceProperties.o \ + $(FOAM_LIBBIN)/libinterfaceProperties.o \ + $(FOAM_LIBBIN)/libincompressibleTransportModels.o \ + $(FOAM_LIBBIN)/libincompressibleTurbulenceModel.o \ + $(FOAM_LIBBIN)/libincompressibleRASModels.o \ + $(FOAM_LIBBIN)/libincompressibleLESModels.o \ + $(FOAM_LIBBIN)/libLESdeltas.o \ + $(FOAM_LIBBIN)/libLESfilters.o \ + $(FOAM_LIBBIN)/libfiniteVolume.o \ + $(FOAM_LIBBIN)/libmeshTools.o \ + $(FOAM_LIBBIN)/libtriSurface.o \ + $(FOAM_LIBBIN)/libfileFormats.o \ + $(FOAM_LIBBIN)/libOpenFOAM.o \ + +- in Make/files add + SEXE = $(FOAM_USER_APPBIN)/interFoam-static +- wmake exe +- check with ldd From 49c79f073aa01dafa5f58acce6ab873f79491fc5 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 2 Feb 2011 12:40:14 +0000 Subject: [PATCH 050/367] Higher-order upwinded: Reorganised linearUpwind and created an equivalent quadraticUpwind scheme from it --- src/finiteVolume/Make/files | 5 +- .../linearUpwind/linearUpwind.C | 15 +- .../linearUpwind/linearUpwind.H | 11 +- .../linearUpwind/linearUpwindV.C | 2 +- .../linearUpwind/linearUpwindV.H | 2 +- .../schemes/quadraticUpwind/quadraticUpwind.C | 38 +++++ .../schemes/quadraticUpwind/quadraticUpwind.H | 134 ++++++++++++++++++ 7 files changed, 189 insertions(+), 18 deletions(-) rename src/finiteVolume/interpolation/surfaceInterpolation/{limitedSchemes => schemes}/linearUpwind/linearUpwind.C (92%) rename src/finiteVolume/interpolation/surfaceInterpolation/{limitedSchemes => schemes}/linearUpwind/linearUpwind.H (92%) rename src/finiteVolume/interpolation/surfaceInterpolation/{limitedSchemes => schemes}/linearUpwind/linearUpwindV.C (98%) rename src/finiteVolume/interpolation/surfaceInterpolation/{limitedSchemes => schemes}/linearUpwind/linearUpwindV.H (98%) create mode 100644 src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C create mode 100644 src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.H diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index 2e4dd38bb1..1e8508d860 100644 --- a/src/finiteVolume/Make/files +++ b/src/finiteVolume/Make/files @@ -243,13 +243,14 @@ $(schemes)/cubicUpwindFit/cubicUpwindFit.C $(schemes)/quadraticLinearPureUpwindFit/quadraticLinearPureUpwindFit.C */ $(schemes)/linearPureUpwindFit/linearPureUpwindFit.C +$(schemes)/linearUpwind/linearUpwind.C +$(schemes)/linearUpwind/linearUpwindV.C +$(schemes)/quadraticUpwind/quadraticUpwind.C limitedSchemes = $(surfaceInterpolation)/limitedSchemes $(limitedSchemes)/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationSchemes.C $(limitedSchemes)/upwind/upwind.C $(limitedSchemes)/blended/blended.C -$(limitedSchemes)/linearUpwind/linearUpwind.C -$(limitedSchemes)/linearUpwind/linearUpwindV.C $(limitedSchemes)/Gamma/Gamma.C $(limitedSchemes)/SFCD/SFCD.C $(limitedSchemes)/Minmod/Minmod.C diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C similarity index 92% rename from src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C rename to src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C index 7f17534c94..77b6ae0d3b 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "linearUpwind.H" #include "fvMesh.H" -#include "zeroGradientFvPatchField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -85,16 +84,8 @@ Foam::linearUpwind::correction forAll(faceFlux, facei) { - if (faceFlux[facei] > 0) - { - label own = owner[facei]; - sfCorr[facei] = (Cf[facei] - C[own]) & gradVf[own]; - } - else - { - label nei = neighbour[facei]; - sfCorr[facei] = (Cf[facei] - C[nei]) & gradVf[nei]; - } + label celli = (faceFlux[facei] > 0) ? owner[facei] : neighbour[facei]; + sfCorr[facei] = (Cf[facei] - C[celli]) & gradVf[celli]; } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H similarity index 92% rename from src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H rename to src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H index 603294c189..232172ba0d 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,8 @@ Class Description linearUpwind interpolation scheme class derived from upwind and returns - upwind weighting factors but also applies an explicit correction. + upwind weighting factors and also applies a gradient-based explicit + correction. SourceFiles linearUpwind.C @@ -67,6 +68,12 @@ class linearUpwind //- Disallow default bitwise assignment void operator=(const linearUpwind&); + //- Hide the limiter because this is not formally a limited scheme + virtual tmp limiter + ( + const GeometricField& + ) const; + public: diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C similarity index 98% rename from src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C rename to src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C index 695637e383..0747a3fb2b 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H similarity index 98% rename from src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.H rename to src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H index 6cd31b836a..262d54115d 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C new file mode 100644 index 0000000000..d0779945d3 --- /dev/null +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C @@ -0,0 +1,38 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +\*---------------------------------------------------------------------------*/ + +#include "quadraticUpwind.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + //makeSurfaceInterpolationScheme(quadraticUpwind); + makeSurfaceInterpolationTypeScheme(quadraticUpwind, scalar); + makeSurfaceInterpolationTypeScheme(quadraticUpwind, vector); +} + +// ************************************************************************* // diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.H new file mode 100644 index 0000000000..a2fb36f7fb --- /dev/null +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.H @@ -0,0 +1,134 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + quadraticUpwind + +Description + quadraticUpwind interpolation scheme class derived from linearUpwind and + returns blended linear/upwind weighting factors and also applies a explicit + gradient-based correction obtained from the linearUpwind scheme. + +SourceFiles + quadraticUpwind.C + +\*---------------------------------------------------------------------------*/ + +#ifndef quadraticUpwind_H +#define quadraticUpwind_H + +#include "linearUpwind.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class quadraticUpwind Declaration +\*---------------------------------------------------------------------------*/ + +template +class quadraticUpwind +: + public linearUpwind +{ + // Private Member Functions + + //- Disallow default bitwise copy construct + quadraticUpwind(const quadraticUpwind&); + + //- Disallow default bitwise assignment + void operator=(const quadraticUpwind&); + + +public: + + //- Runtime type information + TypeName("quadraticUpwind"); + + + // Constructors + + //- Construct from mesh and Istream + quadraticUpwind + ( + const fvMesh& mesh, + Istream& schemeData + ) + : + linearUpwind(mesh, schemeData) + {} + + //- Construct from mesh, faceFlux and Istream + quadraticUpwind + ( + const fvMesh& mesh, + const surfaceScalarField& faceFlux, + Istream& schemeData + ) + : + linearUpwind(mesh, faceFlux, schemeData) + {} + + + // Member Functions + + //- Return the interpolation weighting factors + virtual tmp weights + ( + const GeometricField& + ) const + { + return + 0.75*this->mesh().surfaceInterpolation::weights() + + 0.25*linearUpwind::weights(); + } + + //- Return true if this scheme uses an explicit correction + virtual bool corrected() const + { + return true; + } + + //- Return the explicit correction to the face-interpolate + virtual tmp > + correction + ( + const GeometricField& vf + ) const + { + return 0.25*linearUpwind::correction(vf); + } +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // From 8b5840d012d77c5d19adbf7fe17e7d5874aa6459 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 2 Feb 2011 12:41:54 +0000 Subject: [PATCH 051/367] ENH: mergePoints.C : enforce correct use of merge tolerance --- src/OpenFOAM/meshes/meshTools/mergePoints.C | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/src/OpenFOAM/meshes/meshTools/mergePoints.C b/src/OpenFOAM/meshes/meshTools/mergePoints.C index d11a2e5318..9aa614627d 100644 --- a/src/OpenFOAM/meshes/meshTools/mergePoints.C +++ b/src/OpenFOAM/meshes/meshTools/mergePoints.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -61,11 +61,26 @@ bool Foam::mergePoints return false; } + // We're comparing distance squared to origin first. + // Say if starting from two close points: + // x, y, z + // x+mergeTol, y+mergeTol, z+mergeTol + // Then the magSqr of both will be + // x^2+y^2+z^2 + // x^2+y^2+z^2 + 2*mergeTol*(x+z+y) + mergeTol^2*... + // so the difference will be 2*mergeTol*(x+y+z) const scalar mergeTolSqr = sqr(mergeTol); // Sort points by magSqr - SortableList sortedMagSqr(magSqr(points - compareOrigin)); + const pointField d(points - compareOrigin); + SortableList sortedMagSqr(magSqr(d)); + scalarField sortedTol(points.size()); + forAll(sortedMagSqr.indices(), sortI) + { + const point& pt = d[sortedMagSqr.indices()[sortI]]; + sortedTol[sortI] = 2*mergeTol*(mag(pt.x())+mag(pt.y())+mag(pt.z())); + } bool hasMerged = false; @@ -94,7 +109,7 @@ bool Foam::mergePoints ( sortedMagSqr[prevSortI] - sortedMagSqr[sortI] - ) <= mergeTolSqr; + ) <= sortedTol[sortI]; prevSortI-- ) { From 3e6bfa814f7308feed05673b0db8de11591adfdd Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 2 Feb 2011 12:42:45 +0000 Subject: [PATCH 052/367] COMP: MGridGenGamgAgglomeration : compile only if present in ThirdParty --- src/fvAgglomerationMethods/Allwmake | 7 ++++++- .../MGridGenGamgAgglomeration/Make/options | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake index fcccbcbe9a..61d951c8c6 100755 --- a/src/fvAgglomerationMethods/Allwmake +++ b/src/fvAgglomerationMethods/Allwmake @@ -3,6 +3,11 @@ cd ${0%/*} || exit 1 # run from this directory [ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -wmake $makeOption MGridGenGamgAgglomeration +export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0 + +if [ -d "$ParMGridGen/MGridGen/Lib" ] +then + wmake $makeOption MGridGenGamgAgglomeration +fi # ----------------------------------------------------------------- end-of-file diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options index 80b3169750..a58b65fb79 100644 --- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options +++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options @@ -1,4 +1,4 @@ -ParMGridGen = $(WM_THIRD_PARTY_DIR)/ParMGridGen-1.0 +/* Needs ParMGridGen environment variable set. (see Allwmake script) */ TYPE_REAL= #if defined(WM_SP) From e0ee9bcf8451d898f93a01de67918824107850b0 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 2 Feb 2011 12:44:02 +0000 Subject: [PATCH 053/367] BUG: stitchTriangles : work on triSurface points --- .../triSurface/interfaces/AC3D/readAC.C | 4 ++-- .../triSurface/interfaces/STL/readSTLASCII.L | 8 +++++-- .../triSurface/interfaces/STL/readSTLBINARY.C | 8 +++++-- .../triSurface/interfaces/TRI/readTRI.C | 8 +++++-- src/triSurface/triSurface/stitchTriangles.C | 23 +++++++------------ src/triSurface/triSurface/triSurface.C | 4 ++-- src/triSurface/triSurface/triSurface.H | 1 - 7 files changed, 30 insertions(+), 26 deletions(-) diff --git a/src/triSurface/triSurface/interfaces/AC3D/readAC.C b/src/triSurface/triSurface/interfaces/AC3D/readAC.C index d4e8b0a752..dfe4ae0904 100644 --- a/src/triSurface/triSurface/interfaces/AC3D/readAC.C +++ b/src/triSurface/triSurface/interfaces/AC3D/readAC.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -331,7 +331,7 @@ bool triSurface::readAC(const fileName& ACfileName) *this = triSurface(faces, patches, allPoints, true); - stitchTriangles(allPoints); + stitchTriangles(); return true; } diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L index 4b33f27f57..9cb9f1d3d1 100644 --- a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L +++ b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -422,6 +422,7 @@ bool triSurface::readSTLASCII(const fileName& STLfileName) setSize(lexer.nTriangles()); DynamicList