diff --git a/applications/solvers/combustion/dieselEngineFoam/Make/options b/applications/solvers/combustion/dieselEngineFoam/Make/options index 9cefdaf996..c4d65fa137 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 \ @@ -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 1e6ccfa139..124371575d 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 \ @@ -32,5 +32,5 @@ EXE_LIBS = \ -llaminarFlameSpeedModels \ -lchemistryModel \ -lODE \ - -lpdf \ + -ldistributionModels \ -lfiniteVolume 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..a2e3c13d24 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/Make/options +++ b/applications/solvers/lagrangian/coalChemistryFoam/Make/options @@ -5,18 +5,18 @@ 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/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 \ -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..e679c15b7e 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options @@ -5,18 +5,18 @@ 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/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 \ -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..ba7c9544a8 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -2,18 +2,18 @@ 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/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 \ -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..062f9fbd28 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -4,18 +4,18 @@ 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/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 \ -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..e679c15b7e 100644 --- a/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/steadyReactingParcelFoam/Make/options @@ -5,18 +5,18 @@ 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/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 \ -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/Distribution/Test-Distribution.C b/applications/test/Distribution/Test-Distribution.C index f6da957fb9..8f84237019 100644 --- a/applications/test/Distribution/Test-Distribution.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/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/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/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 diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index 804d519386..826bc4c144 100644 --- a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options +++ b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options @@ -34,22 +34,22 @@ EXE_LIBS = \ -llaminarFlameSpeedModels \ -lLESdeltas \ -lLESfilters \ - -lliquidMixture \ - -lliquids \ + -lliquidMixtureProperties \ + -lliquidProperties \ -lmeshTools \ -lmolecularMeasurements \ -lmolecule \ -lODE \ -lOpenFOAM \ - -lpdf \ + -ldistributionModels \ -lpotential \ - -lradiation \ + -lradiationModels \ -lrandomProcesses \ -lreactionThermophysicalModels \ -lsampling \ - -lpointSolidMixture \ + -lsolidMixtureProperties \ -lsolidParticle \ - -lpointSolids \ + -lsolidProperties \ -lspecie \ -lsurfMesh \ -lsystemCall \ 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/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/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"); } 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 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.

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..a9c7db7118 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 @@ -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 diff --git a/etc/settings.sh b/etc/settings.sh index 637bee7aab..a20742b5fa 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 diff --git a/src/Allwmake b/src/Allwmake index 4dbc726a21..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" @@ -20,13 +18,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 $makeOption OpenFOAM wmake $makeOption fileFormats diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index 372ce59ff2..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 @@ -47,6 +61,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 @@ -56,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 @@ -82,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/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/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 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-- ) { 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 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 ( 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/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 68% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C rename to src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C index f142458397..87d3acc881 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 @@ -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/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H similarity index 95% rename from src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H rename to src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H index 78c55c7870..e336068020 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 @@ -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 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/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 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/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..303c417ac7 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,31 +24,32 @@ 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 { 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])) { @@ -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 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 b335ef8632..0d1770f412 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 @@ -132,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, @@ -148,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 {} @@ -170,12 +173,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 +205,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 +216,7 @@ public: // Static members - virtual List const& elementTypes() const + virtual const List& elementTypes() const { return elemTypes_; } @@ -256,12 +260,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 +288,7 @@ public: // Edit //- renumber elements - void renumber(labelList const&); + void renumber(const labelUList&); //- write summary information about the object bool writeSummary(Ostream&) const; @@ -296,31 +301,37 @@ public: {} //- Helper: write geometry given the pointField - void writeGeometry(ensightGeoFile&, const pointField& points) const; + 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 - template + // optionally write data per node + template void writeField ( ensightFile&, - const Field& + const Field&, + const bool perNode = false ) const; @@ -339,11 +350,8 @@ public: friend Ostream& operator<<(Ostream&, const ensightPart&); //- write geometry - friend ensightGeoFile& operator<< - ( - ensightGeoFile&, - const ensightPart& - ); + friend ensightGeoFile& operator<<(ensightGeoFile&, const ensightPart&); + }; @@ -354,7 +362,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..a05b70bcef 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 labelUList& 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 labelList& idList + const polyMesh& mesh, + const labelUList& 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,25 +253,23 @@ 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; 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) { - const face& f = mesh.faces()[cFaces[cFaceI]]; + const face& f = mesh_.faces()[cFaces[cFaceI]]; forAll(f, fp) { @@ -345,42 +301,40 @@ 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); 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 label id = idList[i] + offset_; + const labelUList& cFace = mesh_.cells()[id]; - os.write( cFace.size() ); + os.write(cFace.size()); os.newline(); } // 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) { const face& cf = meshFaces[cFace[faceI]]; - os.write( cf.size() ); + os.write(cf.size()); os.newline(); } } @@ -388,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) { @@ -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,18 +362,18 @@ void Foam::ensightPartCells::writeConnectivity else { // write primitive - const cellShapeList& cellShapes = mesh.cellShapes(); + const cellShapeList& cellShapes = mesh_.cellShapes(); forAll(idList, i) { - label id = idList[i] + offset_; + const label id = idList[i] + offset_; const cellShape& cellPoints = cellShapes[id]; // convert global -> local index // (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..cd79c029b6 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 labelUList& idLabels = labelUList::null() + ); //- track points used virtual localPoints calcLocalPoints() const; @@ -68,30 +72,35 @@ 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; - //- 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: @@ -112,7 +121,7 @@ public: ( label partNumber, const polyMesh&, - const labelList& + const labelUList& ); //- Construct from polyMesh and cellZone @@ -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..c8bfaa00df 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,21 +203,27 @@ 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; 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 face& f = mesh.faces()[id]; + const label id = idList[i] + offset_; + const face& f = faces_[id]; forAll(f, fp) { @@ -219,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); @@ -233,10 +269,10 @@ 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() ); + os.write(f.size()); os.newline(); } } @@ -244,14 +280,14 @@ 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 // (note: Ensight indices start with 1) forAll(f, fp) { - os.write( pointMap[f[fp]] + 1 ); + os.write(pointMap[f[fp]] + 1); } os.newline(); } @@ -262,15 +298,15 @@ void Foam::ensightPartFaces::writeConnectivity ( ensightGeoFile& os, const word& key, - const labelList& idList, - const labelList& pointMap + const labelUList& idList, + const labelUList& pointMap ) const { 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..1b64688d9c 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 labelUList& idList, + const labelUList& 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 labelUList& idList, + const labelUList& 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..bc893b8411 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 @@ -59,24 +59,71 @@ 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) +{ + 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 +135,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 +159,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; } @@ -127,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); @@ -136,13 +183,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(); } } @@ -169,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); + } } } } @@ -195,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/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 59% rename from src/conversion/ensight/part/ensightPartI.H rename to src/conversion/ensight/part/ensightPartTemplates.C index 9286273276..2f3f4a5994 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,33 +30,50 @@ Description // * * * * * * * * * * * * * * * Global Functions * * * * * * * * * * * * * // -template +template void Foam::ensightPart::writeField ( ensightFile& os, - const Field& field + const Field& field, + const bool perNode ) const { - if (size() && field.size()) + 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 76179b4a11..240b9fb859 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 labelUList& 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++; @@ -181,8 +162,8 @@ void Foam::ensightParts::recalculate(const polyMesh& pMesh) void Foam::ensightParts::renumber ( - const labelList& origCellId, - const labelList& origFaceId + const labelUList& origCellId, + const labelUList& origFaceId ) { forAll(partsList_, partI) @@ -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&)"); } @@ -249,7 +228,8 @@ void Foam::ensightParts::writeScalarField ( ensightFile& os, const List& field, - bool useFaceData + const bool useFaceData, + const bool perNode ) const { forAll(partsList_, partI) @@ -261,7 +241,7 @@ void Foam::ensightParts::writeScalarField : partsList_[partI].isCellData() ) { - partsList_[partI].writeScalarField(os,field); + partsList_[partI].writeScalarField(os, field, perNode); } } } @@ -273,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) @@ -285,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 3d620192b5..6b4f49eef9 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 \*---------------------------------------------------------------------------*/ @@ -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,27 +108,33 @@ 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 - template + //- write generalized volume field components + template void writeField ( ensightFile&, @@ -138,11 +144,8 @@ public: // Friend Operators - friend ensightGeoFile& operator<< - ( - ensightGeoFile&, - const ensightParts& - ); + //- write geometry + friend ensightGeoFile& operator<<(ensightGeoFile&, const ensightParts&); }; @@ -153,7 +156,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/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/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 96% rename from src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H rename to src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H index 603294c189..6c00e4deb2 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 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/sampling/sampledSurface/writers/dx/dxSurfaceWriterRunTime.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C similarity index 61% rename from src/sampling/sampledSurface/writers/dx/dxSurfaceWriterRunTime.C rename to src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C index a53ba0f34f..d0779945d3 100644 --- a/src/sampling/sampledSurface/writers/dx/dxSurfaceWriterRunTime.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C @@ -2,16 +2,16 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / 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 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 @@ -19,25 +19,20 @@ License for more details. You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA \*---------------------------------------------------------------------------*/ -#include "dxSurfaceWriter.H" -#include "surfaceWriters.H" -#include "addToRunTimeSelectionTable.H" +#include "quadraticUpwind.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -makeSurfaceWriters(dxSurfaceWriter); - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End 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 + +// ************************************************************************* // diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake index 27f2fea53a..61d951c8c6 100755 --- a/src/fvAgglomerationMethods/Allwmake +++ b/src/fvAgglomerationMethods/Allwmake @@ -1,10 +1,13 @@ #!/bin/sh cd ${0%/*} || exit 1 # run from this directory +[ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x -makeOption=libso -[ $# -ge 1 ] && makeOption=$1 +export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0 -wmake $makeOption MGridGenGamgAgglomeration +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) diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake index 26fd814f63..908338e62f 100755 --- a/src/lagrangian/Allwmake +++ b/src/lagrangian/Allwmake @@ -1,10 +1,9 @@ #!/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 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 93f4b9d404..33cc415fdf 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -3,16 +3,16 @@ 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/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/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 \ @@ -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 9891ba0197..4d4eba8a2d 100644 --- a/src/lagrangian/dieselSpray/Make/options +++ b/src/lagrangian/dieselSpray/Make/options @@ -8,12 +8,12 @@ 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 \ - -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..9332f97b5a 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_ + sizeDistribution_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - ChomiakDict_.subDict("dropletPDF"), + ChomiakDict_.subDict("sizeDistribution"), sm.rndGen() ) ), @@ -101,7 +101,7 @@ Foam::scalar Foam::ChomiakInjector::d0 const scalar ) const { - return dropletPDF_->sample(); + return sizeDistribution_->sample(); } @@ -113,8 +113,8 @@ Foam::vector Foam::ChomiakInjector::direction const scalar d ) const { - scalar dMin = dropletPDF_->minValue(); - scalar dMax = dropletPDF_->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 41ca27335d..861b19b72c 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 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. @@ -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 sizeDistribution_; scalarList maxSprayAngle_; diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C index 1fc417ba6f..4282d5ec63 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_ + sizeDistribution_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - definedHollowConeDict_.subDict("dropletPDF"), + definedHollowConeDict_.subDict("sizeDistribution"), 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 sizeDistribution_->sample(); } diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.H index 469b0e0ae5..8da81dcd2c 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 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 3be1a660f1..eb358ae7b4 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_ + sizeDistribution_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - hollowConeDict_.subDict("dropletPDF"), + hollowConeDict_.subDict("sizeDistribution"), sm.rndGen() ) ), @@ -112,7 +112,7 @@ Foam::scalar Foam::hollowConeInjector::d0 const scalar ) const { - return dropletPDF_->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 6c956df465..abb59667b9 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 sizeDistribution_; scalarList innerAngle_; scalarList outerAngle_; diff --git a/src/thermophysicalModels/pdfs/Make/files b/src/lagrangian/distributionModels/Make/files similarity index 56% rename from src/thermophysicalModels/pdfs/Make/files rename to src/lagrangian/distributionModels/Make/files index e032b86bc5..c7b621cf58 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/Make/options b/src/lagrangian/distributionModels/Make/options similarity index 100% rename from src/thermophysicalModels/pdfs/Make/options rename to src/lagrangian/distributionModels/Make/options diff --git a/src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C similarity index 69% rename from src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.C rename to src/lagrangian/distributionModels/RosinRammler/RosinRammler.C index a39d48aa69..f3338f92ef 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H similarity index 86% rename from src/thermophysicalModels/pdfs/RosinRammler/RosinRammler.H rename to src/lagrangian/distributionModels/RosinRammler/RosinRammler.H index eb03127686..8fd67cc5a4 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/pdf/pdf.C b/src/lagrangian/distributionModels/distributionModel/distributionModel.C similarity index 54% rename from src/thermophysicalModels/pdfs/pdf/pdf.C rename to src/lagrangian/distributionModels/distributionModel/distributionModel.C index 14f6d659c0..e2be585969 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/pdf/pdf.H b/src/lagrangian/distributionModels/distributionModel/distributionModel.H similarity index 68% rename from src/thermophysicalModels/pdfs/pdf/pdf.H rename to src/lagrangian/distributionModels/distributionModel/distributionModel.H index d61ace2649..26c6eaa5a4 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/pdf/pdfNew.C b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C similarity index 68% rename from src/thermophysicalModels/pdfs/pdf/pdfNew.C rename to src/lagrangian/distributionModels/distributionModel/distributionModelNew.C index 634972ceb7..7084be4275 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/exponential/exponential.C b/src/lagrangian/distributionModels/exponential/exponential.C similarity index 70% rename from src/thermophysicalModels/pdfs/exponential/exponential.C rename to src/lagrangian/distributionModels/exponential/exponential.C index 2eba8cef5c..e9bc6f4edf 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/exponential/exponential.H b/src/lagrangian/distributionModels/exponential/exponential.H similarity index 86% rename from src/thermophysicalModels/pdfs/exponential/exponential.H rename to src/lagrangian/distributionModels/exponential/exponential.H index 6b012c3c64..c0211d3550 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/fixedValue/fixedValue.C b/src/lagrangian/distributionModels/fixedValue/fixedValue.C similarity index 69% rename from src/thermophysicalModels/pdfs/fixedValue/fixedValue.C rename to src/lagrangian/distributionModels/fixedValue/fixedValue.C index 5808c5dbb5..e990b1479b 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/fixedValue/fixedValue.H b/src/lagrangian/distributionModels/fixedValue/fixedValue.H similarity index 84% rename from src/thermophysicalModels/pdfs/fixedValue/fixedValue.H rename to src/lagrangian/distributionModels/fixedValue/fixedValue.H index c290511428..4385f96c5e 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/general/general.C b/src/lagrangian/distributionModels/general/general.C similarity index 81% rename from src/thermophysicalModels/pdfs/general/general.C rename to src/lagrangian/distributionModels/general/general.C index 8f8224ed6b..6e5aad7a7b 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/general/general.H b/src/lagrangian/distributionModels/general/general.H similarity index 87% rename from src/thermophysicalModels/pdfs/general/general.H rename to src/lagrangian/distributionModels/general/general.H index c212f92aea..9201ec143e 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/multiNormal/multiNormal.C b/src/lagrangian/distributionModels/multiNormal/multiNormal.C similarity index 76% rename from src/thermophysicalModels/pdfs/multiNormal/multiNormal.C rename to src/lagrangian/distributionModels/multiNormal/multiNormal.C index 554063bdbf..2f06f898e3 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/multiNormal/multiNormal.H b/src/lagrangian/distributionModels/multiNormal/multiNormal.H similarity index 85% rename from src/thermophysicalModels/pdfs/multiNormal/multiNormal.H rename to src/lagrangian/distributionModels/multiNormal/multiNormal.H index 4b8a9dc731..6af776a728 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/normal/normal.C b/src/lagrangian/distributionModels/normal/normal.C similarity index 75% rename from src/thermophysicalModels/pdfs/normal/normal.C rename to src/lagrangian/distributionModels/normal/normal.C index f8e9f7716e..1a629100ac 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/normal/normal.H b/src/lagrangian/distributionModels/normal/normal.H similarity index 83% rename from src/thermophysicalModels/pdfs/normal/normal.H rename to src/lagrangian/distributionModels/normal/normal.H index 9767398cbe..60c39f1059 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/uniform/uniform.C b/src/lagrangian/distributionModels/uniform/uniform.C similarity index 70% rename from src/thermophysicalModels/pdfs/uniform/uniform.C rename to src/lagrangian/distributionModels/uniform/uniform.C index 1493fe1e6b..7f00a05a93 100644 --- a/src/thermophysicalModels/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/thermophysicalModels/pdfs/uniform/uniform.H b/src/lagrangian/distributionModels/uniform/uniform.H similarity index 86% rename from src/thermophysicalModels/pdfs/uniform/uniform.H rename to src/lagrangian/distributionModels/uniform/uniform.H index db0e44ddbf..2872e88f3c 100644 --- a/src/thermophysicalModels/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/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/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index 7ff9a9456a..0d45fdda60 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -2,16 +2,16 @@ 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/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/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 \ @@ -24,7 +24,7 @@ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -llagrangian \ - -lpdf \ + -ldistributionModels \ -lliquidProperties \ -lliquidMixtureProperties \ -lsolidProperties \ @@ -34,7 +34,7 @@ LIB_LIBS = \ -lreactionThermophysicalModels \ -lSLGThermo \ -lchemistryModel \ - -lradiation \ + -lradiationModels \ -lODE \ -lcompressibleRASModels \ -lcompressibleLESModels \ diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C index 53e0056739..711c41e87b 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,12 @@ Foam::ConeInjection::ConeInjection Umag_(DataEntry::New("Umag", this->coeffDict())), thetaInner_(DataEntry::New("thetaInner", this->coeffDict())), thetaOuter_(DataEntry::New("thetaOuter", this->coeffDict())), - parcelPDF_ + sizeDistribution_ ( - pdfs::pdf::New(this->coeffDict().subDict("parcelPDF"), 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()), - parcelPDF_(im.parcelPDF_().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() = parcelPDF_().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 31768d223f..278b2a1bdd 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 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 122ebea145..a7645b0bc2 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,12 @@ Foam::ConeInjectionMP::ConeInjectionMP Umag_(DataEntry::New("Umag", this->coeffDict())), thetaInner_(DataEntry::New("thetaInner", this->coeffDict())), thetaOuter_(DataEntry::New("thetaOuter", this->coeffDict())), - parcelPDF_ + sizeDistribution_ ( - pdfs::pdf::New(this->coeffDict().subDict("parcelPDF"), 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()), - parcelPDF_(im.parcelPDF_().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() = parcelPDF_().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 47b19de6d3..806799bb7e 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 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 75f34af8eb..03fe941dab 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_ + sizeDistribution_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelPDF"), + 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] = parcelPDF_->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_), - parcelPDF_(im.parcelPDF_().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 b7d76873e0..cf5b023995 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,9 @@ class FieldActivatedInjection //- List of parcel diameters scalarList diameters_; - //- Parcel size PDF model - const autoPtr parcelPDF_; + //- Parcel size distribution model model + 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 3cf8114164..8930fa85e8 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(sizeDistribution_().minValue()) ); label iterationNo = 0; @@ -128,7 +128,7 @@ Foam::label Foam::InflationInjection::parcelsToInject { if (selfSeed_ && !cellCentresUsed.found(cI)) { - scalar dNew = parcelPDF_().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 = parcelPDF_().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 = parcelPDF_().sample(); + dNew = sizeDistribution_().sample(); newParticles_.append ( vectorPairScalarPair @@ -215,7 +215,7 @@ Foam::label Foam::InflationInjection::parcelsToInject ); volumeAccumulator_ -= volNew; - dNew = parcelPDF_().sample(); + dNew = sizeDistribution_().sample(); newParticles_.append ( vectorPairScalarPair @@ -226,7 +226,7 @@ Foam::label Foam::InflationInjection::parcelsToInject ); volumeAccumulator_ -= volNew; - dNew = parcelPDF_().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), - parcelPDF_ + sizeDistribution_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelPDF"), + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) ) @@ -409,7 +409,7 @@ Foam::InflationInjection::InflationInjection fraction_(im.fraction_), selfSeed_(im.selfSeed_), dSeed_(im.dSeed_), - parcelPDF_(im.parcelPDF_().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 b10c8e17d9..ab3f3d1822 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 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 fa816d2e17..f5255106fd 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_ + sizeDistribution_ ( - pdfs::pdf::New + distributionModels::distributionModel::New ( - this->coeffDict().subDict("parcelPDF"), + this->coeffDict().subDict("sizeDistribution"), owner.rndGen() ) ) @@ -149,7 +149,7 @@ Foam::ManualInjection::ManualInjection // Construct parcel diameters forAll(diameters_, i) { - diameters_[i] = parcelPDF_->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_), - parcelPDF_(im.parcelPDF_().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 bf7616b71a..972995a458 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 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 c124977e5a..1f6a275027 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_ + sizeDistribution_ ( - pdfs::pdf::New(this->coeffDict().subDict("parcelPDF"), owner.rndGen()) + distributionModels::distributionModel::New + ( + this->coeffDict().subDict("sizeDistribution"), + 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()), + sizeDistribution_(im.sizeDistribution_().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() = 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 05b1236a8a..4ee540c7bf 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 sizeDistribution_; //- List of cell labels corresponding to injector positions labelList cellOwners_; 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 d658d74dd6..6ca04ca70d 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 wmake $makeOption conformalVoronoiMesh 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/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()) 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 82038ddcd7..581b7e206b 100644 --- a/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C +++ b/src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C @@ -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,15 @@ 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_); + const word writeType(dict.lookup("surfaceFormat")); + // define the surface formatter + // 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/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/ensight/ensightSurfaceWriter.C b/src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C index cde2d597a8..d83ec611a1 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 @@ -28,137 +28,23 @@ License #include "OFstream.H" #include "OSspecific.H" #include "IOmanip.H" -#include "ensightGeoFile.H" -#include "ensightPartNonMeshFaces.H" +#include "ensightPartFaces.H" -// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // +#include "makeSurfaceWriterMethods.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // namespace Foam { - - // Write scalarField in ensight format - template<> - void Foam::ensightSurfaceWriter::writeData - ( - Ostream& os, - 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; - } - } + makeSurfaceWriterType(ensightSurfaceWriter); + addToRunTimeSelectionTable(surfaceWriter, ensightSurfaceWriter, wordDict); } -// Write generic field in ensight format -template -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; - } - } -} - - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -// Construct from components -template -Foam::ensightSurfaceWriter::ensightSurfaceWriter() -: - surfaceWriter() -{} - - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // 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,51 +61,38 @@ 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 + 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 @@ -230,41 +103,97 @@ void Foam::ensightSurfaceWriter::write << timeValue << nl << nl; - ensightPartNonMeshFaces faceWriter(0, geomStr.name().name(), faces, points); - faceWriter.writeGeometry(geomStr); + ensightPartFaces ensPart(0, osGeom.name().name(), points, faces, true); + osGeom << ensPart; // Write field - fieldStr - << pTraits::typeName << nl - << "part" << nl - << setw(10) << 1 << nl; + osField.writeKeyword(pTraits::typeName); + ensPart.writeField(osField, values, isNodeValues); +} - if (isNodeValues) + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::ensightSurfaceWriter::ensightSurfaceWriter() +: + surfaceWriter(), + writeFormat_(IOstream::ASCII) +{} + + +Foam::ensightSurfaceWriter::ensightSurfaceWriter(const dictionary& options) +: + surfaceWriter(), + writeFormat_(IOstream::ASCII) +{ + // choose ascii or binary format + if (options.found("format")) { - fieldStr << "coordinates" << nl; - writeData(fieldStr, values); - } - else - { - //faceWriter.writeField(fieldStr, values); - forAll(faceWriter.elementTypes(), elemI) - { - if (faceWriter.elemLists()[elemI].size()) - { - fieldStr.writeKeyword(faceWriter.elementTypes()[elemI]); - writeData - ( - fieldStr, - Field - ( - values, - faceWriter.elemLists()[elemI] - ) - ); - } - } + writeFormat_ = IOstream::formatEnum(options.lookup("format")); } } +// * * * * * * * * * * * * * * * * 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 osCase(outputDir/surfaceName + ".case"); + ensightGeoFile osGeom + ( + outputDir/surfaceName + ".000.mesh", + writeFormat_ + ); + + if (verbose) + { + Info<< "Writing case file to " << osCase.name() << endl; + } + + osCase + << "FORMAT" << nl + << "type: ensight gold" << nl + << nl + << "GEOMETRY" << nl + << "model: 1 " << osGeom.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; + + ensightPartFaces ensPart(0, osGeom.name().name(), points, faces, true); + osGeom << 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..628c178d4e 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,35 @@ 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_; + //- Write option (default is IOstream::ASCII + IOstream::streamFormat writeFormat_; // Private Member Functions - static void writeData(Ostream&, const Field& values); + //- 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: @@ -77,6 +84,9 @@ public: //- Construct null ensightSurfaceWriter(); + //- Construct with some output options + ensightSurfaceWriter(const dictionary& options); + //- Destructor virtual ~ensightSurfaceWriter(); @@ -84,9 +94,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 +113,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 +192,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..f297e0934f 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,44 @@ 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); + defineRunTimeSelectionTable(surfaceWriter, wordDict); + 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 +80,37 @@ Foam::surfaceWriter::New(const word& writeType) } } - return autoPtr< surfaceWriter >(cstrIter()()); + return autoPtr(cstrIter()()); +} + + +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 * * * * * * * * * * * * * * // -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..be26517849 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 @@ -80,11 +70,30 @@ public: () ); + declareRunTimeSelectionTable + ( + autoPtr, + surfaceWriter, + wordDict, + ( + const dictionary& optDict + ), + (optDict) + ); + // Selectors //- Return a reference to the selected surfaceWriter - static autoPtr New(const word& writeFormat); + 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 @@ -99,14 +108,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 +128,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 +137,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 +213,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 - -// ************************************************************************* // diff --git a/src/surfaceFilmModels/Make/options b/src/surfaceFilmModels/Make/options index dda598200c..9863502e9c 100644 --- a/src/surfaceFilmModels/Make/options +++ b/src/surfaceFilmModels/Make/options @@ -3,13 +3,13 @@ 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 \ + -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/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake index 9160970d75..a3cb03d44c 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -1,24 +1,18 @@ #!/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 -wmake $makeOption liquidProperties -wmake $makeOption liquidMixtureProperties -wmake $makeOption solidProperties -wmake $makeOption solidMixtureProperties +./properties/Allwmake $* wmake $makeOption basic 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/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/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 98% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.C index e972def14d..5ef5f62f86 100644 --- a/src/thermophysicalModels/radiation/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/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H similarity index 98% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiation/MarshakRadiationMixedFvPatchScalarField.H index e770b20fd6..9a5f880042 100644 --- a/src/thermophysicalModels/radiation/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/radiation/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C similarity index 98% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.C index 5b2bca8e93..d5bc52360a 100644 --- a/src/thermophysicalModels/radiation/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/radiation/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H similarity index 98% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/MarshakRadiationFixedT/MarshakRadiationFixedTMixedFvPatchScalarField.H index 2fa538af91..5a77b6f246 100644 --- a/src/thermophysicalModels/radiation/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/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C similarity index 99% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.C index 766f01cce3..850ea09543 100644 --- a/src/thermophysicalModels/radiation/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/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H similarity index 98% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveRadiation/greyDiffusiveRadiationMixedFvPatchScalarField.H index a951362c84..1cf290ec79 100644 --- a/src/thermophysicalModels/radiation/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/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C similarity index 99% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.C index 77d8849832..efe439d69b 100644 --- a/src/thermophysicalModels/radiation/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/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H similarity index 98% rename from src/thermophysicalModels/radiation/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H rename to src/thermophysicalModels/radiationModels/derivedFvPatchFields/wideBandDiffusiveRadiation/wideBandDiffusiveRadiationMixedFvPatchScalarField.H index 8f5db7f851..87048d767a 100644 --- a/src/thermophysicalModels/radiation/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/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 98% rename from src/thermophysicalModels/radiation/radiationModel/P1/P1.C rename to src/thermophysicalModels/radiationModels/radiationModel/P1/P1.C index 55390c5238..f59b5632f4 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/P1/P1.H b/src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H similarity index 98% rename from src/thermophysicalModels/radiation/radiationModel/P1/P1.H rename to src/thermophysicalModels/radiationModels/radiationModel/P1/P1.H index 39da278e1d..d06fb70b2f 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C similarity index 97% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.C index 4b62fd554a..76361fa861 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H similarity index 98% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffs.H index 378dda514a..f5279d54b9 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H similarity index 96% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/absorptionCoeffs/absorptionCoeffsI.H index d971dda8d5..3fbce17326 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C similarity index 99% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.C index d10678a6c8..2ab677fbf1 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H similarity index 98% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/blackBodyEmission/blackBodyEmission.H index 93d39bfa71..58b0db59ed 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C similarity index 99% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.C rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.C index dca6315cb7..17cdab82b4 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/fvDOM/fvDOM/fvDOM.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H similarity index 99% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOM.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOM.H index 1ae3a4c4b4..9c2ba167a8 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/fvDOM/fvDOM/fvDOMI.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOMI.H similarity index 97% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/fvDOM/fvDOMI.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/fvDOM/fvDOMI.H index ae28b450a6..844f93ae03 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C similarity index 98% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C index 89b8e5725c..8da1d9a7ae 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H similarity index 98% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRay.H index a795052305..d2b928dbf2 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H b/src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H similarity index 97% rename from src/thermophysicalModels/radiation/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H rename to src/thermophysicalModels/radiationModels/radiationModel/fvDOM/radiativeIntensityRay/radiativeIntensityRayI.H index 3891ae9a7d..0ef6cf36c9 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/noRadiation/noRadiation.C b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C similarity index 98% rename from src/thermophysicalModels/radiation/radiationModel/noRadiation/noRadiation.C rename to src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.C index 8bbd4ad5c4..045a420611 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/noRadiation/noRadiation.H b/src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H similarity index 97% rename from src/thermophysicalModels/radiation/radiationModel/noRadiation/noRadiation.H rename to src/thermophysicalModels/radiationModels/radiationModel/noRadiation/noRadiation.H index c9a75b8a61..f383a99122 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/radiationModel/radiationModel.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C similarity index 98% rename from src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.C rename to src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.C index 95e37a5a62..13fefd9bc9 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/radiationModel/radiationModel.H b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H similarity index 98% rename from src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModel.H rename to src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModel.H index ddbdcad590..5af7733d16 100644 --- a/src/thermophysicalModels/radiation/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/radiation/radiationModel/radiationModel/radiationModelNew.C b/src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C similarity index 97% rename from src/thermophysicalModels/radiation/radiationModel/radiationModel/radiationModelNew.C rename to src/thermophysicalModels/radiationModels/radiationModel/radiationModel/radiationModelNew.C index fcc34c566a..3c55165157 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C similarity index 98% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.C index 0db3555988..6f95a84b2f 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H similarity index 98% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModel.H index 317772cb07..d515c63d0f 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C similarity index 97% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/absorptionEmissionModel/absorptionEmissionModelNew.C index 5d7bf58808..92a4f876a2 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C similarity index 98% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.C index e15c6e67eb..3ee2c15be3 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H similarity index 98% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/binaryAbsorptionEmission/binaryAbsorptionEmission.H index 6d350b04d7..9d2d437746 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C similarity index 98% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.C index bc29d02cb2..1ecc37d589 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H similarity index 98% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/constantAbsorptionEmission/constantAbsorptionEmission.H index 89bc9d14ef..34460e491a 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C similarity index 99% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C index 04ad376ee6..62c491b104 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H similarity index 98% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.H index 0ac653c9c0..7f72d79a02 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C similarity index 96% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.C index 4eef20f86c..eeb2dff45f 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H similarity index 97% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/noAbsorptionEmission/noAbsorptionEmission.H index dbcef424e1..1eacbda555 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C similarity index 99% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C index 0620ba27a9..474d8df17e 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H b/src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H similarity index 99% rename from src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H rename to src/thermophysicalModels/radiationModels/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.H index 1283eb8b5c..053928f762 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/scatterModel/constantScatter/constantScatter.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C similarity index 97% rename from src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.C rename to src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.C index 712c6ef1f0..f2ed95e128 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/scatterModel/constantScatter/constantScatter.H b/src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H similarity index 97% rename from src/thermophysicalModels/radiation/submodels/scatterModel/constantScatter/constantScatter.H rename to src/thermophysicalModels/radiationModels/submodels/scatterModel/constantScatter/constantScatter.H index 429fd3dd37..f508a979ab 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/scatterModel/scatterModel/scatterModel.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C similarity index 96% rename from src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.C rename to src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.C index e35bd321ca..76641957ed 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/scatterModel/scatterModel/scatterModel.H b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H similarity index 97% rename from src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModel.H rename to src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModel.H index f37744bfe6..128b68a45f 100644 --- a/src/thermophysicalModels/radiation/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/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C b/src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C similarity index 97% rename from src/thermophysicalModels/radiation/submodels/scatterModel/scatterModel/scatterModelNew.C rename to src/thermophysicalModels/radiationModels/submodels/scatterModel/scatterModel/scatterModelNew.C index f03469bafd..8d10e0d07e 100644 --- a/src/thermophysicalModels/radiation/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 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 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(); } 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/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