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/dataEntry/Make/options b/applications/test/dataEntry/Make/options index 79fef3bb93..a4d63bfba8 100644 --- a/applications/test/dataEntry/Make/options +++ b/applications/test/dataEntry/Make/options @@ -1,11 +1,11 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude EXE_LIBS = \ -lfiniteVolume \ -llagrangianIntermediate \ - -lradiation \ + -lradiationModels \ -lthermophysicalFunctions diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/Make/options b/applications/utilities/miscellaneous/foamDebugSwitches/Make/options index 804d519386..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/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C index 859440c6dc..87d3acc881 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C +++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.C @@ -37,13 +37,33 @@ namespace Foam Foam::polynomial::polynomial(const word& entryName, Istream& is) : DataEntry(entryName), - coeffs_(is) + coeffs_(is), + canIntegrate_(true) { if (!coeffs_.size()) { FatalErrorIn("Foam::polynomial::polynomial(const word&, Istream&)") << "polynomial coefficients for entry " << this->name_ - << " is invalid (empty)" << nl << exit(FatalError); + << " are invalid (empty)" << nl << exit(FatalError); + } + + forAll(coeffs_, i) + { + if (mag(coeffs_[i].second() + 1) < ROOTVSMALL) + { + canIntegrate_ = false; + break; + } + } + + if (debug) + { + if (!canIntegrate_) + { + WarningIn("Foam::polynomial::polynomial(const word&, Istream&)") + << "Polynomial " << this->name_ << " cannot be integrated" + << endl; + } } } @@ -51,7 +71,8 @@ Foam::polynomial::polynomial(const word& entryName, Istream& is) Foam::polynomial::polynomial(const polynomial& poly) : DataEntry(poly), - coeffs_(poly.coeffs_) + coeffs_(poly.coeffs_), + canIntegrate_(poly.canIntegrate_) {} @@ -65,13 +86,10 @@ Foam::polynomial::~polynomial() Foam::scalar Foam::polynomial::value(const scalar x) const { - scalar y = coeffs_[0].first(); - scalar powX = x; - - for (label i = 1; i < coeffs_.size(); i++) + scalar y = 0.0; + forAll(coeffs_, i) { - y += coeffs_[i].first()*powX; - powX *= x; + y += coeffs_[i].first()*pow(x, coeffs_[i].second()); } return y; @@ -82,14 +100,17 @@ Foam::scalar Foam::polynomial::integrate(const scalar x1, const scalar x2) const { scalar intx = 0.0; - forAll(coeffs_, i) + if (canIntegrate_) { - intx += - coeffs_[i].first()/(coeffs_[i].second() + 1) - *( - pow(x2, coeffs_[i].second() + 1) - - pow(x1, coeffs_[i].second() + 1) - ); + forAll(coeffs_, i) + { + intx += + coeffs_[i].first()/(coeffs_[i].second() + 1) + *( + pow(x2, coeffs_[i].second() + 1) + - pow(x1, coeffs_[i].second() + 1) + ); + } } return intx; diff --git a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H index 0b4d18a4bb..e336068020 100644 --- a/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H +++ b/src/OpenFOAM/primitives/functions/DataEntry/polynomial/polynomial.H @@ -76,6 +76,9 @@ class polynomial //- Polynomial coefficients - list of prefactor, exponent List > coeffs_; + //- Flag to indicate whether poly can be integrated + bool canIntegrate_; + // Private Member Functions diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files index 2e4dd38bb1..1e8508d860 100644 --- a/src/finiteVolume/Make/files +++ b/src/finiteVolume/Make/files @@ -243,13 +243,14 @@ $(schemes)/cubicUpwindFit/cubicUpwindFit.C $(schemes)/quadraticLinearPureUpwindFit/quadraticLinearPureUpwindFit.C */ $(schemes)/linearPureUpwindFit/linearPureUpwindFit.C +$(schemes)/linearUpwind/linearUpwind.C +$(schemes)/linearUpwind/linearUpwindV.C +$(schemes)/quadraticUpwind/quadraticUpwind.C limitedSchemes = $(surfaceInterpolation)/limitedSchemes $(limitedSchemes)/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationSchemes.C $(limitedSchemes)/upwind/upwind.C $(limitedSchemes)/blended/blended.C -$(limitedSchemes)/linearUpwind/linearUpwind.C -$(limitedSchemes)/linearUpwind/linearUpwindV.C $(limitedSchemes)/Gamma/Gamma.C $(limitedSchemes)/SFCD/SFCD.C $(limitedSchemes)/Minmod/Minmod.C diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C similarity index 92% rename from src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C rename to src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C index 7f17534c94..77b6ae0d3b 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,7 +25,6 @@ License #include "linearUpwind.H" #include "fvMesh.H" -#include "zeroGradientFvPatchField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -85,16 +84,8 @@ Foam::linearUpwind::correction forAll(faceFlux, facei) { - if (faceFlux[facei] > 0) - { - label own = owner[facei]; - sfCorr[facei] = (Cf[facei] - C[own]) & gradVf[own]; - } - else - { - label nei = neighbour[facei]; - sfCorr[facei] = (Cf[facei] - C[nei]) & gradVf[nei]; - } + label celli = (faceFlux[facei] > 0) ? owner[facei] : neighbour[facei]; + sfCorr[facei] = (Cf[facei] - C[celli]) & gradVf[celli]; } diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H similarity index 92% rename from src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H rename to src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H index 603294c189..232172ba0d 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwind.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwind.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -26,7 +26,8 @@ Class Description linearUpwind interpolation scheme class derived from upwind and returns - upwind weighting factors but also applies an explicit correction. + upwind weighting factors and also applies a gradient-based explicit + correction. SourceFiles linearUpwind.C @@ -67,6 +68,12 @@ class linearUpwind //- Disallow default bitwise assignment void operator=(const linearUpwind&); + //- Hide the limiter because this is not formally a limited scheme + virtual tmp limiter + ( + const GeometricField& + ) const; + public: diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C similarity index 98% rename from src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C rename to src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C index 695637e383..0747a3fb2b 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.C +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H similarity index 98% rename from src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.H rename to src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H index 6cd31b836a..262d54115d 100644 --- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwind/linearUpwindV.H +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearUpwind/linearUpwindV.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C new file mode 100644 index 0000000000..d0779945d3 --- /dev/null +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.C @@ -0,0 +1,38 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +\*---------------------------------------------------------------------------*/ + +#include "quadraticUpwind.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + //makeSurfaceInterpolationScheme(quadraticUpwind); + makeSurfaceInterpolationTypeScheme(quadraticUpwind, scalar); + makeSurfaceInterpolationTypeScheme(quadraticUpwind, vector); +} + +// ************************************************************************* // diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.H new file mode 100644 index 0000000000..a2fb36f7fb --- /dev/null +++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/quadraticUpwind/quadraticUpwind.H @@ -0,0 +1,134 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + quadraticUpwind + +Description + quadraticUpwind interpolation scheme class derived from linearUpwind and + returns blended linear/upwind weighting factors and also applies a explicit + gradient-based correction obtained from the linearUpwind scheme. + +SourceFiles + quadraticUpwind.C + +\*---------------------------------------------------------------------------*/ + +#ifndef quadraticUpwind_H +#define quadraticUpwind_H + +#include "linearUpwind.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class quadraticUpwind Declaration +\*---------------------------------------------------------------------------*/ + +template +class quadraticUpwind +: + public linearUpwind +{ + // Private Member Functions + + //- Disallow default bitwise copy construct + quadraticUpwind(const quadraticUpwind&); + + //- Disallow default bitwise assignment + void operator=(const quadraticUpwind&); + + +public: + + //- Runtime type information + TypeName("quadraticUpwind"); + + + // Constructors + + //- Construct from mesh and Istream + quadraticUpwind + ( + const fvMesh& mesh, + Istream& schemeData + ) + : + linearUpwind(mesh, schemeData) + {} + + //- Construct from mesh, faceFlux and Istream + quadraticUpwind + ( + const fvMesh& mesh, + const surfaceScalarField& faceFlux, + Istream& schemeData + ) + : + linearUpwind(mesh, faceFlux, schemeData) + {} + + + // Member Functions + + //- Return the interpolation weighting factors + virtual tmp weights + ( + const GeometricField& + ) const + { + return + 0.75*this->mesh().surfaceInterpolation::weights() + + 0.25*linearUpwind::weights(); + } + + //- Return true if this scheme uses an explicit correction + virtual bool corrected() const + { + return true; + } + + //- Return the explicit correction to the face-interpolate + virtual tmp > + correction + ( + const GeometricField& vf + ) const + { + return 0.25*linearUpwind::correction(vf); + } +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake index e04d7480fb..908338e62f 100755 --- a/src/lagrangian/Allwmake +++ b/src/lagrangian/Allwmake @@ -3,6 +3,7 @@ cd ${0%/*} || exit 1 # run from this directory [ $# -ge 1 ] && makeOption=$1 || makeOption=libso set -x +wmake $makeOption 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/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/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/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 0ae32ec9ac..a3cb03d44c 100755 --- a/src/thermophysicalModels/Allwmake +++ b/src/thermophysicalModels/Allwmake @@ -6,17 +6,13 @@ set -x wmake $makeOption specie wmake $makeOption solid wmake $makeOption thermophysicalFunctions -wmake $makeOption liquidProperties -wmake $makeOption liquidMixtureProperties -wmake $makeOption solidProperties -wmake $makeOption solidMixtureProperties +./properties/Allwmake $* wmake $makeOption basic wmake $makeOption reactionThermo 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/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties index c8cfa62f0b..f9c1ae9b09 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/sprayProperties @@ -120,10 +120,10 @@ RanzMarshallCoeffs hollowConeInjectorCoeffs { - dropletPDF + sizeDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 1e-06; maxValue 0.00015; @@ -131,7 +131,7 @@ hollowConeInjectorCoeffs n 3; } - exponentialPDF + exponentialDistribution { minValue 0.0001; maxValue 0.001; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index b831323c0c..cd5f105401 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -131,10 +131,10 @@ subModels SOI 0; positionsFile "coalCloud1Positions"; U0 ( 0 -10 0 ); - parcelPDF + sizeDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-06; maxValue 0.0005; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 84ddb4faa3..699ce6d46b 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -107,10 +107,10 @@ subModels SOI 0; positionsFile "limestonePositions"; U0 ( 0 0 0 ); - parcelPDF + sizeDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-06; maxValue 0.000565; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index 37dc1c8917..60b93e7d13 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -130,10 +130,10 @@ subModels SOI 0; positionsFile "reactingCloud1Positions"; U0 (0 0 0); - parcelPDF + sizeDistribution { pdfType uniform; - uniformPDF + uniformDistribution { minValue 100e-06; maxValue 100e-06; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index e2532ac365..e28b21992b 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -133,10 +133,10 @@ subModels parcelsPerSecond 1e5; U0 (40 0 0); flowRateProfile constant 1; - parcelPDF + sizeDistribution { pdfType general; - generalPDF + generalDistribution { distribution ( diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index cf178e2faa..ff99c3fba9 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -131,10 +131,10 @@ subModels thetaInner constant 0; thetaOuter constant 45; - parcelPDF + sizeDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-04; maxValue 0.0012; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties index 4099a1fff3..9a2aa28a68 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/surfaceFilmProperties @@ -59,10 +59,10 @@ thermoSingleLayerCoeffs particlesPerParcel 100.0; - parcelPDF + sizeDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-04; maxValue 0.0012; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties index afd89ec9ea..2b4877e8d1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties @@ -131,10 +131,10 @@ subModels thetaInner constant 0; thetaOuter constant 45; - parcelPDF + sizeDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-04; maxValue 0.0012; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties index 5b45e08691..7c745789b7 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/surfaceFilmProperties @@ -61,10 +61,10 @@ thermoSingleLayerCoeffs particlesPerParcel 100.0; - parcelPDF + sizeDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-04; maxValue 0.0012; diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index ea65dea920..823e4111ab 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -123,10 +123,10 @@ subModels SOI 0; positionsFile "reactingCloud1Positions"; U0 ( 0 0 0 ); - parcelPDF + sizeDistribution { pdfType uniform; - uniformPDF + uniformDistribution { minValue 1e-04; maxValue 1e-04; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options index 5e0052eb1d..345c5148f7 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options @@ -11,7 +11,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/SLGThermo/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfaceFilmModels/lnInclude @@ -26,7 +26,7 @@ EXE_LIBS = \ -lreactionThermophysicalModels \ -lSLGThermo \ -lspecie \ - -lradiation \ + -lradiationModels \ -lcompressibleRASModels \ -lcompressibleLESModels \ -lsurfaceFilmModels diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index 22c787b2ab..4896ab3e80 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -87,10 +87,10 @@ subModels SOI 0; positionsFile "kinematicCloud1Positions"; U0 ( 0 0 0 ); - parcelPDF + sizeDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-05; maxValue 0.0001; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 99f68b618b..451e2419c7 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -106,10 +106,10 @@ subModels SOI 0; positionsFile "thermoCloud1Positions"; U0 ( 0 0 0 ); - parcelPDF + sizeDistribution { pdfType RosinRammler; - RosinRammlerPDF + RosinRammlerDistribution { minValue 5e-06; maxValue 0.0005; diff --git a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 65952342c9..1201e96908 100644 --- a/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/steadyReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -144,10 +144,10 @@ subModels duration 1; // NOTE: set to 1 for steady state U0 (0 40 0); flowRateProfile constant 1; - parcelPDF + sizeDistribution { pdfType general; - generalPDF + generalDistribution { distribution (