From e54dae6db752ed19459c3c480327c32320f32c20 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 18 Oct 2010 16:06:47 +0100 Subject: [PATCH 01/83] ENH: Encapsulated cloud sub-models in sub-dictionary --- .../Templates/KinematicCloud/KinematicCloud.C | 15 +- .../Templates/KinematicCloud/KinematicCloud.H | 6 + .../KinematicCloud/KinematicCloudI.H | 8 + .../Templates/ReactingCloud/ReactingCloud.C | 4 +- .../ReactingMultiphaseCloud.C | 4 +- .../Templates/ThermoCloud/ThermoCloud.C | 2 +- .../constant/coalCloud1Properties | 185 ++++++++-------- .../constant/limestoneCloud1Properties | 81 +++---- .../filter/constant/reactingCloud1Properties | 204 ++++++++---------- .../constant/reactingCloud1Properties | 159 +++++++------- .../constant/reactingCloud1Properties | 201 ++++++++--------- .../constant/reactingCloud1Properties | 75 +++---- .../constant/reactingCloud1Properties | 197 ++++++++--------- .../constant/reactingCloud1Properties | 193 +++++++++-------- .../panel/constant/reactingCloud1Properties | 73 ++++--- .../constant/reactingCloud1Properties | 126 +++++------ .../constant/kinematicCloud1Properties | 105 ++++----- .../constant/thermoCloud1Properties | 79 +++---- 18 files changed, 875 insertions(+), 842 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index 9666d61719..96209bde82 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -257,6 +257,7 @@ Foam::KinematicCloud::KinematicCloud ) ), constProps_(particleProperties_), + subModelProperties_(particleProperties_.subDict("subModels")), active_(particleProperties_.lookup("active")), parcelTypeId_(readLabel(particleProperties_.lookup("parcelTypeId"))), coupled_(particleProperties_.lookup("coupled")), @@ -276,7 +277,7 @@ Foam::KinematicCloud::KinematicCloud ( DispersionModel >::New ( - particleProperties_, + subModelProperties_, *this ) ), @@ -284,7 +285,7 @@ Foam::KinematicCloud::KinematicCloud ( DragModel >::New ( - particleProperties_, + subModelProperties_, *this ) ), @@ -292,7 +293,7 @@ Foam::KinematicCloud::KinematicCloud ( InjectionModel >::New ( - particleProperties_, + subModelProperties_, *this ) ), @@ -300,7 +301,7 @@ Foam::KinematicCloud::KinematicCloud ( CollisionModel >::New ( - particleProperties_, + subModelProperties_, *this ) ), @@ -308,7 +309,7 @@ Foam::KinematicCloud::KinematicCloud ( PatchInteractionModel >::New ( - particleProperties_, + subModelProperties_, *this ) ), @@ -316,7 +317,7 @@ Foam::KinematicCloud::KinematicCloud ( PostProcessingModel >::New ( - this->particleProperties_, + subModelProperties_, *this ) ), @@ -324,7 +325,7 @@ Foam::KinematicCloud::KinematicCloud ( SurfaceFilmModel >::New ( - this->particleProperties_, + subModelProperties_, *this, g ) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index 1d0a903810..9138688a13 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -115,6 +115,9 @@ protected: //- Dictionary of particle properties IOdictionary particleProperties_; + //- Sub-models dictionary + const dictionary& subModelProperties_; + //- Parcel constant properties typename ParcelType::constantProperties constProps_; @@ -275,6 +278,9 @@ public: //- Return particle properties dictionary inline const IOdictionary& particleProperties() const; + //- Return reference to the sub-models dictionary + inline const dictionary& subModelProperties() const; + //- Return the constant properties inline const typename ParcelType::constantProperties& constProps() const; diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H index 536e4e6773..3bbc78c905 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H @@ -56,6 +56,14 @@ Foam::KinematicCloud::particleProperties() const } +template +inline const Foam::dictionary& +Foam::KinematicCloud::subModelProperties() const +{ + return subModelProperties_; +} + + template inline const typename ParcelType::constantProperties& Foam::KinematicCloud::constProps() const diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index f3fb165b0e..2a54ef8672 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -183,7 +183,7 @@ Foam::ReactingCloud::ReactingCloud ( CompositionModel >::New ( - this->particleProperties(), + this->subModelProperties(), *this ) ), @@ -191,7 +191,7 @@ Foam::ReactingCloud::ReactingCloud ( PhaseChangeModel >::New ( - this->particleProperties(), + this->subModelProperties(), *this ) ), diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C index 451e3716d4..579191bc63 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C @@ -156,7 +156,7 @@ Foam::ReactingMultiphaseCloud::ReactingMultiphaseCloud ( DevolatilisationModel >::New ( - this->particleProperties(), + this->subModelProperties(), *this ) ), @@ -164,7 +164,7 @@ Foam::ReactingMultiphaseCloud::ReactingMultiphaseCloud ( SurfaceReactionModel >::New ( - this->particleProperties(), + this->subModelProperties(), *this ) ), diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C index 26cbeedcc6..f141c29f7b 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C @@ -158,7 +158,7 @@ Foam::ThermoCloud::ThermoCloud ( HeatTransferModel >::New ( - this->particleProperties(), + this->subModelProperties(), *this ) ), diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 8ea186c54b..cafc1da63f 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -17,30 +17,6 @@ FoamFile active true; -InjectionModel ManualInjection; - -DragModel SphereDrag; - -DispersionModel StochasticDispersionRAS; - -PatchInteractionModel StandardWallInteraction; - -HeatTransferModel RanzMarshall; - -CompositionModel SingleMixtureFraction; - -PhaseChangeModel LiquidEvaporation; - -DevolatilisationModel ConstantRateDevolatilisation; - -SurfaceReactionModel COxidationKineticDiffusionLimitedRate; - -PostProcessingModel none; - -CollisionModel none; - -SurfaceFilmModel none; - radiation on; coupled true; @@ -94,85 +70,112 @@ particleForces paramagnetic off; } -ManualInjectionCoeffs +subModels { - massTotal massTotal [ 1 0 0 0 0 ] 0.0001; - parcelBasisType mass; - SOI 0; - positionsFile "coalCloud1Positions"; - U0 ( 0 -10 0 ); - parcelPDF + InjectionModel ManualInjection; + + DragModel SphereDrag; + + DispersionModel StochasticDispersionRAS; + + PatchInteractionModel StandardWallInteraction; + + HeatTransferModel RanzMarshall; + + CompositionModel SingleMixtureFraction; + + PhaseChangeModel LiquidEvaporation; + + DevolatilisationModel ConstantRateDevolatilisation; + + SurfaceReactionModel COxidationKineticDiffusionLimitedRate; + + PostProcessingModel none; + + CollisionModel none; + + SurfaceFilmModel none; + + ManualInjectionCoeffs { - pdfType RosinRammler; - RosinRammlerPDF + massTotal massTotal [ 1 0 0 0 0 ] 0.0001; + parcelBasisType mass; + SOI 0; + positionsFile "coalCloud1Positions"; + U0 ( 0 -10 0 ); + parcelPDF { - minValue 5e-06; - maxValue 0.0005; - d 5e-05; - n 0.5; + pdfType RosinRammler; + RosinRammlerPDF + { + minValue 5e-06; + maxValue 0.0005; + d 5e-05; + n 0.5; + } } } -} -StandardWallInteractionCoeffs -{ - type rebound; - e 1; - mu 0; -} + StandardWallInteractionCoeffs + { + type rebound; + e 1; + mu 0; + } -RanzMarshallCoeffs -{ - BirdCorrection true; -} + RanzMarshallCoeffs + { + BirdCorrection true; + } -SingleMixtureFractionCoeffs -{ - phases - ( - gas - { - CH4 0.604; - H2 0.099; - CO2 0.297; - } - liquid - { - H2O 1; - } - solid - { - ash 0.136304; - C 0.863696; - } - ); - YGasTot0 0.211; - YLiquidTot0 0.026; - YSolidTot0 0.763; -} + SingleMixtureFractionCoeffs + { + phases + ( + gas + { + CH4 0.604; + H2 0.099; + CO2 0.297; + } + liquid + { + H2O 1; + } + solid + { + ash 0.136304; + C 0.863696; + } + ); + YGasTot0 0.211; + YLiquidTot0 0.026; + YSolidTot0 0.763; + } -LiquidEvaporationCoeffs -{ - enthalpyTransfer enthalpyDifference; + LiquidEvaporationCoeffs + { + enthalpyTransfer enthalpyDifference; - activeLiquids - ( - H2O - ); -} + activeLiquids + ( + H2O + ); + } -ConstantRateDevolatilisationCoeffs -{ - A0 A0 [ 0 0 -1 0 0 ] 12; - volatileResidualCoeff 0.001; -} + ConstantRateDevolatilisationCoeffs + { + A0 A0 [ 0 0 -1 0 0 ] 12; + volatileResidualCoeff 0.001; + } -COxidationKineticDiffusionLimitedRateCoeffs -{ - Sb Sb [ 0 0 0 0 0 ] 2.667; - C1 C1 [ 0 0 0 0 0] 5.0E-12; - C2 C2 [ 0 0 0 0 0] 0.002; - E E [ 0 0 0 0 0] 7.9E+07; + COxidationKineticDiffusionLimitedRateCoeffs + { + Sb Sb [ 0 0 0 0 0 ] 2.667; + C1 C1 [ 0 0 0 0 0] 5.0E-12; + C2 C2 [ 0 0 0 0 0] 0.002; + E E [ 0 0 0 0 0] 7.9E+07; + } } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index db47f7306b..91e44fbaee 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -17,22 +17,6 @@ FoamFile active true; -InjectionModel ManualInjection; - -DragModel SphereDrag; - -DispersionModel StochasticDispersionRAS; - -PatchInteractionModel StandardWallInteraction; - -HeatTransferModel RanzMarshall; - -PostProcessingModel none; - -CollisionModel none; - -SurfaceFilmModel none; - radiation on; coupled true; @@ -79,36 +63,55 @@ particleForces paramagnetic off; } -ManualInjectionCoeffs +subModels { - massTotal massTotal [ 1 0 0 0 0 ] 0.0001; - parcelBasisType mass; - SOI 0; - positionsFile "limestonePositions"; - U0 ( 0 0 0 ); - parcelPDF + InjectionModel ManualInjection; + + DragModel SphereDrag; + + DispersionModel StochasticDispersionRAS; + + PatchInteractionModel StandardWallInteraction; + + HeatTransferModel RanzMarshall; + + PostProcessingModel none; + + CollisionModel none; + + SurfaceFilmModel none; + + ManualInjectionCoeffs { - pdfType RosinRammler; - RosinRammlerPDF + massTotal massTotal [ 1 0 0 0 0 ] 0.0001; + parcelBasisType mass; + SOI 0; + positionsFile "limestonePositions"; + U0 ( 0 0 0 ); + parcelPDF { - minValue 5e-06; - maxValue 0.000565; - d 4.8e-05; - n 0.5; + pdfType RosinRammler; + RosinRammlerPDF + { + minValue 5e-06; + maxValue 0.000565; + d 4.8e-05; + n 0.5; + } } } -} -StandardWallInteractionCoeffs -{ - type rebound; - e 1; - mu 0; -} + StandardWallInteractionCoeffs + { + type rebound; + e 1; + mu 0; + } -RanzMarshallCoeffs -{ - BirdCorrection false; + RanzMarshallCoeffs + { + BirdCorrection false; + } } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties index 4534388250..94e51f9d76 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties @@ -17,31 +17,6 @@ FoamFile active true; -InjectionModel ReactingMultiphaseLookupTableInjection; -//InjectionModel ManualInjection; - -DragModel SphereDrag; - -DispersionModel none; - -PatchInteractionModel LocalInteraction; - -HeatTransferModel RanzMarshall; - -CompositionModel SingleMixtureFraction; - -PhaseChangeModel LiquidEvaporation; - -PostProcessingModel PatchPostProcessing; - -DevolatilisationModel none; - -SurfaceReactionModel none; - -SurfaceFilmModel none; - -CollisionModel none; - radiation off; coupled true; @@ -95,102 +70,111 @@ particleForces paramagnetic off; } -ManualInjectionCoeffs +subModels { - massTotal massTotal [ 1 0 0 0 0 ] 1e-3; - parcelBasisType mass; - SOI 0.5; - positionsFile "reactingCloud1Positions"; - U0 ( 0 0 0 ); - parcelPDF + InjectionModel ReactingMultiphaseLookupTableInjection; + + DragModel SphereDrag; + + DispersionModel none; + + PatchInteractionModel LocalInteraction; + + HeatTransferModel RanzMarshall; + + CompositionModel SingleMixtureFraction; + + PhaseChangeModel LiquidEvaporation; + + PostProcessingModel PatchPostProcessing; + + DevolatilisationModel none; + + SurfaceReactionModel none; + + SurfaceFilmModel none; + + CollisionModel none; + + ReactingMultiphaseLookupTableInjectionCoeffs { - pdfType uniform; - uniformPDF - { - minValue 1e-04; - maxValue 1e-04; - } + massTotal massTotal [ 1 0 0 0 0 ] 1e-2; + parcelBasisType mass; + SOI 0.5; + inputFile "parcelInjectionProperties"; + duration 1.0; + parcelsPerSecond 250; } -} -ReactingMultiphaseLookupTableInjectionCoeffs -{ - massTotal massTotal [ 1 0 0 0 0 ] 1e-2; - parcelBasisType mass; - SOI 0.5; - inputFile "parcelInjectionProperties"; - duration 1.0; - parcelsPerSecond 250; -} + StandardWallInteractionCoeffs + { + type rebound; + } -StandardWallInteractionCoeffs -{ - type rebound; -} + LocalInteractionCoeffs + { + patches + ( + walls + { + type rebound; + } + cycLeft_half0 + { + type rebound; + } + cycLeft_half1 + { + type rebound; + } + ); + } -LocalInteractionCoeffs -{ - patches - ( - walls - { - type rebound; - } - cycLeft_half0 - { - type rebound; - } - cycLeft_half1 - { - type rebound; - } - ); -} + RanzMarshallCoeffs + { + BirdCorrection true; + } -RanzMarshallCoeffs -{ - BirdCorrection true; -} + SingleMixtureFractionCoeffs + { + phases + ( + gas + { + } + liquid + { + H2O 1; + } + solid + { + } + ); + YGasTot0 0; + YLiquidTot0 1; + YSolidTot0 0; + } -SingleMixtureFractionCoeffs -{ - phases - ( - gas - { - } - liquid - { - H2O 1; - } - solid - { - } - ); - YGasTot0 0; - YLiquidTot0 1; - YSolidTot0 0; -} + LiquidEvaporationCoeffs + { + enthalpyTransfer enthalpyDifference; -LiquidEvaporationCoeffs -{ - enthalpyTransfer enthalpyDifference; + activeLiquids + ( + H2O + ); + } - activeLiquids - ( - H2O - ); -} + PatchPostProcessingCoeffs + { + maxStoredParcels 20; -PatchPostProcessingCoeffs -{ - maxStoredParcels 20; - - patches - ( - cycLeft_half0 - cycLeft_half1 - ); + patches + ( + cycLeft_half0 + cycLeft_half1 + ); + } } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index dc6f9aba8b..7243712aab 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -17,30 +17,6 @@ FoamFile active true; -InjectionModel ManualInjection; - -DragModel SphereDrag; - -DispersionModel none; - -PatchInteractionModel StandardWallInteraction; - -HeatTransferModel RanzMarshall; - -CompositionModel SingleMixtureFraction; - -PhaseChangeModel LiquidEvaporation; - -DevolatilisationModel none; - -SurfaceReactionModel none; - -PostProcessingModel none; - -SurfaceFilmModel none; - -CollisionModel none; - radiation off; coupled false; @@ -96,71 +72,98 @@ particleForces paramagnetic off; } -ManualInjectionCoeffs +subModels { - massTotal massTotal [ 1 0 0 0 0 ] 5.23599e-10; // 1 droplet of density 1000 kg/m3 - parcelBasisType mass; - SOI 0; - positionsFile "reactingCloud1Positions"; - U0 (0 0 0); - parcelPDF + InjectionModel ManualInjection; + + DragModel SphereDrag; + + DispersionModel none; + + PatchInteractionModel StandardWallInteraction; + + HeatTransferModel RanzMarshall; + + CompositionModel SingleMixtureFraction; + + PhaseChangeModel LiquidEvaporation; + + DevolatilisationModel none; + + SurfaceReactionModel none; + + PostProcessingModel none; + + SurfaceFilmModel none; + + CollisionModel none; + + ManualInjectionCoeffs { - pdfType uniform; - uniformPDF + massTotal massTotal [ 1 0 0 0 0 ] 5.23599e-10; // 1 droplet of density 1000 kg/m3 + parcelBasisType mass; + SOI 0; + positionsFile "reactingCloud1Positions"; + U0 (0 0 0); + parcelPDF { - minValue 100e-06; - maxValue 100e-06; + pdfType uniform; + uniformPDF + { + minValue 100e-06; + maxValue 100e-06; + } } } -} -StandardWallInteractionCoeffs -{ - type rebound; -} + StandardWallInteractionCoeffs + { + type rebound; + } -RanzMarshallCoeffs -{ - BirdCorrection off; -} + RanzMarshallCoeffs + { + BirdCorrection off; + } -SingleMixtureFractionCoeffs -{ - phases - ( - gas - { - } - liquid - { - H2O 1; - } - solid - { - } - ); - YGasTot0 0; - YLiquidTot0 1; - YSolidTot0 0; -} + SingleMixtureFractionCoeffs + { + phases + ( + gas + { + } + liquid + { + H2O 1; + } + solid + { + } + ); + YGasTot0 0; + YLiquidTot0 1; + YSolidTot0 0; + } -LiquidEvaporationCoeffs -{ - enthalpyTransfer enthalpyDifference; // latentHeat; + LiquidEvaporationCoeffs + { + enthalpyTransfer enthalpyDifference; // latentHeat; - activeLiquids - ( - H2O - ); -} + activeLiquids + ( + H2O + ); + } -PatchPostProcessingCoeffs -{ - maxStoredParcels 100; + PatchPostProcessingCoeffs + { + maxStoredParcels 100; - patches - ( - outlet - ); + patches + ( + outlet + ); + } } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 44a046965f..c97747abb3 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -17,30 +17,6 @@ FoamFile active true; -InjectionModel PatchInjection; - -DragModel SphereDrag; - -DispersionModel StochasticDispersionRAS; - -PatchInteractionModel StandardWallInteraction; - -HeatTransferModel RanzMarshall; - -CompositionModel SingleMixtureFraction; - -PhaseChangeModel LiquidEvaporation; - -DevolatilisationModel none; - -SurfaceReactionModel none; - -PostProcessingModel PatchPostProcessing; - -SurfaceFilmModel none; - -CollisionModel none; - radiation off; coupled true; @@ -96,93 +72,120 @@ particleForces paramagnetic off; } -PatchInjectionCoeffs +subModels { - SOI 0.01; - massTotal massTotal [ 1 0 0 0 0 ] 8; - parcelBasisType mass; - patchName inletCentral; - duration 10000; - parcelsPerSecond 1e5; - U0 (40 0 0); - flowRateProfile constant 1; - parcelPDF + InjectionModel PatchInjection; + + DragModel SphereDrag; + + DispersionModel StochasticDispersionRAS; + + PatchInteractionModel StandardWallInteraction; + + HeatTransferModel RanzMarshall; + + CompositionModel SingleMixtureFraction; + + PhaseChangeModel LiquidEvaporation; + + DevolatilisationModel none; + + SurfaceReactionModel none; + + PostProcessingModel PatchPostProcessing; + + SurfaceFilmModel none; + + CollisionModel none; + + PatchInjectionCoeffs { - pdfType general; - generalPDF + SOI 0.01; + massTotal massTotal [ 1 0 0 0 0 ] 8; + parcelBasisType mass; + patchName inletCentral; + duration 10000; + parcelsPerSecond 1e5; + U0 (40 0 0); + flowRateProfile constant 1; + parcelPDF { - distribution - ( - (10e-06 0.0025) - (15e-06 0.0528) - (20e-06 0.2795) - (25e-06 1.0918) - (30e-06 2.3988) - (35e-06 4.4227) - (40e-06 6.3888) - (45e-06 8.6721) - (50e-06 10.3153) - (55e-06 11.6259) - (60e-06 12.0030) - (65e-06 10.4175) - (70e-06 10.8427) - (75e-06 8.0016) - (80e-06 6.1333) - (85e-06 3.8827) - (90e-06 3.4688) - ); + pdfType general; + generalPDF + { + distribution + ( + (10e-06 0.0025) + (15e-06 0.0528) + (20e-06 0.2795) + (25e-06 1.0918) + (30e-06 2.3988) + (35e-06 4.4227) + (40e-06 6.3888) + (45e-06 8.6721) + (50e-06 10.3153) + (55e-06 11.6259) + (60e-06 12.0030) + (65e-06 10.4175) + (70e-06 10.8427) + (75e-06 8.0016) + (80e-06 6.1333) + (85e-06 3.8827) + (90e-06 3.4688) + ); + } } } -} -StandardWallInteractionCoeffs -{ - type rebound; -} + StandardWallInteractionCoeffs + { + type rebound; + } -RanzMarshallCoeffs -{ - BirdCorrection off; -} + RanzMarshallCoeffs + { + BirdCorrection off; + } -SingleMixtureFractionCoeffs -{ - phases - ( - gas - { - } - liquid - { - H2O 1; - } - solid - { - } - ); - YGasTot0 0; - YLiquidTot0 1; - YSolidTot0 0; -} + SingleMixtureFractionCoeffs + { + phases + ( + gas + { + } + liquid + { + H2O 1; + } + solid + { + } + ); + YGasTot0 0; + YLiquidTot0 1; + YSolidTot0 0; + } -LiquidEvaporationCoeffs -{ - enthalpyTransfer enthalpyDifference; + LiquidEvaporationCoeffs + { + enthalpyTransfer enthalpyDifference; - activeLiquids - ( - H2O - ); -} + activeLiquids + ( + H2O + ); + } -PatchPostProcessingCoeffs -{ - maxStoredParcels 100; + PatchPostProcessingCoeffs + { + maxStoredParcels 100; - patches - ( - outlet - ); + patches + ( + outlet + ); + } } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties index 3f3b7a8aac..4f1233285c 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,26 +17,6 @@ FoamFile active false; // true; -InjectionModel none; - -DragModel SphereDrag; - -DispersionModel none; - -PatchInteractionModel StandardWallInteraction; - -CollisionModel none; - -HeatTransferModel none; - -CompositionModel SinglePhaseMixture; - -PhaseChangeModel none; - -PostProcessingModel none; - -SurfaceFilmModel ThermoSurfaceFilm; - radiation off; coupled true; @@ -88,24 +68,47 @@ particleForces paramagnetic off; } -StandardWallInteractionCoeffs +subModels { - type rebound; -} + InjectionModel none; -SinglePhaseMixtureCoeffs -{ - phases - ( - liquid - { - H2O 1; - } - ); -} + DragModel SphereDrag; -ThermoSurfaceFilmCoeffs -{} + DispersionModel none; + + PatchInteractionModel StandardWallInteraction; + + CollisionModel none; + + HeatTransferModel none; + + CompositionModel SinglePhaseMixture; + + PhaseChangeModel none; + + PostProcessingModel none; + + SurfaceFilmModel ThermoSurfaceFilm; + + StandardWallInteractionCoeffs + { + type rebound; + } + + SinglePhaseMixtureCoeffs + { + phases + ( + liquid + { + H2O 1; + } + ); + } + + ThermoSurfaceFilmCoeffs + {} +} // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index 072f100d49..861b7a0a2c 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.6 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,26 +17,6 @@ FoamFile active true; -InjectionModel ConeInjectionMP; - -DragModel SphereDrag; - -DispersionModel none; - -CollisionModel none; - -PatchInteractionModel StandardWallInteraction; - -HeatTransferModel none; //RanzMarshall; - -CompositionModel SinglePhaseMixture; - -PhaseChangeModel none; // LiquidEvaporation; - -PostProcessingModel none; - -SurfaceFilmModel ThermoSurfaceFilm; // none; - radiation off; coupled true; @@ -88,94 +68,117 @@ particleForces paramagnetic off; } -ConeInjectionCoeffs +subModels { - SOI 0.000; - duration 10.000; - position (0.5 0.8 1.45); - direction (0 -0.5 -1); - massTotal massTotal [ 1 0 0 0 0 ] 0.025; // 1e-3; - parcelsPerSecond 500; - parcelBasisType mass; - flowRateProfile constant 0.01; - Umag constant 5; - thetaInner constant 0; - thetaOuter constant 30; + InjectionModel ConeInjectionMP; - parcelPDF + DragModel SphereDrag; + + DispersionModel none; + + CollisionModel none; + + PatchInteractionModel StandardWallInteraction; + + HeatTransferModel none; //RanzMarshall; + + CompositionModel SinglePhaseMixture; + + PhaseChangeModel none; // LiquidEvaporation; + + PostProcessingModel none; + + SurfaceFilmModel ThermoSurfaceFilm; // none; + + ConeInjectionCoeffs { - pdfType RosinRammler; - RosinRammlerPDF + SOI 0.000; + duration 10.000; + position (0.5 0.8 1.45); + direction (0 -0.5 -1); + massTotal massTotal [ 1 0 0 0 0 ] 0.025; // 1e-3; + parcelsPerSecond 500; + parcelBasisType mass; + flowRateProfile constant 0.01; + Umag constant 5; + thetaInner constant 0; + thetaOuter constant 30; + + parcelPDF { - minValue 5e-04; - maxValue 0.0012; - d 7.5e-05; - n 0.5; + pdfType RosinRammler; + RosinRammlerPDF + { + minValue 5e-04; + maxValue 0.0012; + d 7.5e-05; + n 0.5; + } } } -} -ConeInjectionMPCoeffs -{ - SOI 0.000; - duration 20.000; - positionsFile "reactingCloud1Positions"; - axesFile "reactingCloud1Axes"; - massTotal massTotal [ 1 0 0 0 0 ] 10; - parcelsPerInjector 20000; - parcelsPerSecond 500; - parcelBasisType mass; - flowRateProfile constant 0.1; - Umag constant 3.0; - thetaInner constant 0; - thetaOuter constant 45; + ConeInjectionMPCoeffs + { + SOI 0.000; + duration 20.000; + positionsFile "reactingCloud1Positions"; + axesFile "reactingCloud1Axes"; + massTotal massTotal [ 1 0 0 0 0 ] 10; + parcelsPerInjector 20000; + parcelsPerSecond 500; + parcelBasisType mass; + flowRateProfile constant 0.1; + Umag constant 3.0; + thetaInner constant 0; + thetaOuter constant 45; - parcelPDF - { - pdfType RosinRammler; - RosinRammlerPDF - { - minValue 5e-04; - maxValue 0.0012; - d 7.5e-05; - n 0.5; - } - } - -} - - -StandardWallInteractionCoeffs -{ - type rebound; -} - -RanzMarshallCoeffs -{ - BirdCorrection false; -} - -SinglePhaseMixtureCoeffs -{ - phases - ( - liquid + parcelPDF { - H2O 1; + pdfType RosinRammler; + RosinRammlerPDF + { + minValue 5e-04; + maxValue 0.0012; + d 7.5e-05; + n 0.5; + } } - ); -} -LiquidEvaporationCoeffs -{ - activeLiquids - ( - H2O - ); -} + } -ThermoSurfaceFilmCoeffs -{} + + StandardWallInteractionCoeffs + { + type rebound; + } + + RanzMarshallCoeffs + { + BirdCorrection false; + } + + SinglePhaseMixtureCoeffs + { + phases + ( + liquid + { + H2O 1; + } + ); + } + + LiquidEvaporationCoeffs + { + activeLiquids + ( + H2O + ); + } + + ThermoSurfaceFilmCoeffs + {} +} // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties index 51f281bdad..87e5b789a9 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties @@ -17,26 +17,6 @@ FoamFile active true; -InjectionModel ConeInjectionMP; - -DragModel SphereDrag; - -DispersionModel none; - -PatchInteractionModel StandardWallInteraction; - -HeatTransferModel none; //RanzMarshall; - -CompositionModel SinglePhaseMixture; - -PhaseChangeModel none; // LiquidEvaporation; - -PostProcessingModel none; - -CollisionModel none; - -SurfaceFilmModel ThermoSurfaceFilm; // none; - radiation off; coupled true; @@ -88,94 +68,117 @@ particleForces paramagnetic off; } -ConeInjectionCoeffs +subModels { - SOI 0.000; - duration 10.000; - position (0.5 0.8 1.45); - direction (0 -0.5 -1); - massTotal massTotal [ 1 0 0 0 0 ] 0.025; // 1e-3; - parcelsPerSecond 500; - parcelBasisType mass; - flowRateProfile constant 0.01; - Umag constant 5; - thetaInner constant 0; - thetaOuter constant 30; + InjectionModel ConeInjectionMP; - parcelPDF + DragModel SphereDrag; + + DispersionModel none; + + PatchInteractionModel StandardWallInteraction; + + HeatTransferModel none; //RanzMarshall; + + CompositionModel SinglePhaseMixture; + + PhaseChangeModel none; // LiquidEvaporation; + + PostProcessingModel none; + + CollisionModel none; + + SurfaceFilmModel ThermoSurfaceFilm; // none; + + ConeInjectionCoeffs { - pdfType RosinRammler; - RosinRammlerPDF - { - minValue 5e-04; - maxValue 0.0012; - d 7.5e-05; - n 0.5; - } - } -} + SOI 0.000; + duration 10.000; + position (0.5 0.8 1.45); + direction (0 -0.5 -1); + massTotal massTotal [ 1 0 0 0 0 ] 0.025; // 1e-3; + parcelsPerSecond 500; + parcelBasisType mass; + flowRateProfile constant 0.01; + Umag constant 5; + thetaInner constant 0; + thetaOuter constant 30; -ConeInjectionMPCoeffs -{ - SOI 0.000; - duration 20.000; - positionsFile "reactingCloud1Positions"; - axesFile "reactingCloud1Axes"; - massTotal massTotal [ 1 0 0 0 0 ] 10; - parcelsPerInjector 20000; - parcelsPerSecond 500; - parcelBasisType mass; - flowRateProfile constant 0.1; - Umag constant 3.0; - thetaInner constant 0; - thetaOuter constant 45; - - parcelPDF - { - pdfType RosinRammler; - RosinRammlerPDF + parcelPDF { - minValue 5e-04; - maxValue 0.0012; - d 7.5e-05; - n 0.5; + pdfType RosinRammler; + RosinRammlerPDF + { + minValue 5e-04; + maxValue 0.0012; + d 7.5e-05; + n 0.5; + } } } -} + ConeInjectionMPCoeffs + { + SOI 0.000; + duration 20.000; + positionsFile "reactingCloud1Positions"; + axesFile "reactingCloud1Axes"; + massTotal massTotal [ 1 0 0 0 0 ] 10; + parcelsPerInjector 20000; + parcelsPerSecond 500; + parcelBasisType mass; + flowRateProfile constant 0.1; + Umag constant 3.0; + thetaInner constant 0; + thetaOuter constant 45; - -StandardWallInteractionCoeffs -{ - type rebound; -} - -RanzMarshallCoeffs -{ - BirdCorrection false; -} - -SinglePhaseMixtureCoeffs -{ - phases - ( - liquid + parcelPDF { - H2O 1; + pdfType RosinRammler; + RosinRammlerPDF + { + minValue 5e-04; + maxValue 0.0012; + d 7.5e-05; + n 0.5; + } } - ); -} -LiquidEvaporationCoeffs -{ - activeLiquids - ( - H2O - ); -} + } -ThermoSurfaceFilmCoeffs -{} + + StandardWallInteractionCoeffs + { + type rebound; + } + + RanzMarshallCoeffs + { + BirdCorrection false; + } + + SinglePhaseMixtureCoeffs + { + phases + ( + liquid + { + H2O 1; + } + ); + } + + LiquidEvaporationCoeffs + { + activeLiquids + ( + H2O + ); + } + + ThermoSurfaceFilmCoeffs + {} +} // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties index 73494b022d..bbce9a45bb 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties @@ -17,26 +17,6 @@ FoamFile active false; // true; -InjectionModel none; - -DragModel SphereDrag; - -DispersionModel none; - -PatchInteractionModel StandardWallInteraction; - -HeatTransferModel none; - -CompositionModel SinglePhaseMixture; - -PhaseChangeModel none; - -PostProcessingModel none; - -CollisionModel none; - -SurfaceFilmModel ThermoSurfaceFilm; - radiation off; coupled true; @@ -88,24 +68,47 @@ particleForces paramagnetic off; } -StandardWallInteractionCoeffs +subModels { - type rebound; -} + InjectionModel none; -SinglePhaseMixtureCoeffs -{ - phases - ( - liquid - { - H2O 1; - } - ); -} + DragModel SphereDrag; -ThermoSurfaceFilmCoeffs -{} + DispersionModel none; + + PatchInteractionModel StandardWallInteraction; + + HeatTransferModel none; + + CompositionModel SinglePhaseMixture; + + PhaseChangeModel none; + + PostProcessingModel none; + + CollisionModel none; + + SurfaceFilmModel ThermoSurfaceFilm; + + StandardWallInteractionCoeffs + { + type rebound; + } + + SinglePhaseMixtureCoeffs + { + phases + ( + liquid + { + H2O 1; + } + ); + } + + ThermoSurfaceFilmCoeffs + {} +} // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index ca70790376..e783101066 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -17,26 +17,6 @@ FoamFile active true; -InjectionModel ManualInjection; - -DragModel SphereDrag; - -DispersionModel none; - -PatchInteractionModel StandardWallInteraction; - -HeatTransferModel RanzMarshall; - -CompositionModel SinglePhaseMixture; - -PhaseChangeModel LiquidEvaporation; - -PostProcessingModel none; - -CollisionModel none; - -SurfaceFilmModel none; - radiation off; coupled true; @@ -88,53 +68,77 @@ particleForces paramagnetic off; } -ManualInjectionCoeffs +subModels { - massTotal massTotal [ 1 0 0 0 0 ] 1e-8; - parcelBasisType mass; - SOI 0; - positionsFile "reactingCloud1Positions"; - U0 ( 0 0 0 ); - parcelPDF + InjectionModel ManualInjection; + + DragModel SphereDrag; + + DispersionModel none; + + PatchInteractionModel StandardWallInteraction; + + HeatTransferModel RanzMarshall; + + CompositionModel SinglePhaseMixture; + + PhaseChangeModel LiquidEvaporation; + + PostProcessingModel none; + + CollisionModel none; + + SurfaceFilmModel none; + + ManualInjectionCoeffs { - pdfType uniform; - uniformPDF + massTotal massTotal [ 1 0 0 0 0 ] 1e-8; + parcelBasisType mass; + SOI 0; + positionsFile "reactingCloud1Positions"; + U0 ( 0 0 0 ); + parcelPDF { - minValue 1e-04; - maxValue 1e-04; + pdfType uniform; + uniformPDF + { + minValue 1e-04; + maxValue 1e-04; + } } } + + StandardWallInteractionCoeffs + { + type rebound; + } + + RanzMarshallCoeffs + { + BirdCorrection true; + } + + SinglePhaseMixtureCoeffs + { + phases + ( + liquid + { + H2O 1; + } + ); + } + + LiquidEvaporationCoeffs + { + enthalpyTransfer enthalpyDifference; + + activeLiquids + ( + H2O + ); + } } -StandardWallInteractionCoeffs -{ - type rebound; -} - -RanzMarshallCoeffs -{ - BirdCorrection true; -} - -SinglePhaseMixtureCoeffs -{ - phases - ( - liquid - { - H2O 1; - } - ); -} - -LiquidEvaporationCoeffs -{ - enthalpyTransfer enthalpyDifference; - - activeLiquids - ( - H2O - ); -} // ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index f8223e42b5..e10e6a2c46 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -17,20 +17,6 @@ FoamFile active true; -InjectionModel ManualInjection; - -DragModel SphereDrag; - -DispersionModel StochasticDispersionRAS; - -PatchInteractionModel StandardWallInteraction; - -PostProcessingModel none; - -SurfaceFilmModel none; - -CollisionModel none; - coupled true; cellValueSourceCorrection on; @@ -66,54 +52,71 @@ particleForces paramagnetic off; } -ManualInjectionCoeffs +subModels { - massTotal massTotal [ 1 0 0 0 0 ] 0.0002; - parcelBasisType mass; - SOI 0; - positionsFile "kinematicCloud1Positions"; - U0 ( 0 0 0 ); - parcelPDF + InjectionModel ManualInjection; + + DragModel SphereDrag; + + DispersionModel StochasticDispersionRAS; + + PatchInteractionModel StandardWallInteraction; + + PostProcessingModel none; + + SurfaceFilmModel none; + + CollisionModel none; + + ManualInjectionCoeffs { - pdfType RosinRammler; - RosinRammlerPDF + massTotal massTotal [ 1 0 0 0 0 ] 0.0002; + parcelBasisType mass; + SOI 0; + positionsFile "kinematicCloud1Positions"; + U0 ( 0 0 0 ); + parcelPDF { - minValue 5e-05; - maxValue 0.0001; - d 7.5e-05; - n 0.5; + pdfType RosinRammler; + RosinRammlerPDF + { + minValue 5e-05; + maxValue 0.0001; + d 7.5e-05; + n 0.5; + } } } -} -ConeInjectionCoeffs -{ - SOI 0.001; - duration 0.005; - position ( 0.25 0.25 0.05 ); - direction ( 0 -1 0 ); - parcelsPerSecond 10000; - flowRateProfile Constant 0.01; - Umag Constant 50; - thetaInner Constant 0; - thetaOuter Constant 30; - - parcelPDF + ConeInjectionCoeffs { - pdfType RosinRammler; - RosinRammlerPDF + SOI 0.001; + duration 0.005; + position ( 0.25 0.25 0.05 ); + direction ( 0 -1 0 ); + parcelsPerSecond 10000; + flowRateProfile Constant 0.01; + Umag Constant 50; + thetaInner Constant 0; + thetaOuter Constant 30; + + parcelPDF { - minValue 5e-05; - maxValue 0.0001; - d ( 7.5e-05 ); - n ( 0.5 ); + pdfType RosinRammler; + RosinRammlerPDF + { + minValue 5e-05; + maxValue 0.0001; + d ( 7.5e-05 ); + n ( 0.5 ); + } } } -} -StandardWallInteractionCoeffs -{ - type rebound; + StandardWallInteractionCoeffs + { + type rebound; + } } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 25a6be3624..7817e80b7b 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -17,22 +17,6 @@ FoamFile active true; -InjectionModel ManualInjection; - -DragModel SphereDrag; - -DispersionModel StochasticDispersionRAS; - -PatchInteractionModel StandardWallInteraction; - -HeatTransferModel RanzMarshall; - -PostProcessingModel none; - -CollisionModel none; - -SurfaceFilmModel none; - radiation off; coupled true; @@ -79,35 +63,54 @@ particleForces paramagnetic off; } -ManualInjectionCoeffs +subModels { - massTotal massTotal [ 1 0 0 0 0 ] 0.0001; - parcelBasisType mass; - SOI 0; - positionsFile "thermoCloud1Positions"; - U0 ( 0 0 0 ); - parcelPDF + InjectionModel ManualInjection; + + DragModel SphereDrag; + + DispersionModel StochasticDispersionRAS; + + PatchInteractionModel StandardWallInteraction; + + HeatTransferModel RanzMarshall; + + PostProcessingModel none; + + CollisionModel none; + + SurfaceFilmModel none; + + ManualInjectionCoeffs { - pdfType RosinRammler; - RosinRammlerPDF + massTotal massTotal [ 1 0 0 0 0 ] 0.0001; + parcelBasisType mass; + SOI 0; + positionsFile "thermoCloud1Positions"; + U0 ( 0 0 0 ); + parcelPDF { - minValue 5e-06; - maxValue 0.0005; - d 5e-05; - n 0.5; + pdfType RosinRammler; + RosinRammlerPDF + { + minValue 5e-06; + maxValue 0.0005; + d 5e-05; + n 0.5; + } } } -} -StandardWallInteractionCoeffs -{ - type rebound; -} + StandardWallInteractionCoeffs + { + type rebound; + } -RanzMarshallCoeffs -{ - // thermal shielding - BirdCorrection false; + RanzMarshallCoeffs + { + // thermal shielding + BirdCorrection false; + } } From 2ae6047ac0cc24aeb11ed70b8ee59f2c01b9c36a Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 18 Oct 2010 16:11:01 +0100 Subject: [PATCH 02/83] ENH: Removed dimensions from cloud constant props (not used) --- .../KinematicParcel/KinematicParcelI.H | 19 ++----- .../ReactingMultiphaseParcelI.H | 7 +-- .../ReactingParcel/ReactingParcelI.H | 6 +- .../Templates/ThermoParcel/ThermoParcelI.H | 12 ++-- .../constant/coalCloud1Properties | 32 +++++------ .../constant/limestoneCloud1Properties | 22 ++++---- .../filter/constant/reactingCloud1Properties | 32 +++++------ .../constant/reactingCloud1Properties | 32 +++++------ .../constant/reactingCloud1Properties | 32 +++++------ .../constant/reactingCloud1Properties | 28 +++++----- .../constant/reactingCloud1Properties | 28 +++++----- .../constant/reactingCloud1Properties | 55 +++++-------------- .../panel/constant/reactingCloud1Properties | 28 +++++----- .../constant/reactingCloud1Properties | 28 +++++----- .../constant/kinematicCloud1Properties | 10 ++-- .../constant/thermoCloud1Properties | 22 ++++---- 16 files changed, 177 insertions(+), 216 deletions(-) diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H index e39a9f43af..855c8add6c 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H @@ -36,20 +36,11 @@ inline Foam::KinematicParcel::constantProperties::constantProperties ) : dict_(parentDict.subDict("constantProperties")), - rhoMin_(dimensionedScalar(dict_.lookup("rhoMin")).value()), - rho0_(dimensionedScalar(dict_.lookup("rho0")).value()), - minParticleMass_ - ( - dimensionedScalar(dict_.lookup("minParticleMass")).value() - ), - youngsModulus_ - ( - dimensionedScalar(dict_.lookup("youngsModulus")).value() - ), - poissonsRatio_ - ( - dimensionedScalar(dict_.lookup("poissonsRatio")).value() - ) + rhoMin_(readScalar(dict_.lookup("rhoMin"))), + rho0_(readScalar(dict_.lookup("rho0"))), + minParticleMass_(readScalar(dict_.lookup("minParticleMass"))), + youngsModulus_(readScalar(dict_.lookup("youngsModulus"))), + poissonsRatio_(readScalar(dict_.lookup("poissonsRatio"))) {} diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H index 960a298ad7..cd18d3628c 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H @@ -33,11 +33,8 @@ constantProperties ) : ReactingParcel::constantProperties(parentDict), - LDevol_(dimensionedScalar(this->dict().lookup("LDevol")).value()), - hRetentionCoeff_ - ( - dimensionedScalar(this->dict().lookup("hRetentionCoeff")).value() - ) + LDevol_(readScalar(this->dict().lookup("LDevol"))), + hRetentionCoeff_(readScalar(this->dict().lookup("hRetentionCoeff"))) { if ((hRetentionCoeff_ < 0) || (hRetentionCoeff_ > 1)) { diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H index 60c1556b8f..ffc87eb639 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H @@ -32,10 +32,10 @@ inline Foam::ReactingParcel::constantProperties::constantProperties ) : ThermoParcel::constantProperties(parentDict), - pMin_(dimensionedScalar(this->dict().lookup("pMin")).value()), + pMin_(readScalar(this->dict().lookup("pMin"))), constantVolume_(this->dict().lookup("constantVolume")), - Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value()), - Tbp_(dimensionedScalar(this->dict().lookup("Tbp")).value()) + Tvap_(readScalar(this->dict().lookup("Tvap"))), + Tbp_(readScalar(this->dict().lookup("Tbp"))) {} diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H index b728ce65cb..9e69a46fd0 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H @@ -32,12 +32,12 @@ inline Foam::ThermoParcel::constantProperties::constantProperties ) : KinematicParcel::constantProperties(parentDict), - T0_(dimensionedScalar(this->dict().lookup("T0")).value()), - TMin_(dimensionedScalar(this->dict().lookup("TMin")).value()), - cp0_(dimensionedScalar(this->dict().lookup("cp0")).value()), - epsilon0_(dimensionedScalar(this->dict().lookup("epsilon0")).value()), - f0_(dimensionedScalar(this->dict().lookup("f0")).value()), - Pr_(dimensionedScalar(this->dict().lookup("Pr")).value()) + T0_(readScalar(this->dict().lookup("T0"))), + TMin_(readScalar(this->dict().lookup("TMin"))), + cp0_(readScalar(this->dict().lookup("cp0"))), + epsilon0_(readScalar(this->dict().lookup("epsilon0"))), + f0_(readScalar(this->dict().lookup("f0"))), + Pr_(readScalar(this->dict().lookup("Pr"))) {} diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index cafc1da63f..6ad5bec888 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -27,22 +27,22 @@ parcelTypeId 1; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - TMin TMin [ 0 0 0 1 0 ] 200; - pMin pMin [ 1 -1 2 0 0 ] 1000; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - rho0 rho0 [ 1 -3 0 0 0 ] 1000; - youngsModulus youngsModulus [1 -1 -2 0 0] 2e9; - poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35; - T0 T0 [ 0 0 0 1 0 ] 300; - cp0 cp0 [ 0 2 -2 -1 0 ] 4187; - epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - f0 f0 [ 0 0 0 0 0 ] 0.5; - Pr Pr [ 0 0 0 0 0 ] 0.7; - Tvap Tvap [ 0 0 0 1 0 ] 400; - Tbp Tvap [ 0 0 0 1 0 ] 400; - LDevol LDevol [ 0 0 0 0 0 ] 0; - hRetentionCoeff hRetentionCoeff [ 0 0 0 0 0 ] 1; + rhoMin 1e-15; + TMin 200; + pMin 1000; + minParticleMass 1e-15; + rho0 1000; + youngsModulus 2e9; + poissonsRatio 0.35; + T0 300; + cp0 4187; + epsilon0 1; + f0 0.5; + Pr 0.7; + Tvap 400; + Tbp 400; + LDevol 0; + hRetentionCoeff 1; constantVolume true; } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 91e44fbaee..8b4207b192 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -27,17 +27,17 @@ parcelTypeId 2; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - TMin TMin [ 0 0 0 1 0 ] 200; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - rho0 rho0 [ 1 -3 0 0 0 ] 2500; - youngsModulus youngsModulus [1 -1 -2 0 0] 40e9; - poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.25; - T0 T0 [ 0 0 0 1 0 ] 300; - cp0 cp0 [ 0 2 -2 -1 0 ] 900; - epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - f0 f0 [ 0 0 0 0 0 ] 0.5; - Pr Pr [ 0 0 0 0 0 ] 0.7; + rhoMin 1e-15; + TMin 200; + minParticleMass 1e-15; + rho0 2500; + youngsModulus 40e9; + poissonsRatio 0.25; + T0 300; + cp0 900; + epsilon0 1; + f0 0.5; + Pr 0.7; } interpolationSchemes diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties index 94e51f9d76..464ed8f5e5 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties @@ -27,22 +27,22 @@ parcelTypeId 1; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - TMin TMin [ 0 0 0 1 0 ] 200; - pMin pMin [ 1 -1 2 0 0 ] 1000; - rho0 rho0 [ 1 -3 0 0 0 ] 1000; - youngsModulus youngsModulus [1 -1 -2 0 0] 1e9; - poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - T0 T0 [ 0 0 0 1 0 ] 300; - cp0 cp0 [ 0 2 -2 -1 0 ] 4100; - epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - f0 f0 [ 0 0 0 0 0 ] 0.5; - Pr Pr [ 0 0 0 0 0 ] 0.7; - Tvap Tvap [ 0 0 0 1 0 ] 273; - Tbp Tvap [ 0 0 0 1 0 ] 373; - LDevol LDevol [ 0 0 0 0 0 ] 0; - hRetentionCoeff hRetentionCoeff [ 0 0 0 0 0 ] 1; + rhoMin 1e-15; + TMin 200; + pMin 1000; + rho0 1000; + youngsModulus 1e9; + poissonsRatio 0.35; + minParticleMass 1e-15; + T0 300; + cp0 4100; + epsilon0 1; + f0 0.5; + Pr 0.7; + Tvap 273; + Tbp 373; + LDevol 0; + hRetentionCoeff 1; constantVolume false; } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index 7243712aab..82e218b5a2 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -27,22 +27,22 @@ parcelTypeId 1; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - TMin TMin [ 0 0 0 1 0 ] 200; - pMin pMin [ 1 -1 2 0 0 ] 1000; - rho0 rho0 [ 1 -3 0 0 0 ] 1000; - youngsModulus youngsModulus [1 -1 -2 0 0] 1e9; - poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - T0 T0 [ 0 0 0 1 0 ] 350; - cp0 cp0 [ 0 2 -2 -1 0 ] 4100; - epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - f0 f0 [ 0 0 0 0 0 ] 0.5; - Tvap Tvap [ 0 0 0 1 0 ] 284; - Tbp Tbp [ 0 0 0 1 0 ] 373; - Pr Pr [ 0 0 0 0 0 ] 0.7; - LDevol LDevol [ 0 0 0 0 0 ] 0; - hRetentionCoeff hRetentionCoeff [ 0 0 0 0 0 ] 1; + rhoMin 1e-15; + TMin 200; + pMin 1000; + rho0 1000; + youngsModulus 1e9; + poissonsRatio 0.35; + minParticleMass 1e-15; + T0 350; + cp0 4100; + epsilon0 1; + f0 0.5; + Tvap 284; + Tbp 373; + Pr 0.7; + LDevol 0; + hRetentionCoeff 1; constantVolume false; } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index c97747abb3..83dc18816a 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -27,22 +27,22 @@ parcelTypeId 1; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - TMin TMin [ 0 0 0 1 0 ] 200; - pMin pMin [ 1 -1 2 0 0 ] 1000; - rho0 rho0 [ 1 -3 0 0 0 ] 1000; - youngsModulus youngsModulus [1 -1 -2 0 0] 1e9; - poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - T0 T0 [ 0 0 0 1 0 ] 350; - cp0 cp0 [ 0 2 -2 -1 0 ] 4100; - epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - f0 f0 [ 0 0 0 0 0 ] 0.5; - Tvap Tvap [ 0 0 0 1 0 ] 273; - Tbp Tbp [ 0 0 0 1 0 ] 373; - Pr Pr [ 0 0 0 0 0 ] 0.7; - LDevol LDevol [ 0 0 0 0 0 ] 0; - hRetentionCoeff hRetentionCoeff [ 0 0 0 0 0 ] 1; + rhoMin 1e-15; + TMin 200; + pMin 1000; + rho0 1000; + youngsModulus 1e9; + poissonsRatio 0.35; + minParticleMass 1e-15; + T0 350; + cp0 4100; + epsilon0 1; + f0 0.5; + Tvap 273; + Tbp 373; + Pr 0.7; + LDevol 0; + hRetentionCoeff 1; constantVolume false; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties index 4f1233285c..da06cb5025 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties @@ -27,21 +27,21 @@ parcelTypeId 1; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - TMin TMin [ 0 0 0 1 0 ] 200; - pMin pMin [ 1 -1 2 0 0 ] 1000; - rho0 rho0 [ 1 -3 0 0 0 ] 1000; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - T0 T0 [ 0 0 0 1 0 ] 300; - cp0 cp0 [ 0 2 -2 -1 0 ] 4187; - epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - f0 f0 [ 0 0 0 0 0 ] 0.5; - Pr Pr [ 0 0 0 0 0 ] 0.7; - Tvap Tvap [ 0 0 0 1 0 ] 273; - Tbp Tvap [ 0 0 0 1 0 ] 373; + rhoMin 1e-15; + TMin 200; + pMin 1000; + rho0 1000; + minParticleMass 1e-15; + T0 300; + cp0 4187; + epsilon0 1; + f0 0.5; + Pr 0.7; + Tvap 273; + Tbp 373; constantVolume false; - youngsModulus youngsModulus [ 0 0 0 0 0 ] 0; - poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0; + youngsModulus 0; + poissonsRatio 0; } interpolationSchemes diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index 861b7a0a2c..41d7d0ea06 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -27,20 +27,20 @@ parcelTypeId 1; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - TMin TMin [ 0 0 0 1 0 ] 200; - pMin pMin [ 1 -1 2 0 0 ] 1000; - rho0 rho0 [ 1 -3 0 0 0 ] 1000; - youngsModulus youngsModulus [0 0 0 0 0] 0; - poissonsRatio poissonsRatio [0 0 0 0 0] 0; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - T0 T0 [ 0 0 0 1 0 ] 300; - cp0 cp0 [ 0 2 -2 -1 0 ] 4187; - epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - f0 f0 [ 0 0 0 0 0 ] 0.5; - Pr Pr [ 0 0 0 0 0 ] 0.7; - Tvap Tvap [ 0 0 0 1 0 ] 273; - Tbp Tvap [ 0 0 0 1 0 ] 373; + rhoMin 1e-15; + TMin 200; + pMin 1000; + rho0 1000; + youngsModulus 0; + poissonsRatio 0; + minParticleMass 1e-15; + T0 300; + cp0 4187; + epsilon0 1; + f0 0.5; + Pr 0.7; + Tvap 273; + Tbp 373; constantVolume false; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties index 87e5b789a9..c2f0120ecd 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties @@ -27,20 +27,20 @@ parcelTypeId 1; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - TMin TMin [ 0 0 0 1 0 ] 200; - pMin pMin [ 1 -1 2 0 0 ] 1000; - rho0 rho0 [ 1 -3 0 0 0 ] 1000; - youngsModulus youngsModulus [1 -1 -2 0 0] 1e9; - poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - T0 T0 [ 0 0 0 1 0 ] 300; - cp0 cp0 [ 0 2 -2 -1 0 ] 4187; - epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - f0 f0 [ 0 0 0 0 0 ] 0.5; - Pr Pr [ 0 0 0 0 0 ] 0.7; - Tvap Tvap [ 0 0 0 1 0 ] 273; - Tbp Tvap [ 0 0 0 1 0 ] 373; + rhoMin 1e-15; + TMin 200; + pMin 1000; + rho0 1000; + youngsModulus 1e9; + poissonsRatio 0.35; + minParticleMass 1e-15; + T0 300; + cp0 4187; + epsilon0 1; + f0 0.5; + Pr 0.7; + Tvap 273; + Tbp 373; constantVolume false; } @@ -90,33 +90,6 @@ subModels SurfaceFilmModel ThermoSurfaceFilm; // none; - ConeInjectionCoeffs - { - SOI 0.000; - duration 10.000; - position (0.5 0.8 1.45); - direction (0 -0.5 -1); - massTotal massTotal [ 1 0 0 0 0 ] 0.025; // 1e-3; - parcelsPerSecond 500; - parcelBasisType mass; - flowRateProfile constant 0.01; - Umag constant 5; - thetaInner constant 0; - thetaOuter constant 30; - - parcelPDF - { - pdfType RosinRammler; - RosinRammlerPDF - { - minValue 5e-04; - maxValue 0.0012; - d 7.5e-05; - n 0.5; - } - } - } - ConeInjectionMPCoeffs { SOI 0.000; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties index bbce9a45bb..eeb34eafa1 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties @@ -27,20 +27,20 @@ parcelTypeId 1; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - TMin TMin [ 0 0 0 1 0 ] 200; - pMin pMin [ 1 -1 2 0 0 ] 1000; - rho0 rho0 [ 1 -3 0 0 0 ] 1000; - youngsModulus youngsModulus [1 -1 -2 0 0] 1e9; - poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - T0 T0 [ 0 0 0 1 0 ] 300; - cp0 cp0 [ 0 2 -2 -1 0 ] 4187; - epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - f0 f0 [ 0 0 0 0 0 ] 0.5; - Pr Pr [ 0 0 0 0 0 ] 0.7; - Tvap Tvap [ 0 0 0 1 0 ] 273; - Tbp Tvap [ 0 0 0 1 0 ] 373; + rhoMin 1e-15; + TMin 200; + pMin 1000; + rho0 1000; + youngsModulus 1e9; + poissonsRatio 0.35; + minParticleMass 1e-15; + T0 300; + cp0 4187; + epsilon0 1; + f0 0.5; + Pr 0.7; + Tvap 273; + Tbp 373; constantVolume false; } diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index e783101066..7860f48964 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -27,20 +27,20 @@ parcelTypeId 1; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - TMin TMin [ 0 0 0 1 0 ] 200; - pMin pMin [ 1 -1 2 0 0 ] 1000; - rho0 rho0 [ 1 -3 0 0 0 ] 1000; - youngsModulus youngsModulus [1 -1 -2 0 0] 1e9; - poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - T0 T0 [ 0 0 0 1 0 ] 300; - cp0 cp0 [ 0 2 -2 -1 0 ] 4187; - epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - f0 f0 [ 0 0 0 0 0 ] 0.5; - Pr Pr [ 0 0 0 0 0 ] 0.7; - Tvap Tvap [ 0 0 0 1 0 ] 273; - Tbp Tvap [ 0 0 0 1 0 ] 373; + rhoMin 1e-15; + TMin 200; + pMin 1000; + rho0 1000; + youngsModulus 1e9; + poissonsRatio 0.35; + minParticleMass 1e-15; + T0 300; + cp0 4187; + epsilon0 1; + f0 0.5; + Pr 0.7; + Tvap 273; + Tbp 373; constantVolume false; } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index e10e6a2c46..0a2e6e40cc 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -25,11 +25,11 @@ parcelTypeId 2; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - rho0 rho0 [ 1 -3 0 0 0 ] 5000; - youngsModulus youngsModulus [1 -1 -2 0 0] 1e9; - poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35; + rhoMin 1e-15; + minParticleMass 1e-15; + rho0 5000; + youngsModulus 1e9; + poissonsRatio 0.35; } interpolationSchemes diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 7817e80b7b..9f3b816eb3 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -27,17 +27,17 @@ parcelTypeId 1; constantProperties { - rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; - TMin TMin [ 0 0 0 1 0 ] 200; - minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - rho0 rho0 [ 1 -3 0 0 0 ] 2500; - youngsModulus youngsModulus [1 -1 -2 0 0] 1e9; - poissonsRatio poissonsRatio [ 0 0 0 0 0 ] 0.35; - T0 T0 [ 0 0 0 1 0 ] 300; - cp0 cp0 [ 0 2 -2 -1 0 ] 900; - epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - f0 f0 [ 0 0 0 0 0 ] 0.5; - Pr Pr [ 0 0 0 0 0 ] 0.7; + rhoMin 1e-15; + TMin 200; + minParticleMass 1e-15; + rho0 2500; + youngsModulus 1e9; + poissonsRatio 0.35; + T0 300; + cp0 900; + epsilon0 1; + f0 0.5; + Pr 0.7; } interpolationSchemes From 83db9efc840ec69b8f716ec966a1865215b761ab Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 18 Oct 2010 16:58:53 +0100 Subject: [PATCH 03/83] ENH: Encapuslated cloud solution params --- .../Templates/KinematicCloud/KinematicCloud.C | 79 ++++++++++-- .../Templates/KinematicCloud/KinematicCloud.H | 114 +++++++++++++----- .../KinematicCloud/KinematicCloudI.H | 93 +++++++++----- .../Templates/ReactingCloud/ReactingCloud.C | 4 +- .../ReactingMultiphaseCloud.C | 16 +-- .../Templates/ThermoCloud/ThermoCloud.C | 16 +-- .../Templates/ThermoCloud/ThermoCloudI.H | 6 +- .../KinematicParcel/KinematicParcel.C | 4 +- .../ReactingMultiphaseParcel.C | 4 +- .../Templates/ReactingParcel/ReactingParcel.C | 4 +- .../Templates/ThermoParcel/ThermoParcel.C | 2 +- .../constant/coalCloud1Properties | 43 +++---- .../constant/limestoneCloud1Properties | 41 ++++--- .../filter/constant/reactingCloud1Properties | 43 +++---- .../constant/reactingCloud1Properties | 43 +++---- .../constant/reactingCloud1Properties | 43 +++---- .../constant/reactingCloud1Properties | 43 +++---- .../constant/reactingCloud1Properties | 43 +++---- .../constant/reactingCloud1Properties | 43 +++---- .../panel/constant/reactingCloud1Properties | 43 +++---- .../constant/reactingCloud1Properties | 43 +++---- .../constant/kinematicCloud1Properties | 31 ++--- .../constant/thermoCloud1Properties | 41 ++++--- 23 files changed, 503 insertions(+), 339 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index 96209bde82..bbb730bb62 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -36,13 +36,72 @@ License #include "PostProcessingModel.H" #include "SurfaceFilmModel.H" +// * * * * * * * * * * * * * * cloudSolution * * * * * * * * * * * * * * * * // + +template +void Foam::KinematicCloud::cloudSolution::read() +{ + dict_.lookup("coupled") >> coupled_; +} + + +template +Foam::KinematicCloud::cloudSolution::cloudSolution +( + const fvMesh& mesh, + const dictionary& dict +) +: + mesh_(mesh), + dict_(dict), + active_(dict.lookup("active")), + coupled_(false) +{ + if (active_) + { + read(); + } +} + + +template +Foam::KinematicCloud::cloudSolution::cloudSolution +( + const cloudSolution& cs +) +: + mesh_(cs.mesh_), + dict_(cs.dict_), + active_(cs.active_), + coupled_(cs.coupled_) +{} + + +template +Foam::KinematicCloud::cloudSolution::cloudSolution +( + const fvMesh& mesh +) +: + mesh_(mesh), + dict_(dictionary::null), + active_(false), + coupled_(false) +{} + + +template +Foam::KinematicCloud::cloudSolution::~cloudSolution() +{} + + // * * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * // template void Foam::KinematicCloud::preEvolve() { this->dispersion().cacheFields(true); - forces_.cacheFields(true, interpolationSchemes_); + forces_.cacheFields(true, solution_.interpolationSchemes()); updateCellOccupancy(); } @@ -98,21 +157,21 @@ void Foam::KinematicCloud::evolveCloud() autoPtr > rhoInterpolator = interpolation::New ( - interpolationSchemes_, + solution_.interpolationSchemes(), rho_ ); autoPtr > UInterpolator = interpolation::New ( - interpolationSchemes_, + solution_.interpolationSchemes(), U_ ); autoPtr > muInterpolator = interpolation::New ( - interpolationSchemes_, + solution_.interpolationSchemes(), mu_ ); @@ -141,7 +200,7 @@ void Foam::KinematicCloud::evolveCloud() this->injection().inject(td); - if (coupled_) + if (solution_.coupled()) { resetSourceTerms(); } @@ -223,7 +282,7 @@ void Foam::KinematicCloud::postEvolve() } this->dispersion().cacheFields(false); - forces_.cacheFields(false, interpolationSchemes_); + forces_.cacheFields(false, solution_.interpolationSchemes()); this->postProcessing().post(); } @@ -256,11 +315,10 @@ Foam::KinematicCloud::KinematicCloud IOobject::NO_WRITE ) ), + solution_(mesh_, particleProperties_.subDict("solution")), constProps_(particleProperties_), subModelProperties_(particleProperties_.subDict("subModels")), - active_(particleProperties_.lookup("active")), parcelTypeId_(readLabel(particleProperties_.lookup("parcelTypeId"))), - coupled_(particleProperties_.lookup("coupled")), cellValueSourceCorrection_ ( particleProperties_.lookup("cellValueSourceCorrection") @@ -272,7 +330,6 @@ Foam::KinematicCloud::KinematicCloud mu_(mu), g_(g), forces_(mesh_, particleProperties_, g_.value()), - interpolationSchemes_(particleProperties_.subDict("interpolationSchemes")), dispersionModel_ ( DispersionModel >::New @@ -335,7 +392,7 @@ Foam::KinematicCloud::KinematicCloud vectorIntegrationScheme::New ( "U", - particleProperties_.subDict("integrationSchemes") + solution_.integrationSchemes() ) ), UTrans_ @@ -397,7 +454,7 @@ void Foam::KinematicCloud::resetSourceTerms() template void Foam::KinematicCloud::evolve() { - if (active_) + if (solution_.active()) { preEvolve(); diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index 9138688a13..e86954ef81 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -105,6 +105,83 @@ class KinematicCloud void operator=(const KinematicCloud&); +public: + + // Cloud solution helper class + class cloudSolution + { + // Private Data + + //- Reference to the mesh + const fvMesh& mesh_; + + //- Dictionary used during construction + dictionary dict_; + + //- Cloud active flag + const Switch active_; + + + // Run-time options + + //- Flag to indicate whether parcels are coupled to the carrier + // phase, i.e. whether or not to generate source terms for + // carrier phase + Switch coupled_; + + //- Flag to correct cell values with latest transfer information + // during the lagrangian timestep + Switch cellValueSourceCorrection_; + + + public: + + // Constructors + + //- Construct null from mesh reference + cloudSolution(const fvMesh& mesh); + + //- Construct from mesh and dictionary + cloudSolution(const fvMesh& mesh, const dictionary& dict); + + //- Construct copy + cloudSolution(const cloudSolution& cs); + + + //- Destructor + virtual ~cloudSolution(); + + + // Member functions + + //- Read properties from dictionary + void read(); + + // Access + + //- Return reference to the mesh + inline const fvMesh& mesh() const; + + //- Return const access to the dictionary + inline const dictionary& dict() const; + + //- Return the active flag + inline const Switch active() const; + + //- Return const access to the coupled flag + inline const Switch coupled() const; + + //- Return const access to the cell value correction flag + inline const Switch cellValueSourceCorrection() const; + + //- Interpolation schemes dictionary + inline const dictionary& interpolationSchemes() const; + + //- Integration schemes dictionary + inline const dictionary& integrationSchemes() const; + }; + + protected: // Protected data @@ -115,23 +192,19 @@ protected: //- Dictionary of particle properties IOdictionary particleProperties_; - //- Sub-models dictionary - const dictionary& subModelProperties_; + //- Solution properties + cloudSolution solution_; //- Parcel constant properties typename ParcelType::constantProperties constProps_; - //- Cloud active flag - const Switch active_; + //- Sub-models dictionary + const dictionary& subModelProperties_; //- Parcel type id - used to flag the type of parcels issued by this // cloud const label parcelTypeId_; - //- Flag to indicate whether parcels are coupled to the carrier phase - // i.e. whether or not to generate source terms for carrier phase - const Switch coupled_; - //- Flag to correct cell values with latest transfer information // during the lagrangian timestep const Switch cellValueSourceCorrection_; @@ -164,9 +237,6 @@ protected: //- Optional particle forces particleForces forces_; - //- Interpolation schemes dictionary - dictionary interpolationSchemes_; - // References to the cloud sub-models @@ -278,28 +348,22 @@ public: //- Return particle properties dictionary inline const IOdictionary& particleProperties() const; - //- Return reference to the sub-models dictionary - inline const dictionary& subModelProperties() const; + //- Return const access to the solution properties + inline const cloudSolution& solution() const; //- Return the constant properties inline const typename ParcelType::constantProperties& constProps() const; + //- Return reference to the sub-models dictionary + inline const dictionary& subModelProperties() const; + // Cloud data - //- Return the active flag - inline const Switch active() const; - //- Return the parcel type id inline label parcelTypeId() const; - //- Return coupled flag - inline const Switch coupled() const; - - //- Return cell value correction flag - inline const Switch cellValueSourceCorrection() const; - //- Return refernce to the random object inline Random& rndGen(); @@ -332,12 +396,6 @@ public: inline const particleForces& forces() const; - // Interpolations - - //- Return reference to the interpolation dictionary - inline const dictionary& interpolationSchemes() const; - - // Sub-models //- Return const-access to the dispersion model diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H index 3bbc78c905..7a924d6c65 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H @@ -25,6 +25,65 @@ License #include "fvmSup.H" +// * * * * * * * * * * * cloudSolution Member Functions * * * * * * * * * * // + +template +inline const Foam::fvMesh& +Foam::KinematicCloud::cloudSolution::mesh() const +{ + return mesh_; +} + + +template +inline const Foam::dictionary& +Foam::KinematicCloud::cloudSolution::dict() const +{ + return dict_; +} + + +template +inline const Foam::Switch +Foam::KinematicCloud::cloudSolution::active() const +{ + return active_; +} + + +template +inline const Foam::Switch +Foam::KinematicCloud::cloudSolution::coupled() const +{ + return coupled_; +} + + +template +inline const Foam::Switch +Foam::KinematicCloud::cloudSolution::cellValueSourceCorrection() +const +{ + return cellValueSourceCorrection_; +} + + +template +inline const Foam::dictionary& +Foam::KinematicCloud::cloudSolution::interpolationSchemes() const +{ + return dict_.subDict("interpolationSchemes"); +} + + +template +inline const Foam::dictionary& +Foam::KinematicCloud::cloudSolution::integrationSchemes() const +{ + return dict_.subDict("integrationSchemes"); +} + + // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template @@ -57,10 +116,10 @@ Foam::KinematicCloud::particleProperties() const template -inline const Foam::dictionary& -Foam::KinematicCloud::subModelProperties() const +inline const typename Foam::KinematicCloud::cloudSolution& +Foam::KinematicCloud::solution() const { - return subModelProperties_; + return solution_; } @@ -73,24 +132,10 @@ Foam::KinematicCloud::constProps() const template -inline const Foam::Switch Foam::KinematicCloud::active() const +inline const Foam::dictionary& +Foam::KinematicCloud::subModelProperties() const { - return active_; -} - - -template -inline const Foam::Switch Foam::KinematicCloud::coupled() const -{ - return coupled_; -} - - -template -inline const Foam::Switch -Foam::KinematicCloud::cellValueSourceCorrection() const -{ - return cellValueSourceCorrection_; + return subModelProperties_; } @@ -132,14 +177,6 @@ Foam::KinematicCloud::forces() const } -template -inline const Foam::dictionary& -Foam::KinematicCloud::interpolationSchemes() const -{ - return interpolationSchemes_; -} - - template inline const Foam::DispersionModel >& Foam::KinematicCloud::dispersion() const diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index 2a54ef8672..8ddf9cc206 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -135,7 +135,7 @@ void Foam::ReactingCloud::evolveCloud() this->injection().inject(td); - if (this->coupled()) + if (this->solution().coupled()) { resetSourceTerms(); } @@ -286,7 +286,7 @@ void Foam::ReactingCloud::resetSourceTerms() template void Foam::ReactingCloud::evolve() { - if (this->active()) + if (this->solution().active()) { preEvolve(); diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C index 579191bc63..b8f4ebceef 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C @@ -46,37 +46,37 @@ void Foam::ReactingMultiphaseCloud::evolveCloud() autoPtr > rhoInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->rho() ); autoPtr > UInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->U() ); autoPtr > muInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->mu() ); autoPtr > TInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), T ); autoPtr > cpInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), cp ); autoPtr > pInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), p ); @@ -108,7 +108,7 @@ void Foam::ReactingMultiphaseCloud::evolveCloud() this->injection().inject(td); - if (this->coupled()) + if (this->solution().coupled()) { resetSourceTerms(); } @@ -245,7 +245,7 @@ void Foam::ReactingMultiphaseCloud::resetSourceTerms() template void Foam::ReactingMultiphaseCloud::evolve() { - if (this->active()) + if (this->solution().active()) { preEvolve(); diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C index f141c29f7b..8571238db1 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C @@ -46,31 +46,31 @@ void Foam::ThermoCloud::evolveCloud() autoPtr > rhoInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->rho() ); autoPtr > UInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->U() ); autoPtr > muInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->mu() ); autoPtr > TInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), T ); autoPtr > cpInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), cp ); @@ -101,7 +101,7 @@ void Foam::ThermoCloud::evolveCloud() this->injection().inject(td); - if (this->coupled()) + if (this->solution().coupled()) { resetSourceTerms(); } @@ -167,7 +167,7 @@ Foam::ThermoCloud::ThermoCloud scalarIntegrationScheme::New ( "T", - this->particleProperties().subDict("integrationSchemes") + this->solution().integrationSchemes() ) ), radiation_(this->particleProperties().lookup("radiation")), @@ -236,7 +236,7 @@ void Foam::ThermoCloud::resetSourceTerms() template void Foam::ThermoCloud::evolve() { - if (this->active()) + if (this->solution().active()) { preEvolve(); diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H index a8907205ce..c5d2f37d61 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H @@ -123,7 +123,7 @@ Foam::ThermoCloud::Ep() const ); // Need to check if coupled as field is created on-the-fly - if (radiation_ && this->coupled()) + if (radiation_ && this->solution().coupled()) { scalarField& Ep = tEp().internalField(); const scalarField& V = this->mesh().V(); @@ -166,7 +166,7 @@ Foam::ThermoCloud::ap() const ); // Need to check if coupled as field is created on-the-fly - if (radiation_ && this->coupled()) + if (radiation_ && this->solution().coupled()) { scalarField& ap = tap().internalField(); const scalarField& V = this->mesh().V(); @@ -209,7 +209,7 @@ Foam::ThermoCloud::sigmap() const ); // Need to check if coupled as field is created on-the-fly - if (radiation_ && this->coupled()) + if (radiation_ && this->solution().coupled()) { scalarField& sigmap = tsigmap().internalField(); diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C index f6ba6aeed3..4cd8e6df9b 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C @@ -127,7 +127,7 @@ void Foam::KinematicParcel::calc // Accumulate carrier phase source terms // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Update momentum transfer td.cloud().UTrans()[cellI] += np0*dUTrans; @@ -301,7 +301,7 @@ bool Foam::KinematicParcel::move(TrackData& td) // Update cell based properties p.setCellValues(td, dt, cellI); - if (td.cloud().cellValueSourceCorrection()) + if (td.cloud().solution().cellValueSourceCorrection()) { p.cellValueSourceCorrection(td, dt, cellI); } diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C index 1deed776b9..e77064c5a1 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C @@ -387,7 +387,7 @@ void Foam::ReactingMultiphaseParcel::calc // Accumulate carrier phase source terms // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Transfer mass lost from particle to carrier mass source forAll(YGas_, i) @@ -428,7 +428,7 @@ void Foam::ReactingMultiphaseParcel::calc { td.keepParticle = false; - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Absorb parcel into carrier phase forAll(YGas_, i) diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index f032198856..edd2b8e678 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -333,7 +333,7 @@ void Foam::ReactingParcel::calc // Accumulate carrier phase source terms // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Transfer mass lost from particle to carrier mass source forAll(dMassPC, i) @@ -356,7 +356,7 @@ void Foam::ReactingParcel::calc { td.keepParticle = false; - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Absorb parcel into carrier phase forAll(Y_, i) diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C index dbcc01ad2a..d04caf8cfc 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C @@ -193,7 +193,7 @@ void Foam::ThermoParcel::calc // Accumulate carrier phase source terms // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - if (td.cloud().coupled()) + if (td.cloud().solution().coupled()) { // Update momentum transfer td.cloud().UTrans()[cellI] += np0*dUTrans; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 6ad5bec888..c965f964c8 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation on; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -46,22 +63,6 @@ constantProperties constantVolume true; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 8b4207b192..0524272eb6 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -15,14 +15,30 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + mu cell; + U cellPoint; + Cp cell; + T cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation on; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 2; constantProperties @@ -40,21 +56,6 @@ constantProperties Pr 0.7; } -interpolationSchemes -{ - rho cell; - mu cell; - U cellPoint; - Cp cell; - T cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties index 464ed8f5e5..8244491a54 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -46,22 +63,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index 82e218b5a2..5a4ad7e915 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled false; + cellValueSourceCorrection off; + + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Euler; + } +} radiation off; -coupled false; - -cellValueSourceCorrection off; - parcelTypeId 1; constantProperties @@ -46,22 +63,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Euler; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 83dc18816a..4c127591eb 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -46,22 +63,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties index da06cb5025..33a3f9916d 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active false; // true; +solution +{ + active false; // true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cell; // cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -44,22 +61,6 @@ constantProperties poissonsRatio 0; } -interpolationSchemes -{ - rho cell; - U cell; // cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index 41d7d0ea06..50a9d54746 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cell; // cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -44,22 +61,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cell; // cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties index c2f0120ecd..4eaa668310 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cell; // cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -44,22 +61,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cell; // cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties index eeb34eafa1..dc73bbf25d 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active false; // true; +solution +{ + active false; // true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cell; // cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -44,22 +61,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cell; // cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index 7860f48964..33aba59d3e 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -15,14 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + T cell; + Cp cell; + p cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -44,22 +61,6 @@ constantProperties constantVolume false; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; - T cell; - Cp cell; - p cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity off; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index 0a2e6e40cc..29fccecae6 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -15,11 +15,24 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; -coupled true; + interpolationSchemes + { + rho cell; + U cellPoint; + mu cell; + } -cellValueSourceCorrection on; + integrationSchemes + { + U Euler; + } +} parcelTypeId 2; @@ -32,18 +45,6 @@ constantProperties poissonsRatio 0.35; } -interpolationSchemes -{ - rho cell; - U cellPoint; - mu cell; -} - -integrationSchemes -{ - U Euler; -} - particleForces { gravity on; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 9f3b816eb3..6ab1d7eb67 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -15,14 +15,30 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -active true; +solution +{ + active true; + coupled true; + cellValueSourceCorrection on; + + interpolationSchemes + { + rho cell; + mu cell; + U cellPoint; + T cell; + Cp cell; + } + + integrationSchemes + { + U Euler; + T Analytical; + } +} radiation off; -coupled true; - -cellValueSourceCorrection on; - parcelTypeId 1; constantProperties @@ -40,21 +56,6 @@ constantProperties Pr 0.7; } -interpolationSchemes -{ - rho cell; - mu cell; - U cellPoint; - T cell; - Cp cell; -} - -integrationSchemes -{ - U Euler; - T Analytical; -} - particleForces { gravity on; From f2d170a2150652335ee396713201fe338d8d1385 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 18 Oct 2010 17:41:31 +0100 Subject: [PATCH 04/83] ENH: Re-shuffled particle parcelTypeId label and radition flag --- .../Templates/KinematicCloud/KinematicCloud.C | 1 - .../Templates/KinematicCloud/KinematicCloud.H | 7 ------- .../KinematicCloud/KinematicCloudI.H | 7 ------- .../Templates/ThermoCloud/ThermoCloud.C | 2 +- .../KinematicParcel/KinematicParcel.H | 7 +++++++ .../KinematicParcel/KinematicParcelI.H | 11 ++++++++++- .../constant/coalCloud1Properties | 17 +++++++++++------ .../constant/limestoneCloud1Properties | 16 ++++++++++------ .../filter/constant/reactingCloud1Properties | 19 ++++++++++++------- .../constant/reactingCloud1Properties | 19 ++++++++++++------- .../constant/reactingCloud1Properties | 19 ++++++++++++------- .../constant/reactingCloud1Properties | 16 ++++++++++------ .../constant/reactingCloud1Properties | 18 +++++++++++------- .../constant/reactingCloud1Properties | 18 +++++++++++------- .../panel/constant/reactingCloud1Properties | 18 +++++++++++------- .../constant/reactingCloud1Properties | 18 +++++++++++------- .../constant/kinematicCloud1Properties | 6 ++++-- .../constant/thermoCloud1Properties | 16 ++++++++++------ 18 files changed, 143 insertions(+), 92 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index bbb730bb62..f73a9229be 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -318,7 +318,6 @@ Foam::KinematicCloud::KinematicCloud solution_(mesh_, particleProperties_.subDict("solution")), constProps_(particleProperties_), subModelProperties_(particleProperties_.subDict("subModels")), - parcelTypeId_(readLabel(particleProperties_.lookup("parcelTypeId"))), cellValueSourceCorrection_ ( particleProperties_.lookup("cellValueSourceCorrection") diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index e86954ef81..f9a203b4ae 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -201,10 +201,6 @@ protected: //- Sub-models dictionary const dictionary& subModelProperties_; - //- Parcel type id - used to flag the type of parcels issued by this - // cloud - const label parcelTypeId_; - //- Flag to correct cell values with latest transfer information // during the lagrangian timestep const Switch cellValueSourceCorrection_; @@ -361,9 +357,6 @@ public: // Cloud data - //- Return the parcel type id - inline label parcelTypeId() const; - //- Return refernce to the random object inline Random& rndGen(); diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H index 7a924d6c65..d3078fbb1b 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H @@ -93,13 +93,6 @@ inline bool Foam::KinematicCloud::hasWallImpactDistance() const } -template -inline Foam::label Foam::KinematicCloud::parcelTypeId() const -{ - return parcelTypeId_; -} - - template inline const Foam::fvMesh& Foam::KinematicCloud::mesh() const { diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C index 8571238db1..6790c8bb12 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C @@ -170,7 +170,7 @@ Foam::ThermoCloud::ThermoCloud this->solution().integrationSchemes() ) ), - radiation_(this->particleProperties().lookup("radiation")), + radiation_(this->subModelProperties().lookup("radiation")), hsTrans_ ( IOobject diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H index 7ff71216d8..f88672be6e 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H @@ -96,6 +96,10 @@ public: //- Constant properties dictionary const dictionary dict_; + //- Parcel type id - used for post-processing to flag the type + // of parcels issued by this cloud + const label parcelTypeId_; + //- Minimum density [kg/m3] const scalar rhoMin_; @@ -122,6 +126,9 @@ public: //- Return const access to the constant properties dictionary inline const dictionary& dict() const; + //- Return const access to the parcel type id + inline label parcelTypeId() const; + //- Return const access to the minimum density inline scalar rhoMin() const; diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H index 855c8add6c..6b0cb76ba2 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H @@ -36,6 +36,7 @@ inline Foam::KinematicParcel::constantProperties::constantProperties ) : dict_(parentDict.subDict("constantProperties")), + parcelTypeId_(readLabel(dict_.lookup("parcelTypeId"))), rhoMin_(readScalar(dict_.lookup("rhoMin"))), rho0_(readScalar(dict_.lookup("rho0"))), minParticleMass_(readScalar(dict_.lookup("minParticleMass"))), @@ -79,7 +80,7 @@ inline Foam::KinematicParcel::KinematicParcel : Particle(owner, position, cellI, tetFaceI, tetPtI), active_(true), - typeId_(owner.parcelTypeId()), + typeId_(owner.constProps().parcelTypeId()), nParticle_(0), d_(0.0), dTarget_(0.0), @@ -146,6 +147,14 @@ Foam::KinematicParcel::constantProperties::dict() const } +template +inline Foam::label +Foam::KinematicParcel::constantProperties::parcelTypeId() const +{ + return parcelTypeId_; +} + + template inline Foam::scalar Foam::KinematicParcel::constantProperties::rhoMin() const diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index c965f964c8..52dfc816b1 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -38,28 +38,31 @@ solution } } -radiation on; - -parcelTypeId 1; - constantProperties { + parcelTypeId 1; + rhoMin 1e-15; TMin 200; pMin 1000; minParticleMass 1e-15; + rho0 1000; - youngsModulus 2e9; - poissonsRatio 0.35; T0 300; cp0 4187; + + youngsModulus 2e9; + poissonsRatio 0.35; + epsilon0 1; f0 0.5; + Pr 0.7; Tvap 400; Tbp 400; LDevol 0; hRetentionCoeff 1; + constantVolume true; } @@ -97,6 +100,8 @@ subModels SurfaceFilmModel none; + radiation on; + ManualInjectionCoeffs { massTotal massTotal [ 1 0 0 0 0 ] 0.0001; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 0524272eb6..0d8c7a1bbd 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -37,22 +37,24 @@ solution } } -radiation on; - -parcelTypeId 2; - constantProperties { + parcelTypeId 2; + rhoMin 1e-15; TMin 200; minParticleMass 1e-15; + rho0 2500; - youngsModulus 40e9; - poissonsRatio 0.25; T0 300; cp0 900; + + youngsModulus 40e9; + poissonsRatio 0.25; + epsilon0 1; f0 0.5; + Pr 0.7; } @@ -82,6 +84,8 @@ subModels SurfaceFilmModel none; + radiation on; + ManualInjectionCoeffs { massTotal massTotal [ 1 0 0 0 0 ] 0.0001; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties index 8244491a54..7a779261f0 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties @@ -38,28 +38,31 @@ solution } } -radiation off; - -parcelTypeId 1; - constantProperties { + parcelTypeId 1; + rhoMin 1e-15; TMin 200; pMin 1000; - rho0 1000; - youngsModulus 1e9; - poissonsRatio 0.35; minParticleMass 1e-15; + + rho0 1000; T0 300; cp0 4100; + + youngsModulus 1e9; + poissonsRatio 0.35; + epsilon0 1; f0 0.5; + Pr 0.7; Tvap 273; Tbp 373; LDevol 0; hRetentionCoeff 1; + constantVolume false; } @@ -97,6 +100,8 @@ subModels CollisionModel none; + radiation off; + ReactingMultiphaseLookupTableInjectionCoeffs { massTotal massTotal [ 1 0 0 0 0 ] 1e-2; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index 5a4ad7e915..d94a42daa1 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -38,28 +38,31 @@ solution } } -radiation off; - -parcelTypeId 1; - constantProperties { + parcelTypeId 1; + rhoMin 1e-15; TMin 200; pMin 1000; - rho0 1000; - youngsModulus 1e9; - poissonsRatio 0.35; minParticleMass 1e-15; + + rho0 1000; T0 350; cp0 4100; + + youngsModulus 1e9; + poissonsRatio 0.35; + epsilon0 1; f0 0.5; + Tvap 284; Tbp 373; Pr 0.7; LDevol 0; hRetentionCoeff 1; + constantVolume false; } @@ -99,6 +102,8 @@ subModels CollisionModel none; + radiation off; + ManualInjectionCoeffs { massTotal massTotal [ 1 0 0 0 0 ] 5.23599e-10; // 1 droplet of density 1000 kg/m3 diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 4c127591eb..801cae7f95 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -38,28 +38,31 @@ solution } } -radiation off; - -parcelTypeId 1; - constantProperties { + parcelTypeId 1; + rhoMin 1e-15; TMin 200; pMin 1000; - rho0 1000; - youngsModulus 1e9; - poissonsRatio 0.35; minParticleMass 1e-15; + + rho0 1000; T0 350; cp0 4100; + + youngsModulus 1e9; + poissonsRatio 0.35; + epsilon0 1; f0 0.5; + Tvap 273; Tbp 373; Pr 0.7; LDevol 0; hRetentionCoeff 1; + constantVolume false; } @@ -99,6 +102,8 @@ subModels CollisionModel none; + radiation off; + PatchInjectionCoeffs { SOI 0.01; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties index 33a3f9916d..541dc8af58 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/evaporationTest/constant/reactingCloud1Properties @@ -38,27 +38,29 @@ solution } } -radiation off; - -parcelTypeId 1; - constantProperties { + parcelTypeId 1; + rhoMin 1e-15; TMin 200; pMin 1000; - rho0 1000; minParticleMass 1e-15; + + rho0 1000; T0 300; cp0 4187; + epsilon0 1; f0 0.5; + Pr 0.7; Tvap 273; Tbp 373; - constantVolume false; youngsModulus 0; poissonsRatio 0; + + constantVolume false; } particleForces @@ -91,6 +93,8 @@ subModels SurfaceFilmModel ThermoSurfaceFilm; + radiation off; + StandardWallInteractionCoeffs { type rebound; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index 50a9d54746..97eeae1d51 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -38,26 +38,28 @@ solution } } -radiation off; - -parcelTypeId 1; - constantProperties { + parcelTypeId 1; + rhoMin 1e-15; TMin 200; pMin 1000; - rho0 1000; - youngsModulus 0; - poissonsRatio 0; minParticleMass 1e-15; + + rho0 1000; T0 300; cp0 4187; + + youngsModulus 0; + poissonsRatio 0; + epsilon0 1; f0 0.5; Pr 0.7; Tvap 273; Tbp 373; + constantVolume false; } @@ -91,6 +93,8 @@ subModels SurfaceFilmModel ThermoSurfaceFilm; // none; + radiation off; + ConeInjectionCoeffs { SOI 0.000; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties index 4eaa668310..cf917e1058 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/multipleBoxes/constant/reactingCloud1Properties @@ -38,26 +38,28 @@ solution } } -radiation off; - -parcelTypeId 1; - constantProperties { + parcelTypeId 1; + rhoMin 1e-15; TMin 200; pMin 1000; - rho0 1000; - youngsModulus 1e9; - poissonsRatio 0.35; minParticleMass 1e-15; + + rho0 1000; T0 300; cp0 4187; + + youngsModulus 1e9; + poissonsRatio 0.35; + epsilon0 1; f0 0.5; Pr 0.7; Tvap 273; Tbp 373; + constantVolume false; } @@ -91,6 +93,8 @@ subModels SurfaceFilmModel ThermoSurfaceFilm; // none; + radiation off; + ConeInjectionMPCoeffs { SOI 0.000; diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties index dc73bbf25d..ae3045dec6 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/panel/constant/reactingCloud1Properties @@ -38,26 +38,28 @@ solution } } -radiation off; - -parcelTypeId 1; - constantProperties { + parcelTypeId 1; + rhoMin 1e-15; TMin 200; pMin 1000; - rho0 1000; - youngsModulus 1e9; - poissonsRatio 0.35; minParticleMass 1e-15; + + rho0 1000; T0 300; cp0 4187; + + youngsModulus 1e9; + poissonsRatio 0.35; + epsilon0 1; f0 0.5; Pr 0.7; Tvap 273; Tbp 373; + constantVolume false; } @@ -91,6 +93,8 @@ subModels SurfaceFilmModel ThermoSurfaceFilm; + radiation off; + StandardWallInteractionCoeffs { type rebound; diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index 33aba59d3e..2e29d9d77f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -38,26 +38,28 @@ solution } } -radiation off; - -parcelTypeId 1; - constantProperties { + parcelTypeId 1; + rhoMin 1e-15; TMin 200; pMin 1000; - rho0 1000; - youngsModulus 1e9; - poissonsRatio 0.35; minParticleMass 1e-15; + + rho0 1000; T0 300; cp0 4187; + + youngsModulus 1e9; + poissonsRatio 0.35; + epsilon0 1; f0 0.5; Pr 0.7; Tvap 273; Tbp 373; + constantVolume false; } @@ -91,6 +93,8 @@ subModels SurfaceFilmModel none; + radiation off; + ManualInjectionCoeffs { massTotal massTotal [ 1 0 0 0 0 ] 1e-8; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index 29fccecae6..ea87f36b72 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -34,13 +34,15 @@ solution } } -parcelTypeId 2; - constantProperties { + parcelTypeId 2; + rhoMin 1e-15; minParticleMass 1e-15; + rho0 5000; + youngsModulus 1e9; poissonsRatio 0.35; } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 6ab1d7eb67..b4f9f66a66 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -37,22 +37,24 @@ solution } } -radiation off; - -parcelTypeId 1; - constantProperties { + parcelTypeId 1; + rhoMin 1e-15; TMin 200; minParticleMass 1e-15; + rho0 2500; - youngsModulus 1e9; - poissonsRatio 0.35; T0 300; cp0 900; + + youngsModulus 1e9; + poissonsRatio 0.35; + epsilon0 1; f0 0.5; + Pr 0.7; } @@ -82,6 +84,8 @@ subModels SurfaceFilmModel none; + radiation off; + ManualInjectionCoeffs { massTotal massTotal [ 1 0 0 0 0 ] 0.0001; From 325279ddd06e9443c0f80b3e56c70f774c635785 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 19 Oct 2010 09:12:19 +0100 Subject: [PATCH 05/83] BUG: Corrected (missed updated) path to cloud interpolation schemes --- .../clouds/Templates/ReactingCloud/ReactingCloud.C | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index 8ddf9cc206..adbed66c81 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -73,37 +73,37 @@ void Foam::ReactingCloud::evolveCloud() autoPtr > rhoInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->rho() ); autoPtr > UInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->U() ); autoPtr > muInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), this->mu() ); autoPtr > TInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), T ); autoPtr > cpInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), cp ); autoPtr > pInterp = interpolation::New ( - this->interpolationSchemes(), + this->solution().interpolationSchemes(), p ); From 6c7f869d456005902a6398183e47678817e284eb Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 19 Oct 2010 10:44:35 +0100 Subject: [PATCH 06/83] STYLE: refactored cp -> Cp --- .../standardPhaseChange/standardPhaseChange.C | 4 ++-- .../kinematicSingleLayer.C | 6 +++--- .../kinematicSingleLayer.H | 2 +- .../surfaceFilmModel/noFilm/noFilm.C | 6 +++--- .../surfaceFilmModel/noFilm/noFilm.H | 2 +- .../surfaceFilmModel/surfaceFilmModel.H | 2 +- .../thermoSingleLayer/thermoSingleLayer.C | 20 +++++++++---------- .../thermoSingleLayer/thermoSingleLayer.H | 6 +++--- .../thermoSingleLayer/thermoSingleLayerI.H | 4 ++-- .../liquidMixture/liquidMixture.C | 8 ++++---- .../liquidMixture/liquidMixture.H | 2 +- src/thermophysicalModels/liquids/Ar/Ar.C | 16 +++++++-------- src/thermophysicalModels/liquids/Ar/Ar.H | 12 +++++------ src/thermophysicalModels/liquids/Ar/ArI.H | 8 ++++---- .../liquids/C10H22/C10H22.C | 16 +++++++-------- .../liquids/C10H22/C10H22.H | 12 +++++------ .../liquids/C10H22/C10H22I.H | 8 ++++---- .../liquids/C12H26/C12H26.C | 16 +++++++-------- .../liquids/C12H26/C12H26.H | 12 +++++------ .../liquids/C12H26/C12H26I.H | 8 ++++---- .../liquids/C13H28/C13H28.C | 16 +++++++-------- .../liquids/C13H28/C13H28.H | 12 +++++------ .../liquids/C13H28/C13H28I.H | 8 ++++---- .../liquids/C14H30/C14H30.C | 16 +++++++-------- .../liquids/C14H30/C14H30.H | 12 +++++------ .../liquids/C14H30/C14H30I.H | 8 ++++---- .../liquids/C16H34/C16H34.C | 16 +++++++-------- .../liquids/C16H34/C16H34.H | 12 +++++------ .../liquids/C16H34/C16H34I.H | 8 ++++---- .../liquids/C2H5OH/C2H5OH.C | 16 +++++++-------- .../liquids/C2H5OH/C2H5OH.H | 12 +++++------ .../liquids/C2H5OH/C2H5OHI.H | 8 ++++---- src/thermophysicalModels/liquids/C2H6/C2H6.C | 16 +++++++-------- src/thermophysicalModels/liquids/C2H6/C2H6.H | 12 +++++------ src/thermophysicalModels/liquids/C2H6/C2H6I.H | 8 ++++---- .../liquids/C2H6O/C2H6O.C | 16 +++++++-------- .../liquids/C2H6O/C2H6O.H | 12 +++++------ .../liquids/C2H6O/C2H6OI.H | 8 ++++---- .../liquids/C3H6O/C3H6O.C | 16 +++++++-------- .../liquids/C3H6O/C3H6O.H | 12 +++++------ .../liquids/C3H6O/C3H6OI.H | 8 ++++---- src/thermophysicalModels/liquids/C3H8/C3H8.C | 16 +++++++-------- src/thermophysicalModels/liquids/C3H8/C3H8.H | 12 +++++------ src/thermophysicalModels/liquids/C3H8/C3H8I.H | 8 ++++---- .../liquids/C4H10O/C4H10O.C | 16 +++++++-------- .../liquids/C4H10O/C4H10O.H | 12 +++++------ .../liquids/C4H10O/C4H10OI.H | 8 ++++---- .../liquids/C6H14/C6H14.C | 16 +++++++-------- .../liquids/C6H14/C6H14.H | 12 +++++------ .../liquids/C6H14/C6H14I.H | 8 ++++---- src/thermophysicalModels/liquids/C6H6/C6H6.C | 16 +++++++-------- src/thermophysicalModels/liquids/C6H6/C6H6.H | 12 +++++------ src/thermophysicalModels/liquids/C6H6/C6H6I.H | 8 ++++---- .../liquids/C7H16/C7H16.C | 16 +++++++-------- .../liquids/C7H16/C7H16.H | 12 +++++------ .../liquids/C7H16/C7H16I.H | 8 ++++---- src/thermophysicalModels/liquids/C7H8/C7H8.C | 16 +++++++-------- src/thermophysicalModels/liquids/C7H8/C7H8.H | 12 +++++------ src/thermophysicalModels/liquids/C7H8/C7H8I.H | 8 ++++---- .../liquids/C8H10/C8H10.C | 16 +++++++-------- .../liquids/C8H10/C8H10.H | 12 +++++------ .../liquids/C8H10/C8H10I.H | 8 ++++---- .../liquids/C8H18/C8H18.C | 16 +++++++-------- .../liquids/C8H18/C8H18.H | 12 +++++------ .../liquids/C8H18/C8H18I.H | 8 ++++---- .../liquids/C9H20/C9H20.C | 16 +++++++-------- .../liquids/C9H20/C9H20.H | 12 +++++------ .../liquids/C9H20/C9H20I.H | 8 ++++---- .../liquids/CH3OH/CH3OH.C | 16 +++++++-------- .../liquids/CH3OH/CH3OH.H | 12 +++++------ .../liquids/CH3OH/CH3OHI.H | 8 ++++---- .../liquids/CH4N2O/CH4N2O.C | 16 +++++++-------- .../liquids/CH4N2O/CH4N2O.H | 12 +++++------ .../liquids/CH4N2O/CH4N2OI.H | 8 ++++---- src/thermophysicalModels/liquids/H2O/H2O.C | 16 +++++++-------- src/thermophysicalModels/liquids/H2O/H2O.H | 12 +++++------ src/thermophysicalModels/liquids/H2O/H2OI.H | 8 ++++---- .../liquids/IC8H18/IC8H18.C | 16 +++++++-------- .../liquids/IC8H18/IC8H18.H | 12 +++++------ .../liquids/IC8H18/IC8H18I.H | 8 ++++---- src/thermophysicalModels/liquids/IDEA/IDEA.C | 16 +++++++-------- src/thermophysicalModels/liquids/IDEA/IDEA.H | 12 +++++------ src/thermophysicalModels/liquids/IDEA/IDEAI.H | 8 ++++---- src/thermophysicalModels/liquids/MB/MB.C | 16 +++++++-------- src/thermophysicalModels/liquids/MB/MB.H | 12 +++++------ src/thermophysicalModels/liquids/MB/MBI.H | 8 ++++---- src/thermophysicalModels/liquids/N2/N2.C | 16 +++++++-------- src/thermophysicalModels/liquids/N2/N2.H | 12 +++++------ src/thermophysicalModels/liquids/N2/N2I.H | 8 ++++---- .../liquids/aC10H7CH3/aC10H7CH3.C | 16 +++++++-------- .../liquids/aC10H7CH3/aC10H7CH3.H | 12 +++++------ .../liquids/aC10H7CH3/aC10H7CH3I.H | 8 ++++---- .../liquids/bC10H7CH3/bC10H7CH3.C | 16 +++++++-------- .../liquids/bC10H7CH3/bC10H7CH3.H | 12 +++++------ .../liquids/bC10H7CH3/bC10H7CH3I.H | 8 ++++---- .../liquids/iC3H8O/iC3H8O.C | 16 +++++++-------- .../liquids/iC3H8O/iC3H8O.H | 12 +++++------ .../liquids/iC3H8O/iC3H8OI.H | 8 ++++---- .../liquids/liquid/liquid.H | 4 ++-- .../liquids/nC3H8O/nC3H8O.C | 16 +++++++-------- .../liquids/nC3H8O/nC3H8O.H | 12 +++++------ .../liquids/nC3H8O/nC3H8OI.H | 8 ++++---- .../solidMixture/solidMixture/solidMixture.C | 4 ++-- .../solidMixture/solidMixture/solidMixture.H | 2 +- src/thermophysicalModels/solids/solid/solid.C | 10 +++++----- src/thermophysicalModels/solids/solid/solid.H | 6 +++--- .../solids/solid/solidI.H | 4 ++-- 107 files changed, 586 insertions(+), 586 deletions(-) diff --git a/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C index df0eb7712e..8380d06ef7 100644 --- a/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C +++ b/src/surfaceFilmModels/submodels/thermo/phaseChangeModel/standardPhaseChange/standardPhaseChange.C @@ -148,8 +148,8 @@ void Foam::surfaceFilmModels::standardPhaseChange::correct const scalar qDotInf = hInf[cellI]*(TInf[cellI] - T[cellI]); const scalar qDotFilm = hFilm[cellI]*(T[cellI] - Tw[cellI]); - const scalar cp = liq.cp(pc, Tloc); - const scalar qCorr = availableMass[cellI]*cp*(T[cellI] - Tb_); + const scalar Cp = liq.Cp(pc, Tloc); + const scalar qCorr = availableMass[cellI]*Cp*(T[cellI] - Tb_); dMass[cellI] = dt*magSf[cellI]/hVap*(qDotInf + qDotFilm) + qCorr/hVap; diff --git a/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C b/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C index 5c81e24cc3..c645552e67 100644 --- a/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C +++ b/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.C @@ -1116,12 +1116,12 @@ Foam::surfaceFilmModels::kinematicSingleLayer::Tw() const const Foam::volScalarField& -Foam::surfaceFilmModels::kinematicSingleLayer::cp() const +Foam::surfaceFilmModels::kinematicSingleLayer::Cp() const { FatalErrorIn ( - "const volScalarField& kinematicSingleLayer::cp() const" - ) << "cp field not available for " << type() << abort(FatalError); + "const volScalarField& kinematicSingleLayer::Cp() const" + ) << "Cp field not available for " << type() << abort(FatalError); return volScalarField::null(); } diff --git a/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.H b/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.H index c6b1ed1b4e..4e33708c25 100644 --- a/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.H +++ b/src/surfaceFilmModels/surfaceFilmModel/kinematicSingleLayer/kinematicSingleLayer.H @@ -401,7 +401,7 @@ public: virtual const volScalarField& Tw() const; //- Return the film specific heat capacity [J/kg/K] - virtual const volScalarField& cp() const; + virtual const volScalarField& Cp() const; //- Return the film thermal conductivity [W/m/K] virtual const volScalarField& kappa() const; diff --git a/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.C b/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.C index b277192e25..619226bb8f 100644 --- a/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.C +++ b/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.C @@ -199,10 +199,10 @@ const Foam::volScalarField& Foam::surfaceFilmModels::noFilm::Tw() const } -const Foam::volScalarField& Foam::surfaceFilmModels::noFilm::cp() const +const Foam::volScalarField& Foam::surfaceFilmModels::noFilm::Cp() const { - FatalErrorIn("const volScalarField& noFilm::cp() const") - << "cp field not available for " << type() << abort(FatalError); + FatalErrorIn("const volScalarField& noFilm::Cp() const") + << "Cp field not available for " << type() << abort(FatalError); return volScalarField::null(); } diff --git a/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.H b/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.H index e4616151fd..7c3d7f89d9 100644 --- a/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.H +++ b/src/surfaceFilmModels/surfaceFilmModel/noFilm/noFilm.H @@ -148,7 +148,7 @@ public: virtual const volScalarField& Tw() const; //- Return the film specific heat capacity [J/kg/K] - virtual const volScalarField& cp() const; + virtual const volScalarField& Cp() const; //- Return the film thermal conductivity [W/m/K] virtual const volScalarField& kappa() const; diff --git a/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.H b/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.H index c8c01ed6a7..511a6204e4 100644 --- a/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.H +++ b/src/surfaceFilmModels/surfaceFilmModel/surfaceFilmModel/surfaceFilmModel.H @@ -242,7 +242,7 @@ public: virtual const volScalarField& Tw() const = 0; //- Return the film specific heat capacity [J/kg/K] - virtual const volScalarField& cp() const = 0; + virtual const volScalarField& Cp() const = 0; //- Return the film thermal conductivity [W/m/K] virtual const volScalarField& kappa() const = 0; diff --git a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C index aa9194942e..ec1391ec18 100644 --- a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C +++ b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.C @@ -74,7 +74,7 @@ void Foam::surfaceFilmModels::thermoSingleLayer::correctThermoFields() rho_ == dimensionedScalar(coeffs_.lookup("rho0")); mu_ == dimensionedScalar(coeffs_.lookup("mu0")); sigma_ == dimensionedScalar(coeffs_.lookup("sigma0")); - cp_ == dimensionedScalar(coeffs_.lookup("cp0")); + Cp_ == dimensionedScalar(coeffs_.lookup("Cp0")); kappa_ == dimensionedScalar(coeffs_.lookup("kappa0")); break; @@ -89,14 +89,14 @@ void Foam::surfaceFilmModels::thermoSingleLayer::correctThermoFields() rho_[cellI] = liq.rho(p, T); mu_[cellI] = liq.mu(p, T); sigma_[cellI] = liq.sigma(p, T); - cp_[cellI] = liq.cp(p, T); + Cp_[cellI] = liq.Cp(p, T); kappa_[cellI] = liq.K(p, T); } rho_.correctBoundaryConditions(); mu_.correctBoundaryConditions(); sigma_.correctBoundaryConditions(); - cp_.correctBoundaryConditions(); + Cp_.correctBoundaryConditions(); kappa_.correctBoundaryConditions(); break; @@ -188,8 +188,8 @@ Foam::tmp Foam::surfaceFilmModels::thermoSingleLayer::q return ( - - fvm::Sp(htcs_->h()/cp_, hs) - htcs_->h()*(Tstd - TPrimary_) - - fvm::Sp(htcw_->h()/cp_, hs) - htcw_->h()*(Tstd - Tw_) + - fvm::Sp(htcs_->h()/Cp_, hs) - htcs_->h()*(Tstd - TPrimary_) + - fvm::Sp(htcw_->h()/Cp_, hs) - htcw_->h()*(Tstd - Tw_) ); } @@ -236,18 +236,18 @@ Foam::surfaceFilmModels::thermoSingleLayer::thermoSingleLayer kinematicSingleLayer(modelType, mesh, g), thermo_(mesh.lookupObject("SLGThermo")), liquidId_(thermo_.liquidId(coeffs_.lookup("liquid"))), - cp_ + Cp_ ( IOobject ( - "cp", + "Cp", time_.timeName(), filmRegion_, IOobject::NO_READ, IOobject::AUTO_WRITE ), filmRegion_, - dimensionedScalar("cp", dimEnergy/dimMass/dimTemperature, 0.0), + dimensionedScalar("Cp", dimEnergy/dimMass/dimTemperature, 0.0), zeroGradientFvPatchScalarField::typeName ), kappa_ @@ -526,9 +526,9 @@ void Foam::surfaceFilmModels::thermoSingleLayer::evolveFilm() const Foam::volScalarField& -Foam::surfaceFilmModels::thermoSingleLayer::cp() const +Foam::surfaceFilmModels::thermoSingleLayer::Cp() const { - return cp_; + return Cp_; } diff --git a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.H b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.H index 2cdf71f2e4..5ee8d0de52 100644 --- a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.H +++ b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayer.H @@ -27,7 +27,7 @@ Class Description Thermodynamic form of single-cell layer surface film model - Note: defining enthalpy as cp(T - Tstd) - when using liquids from the + Note: defining enthalpy as Cp(T - Tstd) - when using liquids from the thermophysical library, their enthalpies are calculated similarly, where Tstd = 298.15 K @@ -90,7 +90,7 @@ protected: // Fields //- Specific heat capacity / [J/kg/K] - volScalarField cp_; + volScalarField Cp_; //- Thermal conductivity / [W/m/K] volScalarField kappa_; @@ -218,7 +218,7 @@ public: // Fields //- Return the film specific heat capacity [J/kg/K] - virtual const volScalarField& cp() const; + virtual const volScalarField& Cp() const; //- Return the film thermal conductivity [W/m/K] virtual const volScalarField& kappa() const; diff --git a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayerI.H b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayerI.H index f98802a51a..3d0138ad62 100644 --- a/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayerI.H +++ b/src/surfaceFilmModels/surfaceFilmModel/thermoSingleLayer/thermoSingleLayerI.H @@ -61,7 +61,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::hs IOobject::NO_READ, IOobject::NO_WRITE ), - cp_*(T - Tstd), + Cp_*(T - Tstd), zeroGradientFvPatchScalarField::typeName ) ); @@ -88,7 +88,7 @@ Foam::surfaceFilmModels::thermoSingleLayer::T IOobject::NO_READ, IOobject::NO_WRITE ), - hs/cp_ + Tstd, + hs/Cp_ + Tstd, zeroGradientFvPatchScalarField::typeName ) ); diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C index 8c958caa4f..6db944c028 100644 --- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C +++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C @@ -256,25 +256,25 @@ Foam::scalar Foam::liquidMixture::hl } -Foam::scalar Foam::liquidMixture::cp +Foam::scalar Foam::liquidMixture::Cp ( const scalar p, const scalar T, const scalarField& x ) const { - scalar cp = 0.0; + scalar Cp = 0.0; forAll(properties_, i) { if (x[i] > SMALL) { scalar Ti = min(TrMax*properties_[i].Tc(), T); - cp += x[i]*properties_[i].cp(p, Ti)*properties_[i].W(); + Cp += x[i]*properties_[i].Cp(p, Ti)*properties_[i].W(); } } - return cp/W(x); + return Cp/W(x); } diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H index 8810256475..2ecde01b7b 100644 --- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H +++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H @@ -207,7 +207,7 @@ public: ) const; //- Calculate the mixture heat capacity [J/(kg K)] - scalar cp + scalar Cp ( const scalar p, const scalar T, diff --git a/src/thermophysicalModels/liquids/Ar/Ar.C b/src/thermophysicalModels/liquids/Ar/Ar.C index 456872eeaa..cb78356910 100644 --- a/src/thermophysicalModels/liquids/Ar/Ar.C +++ b/src/thermophysicalModels/liquids/Ar/Ar.C @@ -57,7 +57,7 @@ Foam::Ar::Ar() rho_(151.922244, 0.286, 150.86, 0.2984), pv_(39.233, -1051.7, -3.5895, 5.0444e-05, 2), hl_(150.86, 218509.061780314, 0.352, 0.0, 0.0, 0.0), - cp_(4562.43116050866, -70.7770101131471, 0.367477721037349, 0.0, 0.0, 0.0), + Cp_(4562.43116050866, -70.7770101131471, 0.367477721037349, 0.0, 0.0, 0.0), h_ ( -1460974.49982473, @@ -67,7 +67,7 @@ Foam::Ar::Ar() 0.0, 0.0 ), - cpg_(520.326424351657, 0.0, 0.0, 0.0, 0.0, 0.0), + Cpg_(520.326424351657, 0.0, 0.0, 0.0, 0.0, 0.0), B_ ( 0.000952488234705117, @@ -107,9 +107,9 @@ Foam::Ar::Ar rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -126,9 +126,9 @@ Foam::Ar::Ar(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -145,9 +145,9 @@ Foam::Ar::Ar(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/Ar/Ar.H b/src/thermophysicalModels/liquids/Ar/Ar.H index 7c09009841..560b99a583 100644 --- a/src/thermophysicalModels/liquids/Ar/Ar.H +++ b/src/thermophysicalModels/liquids/Ar/Ar.H @@ -65,9 +65,9 @@ class Ar NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc0 cpg_; + NSRDSfunc0 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/Ar/ArI.H b/src/thermophysicalModels/liquids/Ar/ArI.H index 358c1195ff..734d9c5c88 100644 --- a/src/thermophysicalModels/liquids/Ar/ArI.H +++ b/src/thermophysicalModels/liquids/Ar/ArI.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::Ar::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::Ar::cp(scalar p, scalar T) const +inline Foam::scalar Foam::Ar::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::Ar::h(scalar p, scalar T) const } -inline Foam::scalar Foam::Ar::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::Ar::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.C b/src/thermophysicalModels/liquids/C10H22/C10H22.C index 8c1e70e388..c274669126 100644 --- a/src/thermophysicalModels/liquids/C10H22/C10H22.C +++ b/src/thermophysicalModels/liquids/C10H22/C10H22.C @@ -57,7 +57,7 @@ Foam::C10H22::C10H22() rho_(60.94208835, 0.25745, 617.7, 0.28912), pv_(112.73, -9749.6, -13.245, 7.1266e-06, 2.0), hl_(617.70, 464743.296904101, 0.39797, 0.0, 0.0, 0.0), - cp_ + Cp_ ( 1958.18252099659, -1.39094071757388, @@ -75,7 +75,7 @@ Foam::C10H22::C10H22() 0.0, 0.0 ), - cpg_(1175.10630073444, 3762.16748076045, 1614.1, 2658.04547211582, 742), + Cpg_(1175.10630073444, 3762.16748076045, 1614.1, 2658.04547211582, 742), B_ ( 0.00337351091119935, @@ -115,9 +115,9 @@ Foam::C10H22::C10H22 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C10H22::C10H22(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C10H22::C10H22(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22.H b/src/thermophysicalModels/liquids/C10H22/C10H22.H index 0e6881d58c..9fc03f0640 100644 --- a/src/thermophysicalModels/liquids/C10H22/C10H22.H +++ b/src/thermophysicalModels/liquids/C10H22/C10H22.H @@ -65,9 +65,9 @@ class C10H22 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C10H22/C10H22I.H b/src/thermophysicalModels/liquids/C10H22/C10H22I.H index 8a22471a7f..47706cc0c8 100644 --- a/src/thermophysicalModels/liquids/C10H22/C10H22I.H +++ b/src/thermophysicalModels/liquids/C10H22/C10H22I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C10H22::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C10H22::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C10H22::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C10H22::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C10H22::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C10H22::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.C b/src/thermophysicalModels/liquids/C12H26/C12H26.C index 52efdd1ed2..f384008d69 100644 --- a/src/thermophysicalModels/liquids/C12H26/C12H26.C +++ b/src/thermophysicalModels/liquids/C12H26/C12H26.C @@ -57,7 +57,7 @@ Foam::C12H26::C12H26() rho_(60.53982858, 0.25511, 658.0, 0.29368), pv_(137.47, -11976.0, -16.698, 8.0906e-06, 2.0), hl_(658.0, 454020.829174935, 0.40681, 0.0, 0.0, 0.0), - cp_(2983.53861146661, -8.0352006011577, 0.018207916025784, 0.0, 0.0, 0.0), + Cp_(2983.53861146661, -8.0352006011577, 0.018207916025784, 0.0, 0.0, 0.0), h_ ( -2755166.83820769, @@ -67,7 +67,7 @@ Foam::C12H26::C12H26() 0.0, 0.0 ), - cpg_(1250.16144371778, 3894.02247296552, 1715.5, 2650.67101879792, 777.5), + Cpg_(1250.16144371778, 3894.02247296552, 1715.5, 2650.67101879792, 777.5), B_ ( 0.00516619896910848, @@ -107,9 +107,9 @@ Foam::C12H26::C12H26 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -126,9 +126,9 @@ Foam::C12H26::C12H26(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -145,9 +145,9 @@ Foam::C12H26::C12H26(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26.H b/src/thermophysicalModels/liquids/C12H26/C12H26.H index cd0070c79f..bbdba13e79 100644 --- a/src/thermophysicalModels/liquids/C12H26/C12H26.H +++ b/src/thermophysicalModels/liquids/C12H26/C12H26.H @@ -65,9 +65,9 @@ class C12H26 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C12H26/C12H26I.H b/src/thermophysicalModels/liquids/C12H26/C12H26I.H index adf5fc6801..2d5b06218e 100644 --- a/src/thermophysicalModels/liquids/C12H26/C12H26I.H +++ b/src/thermophysicalModels/liquids/C12H26/C12H26I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C12H26::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C12H26::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C12H26::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C12H26::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C12H26::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C12H26::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.C b/src/thermophysicalModels/liquids/C13H28/C13H28.C index f47acd37f3..adb9e44911 100644 --- a/src/thermophysicalModels/liquids/C13H28/C13H28.C +++ b/src/thermophysicalModels/liquids/C13H28/C13H28.C @@ -57,7 +57,7 @@ Foam::C13H28::C13H28() rho_(59.513022, 0.2504, 675.8, 0.312), pv_(118.27, -11432, -13.769, 5.9641e-06, 2.0), hl_(675.80, 444227.48352453, 0.4162, 0.0, 0.0, 0.0), - cp_ + Cp_ ( 4275.05220622135, -16.6539202126217, @@ -75,7 +75,7 @@ Foam::C13H28::C13H28() 0.0, 0.0 ), - cpg_(1136.87522035093, 3641.14663846175, -1443, 2277.00485450058, -683.0), + Cpg_(1136.87522035093, 3641.14663846175, -1443, 2277.00485450058, -683.0), B_ ( 0.00246321156401703, @@ -115,9 +115,9 @@ Foam::C13H28::C13H28 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C13H28::C13H28(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C13H28::C13H28(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28.H b/src/thermophysicalModels/liquids/C13H28/C13H28.H index 7e481470a5..3cd8dfcb79 100644 --- a/src/thermophysicalModels/liquids/C13H28/C13H28.H +++ b/src/thermophysicalModels/liquids/C13H28/C13H28.H @@ -65,9 +65,9 @@ class C13H28 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C13H28/C13H28I.H b/src/thermophysicalModels/liquids/C13H28/C13H28I.H index 243bf0d3a1..e8e63ce77a 100644 --- a/src/thermophysicalModels/liquids/C13H28/C13H28I.H +++ b/src/thermophysicalModels/liquids/C13H28/C13H28I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C13H28::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C13H28::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C13H28::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C13H28::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C13H28::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C13H28::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.C b/src/thermophysicalModels/liquids/C14H30/C14H30.C index 9c7dfc16bf..0b2d2515c4 100644 --- a/src/thermophysicalModels/liquids/C14H30/C14H30.C +++ b/src/thermophysicalModels/liquids/C14H30/C14H30.C @@ -57,7 +57,7 @@ Foam::C14H30::C14H30() rho_(60.92023144, 0.2582, 692.4, 0.26628), pv_(249.21, -16915, -35.195, 0.028451, 1.0), hl_(692.40, 455764.345336506, 0.428, 0.0, 0.0, 0.0), - cp_ + Cp_ ( 2565.72845679261, -4.78114036856325, @@ -75,7 +75,7 @@ Foam::C14H30::C14H30() 0.0, 0.0 ), - cpg_(1134.11831122223, 3629.17859591113, -1440.3, 2275.29335860317, -682), + Cpg_(1134.11831122223, 3629.17859591113, -1440.3, 2275.29335860317, -682), B_ ( 0.00247837614419936, @@ -115,9 +115,9 @@ Foam::C14H30::C14H30 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C14H30::C14H30(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C14H30::C14H30(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30.H b/src/thermophysicalModels/liquids/C14H30/C14H30.H index c7095f77e6..b96d4daf7d 100644 --- a/src/thermophysicalModels/liquids/C14H30/C14H30.H +++ b/src/thermophysicalModels/liquids/C14H30/C14H30.H @@ -65,9 +65,9 @@ class C14H30 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C14H30/C14H30I.H b/src/thermophysicalModels/liquids/C14H30/C14H30I.H index 3677e3c41d..a390ce4a00 100644 --- a/src/thermophysicalModels/liquids/C14H30/C14H30I.H +++ b/src/thermophysicalModels/liquids/C14H30/C14H30I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C14H30::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C14H30::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C14H30::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C14H30::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C14H30::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C14H30::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.C b/src/thermophysicalModels/liquids/C16H34/C16H34.C index 98f18bff4d..3f7089378e 100644 --- a/src/thermophysicalModels/liquids/C16H34/C16H34.C +++ b/src/thermophysicalModels/liquids/C16H34/C16H34.C @@ -57,7 +57,7 @@ Foam::C16H34::C16H34() rho_(61.94656776, 0.25442, 720.6, 0.3238), pv_(233.1, -17346, -32.251, 0.02407, 1.0), hl_(720.60, 430654.548987397, 0.4122, 0.0, 0.0, 0.0), - cp_ + Cp_ ( 3769.90540791182, -12.5871068599136, @@ -75,7 +75,7 @@ Foam::C16H34::C16H34() 0.0, 0.0 ), - cpg_(1128.74592618108, 3600.8584828171, -1429.7, 2259.69988429913, 679.0), + Cpg_(1128.74592618108, 3600.8584828171, -1429.7, 2259.69988429913, 679.0), B_ ( 0.0025091191718997, @@ -115,9 +115,9 @@ Foam::C16H34::C16H34 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C16H34::C16H34(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C16H34::C16H34(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34.H b/src/thermophysicalModels/liquids/C16H34/C16H34.H index 1b70c2e7a9..4654a0eef3 100644 --- a/src/thermophysicalModels/liquids/C16H34/C16H34.H +++ b/src/thermophysicalModels/liquids/C16H34/C16H34.H @@ -65,9 +65,9 @@ class C16H34 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C16H34/C16H34I.H b/src/thermophysicalModels/liquids/C16H34/C16H34I.H index 48f9df8421..5f23d611de 100644 --- a/src/thermophysicalModels/liquids/C16H34/C16H34I.H +++ b/src/thermophysicalModels/liquids/C16H34/C16H34I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C16H34::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C16H34::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C16H34::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C16H34::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C16H34::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C16H34::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C index afe17a2c76..1f7c2beab6 100644 --- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C +++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.C @@ -57,7 +57,7 @@ Foam::C2H5OH::C2H5OH() rho_(70.1308387, 0.26395, 516.25, 0.2367), pv_(59.796, -6595, -5.0474, 6.3e-07, 2), hl_(516.25, 958345.091059064, -0.4134, 0.75362, 0.0, 0.0), - cp_ + Cp_ ( 2052.57331394213, -1.21990926653498, @@ -75,7 +75,7 @@ Foam::C2H5OH::C2H5OH() 1.30130890620591e-05, 0.0 ), - cpg_(909.505307256507, 3358.00646855803, 1530, 2029.56434912848, 640), + Cpg_(909.505307256507, 3358.00646855803, 1530, 2029.56434912848, 640), B_ ( -0.00358158414552085, @@ -115,9 +115,9 @@ Foam::C2H5OH::C2H5OH rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C2H5OH::C2H5OH(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C2H5OH::C2H5OH(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H index 5027e925ef..57a692608d 100644 --- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H +++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OH.H @@ -65,9 +65,9 @@ class C2H5OH NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H b/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H index d578dbf6de..880c05fb23 100644 --- a/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H +++ b/src/thermophysicalModels/liquids/C2H5OH/C2H5OHI.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C2H5OH::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C2H5OH::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C2H5OH::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C2H5OH::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C2H5OH::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C2H5OH::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.C b/src/thermophysicalModels/liquids/C2H6/C2H6.C index 871c75881e..57b63c89a8 100644 --- a/src/thermophysicalModels/liquids/C2H6/C2H6.C +++ b/src/thermophysicalModels/liquids/C2H6/C2H6.C @@ -57,7 +57,7 @@ Foam::C2H6::C2H6() rho_(57.499854, 0.27937, 305.32, 0.29187), pv_(51.857, -2598.7, -5.1283, 1.4913e-05, 2.0), hl_(305.32, 701396.740937812, 0.60646, -0.55492, 0.32799, 0.0), - cp_ + Cp_ ( 305.32, 8.02554965861611, @@ -66,7 +66,7 @@ Foam::C2H6::C2H6() -343.93389207094 ), h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0), - cpg_(1341.07083471899, 4463.58496840705, 1655.5, 2435.08480212837, 752.87), + Cpg_(1341.07083471899, 4463.58496840705, 1655.5, 2435.08480212837, 752.87), B_ ( 0.00269205187894912, @@ -106,9 +106,9 @@ Foam::C2H6::C2H6 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -125,9 +125,9 @@ Foam::C2H6::C2H6(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -144,9 +144,9 @@ Foam::C2H6::C2H6(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6.H b/src/thermophysicalModels/liquids/C2H6/C2H6.H index 6be77e42c2..f3647fae40 100644 --- a/src/thermophysicalModels/liquids/C2H6/C2H6.H +++ b/src/thermophysicalModels/liquids/C2H6/C2H6.H @@ -65,9 +65,9 @@ class C2H6 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc14 cp_; + NSRDSfunc14 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C2H6/C2H6I.H b/src/thermophysicalModels/liquids/C2H6/C2H6I.H index b1f0cbe75f..23da581d02 100644 --- a/src/thermophysicalModels/liquids/C2H6/C2H6I.H +++ b/src/thermophysicalModels/liquids/C2H6/C2H6I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C2H6::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C2H6::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C2H6::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C2H6::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C2H6::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C2H6::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C b/src/thermophysicalModels/liquids/C2H6O/C2H6O.C index 89fc93f75a..d3ea71a528 100644 --- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.C +++ b/src/thermophysicalModels/liquids/C2H6O/C2H6O.C @@ -57,7 +57,7 @@ Foam::C2H6O::C2H6O() rho_(69.472052, 0.26325, 400.1, 0.2806), pv_(51.566, -3664.4, -4.653, 5.9e-06, 2), hl_(400.10, 608435.173326966, 0.2477, -0.089, 0.203, 0), - cp_ + Cp_ ( 1491.24139877141, 11.3099915344375, @@ -75,7 +75,7 @@ Foam::C2H6O::C2H6O() 3.41390088779874e-05, 0.0 ), - cpg_(950.747791356443, 3160.47667628991, 1284, 1291.5409494454, 520), + Cpg_(950.747791356443, 3160.47667628991, 1284, 1291.5409494454, 520), B_ ( 0.00235082159369641, @@ -115,9 +115,9 @@ Foam::C2H6O::C2H6O rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C2H6O::C2H6O(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C2H6O::C2H6O(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H b/src/thermophysicalModels/liquids/C2H6O/C2H6O.H index a9a053b371..d4faffa564 100644 --- a/src/thermophysicalModels/liquids/C2H6O/C2H6O.H +++ b/src/thermophysicalModels/liquids/C2H6O/C2H6O.H @@ -65,9 +65,9 @@ class C2H6O NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H b/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H index 6a73d4c5e2..4ffa57920d 100644 --- a/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H +++ b/src/thermophysicalModels/liquids/C2H6O/C2H6OI.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C2H6O::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C2H6O::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C2H6O::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C2H6O::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C2H6O::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C2H6O::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C b/src/thermophysicalModels/liquids/C3H6O/C3H6O.C index fa20f6d078..b72d1f43d8 100644 --- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.C +++ b/src/thermophysicalModels/liquids/C3H6O/C3H6O.C @@ -57,7 +57,7 @@ Foam::C3H6O::C3H6O() rho_(71.426784, 0.2576, 508.2, 0.29903), pv_(70.72, -5.685, -7.351, 6.3e-06, 2.0), hl_(508.20, 846590.909090909, 1.036, -1.294, 0.672, 0.0), - cp_ + Cp_ ( 2334.71074380165, -3.04752066115702, @@ -75,7 +75,7 @@ Foam::C3H6O::C3H6O() 2.96573691460055e-06, 0.0 ), - cpg_(828.512396694215, 2830.57851239669, 1250.0, 1234.50413223141, -524.4), + Cpg_(828.512396694215, 2830.57851239669, 1250.0, 1234.50413223141, -524.4), B_ ( 0.00190599173553719, @@ -115,9 +115,9 @@ Foam::C3H6O::C3H6O rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C3H6O::C3H6O(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C3H6O::C3H6O(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H b/src/thermophysicalModels/liquids/C3H6O/C3H6O.H index b383111750..664693ac74 100644 --- a/src/thermophysicalModels/liquids/C3H6O/C3H6O.H +++ b/src/thermophysicalModels/liquids/C3H6O/C3H6O.H @@ -65,9 +65,9 @@ class C3H6O NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H b/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H index 93d5b88664..4e7052b2b2 100644 --- a/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H +++ b/src/thermophysicalModels/liquids/C3H6O/C3H6OI.H @@ -40,9 +40,9 @@ inline Foam::scalar Foam::C3H6O::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C3H6O::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C3H6O::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -52,9 +52,9 @@ inline Foam::scalar Foam::C3H6O::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C3H6O::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C3H6O::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.C b/src/thermophysicalModels/liquids/C3H8/C3H8.C index 767e83c834..79069ed5b6 100644 --- a/src/thermophysicalModels/liquids/C3H8/C3H8.C +++ b/src/thermophysicalModels/liquids/C3H8/C3H8.C @@ -56,7 +56,7 @@ Foam::C3H8::C3H8() rho_(60.6628672, 0.27453, 369.83, 0.29359), pv_(59.078, -3492.6, -6.0669, 1.0919e-05, 2.0), hl_(369.83, 662395.682148041, 0.78237, -0.77319, 0.39246, 0.0), - cp_ + Cp_ ( 369.83, 9.48470319647089, @@ -65,7 +65,7 @@ Foam::C3H8::C3H8() -131.535634282099 ), h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0), - cpg_(1177.43105950653, 4364.34143686502, 1626.5, 2648.76632801161, 723.6), + Cpg_(1177.43105950653, 4364.34143686502, 1626.5, 2648.76632801161, 723.6), B_ ( 0.00255578737300435, @@ -105,9 +105,9 @@ Foam::C3H8::C3H8 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -124,9 +124,9 @@ Foam::C3H8::C3H8(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -143,9 +143,9 @@ Foam::C3H8::C3H8(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8.H b/src/thermophysicalModels/liquids/C3H8/C3H8.H index c9cea66934..88de0f86d3 100644 --- a/src/thermophysicalModels/liquids/C3H8/C3H8.H +++ b/src/thermophysicalModels/liquids/C3H8/C3H8.H @@ -65,9 +65,9 @@ class C3H8 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc14 cp_; + NSRDSfunc14 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C3H8/C3H8I.H b/src/thermophysicalModels/liquids/C3H8/C3H8I.H index b75b4c9e74..90328adbb8 100644 --- a/src/thermophysicalModels/liquids/C3H8/C3H8I.H +++ b/src/thermophysicalModels/liquids/C3H8/C3H8I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C3H8::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C3H8::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C3H8::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C3H8::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C3H8::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C3H8::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C b/src/thermophysicalModels/liquids/C4H10O/C4H10O.C index 1dd51ea3f6..10483d5dec 100644 --- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.C +++ b/src/thermophysicalModels/liquids/C4H10O/C4H10O.C @@ -57,7 +57,7 @@ Foam::C4H10O::C4H10O() rho_(75.2793188, 0.27608, 466.7, 0.29358), pv_(101.03, -6311.5, -12.27, 1.377e-05, 2), hl_(466.70, 566355.921913576, 0.40717, 0, 0, 0), - cp_ + Cp_ ( 599.004357621791, 17.5519069654493, @@ -75,7 +75,7 @@ Foam::C4H10O::C4H10O() 2.95556035238725e-05, 0.0 ), - cpg_(1163.06679438231, 3441.57683849817, 1541.3, 1938.66950878944, -688.9), + Cpg_(1163.06679438231, 3441.57683849817, 1541.3, 1938.66950878944, -688.9), B_ ( 0.00215992337061371, @@ -115,9 +115,9 @@ Foam::C4H10O::C4H10O rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C4H10O::C4H10O(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C4H10O::C4H10O(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H b/src/thermophysicalModels/liquids/C4H10O/C4H10O.H index a2d07a66a1..2099cffa8b 100644 --- a/src/thermophysicalModels/liquids/C4H10O/C4H10O.H +++ b/src/thermophysicalModels/liquids/C4H10O/C4H10O.H @@ -65,9 +65,9 @@ class C4H10O NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H b/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H index 263cac4254..34a392871f 100644 --- a/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H +++ b/src/thermophysicalModels/liquids/C4H10O/C4H10OI.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C4H10O::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C4H10O::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C4H10O::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C4H10O::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C4H10O::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C4H10O::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.C b/src/thermophysicalModels/liquids/C6H14/C6H14.C index 0a3a75349a..607e94217f 100644 --- a/src/thermophysicalModels/liquids/C6H14/C6H14.C +++ b/src/thermophysicalModels/liquids/C6H14/C6H14.C @@ -57,7 +57,7 @@ Foam::C6H14::C6H14() rho_(61.03399848, 0.26411, 507.6, 0.27537), pv_(104.65, -6995.5, -12.702, 1.2381e-05, 2.0), hl_(507.60, 527286.863084118, 0.39002, 0.0, 0.0, 0.0), - cp_ + Cp_ ( 1997.28465831951, -2.13258758137322, @@ -75,7 +75,7 @@ Foam::C6H14::C6H14() 0.0, 0.0 ), - cpg_(1211.4601343746, 4088.0977523005, 1694.6, 2748.99335089409, 761.6), + Cpg_(1211.4601343746, 4088.0977523005, 1694.6, 2748.99335089409, 761.6), B_ ( 0.0022859927822969, @@ -115,9 +115,9 @@ Foam::C6H14::C6H14 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C6H14::C6H14(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C6H14::C6H14(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14.H b/src/thermophysicalModels/liquids/C6H14/C6H14.H index 9a29cb9590..fe97e35f9b 100644 --- a/src/thermophysicalModels/liquids/C6H14/C6H14.H +++ b/src/thermophysicalModels/liquids/C6H14/C6H14.H @@ -65,9 +65,9 @@ class C6H14 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C6H14/C6H14I.H b/src/thermophysicalModels/liquids/C6H14/C6H14I.H index 7f560fd984..6f3335d990 100644 --- a/src/thermophysicalModels/liquids/C6H14/C6H14I.H +++ b/src/thermophysicalModels/liquids/C6H14/C6H14I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C6H14::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C6H14::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C6H14::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C6H14::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C6H14::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C6H14::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.C b/src/thermophysicalModels/liquids/C6H6/C6H6.C index f3d2beb400..5dd2ee1398 100644 --- a/src/thermophysicalModels/liquids/C6H6/C6H6.C +++ b/src/thermophysicalModels/liquids/C6H6/C6H6.C @@ -57,7 +57,7 @@ Foam::C6H6::C6H6() rho_(80.5511568, 0.2667, 562.16, 0.2818), pv_(78.05, -6275.5, -8.4443, 6.26e-06, 2), hl_(562.16, 649435.440510024, 0.7616, -0.5052, 0.1564, 0), - cp_ + Cp_ ( 1386.69124612745, -0.416058581048212, @@ -75,7 +75,7 @@ Foam::C6H6::C6H6() 0.0, 0.0 ), - cpg_(568.656066774202, 2970.65826868423, 1494.6, 2203.57426325627, -678.15), + Cpg_(568.656066774202, 2970.65826868423, 1494.6, 2203.57426325627, -678.15), B_ ( 0.00184089919860716, @@ -115,9 +115,9 @@ Foam::C6H6::C6H6 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C6H6::C6H6(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C6H6::C6H6(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6.H b/src/thermophysicalModels/liquids/C6H6/C6H6.H index 0ac6610758..3484656d00 100644 --- a/src/thermophysicalModels/liquids/C6H6/C6H6.H +++ b/src/thermophysicalModels/liquids/C6H6/C6H6.H @@ -65,9 +65,9 @@ class C6H6 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C6H6/C6H6I.H b/src/thermophysicalModels/liquids/C6H6/C6H6I.H index 40453d887b..8dc5a871cd 100644 --- a/src/thermophysicalModels/liquids/C6H6/C6H6I.H +++ b/src/thermophysicalModels/liquids/C6H6/C6H6I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C6H6::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C6H6::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C6H6::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C6H6::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C6H6::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C6H6::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.C b/src/thermophysicalModels/liquids/C7H16/C7H16.C index df1d14bbe6..15d2b2678b 100644 --- a/src/thermophysicalModels/liquids/C7H16/C7H16.C +++ b/src/thermophysicalModels/liquids/C7H16/C7H16.C @@ -57,7 +57,7 @@ Foam::C7H16::C7H16() rho_(61.38396836, 0.26211, 540.2, 0.28141), pv_(87.829, -6996.4, -9.8802, 7.2099e-06, 2.0), hl_(540.20, 499121.791545248, 0.38795, 0.0, 0.0, 0.0), - cp_ + Cp_ ( 540.20, 6.11976102401216, @@ -74,7 +74,7 @@ Foam::C7H16::C7H16() -1.634831e-4, 9.64941e-8 ), - cpg_(1199.05392998284, 3992.85457666361, 1676.6, 2734.42177956968, 756.4), + Cpg_(1199.05392998284, 3992.85457666361, 1676.6, 2734.42177956968, 756.4), B_ ( 0.00274040956448844, @@ -114,9 +114,9 @@ Foam::C7H16::C7H16 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -133,9 +133,9 @@ Foam::C7H16::C7H16(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -152,9 +152,9 @@ Foam::C7H16::C7H16(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16.H b/src/thermophysicalModels/liquids/C7H16/C7H16.H index 75f816ff44..ce8b9dfb37 100644 --- a/src/thermophysicalModels/liquids/C7H16/C7H16.H +++ b/src/thermophysicalModels/liquids/C7H16/C7H16.H @@ -65,9 +65,9 @@ class C7H16 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc14 cp_; + NSRDSfunc14 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/kg] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C7H16/C7H16I.H b/src/thermophysicalModels/liquids/C7H16/C7H16I.H index e71b5c57cd..299f8b6d7e 100644 --- a/src/thermophysicalModels/liquids/C7H16/C7H16I.H +++ b/src/thermophysicalModels/liquids/C7H16/C7H16I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C7H16::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C7H16::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C7H16::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C7H16::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C7H16::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C7H16::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.C b/src/thermophysicalModels/liquids/C7H8/C7H8.C index e38dede79d..311eabbe12 100644 --- a/src/thermophysicalModels/liquids/C7H8/C7H8.C +++ b/src/thermophysicalModels/liquids/C7H8/C7H8.C @@ -57,7 +57,7 @@ Foam::C7H8::C7H8() rho_(81.32088237, 0.27108, 591.79, 0.29889), pv_(83.359, -6995, -9.1635, 6.225e-06, 2.0), hl_(591.79, 544383.065085033, 0.3834, 0.0, 0.0, 0.0), - cp_ + Cp_ ( 2066.83235476064, -8.14664481609707, @@ -75,7 +75,7 @@ Foam::C7H8::C7H8() -7.53057813568336e-06, 0.0 ), - cpg_(630.989461803106, 3107.19440856947, 1440.6, 2059.88647833212, -650.43), + Cpg_(630.989461803106, 3107.19440856947, 1440.6, 2059.88647833212, -650.43), B_ ( 0.00191120131103418, @@ -115,9 +115,9 @@ Foam::C7H8::C7H8 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C7H8::C7H8(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C7H8::C7H8(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8.H b/src/thermophysicalModels/liquids/C7H8/C7H8.H index 2091f852c9..31130737cb 100644 --- a/src/thermophysicalModels/liquids/C7H8/C7H8.H +++ b/src/thermophysicalModels/liquids/C7H8/C7H8.H @@ -65,9 +65,9 @@ class C7H8 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C7H8/C7H8I.H b/src/thermophysicalModels/liquids/C7H8/C7H8I.H index 217aeb33e9..622ea133ea 100644 --- a/src/thermophysicalModels/liquids/C7H8/C7H8I.H +++ b/src/thermophysicalModels/liquids/C7H8/C7H8I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C7H8::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C7H8::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C7H8::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C7H8::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C7H8::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C7H8::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.C b/src/thermophysicalModels/liquids/C8H10/C8H10.C index 5c6e34c12c..a7d001394c 100644 --- a/src/thermophysicalModels/liquids/C8H10/C8H10.C +++ b/src/thermophysicalModels/liquids/C8H10/C8H10.C @@ -57,7 +57,7 @@ Foam::C8H10::C8H10() rho_(76.3765398, 0.26438, 617.17, 0.2921), pv_(88.246, -7691.1, -9.797, 5.931e-06, 2.0), hl_(617.17, 516167.924119547, 0.3882, 0.0, 0.0, 0.0), - cp_ + Cp_ ( 818.521762883005, 6.66873887366131, @@ -75,7 +75,7 @@ Foam::C8H10::C8H10() 1.05965130407754e-05, 0.0 ), - cpg_(738.835984816374, 3201.5598067196, 1559, 2285.07916772632, -702.0), + Cpg_(738.835984816374, 3201.5598067196, 1559, 2285.07916772632, -702.0), B_ ( 0.00165776559571242, @@ -115,9 +115,9 @@ Foam::C8H10::C8H10 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C8H10::C8H10(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C8H10::C8H10(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10.H b/src/thermophysicalModels/liquids/C8H10/C8H10.H index a524ad0138..3757aabee5 100644 --- a/src/thermophysicalModels/liquids/C8H10/C8H10.H +++ b/src/thermophysicalModels/liquids/C8H10/C8H10.H @@ -64,9 +64,9 @@ class C8H10 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -125,13 +125,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -167,8 +167,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C8H10/C8H10I.H b/src/thermophysicalModels/liquids/C8H10/C8H10I.H index 11f6933183..cf961922fc 100644 --- a/src/thermophysicalModels/liquids/C8H10/C8H10I.H +++ b/src/thermophysicalModels/liquids/C8H10/C8H10I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C8H10::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C8H10::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C8H10::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C8H10::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C8H10::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C8H10::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.C b/src/thermophysicalModels/liquids/C8H18/C8H18.C index ce8d75361e..a5f3529d1a 100644 --- a/src/thermophysicalModels/liquids/C8H18/C8H18.C +++ b/src/thermophysicalModels/liquids/C8H18/C8H18.C @@ -57,7 +57,7 @@ Foam::C8H18::C8H18() rho_(61.37745861, 0.26115, 568.7, 0.28034), pv_(96.084, -7900.2, -11.003, 7.1802e-06, 2.0), hl_(568.70, 483056.263186, 0.38467, 0.0, 0.0, 0.0), - cp_ + Cp_ ( 1968.20477803749, -1.63379467920267, @@ -75,7 +75,7 @@ Foam::C8H18::C8H18() 0.0, 0.0 ), - cpg_(1186.54305748877, 3878.9820626625, 1635.6, 2673.52995246474, 746.4), + Cpg_(1186.54305748877, 3878.9820626625, 1635.6, 2673.52995246474, 746.4), B_ ( 0.00239777293379205, @@ -115,9 +115,9 @@ Foam::C8H18::C8H18 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C8H18::C8H18(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C8H18::C8H18(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18.H b/src/thermophysicalModels/liquids/C8H18/C8H18.H index 7ccc527680..57223738b0 100644 --- a/src/thermophysicalModels/liquids/C8H18/C8H18.H +++ b/src/thermophysicalModels/liquids/C8H18/C8H18.H @@ -65,9 +65,9 @@ class C8H18 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C8H18/C8H18I.H b/src/thermophysicalModels/liquids/C8H18/C8H18I.H index a1a00bee10..205f9bfea5 100644 --- a/src/thermophysicalModels/liquids/C8H18/C8H18I.H +++ b/src/thermophysicalModels/liquids/C8H18/C8H18I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C8H18::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C8H18::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C8H18::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C8H18::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C8H18::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C8H18::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.C b/src/thermophysicalModels/liquids/C9H20/C9H20.C index 674dc80ed3..966965dbd2 100644 --- a/src/thermophysicalModels/liquids/C9H20/C9H20.C +++ b/src/thermophysicalModels/liquids/C9H20/C9H20.C @@ -57,7 +57,7 @@ Foam::C9H20::C9H20() rho_(62.06019846, 0.26147, 594.6, 0.28281), pv_(109.35, -90304.0, -12.882, 7.8544e-06, 2.0), hl_(594.60, 470691.886665939, 0.38522, 0.0, 0.0, 0.0), - cp_ + Cp_ ( 2986.79224687739, -8.88677509395125, @@ -75,7 +75,7 @@ Foam::C9H20::C9H20() 0.0, 0.0 ), - cpg_(1183.16206396482, 3832.11963386299, 1644.8, 2705.48425829188, 749.6), + Cpg_(1183.16206396482, 3832.11963386299, 1644.8, 2705.48425829188, 749.6), B_ ( 0.00304542406711472, @@ -115,9 +115,9 @@ Foam::C9H20::C9H20 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::C9H20::C9H20(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::C9H20::C9H20(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20.H b/src/thermophysicalModels/liquids/C9H20/C9H20.H index f930dcf21c..375219da82 100644 --- a/src/thermophysicalModels/liquids/C9H20/C9H20.H +++ b/src/thermophysicalModels/liquids/C9H20/C9H20.H @@ -65,9 +65,9 @@ class C9H20 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/C9H20/C9H20I.H b/src/thermophysicalModels/liquids/C9H20/C9H20I.H index 9860a1a564..d4d0661951 100644 --- a/src/thermophysicalModels/liquids/C9H20/C9H20I.H +++ b/src/thermophysicalModels/liquids/C9H20/C9H20I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::C9H20::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::C9H20::cp(scalar p, scalar T) const +inline Foam::scalar Foam::C9H20::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::C9H20::h(scalar p, scalar T) const } -inline Foam::scalar Foam::C9H20::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::C9H20::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C b/src/thermophysicalModels/liquids/CH3OH/CH3OH.C index ef18d40a20..e93e52aa95 100644 --- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.C +++ b/src/thermophysicalModels/liquids/CH3OH/CH3OH.C @@ -57,7 +57,7 @@ Foam::CH3OH::CH3OH() rho_(73.952936, 0.27192, 512.58, 0.2331), pv_(109.93, -7471.3, -13.988, 0.015281, 1.0), hl_(512.58, 1644716.30984333, 0.3766, 0.0, 0.0, 0.0), - cp_ + Cp_ ( 3358.09250358904, -11.8781599151114, @@ -75,7 +75,7 @@ Foam::CH3OH::CH3OH() 0.0, 0.0 ), - cpg_(1226.9521253355, 2772.92303851195, 1963, 1733.66206853505, 909.6), + Cpg_(1226.9521253355, 2772.92303851195, 1963, 1733.66206853505, 909.6), B_ ( -0.0199737844079645, @@ -115,9 +115,9 @@ Foam::CH3OH::CH3OH rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::CH3OH::CH3OH(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::CH3OH::CH3OH(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H b/src/thermophysicalModels/liquids/CH3OH/CH3OH.H index c754565d9c..5f90bafe92 100644 --- a/src/thermophysicalModels/liquids/CH3OH/CH3OH.H +++ b/src/thermophysicalModels/liquids/CH3OH/CH3OH.H @@ -65,9 +65,9 @@ class CH3OH NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H b/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H index 260d97b3de..1d4c767af7 100644 --- a/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H +++ b/src/thermophysicalModels/liquids/CH3OH/CH3OHI.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::CH3OH::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::CH3OH::cp(scalar p, scalar T) const +inline Foam::scalar Foam::CH3OH::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::CH3OH::h(scalar p, scalar T) const } -inline Foam::scalar Foam::CH3OH::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::CH3OH::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C index 7b36eb583b..b32f82f269 100644 --- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C +++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.C @@ -58,9 +58,9 @@ Foam::CH4N2O::CH4N2O() rho_(1230.006936, 0.0, 0.0, 0.0, 0.0, 0.0), pv_(3015.15611544, -185497.059684, -430.223621983, 0.00017405122622, 2.0), hl_(705.0, 2534249.0, 0.5, 0.0, 0.0, 0.0), - cp_(2006.46063673904, 0.0, 0.0, 0.0, 0.0, 0.0), + Cp_(2006.46063673904, 0.0, 0.0, 0.0, 0.0, 0.0), h_(-6154107.41641135, 2006.46063673904, 0.0, 0.0, 0.0, 0.0), - cpg_(811.875582789397, 2099.04089516451, 1627.3, 1603.63660583455, 724.41), + Cpg_(811.875582789397, 2099.04089516451, 1627.3, 1603.63660583455, 724.41), B_ ( -0.000383641934194752, @@ -100,9 +100,9 @@ Foam::CH4N2O::CH4N2O rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -119,9 +119,9 @@ Foam::CH4N2O::CH4N2O(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -138,9 +138,9 @@ Foam::CH4N2O::CH4N2O(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H index a45bc0cd5b..b4d221b42d 100644 --- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H +++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2O.H @@ -66,9 +66,9 @@ class CH4N2O NSRDSfunc0 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H b/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H index 23b40c1a0b..a9496589c3 100644 --- a/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H +++ b/src/thermophysicalModels/liquids/CH4N2O/CH4N2OI.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::CH4N2O::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::CH4N2O::cp(scalar p, scalar T) const +inline Foam::scalar Foam::CH4N2O::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::CH4N2O::h(scalar p, scalar T) const } -inline Foam::scalar Foam::CH4N2O::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::CH4N2O::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/H2O/H2O.C b/src/thermophysicalModels/liquids/H2O/H2O.C index ff68fa7324..6820731f8b 100644 --- a/src/thermophysicalModels/liquids/H2O/H2O.C +++ b/src/thermophysicalModels/liquids/H2O/H2O.C @@ -57,7 +57,7 @@ Foam::H2O::H2O() rho_(98.343885, 0.30542, 647.13, 0.081), pv_(73.649, -7258.2, -7.3037, 4.1653e-06, 2), hl_(647.13, 2889425.47876769, 0.3199, -0.212, 0.25795, 0), - cp_ + Cp_ ( 15341.1046350264, -116.019983347211, @@ -75,7 +75,7 @@ Foam::H2O::H2O() -0.000195892311962254, 1.04025534276991e-07 ), - cpg_ + Cpg_ ( 1851.73466555648, 1487.53816264224, @@ -122,9 +122,9 @@ Foam::H2O::H2O rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -141,9 +141,9 @@ Foam::H2O::H2O(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -160,9 +160,9 @@ Foam::H2O::H2O(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/H2O/H2O.H b/src/thermophysicalModels/liquids/H2O/H2O.H index 08e4145a9b..a25c9f48db 100644 --- a/src/thermophysicalModels/liquids/H2O/H2O.H +++ b/src/thermophysicalModels/liquids/H2O/H2O.H @@ -64,9 +64,9 @@ class H2O NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -125,13 +125,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -167,8 +167,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/H2O/H2OI.H b/src/thermophysicalModels/liquids/H2O/H2OI.H index d3e4683b68..ce9dd1125c 100644 --- a/src/thermophysicalModels/liquids/H2O/H2OI.H +++ b/src/thermophysicalModels/liquids/H2O/H2OI.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::H2O::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::H2O::cp(scalar p, scalar T) const +inline Foam::scalar Foam::H2O::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::H2O::h(scalar p, scalar T) const } -inline Foam::scalar Foam::H2O::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::H2O::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C b/src/thermophysicalModels/liquids/IC8H18/IC8H18.C index dd03caf74e..cfc4736d60 100644 --- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.C +++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18.C @@ -57,7 +57,7 @@ Foam::IC8H18::IC8H18() rho_(67.2363666, 0.27373, 543.96, 0.2846), pv_(120.81, -7550, -16.111, 0.017099, 1.0), hl_(543.96, 375379.713037617, 0.1549, 0.138, 0.0666, 0.0), - cp_ + Cp_ ( 1219.89652546156, 1.67205049417409, @@ -75,7 +75,7 @@ Foam::IC8H18::IC8H18() 0.0, 0.0 ), - cpg_(997.10236275617, 4627.4653990598, 1594, 2933.52942721328, 677.94), + Cpg_(997.10236275617, 4627.4653990598, 1594, 2933.52942721328, 677.94), B_ ( 0.00234936225718063, @@ -115,9 +115,9 @@ Foam::IC8H18::IC8H18 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::IC8H18::IC8H18(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::IC8H18::IC8H18(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H b/src/thermophysicalModels/liquids/IC8H18/IC8H18.H index 6a90aa0dae..967a458b47 100644 --- a/src/thermophysicalModels/liquids/IC8H18/IC8H18.H +++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18.H @@ -65,9 +65,9 @@ class IC8H18 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H b/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H index 2ff7b50602..72e0999e4a 100644 --- a/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H +++ b/src/thermophysicalModels/liquids/IC8H18/IC8H18I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::IC8H18::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::IC8H18::cp(scalar p, scalar T) const +inline Foam::scalar Foam::IC8H18::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::IC8H18::h(scalar p, scalar T) const } -inline Foam::scalar Foam::IC8H18::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::IC8H18::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.C b/src/thermophysicalModels/liquids/IDEA/IDEA.C index 959f8f3aea..8e113b90c8 100644 --- a/src/thermophysicalModels/liquids/IDEA/IDEA.C +++ b/src/thermophysicalModels/liquids/IDEA/IDEA.C @@ -72,9 +72,9 @@ Foam::IDEA::IDEA() -1.1656446689e+01, 4.3667661492 ), - cp_(1.6604957e+3, -6.250871e-1, 6.1778552e-3, 0.0, 0.0, 0.0), + Cp_(1.6604957e+3, -6.250871e-1, 6.1778552e-3, 0.0, 0.0, 0.0), h_(0.0, 0.0, 0.0, 0.0, 0.0, 0.0), - cpg_ + Cpg_ ( 1.0457515243e+03, 3.4410492875e+03, @@ -135,9 +135,9 @@ Foam::IDEA::IDEA rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -154,9 +154,9 @@ Foam::IDEA::IDEA(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -173,9 +173,9 @@ Foam::IDEA::IDEA(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/IDEA/IDEA.H b/src/thermophysicalModels/liquids/IDEA/IDEA.H index 41bfb4b326..f5e6d9152e 100644 --- a/src/thermophysicalModels/liquids/IDEA/IDEA.H +++ b/src/thermophysicalModels/liquids/IDEA/IDEA.H @@ -87,9 +87,9 @@ class IDEA NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -148,13 +148,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -190,8 +190,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; K_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/IDEA/IDEAI.H b/src/thermophysicalModels/liquids/IDEA/IDEAI.H index 9861b03c8e..5f8b8bfb9d 100644 --- a/src/thermophysicalModels/liquids/IDEA/IDEAI.H +++ b/src/thermophysicalModels/liquids/IDEA/IDEAI.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::IDEA::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::IDEA::cp(scalar p, scalar T) const +inline Foam::scalar Foam::IDEA::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::IDEA::h(scalar p, scalar T) const } -inline Foam::scalar Foam::IDEA::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::IDEA::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/MB/MB.C b/src/thermophysicalModels/liquids/MB/MB.C index fe9c3fb574..c4d6fe38f4 100644 --- a/src/thermophysicalModels/liquids/MB/MB.C +++ b/src/thermophysicalModels/liquids/MB/MB.C @@ -57,9 +57,9 @@ Foam::MB::MB() rho_(76.6099633, 0.257, 554.5, 0.2772), pv_(107.51, -8112.9, -12.77, 9.2919e-06, 2.0), hl_(554.5, 508307.794738233, 0.392, 0.0, 0.0, 0.0), - cp_(1135.77394182096, 2.89818178257762, 0.0, 0.0, 0.0, 0.0), + Cp_(1135.77394182096, 2.89818178257762, 0.0, 0.0, 0.0, 0.0), h_(-5255966.14542938, 1135.77394182096, 1.44909089128881, 0.0, 0.0, 0.0), - cpg_(875.329227575808, 2849.22600922327, 1570.0, 2029.70636327142, 678.3), + Cpg_(875.329227575808, 2849.22600922327, 1570.0, 2029.70636327142, 678.3), B_ ( 0.00220496803188, @@ -99,9 +99,9 @@ Foam::MB::MB rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -118,9 +118,9 @@ Foam::MB::MB(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -137,9 +137,9 @@ Foam::MB::MB(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/MB/MB.H b/src/thermophysicalModels/liquids/MB/MB.H index 121a914154..15245c6e47 100644 --- a/src/thermophysicalModels/liquids/MB/MB.H +++ b/src/thermophysicalModels/liquids/MB/MB.H @@ -65,9 +65,9 @@ class MB NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/MB/MBI.H b/src/thermophysicalModels/liquids/MB/MBI.H index f08998b1c2..89ea496c75 100644 --- a/src/thermophysicalModels/liquids/MB/MBI.H +++ b/src/thermophysicalModels/liquids/MB/MBI.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::MB::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::MB::cp(scalar p, scalar T) const +inline Foam::scalar Foam::MB::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::MB::h(scalar p, scalar T) const } -inline Foam::scalar Foam::MB::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::MB::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/N2/N2.C b/src/thermophysicalModels/liquids/N2/N2.C index 918ff702a6..5e41412243 100644 --- a/src/thermophysicalModels/liquids/N2/N2.C +++ b/src/thermophysicalModels/liquids/N2/N2.C @@ -57,7 +57,7 @@ Foam::N2::N2() rho_(88.8716136, 0.28479, 126.1, 0.2925), pv_(59.826, -1097.6, -8.6689, 0.046346, 1.0), hl_(126.10, 336617.405582923, 1.201, -1.4811, 0.7085, 0.0), - cp_ + Cp_ ( -1192.26101235097, 125.187406296852, @@ -75,7 +75,7 @@ Foam::N2::N2() 0.00189815806382523, 0.0 ), - cpg_(1038.94481330763, 307.52123938031, 1701.6, 3.69351038766331, 909.79), + Cpg_(1038.94481330763, 307.52123938031, 1701.6, 3.69351038766331, 909.79), B_ ( 0.00166702363104162, @@ -115,9 +115,9 @@ Foam::N2::N2 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::N2::N2(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::N2::N2(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/N2/N2.H b/src/thermophysicalModels/liquids/N2/N2.H index 66a4d84434..6f318f1a45 100644 --- a/src/thermophysicalModels/liquids/N2/N2.H +++ b/src/thermophysicalModels/liquids/N2/N2.H @@ -65,9 +65,9 @@ class N2 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/N2/N2I.H b/src/thermophysicalModels/liquids/N2/N2I.H index d02df907a4..264de66aca 100644 --- a/src/thermophysicalModels/liquids/N2/N2I.H +++ b/src/thermophysicalModels/liquids/N2/N2I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::N2::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::N2::cp(scalar p, scalar T) const +inline Foam::scalar Foam::N2::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::N2::h(scalar p, scalar T) const } -inline Foam::scalar Foam::N2::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::N2::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C index 5d04492def..9532106b78 100644 --- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C +++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.C @@ -57,7 +57,7 @@ Foam::aC10H7CH3::aC10H7CH3() rho_(60.92559, 0.22408, 772.04, 0.25709), pv_(73.716, -9103.2, -7.2253, 2.062e-06, 2), hl_(772.04, 511744.022503516, 0.4164, 0, 0, 0), - cp_(965.893108298172, 1.16216596343179, 0.00298523206751055, 0, 0, 0), + Cp_(965.893108298172, 1.16216596343179, 0.00298523206751055, 0, 0, 0), h_ ( 38161.6838138517, @@ -67,7 +67,7 @@ Foam::aC10H7CH3::aC10H7CH3() 0, 0 ), - cpg_(743.389592123769, 2703.5864978903, 1548.5, 2031.64556962025, 722.06), + Cpg_(743.389592123769, 2703.5864978903, 1548.5, 2031.64556962025, 722.06), B_ ( 0.00205555555555556, @@ -107,9 +107,9 @@ Foam::aC10H7CH3::aC10H7CH3 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -126,9 +126,9 @@ Foam::aC10H7CH3::aC10H7CH3(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -145,9 +145,9 @@ Foam::aC10H7CH3::aC10H7CH3(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H index 702f07faec..05ec2c90a0 100644 --- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H +++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3.H @@ -65,9 +65,9 @@ class aC10H7CH3 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H index 138bede091..5d837d8af3 100644 --- a/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H +++ b/src/thermophysicalModels/liquids/aC10H7CH3/aC10H7CH3I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::aC10H7CH3::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::aC10H7CH3::cp(scalar p, scalar T) const +inline Foam::scalar Foam::aC10H7CH3::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::aC10H7CH3::h(scalar p, scalar T) const } -inline Foam::scalar Foam::aC10H7CH3::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::aC10H7CH3::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C index 540f3d249e..656a57d23b 100644 --- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C +++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.C @@ -57,7 +57,7 @@ Foam::bC10H7CH3::bC10H7CH3() rho_(67.36014, 0.23843, 761, 0.2559), pv_(134.31, -12103, -16.195, 6.9659e-06, 2), hl_(761.0, 513150.492264416, 0.4044, 0.0, 0.0, 0.0), - cp_(811.322081575246, 2.30225035161744, 0.0008628691983122, 0.0, 0.0, 0.0), + Cp_(811.322081575246, 2.30225035161744, 0.0008628691983122, 0.0, 0.0, 0.0), h_ ( 45001.2311880177, @@ -67,7 +67,7 @@ Foam::bC10H7CH3::bC10H7CH3() 0.0, 0.0 ), - cpg_(760.126582278481, 2699.08579465542, 1564.1, 1994.51476793249, 727.49), + Cpg_(760.126582278481, 2699.08579465542, 1564.1, 1994.51476793249, 727.49), B_ ( 0.00229430379746835, @@ -107,9 +107,9 @@ Foam::bC10H7CH3::bC10H7CH3 rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -126,9 +126,9 @@ Foam::bC10H7CH3::bC10H7CH3(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -145,9 +145,9 @@ Foam::bC10H7CH3::bC10H7CH3(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H index a986564046..d3ff351291 100644 --- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H +++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3.H @@ -65,9 +65,9 @@ class bC10H7CH3 NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -126,13 +126,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -168,8 +168,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H index fd01df9d51..0ae9b284a7 100644 --- a/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H +++ b/src/thermophysicalModels/liquids/bC10H7CH3/bC10H7CH3I.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::bC10H7CH3::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::bC10H7CH3::cp(scalar p, scalar T) const +inline Foam::scalar Foam::bC10H7CH3::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::bC10H7CH3::h(scalar p, scalar T) const } -inline Foam::scalar Foam::bC10H7CH3::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::bC10H7CH3::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C index fc89e36a5e..1faec0b0c2 100644 --- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C +++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.C @@ -57,7 +57,7 @@ Foam::iC3H8O::iC3H8O() rho_(70.91328, 0.26475, 508.31, 0.243), pv_(92.935, -8177.1, -10.031, 3.9988e-06, 2.0), hl_(508.31, 948149.627263046, 0.087, 0.3007, 0.0, 0.0), - cp_ + Cp_ ( 7760.91586794462, -68.3672790202343, @@ -75,7 +75,7 @@ Foam::iC3H8O::iC3H8O() -5.87643104366347e-05, 0.0 ), - cpg_(789.73642172524, 3219.8482428115, 1124, 1560.83599574015, 460.0), + Cpg_(789.73642172524, 3219.8482428115, 1124, 1560.83599574015, 460.0), B_ ( 0.000502529286474973, @@ -115,9 +115,9 @@ Foam::iC3H8O::iC3H8O rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::iC3H8O::iC3H8O(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::iC3H8O::iC3H8O(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H index 4b2e45cd74..6caa059222 100644 --- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H +++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8O.H @@ -64,9 +64,9 @@ class iC3H8O NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -124,13 +124,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -167,8 +167,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H b/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H index 13b8bd2c9d..a25862a37c 100644 --- a/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H +++ b/src/thermophysicalModels/liquids/iC3H8O/iC3H8OI.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::iC3H8O::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::iC3H8O::cp(scalar p, scalar T) const +inline Foam::scalar Foam::iC3H8O::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::iC3H8O::h(scalar p, scalar T) const } -inline Foam::scalar Foam::iC3H8O::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::iC3H8O::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/liquids/liquid/liquid.H b/src/thermophysicalModels/liquids/liquid/liquid.H index 7db4131b99..005058857e 100644 --- a/src/thermophysicalModels/liquids/liquid/liquid.H +++ b/src/thermophysicalModels/liquids/liquid/liquid.H @@ -213,13 +213,13 @@ public: virtual scalar hl(scalar p, scalar T) const = 0; //- Liquid heat capacity [J/(kg K)] - virtual scalar cp(scalar p, scalar T) const = 0; + virtual scalar Cp(scalar p, scalar T) const = 0; //- Liquid enthalpy [J/kg] - reference to 298.15 K virtual scalar h(scalar p, scalar T) const = 0; //- Ideal gas heat capacity [J/(kg K)] - virtual scalar cpg(scalar p, scalar T) const = 0; + virtual scalar Cpg(scalar p, scalar T) const = 0; //- Liquid viscosity [Pa s] virtual scalar mu(scalar p, scalar T) const = 0; diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C index ff696d1002..6d816baa76 100644 --- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C +++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.C @@ -57,7 +57,7 @@ Foam::nC3H8O::nC3H8O() rho_(75.300288, 0.272, 536.71, 0.2494), pv_(77.46, -7960, -7.5235, 3e-07, 2.0), hl_(536.71, 1098242.8115016, 0.647, -0.783, 0.613, 0.0), - cp_ + Cp_ ( 216.320553780618, 18.5203674121406, @@ -75,7 +75,7 @@ Foam::nC3H8O::nC3H8O() 3.16160809371672e-05, 0.0 ), - cpg_(961.794462193823, 3467.78487752929, 1542, 2046.72523961661, 649), + Cpg_(961.794462193823, 3467.78487752929, 1542, 2046.72523961661, 649), B_ ( 0.000933506389776358, @@ -115,9 +115,9 @@ Foam::nC3H8O::nC3H8O rho_(density), pv_(vapourPressure), hl_(heatOfVapourisation), - cp_(heatCapacity), + Cp_(heatCapacity), h_(enthalpy), - cpg_(idealGasHeatCapacity), + Cpg_(idealGasHeatCapacity), B_(secondVirialCoeff), mu_(dynamicViscosity), mug_(vapourDynamicViscosity), @@ -134,9 +134,9 @@ Foam::nC3H8O::nC3H8O(Istream& is) rho_(is), pv_(is), hl_(is), - cp_(is), + Cp_(is), h_(is), - cpg_(is), + Cpg_(is), B_(is), mu_(is), mug_(is), @@ -153,9 +153,9 @@ Foam::nC3H8O::nC3H8O(const dictionary& dict) rho_(dict.subDict("rho")), pv_(dict.subDict("pv")), hl_(dict.subDict("hl")), - cp_(dict.subDict("cp")), + Cp_(dict.subDict("Cp")), h_(dict.subDict("h")), - cpg_(dict.subDict("cpg")), + Cpg_(dict.subDict("Cpg")), B_(dict.subDict("B")), mu_(dict.subDict("mu")), mug_(dict.subDict("mug")), diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H index c63f109fcf..f4751b0fcf 100644 --- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H +++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8O.H @@ -64,9 +64,9 @@ class nC3H8O NSRDSfunc5 rho_; NSRDSfunc1 pv_; NSRDSfunc6 hl_; - NSRDSfunc0 cp_; + NSRDSfunc0 Cp_; NSRDSfunc0 h_; - NSRDSfunc7 cpg_; + NSRDSfunc7 Cpg_; NSRDSfunc4 B_; NSRDSfunc1 mu_; NSRDSfunc2 mug_; @@ -124,13 +124,13 @@ public: inline scalar hl(scalar p, scalar T) const; //- Liquid heat capacity [J/(kg K)] - inline scalar cp(scalar p, scalar T) const; + inline scalar Cp(scalar p, scalar T) const; //- Liquid Enthalpy [J/(kg)] inline scalar h(scalar p, scalar T) const; //- Ideal gas heat capacity [J/(kg K)] - inline scalar cpg(scalar p, scalar T) const; + inline scalar Cpg(scalar p, scalar T) const; //- Second Virial Coefficient [m^3/kg] inline scalar B(scalar p, scalar T) const; @@ -167,8 +167,8 @@ public: rho_.writeData(os); os << nl; pv_.writeData(os); os << nl; hl_.writeData(os); os << nl; - cp_.writeData(os); os << nl; - cpg_.writeData(os); os << nl; + Cp_.writeData(os); os << nl; + Cpg_.writeData(os); os << nl; B_.writeData(os); os << nl; mu_.writeData(os); os << nl; mug_.writeData(os); os << nl; diff --git a/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H b/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H index 23738672b4..c337999310 100644 --- a/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H +++ b/src/thermophysicalModels/liquids/nC3H8O/nC3H8OI.H @@ -41,9 +41,9 @@ inline Foam::scalar Foam::nC3H8O::hl(scalar p, scalar T) const } -inline Foam::scalar Foam::nC3H8O::cp(scalar p, scalar T) const +inline Foam::scalar Foam::nC3H8O::Cp(scalar p, scalar T) const { - return cp_.f(p, T); + return Cp_.f(p, T); } @@ -53,9 +53,9 @@ inline Foam::scalar Foam::nC3H8O::h(scalar p, scalar T) const } -inline Foam::scalar Foam::nC3H8O::cpg(scalar p, scalar T) const +inline Foam::scalar Foam::nC3H8O::Cpg(scalar p, scalar T) const { - return cpg_.f(p, T); + return Cpg_.f(p, T); } diff --git a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C index a0a60c1534..1132a9e870 100644 --- a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C +++ b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C @@ -98,7 +98,7 @@ Foam::scalar Foam::solidMixture::rho } -Foam::scalar Foam::solidMixture::cp +Foam::scalar Foam::solidMixture::Cp ( const scalarField& Y ) const @@ -106,7 +106,7 @@ Foam::scalar Foam::solidMixture::cp scalar val = 0.0; forAll(properties_, i) { - val += properties_[i].cp()*Y[i]; + val += properties_[i].Cp()*Y[i]; } return val; } diff --git a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H index ba1d582ee5..f7dc730920 100644 --- a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H +++ b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.H @@ -116,7 +116,7 @@ public: //- Calculate the mixture heat capacity [J/(kg K)] as a function // of mass fractions - scalar cp(const scalarField& Y) const; + scalar Cp(const scalarField& Y) const; }; diff --git a/src/thermophysicalModels/solids/solid/solid.C b/src/thermophysicalModels/solids/solid/solid.C index 0a3c4eaa46..cda2444962 100644 --- a/src/thermophysicalModels/solids/solid/solid.C +++ b/src/thermophysicalModels/solids/solid/solid.C @@ -40,14 +40,14 @@ namespace Foam Foam::solid::solid ( scalar rho, - scalar cp, + scalar Cp, scalar K, scalar Hf, scalar emissivity ) : rho_(rho), - cp_(cp), + Cp_(Cp), K_(K), Hf_(Hf), emissivity_(emissivity) @@ -57,7 +57,7 @@ Foam::solid::solid Foam::solid::solid(Istream& is) : rho_(readScalar(is)), - cp_(readScalar(is)), + Cp_(readScalar(is)), K_(readScalar(is)), Hf_(readScalar(is)), emissivity_(readScalar(is)) @@ -67,7 +67,7 @@ Foam::solid::solid(Istream& is) Foam::solid::solid(const dictionary& dict) : rho_(readScalar(dict.lookup("rho"))), - cp_(readScalar(dict.lookup("cp"))), + Cp_(readScalar(dict.lookup("Cp"))), K_(readScalar(dict.lookup("K"))), Hf_(readScalar(dict.lookup("Hf"))), emissivity_(readScalar(dict.lookup("emissivity"))) @@ -79,7 +79,7 @@ Foam::solid::solid(const dictionary& dict) void Foam::solid::writeData(Ostream& os) const { os << rho_ << token::SPACE - << cp_ << token::SPACE + << Cp_ << token::SPACE << K_ << token::SPACE << Hf_ << token::SPACE << emissivity_; diff --git a/src/thermophysicalModels/solids/solid/solid.H b/src/thermophysicalModels/solids/solid/solid.H index e66ece6ca8..1adb26e4d9 100644 --- a/src/thermophysicalModels/solids/solid/solid.H +++ b/src/thermophysicalModels/solids/solid/solid.H @@ -67,7 +67,7 @@ class solid scalar rho_; //- Specific heat capacity [J/(kg.K)] - scalar cp_; + scalar Cp_; //- Thermal conductivity [W/(m.K)] scalar K_; @@ -121,7 +121,7 @@ public: solid ( scalar rho, - scalar cp, + scalar Cp, scalar K, scalar Hf, scalar emissivity @@ -153,7 +153,7 @@ public: inline scalar rho() const; //- Specific heat capacity [J/(kg.K)] - inline scalar cp() const; + inline scalar Cp() const; //- Thermal conductivity [W/(m.K)] inline scalar K() const; diff --git a/src/thermophysicalModels/solids/solid/solidI.H b/src/thermophysicalModels/solids/solid/solidI.H index d18d48087e..79d1ec5837 100644 --- a/src/thermophysicalModels/solids/solid/solidI.H +++ b/src/thermophysicalModels/solids/solid/solidI.H @@ -31,9 +31,9 @@ inline Foam::scalar Foam::solid::rho() const } -inline Foam::scalar Foam::solid::cp() const +inline Foam::scalar Foam::solid::Cp() const { - return cp_; + return Cp_; } From 8f1fe51be5f2117fd72b0aa2112736fd131d7830 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 19 Oct 2010 10:45:26 +0100 Subject: [PATCH 07/83] ENH: Cleaned-up construction of cloud trackData STYLE: Refactored cp -> Cp --- .../Templates/KinematicCloud/KinematicCloud.C | 31 +-------- .../Templates/KinematicCloud/KinematicCloud.H | 6 +- .../Templates/ReactingCloud/ReactingCloud.C | 51 ++------------ .../ReactingMultiphaseCloud.C | 51 ++------------ .../Templates/ThermoCloud/ThermoCloud.C | 47 ++----------- .../Templates/ThermoCloud/ThermoCloud.H | 12 ++++ .../Templates/ThermoCloud/ThermoCloudI.H | 14 ++++ .../KinematicParcel/KinematicParcel.H | 12 ++-- .../KinematicParcel/KinematicParcelI.H | 66 +++++++++++-------- .../ReactingMultiphaseParcel.C | 24 +++---- .../ReactingMultiphaseParcel.H | 13 ++-- .../ReactingMultiphaseParcelI.H | 23 +------ .../Templates/ReactingParcel/ReactingParcel.C | 22 +++---- .../Templates/ReactingParcel/ReactingParcel.H | 9 +-- .../ReactingParcel/ReactingParcelI.H | 31 ++++----- .../Templates/ThermoParcel/ThermoParcel.C | 22 +++---- .../Templates/ThermoParcel/ThermoParcel.H | 30 ++++----- .../Templates/ThermoParcel/ThermoParcelI.H | 62 ++++++++--------- .../Templates/ThermoParcel/ThermoParcelIO.C | 26 ++++---- .../CompositionModel/CompositionModel.C | 18 ++--- .../CompositionModel/CompositionModel.H | 2 +- .../ReactingLookupTableInjection.C | 2 +- .../ReactingMultiphaseLookupTableInjection.C | 2 +- .../thermoParcelInjectionData.C | 4 +- .../thermoParcelInjectionData.H | 6 +- .../thermoParcelInjectionDataI.H | 8 +-- .../thermoParcelInjectionDataIO.C | 10 +-- .../ThermoSurfaceFilm/ThermoSurfaceFilm.C | 8 +-- .../ThermoSurfaceFilm/ThermoSurfaceFilm.H | 2 +- 29 files changed, 225 insertions(+), 389 deletions(-) diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C index f73a9229be..eb623df2f2 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C @@ -154,36 +154,7 @@ void Foam::KinematicCloud::updateCellOccupancy() template void Foam::KinematicCloud::evolveCloud() { - autoPtr > rhoInterpolator = - interpolation::New - ( - solution_.interpolationSchemes(), - rho_ - ); - - autoPtr > UInterpolator = - interpolation::New - ( - solution_.interpolationSchemes(), - U_ - ); - - autoPtr > muInterpolator = - interpolation::New - ( - solution_.interpolationSchemes(), - mu_ - ); - - typename ParcelType::trackData td - ( - *this, - constProps_, - rhoInterpolator(), - UInterpolator(), - muInterpolator(), - g_.value() - ); + typename ParcelType::trackData td(*this); label preInjectionSize = this->size(); diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H index f9a203b4ae..f2b489a8c7 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H @@ -214,13 +214,13 @@ protected: // References to the carrier gas fields - //- Density + //- Density [kg/m3] const volScalarField& rho_; - //- Velocity + //- Velocity [m/s] const volVectorField& U_; - //- Dynamic viscosity + //- Dynamic viscosity [Pa.s] const volScalarField& mu_; diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C index adbed66c81..cf3fec1732 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C @@ -67,58 +67,15 @@ void Foam::ReactingCloud::preEvolve() template void Foam::ReactingCloud::evolveCloud() { - const volScalarField& T = this->thermo().thermo().T(); - const volScalarField cp = this->thermo().thermo().Cp(); - const volScalarField& p = this->thermo().thermo().p(); + const volScalarField Cp = this->thermo().thermo().Cp(); - autoPtr > rhoInterp = interpolation::New + autoPtr > CpInterp = interpolation::New ( this->solution().interpolationSchemes(), - this->rho() + Cp ); - autoPtr > UInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - this->U() - ); - - autoPtr > muInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - this->mu() - ); - - autoPtr > TInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - T - ); - - autoPtr > cpInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - cp - ); - - autoPtr > pInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - p - ); - - typename ParcelType::trackData td - ( - *this, - constProps_, - rhoInterp(), - UInterp(), - muInterp(), - TInterp(), - cpInterp(), - pInterp(), - this->g().value() - ); + typename ParcelType::trackData td(*this, CpInterp()); label preInjectionSize = this->size(); diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C index b8f4ebceef..9dc75d5138 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C @@ -40,58 +40,15 @@ void Foam::ReactingMultiphaseCloud::preEvolve() template void Foam::ReactingMultiphaseCloud::evolveCloud() { - const volScalarField& T = this->thermo().thermo().T(); - const volScalarField cp = this->thermo().thermo().Cp(); - const volScalarField& p = this->thermo().thermo().p(); + const volScalarField Cp = this->thermo().thermo().Cp(); - autoPtr > rhoInterp = interpolation::New + autoPtr > CpInterp = interpolation::New ( this->solution().interpolationSchemes(), - this->rho() + Cp ); - autoPtr > UInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - this->U() - ); - - autoPtr > muInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - this->mu() - ); - - autoPtr > TInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - T - ); - - autoPtr > cpInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - cp - ); - - autoPtr > pInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - p - ); - - typename ParcelType::trackData td - ( - *this, - constProps_, - rhoInterp(), - UInterp(), - muInterp(), - TInterp(), - cpInterp(), - pInterp(), - this->g().value() - ); + typename ParcelType::trackData td(*this, CpInterp()); label preInjectionSize = this->size(); diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C index 6790c8bb12..5296583c2b 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C @@ -41,50 +41,15 @@ void Foam::ThermoCloud::preEvolve() template void Foam::ThermoCloud::evolveCloud() { - const volScalarField& T = thermo_.thermo().T(); - const volScalarField cp = thermo_.thermo().Cp(); + const volScalarField Cp = thermo_.thermo().Cp(); - autoPtr > rhoInterp = interpolation::New + autoPtr > CpInterp = interpolation::New ( this->solution().interpolationSchemes(), - this->rho() + Cp ); - autoPtr > UInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - this->U() - ); - - autoPtr > muInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - this->mu() - ); - - autoPtr > TInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - T - ); - - autoPtr > cpInterp = interpolation::New - ( - this->solution().interpolationSchemes(), - cp - ); - - typename ParcelType::trackData td - ( - *this, - constProps_, - rhoInterp(), - UInterp(), - muInterp(), - TInterp(), - cpInterp(), - this->g().value() - ); + typename ParcelType::trackData td(*this, CpInterp()); label preInjectionSize = this->size(); @@ -154,6 +119,8 @@ Foam::ThermoCloud::ThermoCloud thermoCloud(), constProps_(this->particleProperties()), thermo_(thermo), + T_(thermo.thermo().T()), + p_(thermo.thermo().p()), heatTransferModel_ ( HeatTransferModel >::New @@ -220,7 +187,7 @@ void Foam::ThermoCloud::checkParcelProperties if (!fullyDescribed) { parcel.T() = constProps_.T0(); - parcel.cp() = constProps_.cp0(); + parcel.Cp() = constProps_.Cp0(); } } diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H index a476dcb6f7..ec7dc35627 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H @@ -85,6 +85,12 @@ protected: //- SLG thermodynamics package const SLGThermo& thermo_; + //- Temperature [K] + const volScalarField& T_; + + //- Pressure [Pa] + const volScalarField& p_; + // References to the cloud sub-models @@ -163,6 +169,12 @@ public: //- Return const access to thermo package inline const SLGThermo& thermo() const; + //- Return const access to the carrier temperature field + inline const volScalarField& T() const; + + //- Return const access to the carrier prressure field + inline const volScalarField& p() const; + // Sub-models diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H index c5d2f37d61..887fbd30f2 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H @@ -44,6 +44,20 @@ inline const Foam::SLGThermo& Foam::ThermoCloud::thermo() const } +template +inline const Foam::volScalarField& Foam::ThermoCloud::T() const +{ + return T_; +} + + +template +inline const Foam::volScalarField& Foam::ThermoCloud::p() const +{ + return p_; +} + + template inline const Foam::HeatTransferModel >& Foam::ThermoCloud::heatTransfer() const diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H index f88672be6e..70724cc816 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H @@ -175,13 +175,14 @@ public: // Interpolators for continuous phase fields //- Density interpolator - const interpolation& rhoInterp_; + autoPtr > rhoInterp_; //- Velocity interpolator - const interpolation& UInterp_; + autoPtr > UInterp_; //- Dynamic viscosity interpolator - const interpolation& muInterp_; + autoPtr > muInterp_; + //- Local gravitational or other body-force acceleration const vector& g_; @@ -199,11 +200,6 @@ public: inline trackData ( KinematicCloud& cloud, - const constantProperties& constProps, - const interpolation& rhoInterp, - const interpolation& UInterp, - const interpolation& muInterp, - const vector& g, trackPart part = tpLinearTrack ); diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H index 6b0cb76ba2..8d7a9f0236 100644 --- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H @@ -49,21 +49,37 @@ template inline Foam::KinematicParcel::trackData::trackData ( KinematicCloud& cloud, - const constantProperties& constProps, - const interpolation& rhoInterp, - const interpolation& UInterp, - const interpolation& muInterp, - const vector& g, trackPart part ) : Particle::trackData(cloud), cloud_(cloud), - constProps_(constProps), - rhoInterp_(rhoInterp), - UInterp_(UInterp), - muInterp_(muInterp), - g_(g), + constProps_(cloud.constProps()), + rhoInterp_ + ( + interpolation::New + ( + cloud.solution().interpolationSchemes(), + cloud.rho() + ) + ), + UInterp_ + ( + interpolation::New + ( + cloud.solution().interpolationSchemes(), + cloud.U() + ) + ), + muInterp_ + ( + interpolation::New + ( + cloud.solution().interpolationSchemes(), + cloud.mu() + ) + ), + g_(cloud.g().value()), part_(part) {} @@ -219,7 +235,7 @@ template inline const Foam::interpolation& Foam::KinematicParcel::trackData::rhoInterp() const { - return rhoInterp_; + return rhoInterp_(); } @@ -227,7 +243,7 @@ template inline const Foam::interpolation& Foam::KinematicParcel::trackData::UInterp() const { - return UInterp_; + return UInterp_(); } @@ -235,7 +251,7 @@ template inline const Foam::interpolation& Foam::KinematicParcel::trackData::muInterp() const { - return muInterp_; + return muInterp_(); } @@ -248,8 +264,7 @@ Foam::KinematicParcel::trackData::g() const template -inline -typename Foam::KinematicParcel::trackData::trackPart +inline typename Foam::KinematicParcel::trackData::trackPart Foam::KinematicParcel::trackData::part() const { return part_; @@ -257,8 +272,7 @@ Foam::KinematicParcel::trackData::part() const template -inline -typename Foam::KinematicParcel::trackData::trackPart& +inline typename Foam::KinematicParcel::trackData::trackPart& Foam::KinematicParcel::trackData::part() { return part_; @@ -497,16 +511,14 @@ inline Foam::scalar Foam::KinematicParcel::mass() const template -inline Foam::scalar -Foam::KinematicParcel::momentOfInertia() const +inline Foam::scalar Foam::KinematicParcel::momentOfInertia() const { return 0.1*mass()*sqr(d_); } template -inline Foam::vector -Foam::KinematicParcel::omega() const +inline Foam::vector Foam::KinematicParcel::omega() const { return angularMomentum_/momentOfInertia(); } @@ -520,8 +532,7 @@ inline Foam::scalar Foam::KinematicParcel::volume() const template -inline Foam::scalar -Foam::KinematicParcel::volume(const scalar d) +inline Foam::scalar Foam::KinematicParcel::volume(const scalar d) { return pi/6.0*pow3(d); } @@ -535,8 +546,7 @@ inline Foam::scalar Foam::KinematicParcel::areaP() const template -inline Foam::scalar -Foam::KinematicParcel::areaP(const scalar d) +inline Foam::scalar Foam::KinematicParcel::areaP(const scalar d) { return 0.25*areaS(d); } @@ -550,16 +560,14 @@ inline Foam::scalar Foam::KinematicParcel::areaS() const template -inline Foam::scalar -Foam::KinematicParcel::areaS(const scalar d) +inline Foam::scalar Foam::KinematicParcel::areaS(const scalar d) { return pi*d*d; } template -inline Foam::scalar -Foam::KinematicParcel::Re +inline Foam::scalar Foam::KinematicParcel::Re ( const vector& U, const scalar d, diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C index e77064c5a1..dba3409a12 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C @@ -44,7 +44,7 @@ const Foam::label Foam::ReactingMultiphaseParcel::SLD(2); template template -Foam::scalar Foam::ReactingMultiphaseParcel::cpEff +Foam::scalar Foam::ReactingMultiphaseParcel::CpEff ( TrackData& td, const scalar p, @@ -55,9 +55,9 @@ Foam::scalar Foam::ReactingMultiphaseParcel::cpEff ) const { return - this->Y_[GAS]*td.cloud().composition().cp(idG, YGas_, p, T) - + this->Y_[LIQ]*td.cloud().composition().cp(idL, YLiquid_, p, T) - + this->Y_[SLD]*td.cloud().composition().cp(idS, YSolid_, p, T); + this->Y_[GAS]*td.cloud().composition().Cp(idG, YGas_, p, T) + + this->Y_[LIQ]*td.cloud().composition().Cp(idL, YLiquid_, p, T) + + this->Y_[SLD]*td.cloud().composition().Cp(idS, YSolid_, p, T); } @@ -164,19 +164,19 @@ void Foam::ReactingMultiphaseParcel::cellValueSourceCorrection scalar massCellNew = massCell + addedMass; this->Uc_ += td.cloud().UTrans()[cellI]/massCellNew; - scalar cpEff = 0; + scalar CpEff = 0; if (addedMass > ROOTVSMALL) { forAll(td.cloud().rhoTrans(), i) { scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass; - cpEff += Y*td.cloud().thermo().carrier().Cp(i, this->Tc_); + CpEff += Y*td.cloud().thermo().carrier().Cp(i, this->Tc_); } } - const scalar cpc = td.cpInterp().psi()[cellI]; - this->cpc_ = (massCell*cpc + addedMass*cpEff)/massCellNew; + const scalar Cpc = td.CpInterp().psi()[cellI]; + this->Cpc_ = (massCell*Cpc + addedMass*CpEff)/massCellNew; - this->Tc_ += td.cloud().hsTrans()[cellI]/(this->cpc_*massCellNew); + this->Tc_ += td.cloud().hsTrans()[cellI]/(this->Cpc_*massCellNew); } @@ -196,7 +196,7 @@ void Foam::ReactingMultiphaseParcel::calc const vector& U0 = this->U_; const scalar rho0 = this->rho_; const scalar T0 = this->T_; - const scalar cp0 = this->cp_; + const scalar Cp0 = this->Cp_; const scalar mass0 = this->mass(); const scalar pc = this->pc_; @@ -367,7 +367,7 @@ void Foam::ReactingMultiphaseParcel::calc d0, rho0, T0, - cp0, + Cp0, NCpW, Sh, dhsTrans @@ -466,7 +466,7 @@ void Foam::ReactingMultiphaseParcel::calc else { - this->cp_ = cpEff(td, pc, T1, idG, idL, idS); + this->Cp_ = CpEff(td, pc, T1, idG, idL, idS); this->T_ = T1; this->U_ = U1; diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H index ed0b11e88e..b4b9ff213a 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H @@ -127,15 +127,10 @@ public: inline trackData ( ReactingMultiphaseCloud& cloud, - const constantProperties& constProps, - const interpolation& rhoInterp, - const interpolation& UInterp, - const interpolation& muInterp, - const interpolation& TInterp, const interpolation& CpInterp, - const interpolation& pInterp, - const vector& g - ); + typename ReactingParcel::trackData::trackPart + part = ReactingParcel::trackData::tpLinearTrack + ); // Member functions @@ -154,7 +149,7 @@ private: //- Return the mixture effective specific heat capacity template - scalar cpEff + scalar CpEff ( TrackData& td, const scalar p, diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H index cd18d3628c..454ec13f0e 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H @@ -54,30 +54,13 @@ template inline Foam::ReactingMultiphaseParcel::trackData::trackData ( ReactingMultiphaseCloud& cloud, - const constantProperties& constProps, - const interpolation& rhoInterp, - const interpolation& UInterp, - const interpolation& muInterp, - const interpolation& TInterp, const interpolation& CpInterp, - const interpolation& pInterp, - const vector& g + typename ReactingParcel::trackData::trackPart part ) : - ReactingParcel::trackData - ( - cloud, - constProps, - rhoInterp, - UInterp, - muInterp, - TInterp, - CpInterp, - pInterp, - g - ), + ReactingParcel::trackData(cloud, CpInterp, part), cloud_(cloud), - constProps_(constProps) + constProps_(cloud.constProps()) {} diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index edd2b8e678..1c0539eda6 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -88,19 +88,19 @@ void Foam::ReactingParcel::cellValueSourceCorrection scalar massCellNew = massCell + addedMass; this->Uc_ += td.cloud().UTrans()[cellI]/massCellNew; - scalar cpEff = 0; + scalar CpEff = 0; if (addedMass > ROOTVSMALL) { forAll(td.cloud().rhoTrans(), i) { scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass; - cpEff += Y*td.cloud().composition().carrier().Cp(i, this->Tc_); + CpEff += Y*td.cloud().composition().carrier().Cp(i, this->Tc_); } } - const scalar cpc = td.cpInterp().psi()[cellI]; - this->cpc_ = (massCell*cpc + addedMass*cpEff)/massCellNew; + const scalar Cpc = td.CpInterp().psi()[cellI]; + this->Cpc_ = (massCell*Cpc + addedMass*CpEff)/massCellNew; - this->Tc_ += td.cloud().hsTrans()[cellI]/(this->cpc_*massCellNew); + this->Tc_ += td.cloud().hsTrans()[cellI]/(this->Cpc_*massCellNew); } @@ -162,7 +162,7 @@ void Foam::ReactingParcel::correctSurfaceValues rhos = 0; mus = 0; kappa = 0; - scalar cps = 0; + scalar Cps = 0; scalar sumYiSqrtW = 0; scalar sumYiCbrtW = 0; @@ -174,7 +174,7 @@ void Foam::ReactingParcel::correctSurfaceValues rhos += Xs[i]*td.cloud().thermo().carrier().W(i); mus += Ys[i]*sqrtW*td.cloud().thermo().carrier().mu(i, T); kappa += Ys[i]*cbrtW*td.cloud().thermo().carrier().kappa(i, T); - cps += Xs[i]*td.cloud().thermo().carrier().Cp(i, T); + Cps += Xs[i]*td.cloud().thermo().carrier().Cp(i, T); sumYiSqrtW += Ys[i]*sqrtW; sumYiCbrtW += Ys[i]*cbrtW; @@ -183,7 +183,7 @@ void Foam::ReactingParcel::correctSurfaceValues rhos *= pc_/(specie::RR*T); mus /= sumYiSqrtW; kappa /= sumYiCbrtW; - Pr = cps*mus/kappa; + Pr = Cps*mus/kappa; } @@ -226,7 +226,7 @@ void Foam::ReactingParcel::calc const vector& U0 = this->U_; const scalar rho0 = this->rho_; const scalar T0 = this->T_; - const scalar cp0 = this->cp_; + const scalar Cp0 = this->Cp_; const scalar mass0 = this->mass(); @@ -315,7 +315,7 @@ void Foam::ReactingParcel::calc d0, rho0, T0, - cp0, + Cp0, NCpW, Sh, dhsTrans @@ -377,7 +377,7 @@ void Foam::ReactingParcel::calc else { - this->cp_ = td.cloud().composition().cp(0, Y_, pc_, T1); + this->Cp_ = td.cloud().composition().Cp(0, Y_, pc_, T1); this->T_ = T1; this->U_ = U1; diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H index 6ae15d5098..0d6cc119ab 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H @@ -139,14 +139,9 @@ public: inline trackData ( ReactingCloud& cloud, - const constantProperties& constProps, - const interpolation& rhoInterp, - const interpolation& UInterp, - const interpolation& muInterp, - const interpolation& TInterp, const interpolation& CpInterp, - const interpolation& pInterp, - const vector& g + typename ThermoParcel::trackData::trackPart + part = ThermoParcel::trackData::tpLinearTrack ); diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H index ffc87eb639..285a1af0da 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H @@ -43,30 +43,21 @@ template inline Foam::ReactingParcel::trackData::trackData ( ReactingCloud& cloud, - const constantProperties& constProps, - const interpolation& rhoInterp, - const interpolation& UInterp, - const interpolation& muInterp, - const interpolation& TInterp, const interpolation& CpInterp, - const interpolation& pInterp, - const vector& g + typename ThermoParcel::trackData::trackPart part ) : - ThermoParcel::trackData - ( - cloud, - constProps, - rhoInterp, - UInterp, - muInterp, - TInterp, - CpInterp, - g - ), + ThermoParcel::trackData(cloud, CpInterp, part), cloud_(cloud), - constProps_(constProps), - pInterp_(pInterp) + constProps_(cloud.constProps()), + pInterp_ + ( + interpolation::New + ( + cloud.solution().interpolationSchemes(), + cloud.p() + ) + ) {} diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C index d04caf8cfc..bdf5f1d2cb 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C @@ -43,7 +43,7 @@ void Foam::ThermoParcel::setCellValues tetIndices tetIs = this->currentTetIndices(); - cpc_ = td.cpInterp().interpolate(this->position(), tetIs); + Cpc_ = td.CpInterp().interpolate(this->position(), tetIs); Tc_ = td.TInterp().interpolate(this->position(), tetIs); @@ -76,8 +76,8 @@ void Foam::ThermoParcel::cellValueSourceCorrection { this->Uc_ += td.cloud().UTrans()[cellI]/this->massCell(cellI); - scalar cpMean = td.cpInterp().psi()[cellI]; - Tc_ += td.cloud().hsTrans()[cellI]/(cpMean*this->massCell(cellI)); + const scalar CpMean = td.CpInterp().psi()[cellI]; + Tc_ += td.cloud().hsTrans()[cellI]/(CpMean*this->massCell(cellI)); } @@ -108,7 +108,7 @@ void Foam::ThermoParcel::calcSurfaceValues mus = td.muInterp().interpolate (this->position(), tetIs)/factor; Pr = td.constProps().Pr(); - kappa = cpc_*mus/Pr; + kappa = Cpc_*mus/Pr; } @@ -128,7 +128,7 @@ void Foam::ThermoParcel::calc const vector U0 = this->U_; const scalar rho0 = this->rho_; const scalar T0 = this->T_; - const scalar cp0 = this->cp_; + const scalar Cp0 = this->Cp_; const scalar mass0 = this->mass(); @@ -176,7 +176,7 @@ void Foam::ThermoParcel::calc d0, rho0, T0, - cp0, + Cp0, NCpW, Sh, dhsTrans @@ -222,7 +222,7 @@ Foam::scalar Foam::ThermoParcel::calcHeatTransfer const scalar d, const scalar rho, const scalar T, - const scalar cp, + const scalar Cp, const scalar NCpW, const scalar Sh, scalar& dhsTrans @@ -238,7 +238,7 @@ Foam::scalar Foam::ThermoParcel::calcHeatTransfer if (mag(htc) < ROOTVSMALL && !td.cloud().radiation()) { - return max(T + dt*Sh/(this->volume(d)*rho*cp), td.constProps().TMin()); + return max(T + dt*Sh/(this->volume(d)*rho*Cp), td.constProps().TMin()); } const scalar As = this->areaS(d); @@ -255,7 +255,7 @@ Foam::scalar Foam::ThermoParcel::calcHeatTransfer ap = (ap + epsilon*Gc/(4.0*htc))/(1.0 + epsilon*sigma*pow3(T)/htc); bp += 6.0*(epsilon*(Gc/4.0 - sigma*pow4(T))); } - bp /= rho*d*cp*(ap - T); + bp /= rho*d*Cp*(ap - T); // Integrate to find the new parcel temperature IntegrationScheme::integrationResult Tres = @@ -279,9 +279,9 @@ Foam::ThermoParcel::ThermoParcel : KinematicParcel(p), T_(p.T_), - cp_(p.cp_), + Cp_(p.Cp_), Tc_(p.Tc_), - cpc_(p.cpc_) + Cpc_(p.Cpc_) {} diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H index dc97dcba6c..38de73df1b 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H @@ -83,7 +83,7 @@ public: const scalar TMin_; //- Particle specific heat capacity [J/(kg.K)] - const scalar cp0_; + const scalar Cp0_; //- Particle emissivity [] (radiation) const scalar epsilon0_; @@ -112,7 +112,7 @@ public: //- Return const access to the particle specific heat capacity // [J/(kg.K)] - inline scalar cp0() const; + inline scalar Cp0() const; //- Return const access to the particle emissivity [] // Active for radiation only @@ -144,10 +144,10 @@ public: // Interpolators for continuous phase fields //- Temperature field interpolator - const interpolation& TInterp_; + autoPtr > TInterp_; //- Specific heat capacity field interpolator - const interpolation& cpInterp_; + const interpolation& CpInterp_; public: @@ -158,13 +158,9 @@ public: inline trackData ( ThermoCloud& cloud, - const constantProperties& constProps, - const interpolation& rhoInterp, - const interpolation& UInterp, - const interpolation& muInterp, - const interpolation& TInterp, - const interpolation& cpInterp, - const vector& g + const interpolation& CpInterp, + typename KinematicParcel::trackData::trackPart + part = KinematicParcel::trackData::tpLinearTrack ); @@ -182,7 +178,7 @@ public: //- Return const access to the interpolator for continuous // phase specific heat capacity field - inline const interpolation& cpInterp() const; + inline const interpolation& CpInterp() const; }; @@ -196,7 +192,7 @@ protected: scalar T_; //- Specific heat capacity [J/(kg.K)] - scalar cp_; + scalar Cp_; // Cell-based quantities @@ -205,7 +201,7 @@ protected: scalar Tc_; //- Specific heat capacity [J/(kg.K)] - scalar cpc_; + scalar Cpc_; // Protected Member Functions @@ -223,7 +219,7 @@ protected: const scalar d, // diameter const scalar rho, // density const scalar T, // temperature - const scalar cp, // specific heat capacity + const scalar Cp, // specific heat capacity const scalar NCpW, // Sum of N*Cp*W of emission species const scalar Sh, // explicit particle enthalpy source scalar& dhsTrans // sensible enthalpy transfer to carrier @@ -302,7 +298,7 @@ public: inline scalar T() const; //- Return const access to specific heat capacity - inline scalar cp() const; + inline scalar Cp() const; //- Return the parcel sensible enthalpy inline scalar hs() const; @@ -314,7 +310,7 @@ public: inline scalar& T(); //- Return access to specific heat capacity - inline scalar& cp(); + inline scalar& Cp(); // Main calculation loop diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H index 9e69a46fd0..a7b9b9d68b 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H @@ -34,7 +34,7 @@ inline Foam::ThermoParcel::constantProperties::constantProperties KinematicParcel::constantProperties(parentDict), T0_(readScalar(this->dict().lookup("T0"))), TMin_(readScalar(this->dict().lookup("TMin"))), - cp0_(readScalar(this->dict().lookup("cp0"))), + Cp0_(readScalar(this->dict().lookup("Cp0"))), epsilon0_(readScalar(this->dict().lookup("epsilon0"))), f0_(readScalar(this->dict().lookup("f0"))), Pr_(readScalar(this->dict().lookup("Pr"))) @@ -45,28 +45,22 @@ template inline Foam::ThermoParcel::trackData::trackData ( ThermoCloud& cloud, - const constantProperties& constProps, - const interpolation& rhoInterp, - const interpolation& UInterp, - const interpolation& muInterp, - const interpolation& TInterp, - const interpolation& cpInterp, - const vector& g + const interpolation& CpInterp, + typename KinematicParcel::trackData::trackPart part ) : - KinematicParcel::trackData - ( - cloud, - constProps, - rhoInterp, - UInterp, - muInterp, - g - ), + KinematicParcel::trackData(cloud, part), cloud_(cloud), - constProps_(constProps), - TInterp_(TInterp), - cpInterp_(cpInterp) + constProps_(cloud.constProps()), + TInterp_ + ( + interpolation::New + ( + cloud.solution().interpolationSchemes(), + cloud.T() + ) + ), + CpInterp_(CpInterp) {} @@ -82,9 +76,9 @@ inline Foam::ThermoParcel::ThermoParcel : KinematicParcel(owner, position, cellI, tetFaceI, tetPtI), T_(0.0), - cp_(0.0), + Cp_(0.0), Tc_(0.0), - cpc_(0.0) + Cpc_(0.0) {} @@ -125,9 +119,9 @@ inline Foam::ThermoParcel::ThermoParcel constProps ), T_(constProps.T0()), - cp_(constProps.cp0()), + Cp_(constProps.Cp0()), Tc_(0.0), - cpc_(0.0) + Cpc_(0.0) {} @@ -151,9 +145,9 @@ Foam::ThermoParcel::constantProperties::TMin() const template inline Foam::scalar -Foam::ThermoParcel::constantProperties::cp0() const +Foam::ThermoParcel::constantProperties::Cp0() const { - return cp0_; + return Cp0_; } @@ -203,15 +197,15 @@ template inline const Foam::interpolation& Foam::ThermoParcel::trackData::TInterp() const { - return TInterp_; + return TInterp_(); } template inline const Foam::interpolation& -Foam::ThermoParcel::trackData::cpInterp() const +Foam::ThermoParcel::trackData::CpInterp() const { - return cpInterp_; + return CpInterp_; } @@ -225,16 +219,16 @@ inline Foam::scalar Foam::ThermoParcel::T() const template -inline Foam::scalar Foam::ThermoParcel::cp() const +inline Foam::scalar Foam::ThermoParcel::Cp() const { - return cp_; + return Cp_; } template inline Foam::scalar Foam::ThermoParcel::hs() const { - return cp_*(T_ - 298.15); + return Cp_*(T_ - 298.15); } @@ -246,9 +240,9 @@ inline Foam::scalar& Foam::ThermoParcel::T() template -inline Foam::scalar& Foam::ThermoParcel::cp() +inline Foam::scalar& Foam::ThermoParcel::Cp() { - return cp_; + return Cp_; } diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C index 447de83adc..4ea8b8c246 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C @@ -32,7 +32,7 @@ template Foam::string Foam::ThermoParcel::propHeader = KinematicParcel::propHeader + " T" - + " cp"; + + " Cp"; // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -47,16 +47,16 @@ Foam::ThermoParcel::ThermoParcel : KinematicParcel(cloud, is, readFields), T_(0.0), - cp_(0.0), + Cp_(0.0), Tc_(0.0), - cpc_(0.0) + Cpc_(0.0) { if (readFields) { if (is.format() == IOstream::ASCII) { T_ = readScalar(is); - cp_ = readScalar(is); + Cp_ = readScalar(is); } else { @@ -64,7 +64,7 @@ Foam::ThermoParcel::ThermoParcel ( reinterpret_cast(&T_), + sizeof(T_) - + sizeof(cp_) + + sizeof(Cp_) ); } } @@ -90,8 +90,8 @@ void Foam::ThermoParcel::readFields(Cloud& c) IOField T(c.fieldIOobject("T", IOobject::MUST_READ)); c.checkFieldIOobject(c, T); - IOField cp(c.fieldIOobject("cp", IOobject::MUST_READ)); - c.checkFieldIOobject(c, cp); + IOField Cp(c.fieldIOobject("Cp", IOobject::MUST_READ)); + c.checkFieldIOobject(c, Cp); label i = 0; @@ -100,7 +100,7 @@ void Foam::ThermoParcel::readFields(Cloud& c) ThermoParcel& p = iter(); p.T_ = T[i]; - p.cp_ = cp[i]; + p.Cp_ = Cp[i]; i++; } } @@ -114,7 +114,7 @@ void Foam::ThermoParcel::writeFields(const Cloud& c) label np = c.size(); IOField T(c.fieldIOobject("T", IOobject::NO_READ), np); - IOField cp(c.fieldIOobject("cp", IOobject::NO_READ), np); + IOField Cp(c.fieldIOobject("Cp", IOobject::NO_READ), np); label i = 0; forAllConstIter(typename Cloud, c, iter) @@ -122,12 +122,12 @@ void Foam::ThermoParcel::writeFields(const Cloud& c) const ThermoParcel& p = iter(); T[i] = p.T_; - cp[i] = p.cp_; + Cp[i] = p.Cp_; i++; } T.write(); - cp.write(); + Cp.write(); } @@ -144,7 +144,7 @@ Foam::Ostream& Foam::operator<< { os << static_cast&>(p) << token::SPACE << p.T() - << token::SPACE << p.cp(); + << token::SPACE << p.Cp(); } else { @@ -152,7 +152,7 @@ Foam::Ostream& Foam::operator<< os.write ( reinterpret_cast(&p.T_), - sizeof(p.T()) + sizeof(p.cp()) + sizeof(p.T()) + sizeof(p.Cp()) ); } diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C index 7ce1c6d3c0..fff52dd90b 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C @@ -368,7 +368,7 @@ Foam::scalar Foam::CompositionModel::H Y[i] *( thermo_.solids().properties()[gid].Hf() - + thermo_.solids().properties()[gid].cp()*T + + thermo_.solids().properties()[gid].Cp()*T ); } break; @@ -433,7 +433,7 @@ Foam::scalar Foam::CompositionModel::Hs forAll(Y, i) { label gid = props.globalIds()[i]; - HsMixture += Y[i]*thermo_.solids().properties()[gid].cp()*T; + HsMixture += Y[i]*thermo_.solids().properties()[gid].Cp()*T; } break; } @@ -517,7 +517,7 @@ Foam::scalar Foam::CompositionModel::Hc template -Foam::scalar Foam::CompositionModel::cp +Foam::scalar Foam::CompositionModel::Cp ( const label phaseI, const scalarField& Y, @@ -526,7 +526,7 @@ Foam::scalar Foam::CompositionModel::cp ) const { const phaseProperties& props = phaseProps_[phaseI]; - scalar cpMixture = 0.0; + scalar CpMixture = 0.0; switch (props.phase()) { case phaseProperties::GAS: @@ -534,7 +534,7 @@ Foam::scalar Foam::CompositionModel::cp forAll(Y, i) { label gid = props.globalIds()[i]; - cpMixture += Y[i]*thermo_.carrier().Cp(gid, T); + CpMixture += Y[i]*thermo_.carrier().Cp(gid, T); } break; } @@ -543,7 +543,7 @@ Foam::scalar Foam::CompositionModel::cp forAll(Y, i) { label gid = props.globalIds()[i]; - cpMixture += Y[i]*thermo_.liquids().properties()[gid].cp(p, T); + CpMixture += Y[i]*thermo_.liquids().properties()[gid].Cp(p, T); } break; } @@ -552,7 +552,7 @@ Foam::scalar Foam::CompositionModel::cp forAll(Y, i) { label gid = props.globalIds()[i]; - cpMixture += Y[i]*thermo_.solids().properties()[gid].cp(); + CpMixture += Y[i]*thermo_.solids().properties()[gid].Cp(); } break; } @@ -560,7 +560,7 @@ Foam::scalar Foam::CompositionModel::cp { FatalErrorIn ( - "Foam::scalar Foam::CompositionModel::cp" + "Foam::scalar Foam::CompositionModel::Cp" "(" "const label, " "const scalarField&, " @@ -571,7 +571,7 @@ Foam::scalar Foam::CompositionModel::cp } } - return cpMixture; + return CpMixture; } diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H index bff960c2ed..0e971d2038 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H +++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H @@ -242,7 +242,7 @@ public: ) const; //- Return specific heat caoacity for the phase phaseI - virtual scalar cp + virtual scalar Cp ( const label phaseI, const scalarField& Y, diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C index 5c4b49370b..74629877d3 100644 --- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C +++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C @@ -190,7 +190,7 @@ void Foam::ReactingLookupTableInjection::setProperties parcel.T() = injectors_[injectorI].T(); // set particle specific heat capacity - parcel.cp() = injectors_[injectorI].cp(); + parcel.Cp() = injectors_[injectorI].Cp(); // set particle component mass fractions parcel.Y() = injectors_[injectorI].Y(); diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C index 1178b5cc33..cfdb19dfcd 100644 --- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C +++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C @@ -195,7 +195,7 @@ void Foam::ReactingMultiphaseLookupTableInjection::setProperties parcel.T() = injectors_[injectorI].T(); // set particle specific heat capacity - parcel.cp() = injectors_[injectorI].cp(); + parcel.Cp() = injectors_[injectorI].Cp(); // set particle component mass fractions parcel.Y() = injectors_[injectorI].Y(); diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C index 23ea5aa1f6..f499149b88 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C @@ -38,7 +38,7 @@ Foam::thermoParcelInjectionData::thermoParcelInjectionData() : kinematicParcelInjectionData(), T_(0.0), - cp_(0.0) + Cp_(0.0) {} @@ -49,7 +49,7 @@ Foam::thermoParcelInjectionData::thermoParcelInjectionData : kinematicParcelInjectionData(dict), T_(readScalar(dict.lookup("T"))), - cp_(readScalar(dict.lookup("cp"))) + Cp_(readScalar(dict.lookup("Cp"))) {} // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.H index 3f6c4ac084..9bec2120a7 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.H +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.H @@ -75,7 +75,7 @@ protected: scalar T_; //- Specific heat capacity [J/kg/K] - scalar cp_; + scalar Cp_; public: @@ -105,7 +105,7 @@ public: inline scalar T() const; //- Return const access to the specific heat capacity - inline scalar cp() const; + inline scalar Cp() const; // Edit @@ -114,7 +114,7 @@ public: inline scalar& T(); //- Return access to the specific heat capacity - inline scalar& cp(); + inline scalar& Cp(); // I-O diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataI.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataI.H index 5069d456b7..8cb96ee1d9 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataI.H +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataI.H @@ -33,9 +33,9 @@ inline Foam::scalar Foam::thermoParcelInjectionData::T() const } -inline Foam::scalar Foam::thermoParcelInjectionData::cp() const +inline Foam::scalar Foam::thermoParcelInjectionData::Cp() const { - return cp_; + return Cp_; } @@ -45,9 +45,9 @@ inline Foam::scalar& Foam::thermoParcelInjectionData::T() } -inline Foam::scalar& Foam::thermoParcelInjectionData::cp() +inline Foam::scalar& Foam::thermoParcelInjectionData::Cp() { - return cp_; + return Cp_; } diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C index 5b3a54c561..390d195e39 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C @@ -34,8 +34,8 @@ Foam::thermoParcelInjectionData::thermoParcelInjectionData(Istream& is) is.check("reading T"); is >> T_; - is.check("reading cp"); - is >> cp_; + is.check("reading Cp"); + is >> Cp_; is.check("thermoParcelInjectionData(Istream& is)"); } @@ -51,7 +51,7 @@ Foam::Ostream& Foam::operator<< { os << static_cast(data); - os << data.T_ << data.cp_; + os << data.T_ << data.Cp_; return os; } @@ -64,8 +64,8 @@ Foam::Istream& Foam::operator>>(Istream& is, thermoParcelInjectionData& data) is.check("reading T"); is >> data.T_; - is.check("reading cp"); - is >> data.cp_; + is.check("reading Cp"); + is >> data.Cp_; is.check("operator(Istream&, thermoParcelInjectionData&)"); diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C index 04413ad9cf..350017913c 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C @@ -38,7 +38,7 @@ Foam::ThermoSurfaceFilm::ThermoSurfaceFilm : SurfaceFilmModel(dict, owner, g, typeName), TFilmPatch_(0), - cpFilmPatch_(0) + CpFilmPatch_(0) {} @@ -140,8 +140,8 @@ void Foam::ThermoSurfaceFilm::cacheFilmFields TFilmPatch_ = filmModel.Ts().boundaryField()[filmPatchI]; distMap.distribute(TFilmPatch_); - cpFilmPatch_ = filmModel.cp().boundaryField()[filmPatchI]; - distMap.distribute(cpFilmPatch_); + CpFilmPatch_ = filmModel.Cp().boundaryField()[filmPatchI]; + distMap.distribute(CpFilmPatch_); } @@ -156,7 +156,7 @@ void Foam::ThermoSurfaceFilm::setParcelProperties // Set parcel properties p.T() = TFilmPatch_[filmFaceI]; - p.cp() = cpFilmPatch_[filmFaceI]; + p.Cp() = CpFilmPatch_[filmFaceI]; } diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H index af594cc5e5..4e67803f97 100644 --- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H +++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H @@ -66,7 +66,7 @@ protected: scalarList TFilmPatch_; //- Film specific heat capacity / patch face - scalarList cpFilmPatch_; + scalarList CpFilmPatch_; // Protected functions From 8cabc8b543808ad9230e5a0bbe617ac1a19410e3 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 19 Oct 2010 11:06:37 +0100 Subject: [PATCH 08/83] ENH: Added particle non-sphere drag model --- .../parcels/include/makeParcelDragModels.H | 2 + .../Kinematic/DragModel/DragModel/DragModel.C | 20 ++- .../Kinematic/DragModel/DragModel/DragModel.H | 12 +- .../Kinematic/DragModel/NoDrag/NoDrag.C | 2 +- .../DragModel/NonSphereDrag/NonSphereDrag.C | 84 +++++++++++ .../DragModel/NonSphereDrag/NonSphereDrag.H | 142 ++++++++++++++++++ .../DragModel/SphereDrag/SphereDrag.C | 4 +- 7 files changed, 261 insertions(+), 5 deletions(-) create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/DragModel/NonSphereDrag/NonSphereDrag.C create mode 100644 src/lagrangian/intermediate/submodels/Kinematic/DragModel/NonSphereDrag/NonSphereDrag.H diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H index a4c5e5f098..d849b7833e 100644 --- a/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H +++ b/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H @@ -31,6 +31,7 @@ License #include "KinematicCloud.H" #include "NoDrag.H" +#include "NonSphereDrag.H" #include "SphereDrag.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -40,6 +41,7 @@ License makeDragModel(KinematicCloud); \ \ makeDragModelType(NoDrag, KinematicCloud, ParcelType); \ + makeDragModelType(NonSphereDrag, KinematicCloud, ParcelType); \ makeDragModelType(SphereDrag, KinematicCloud, ParcelType); diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C index 28e0cef24c..7bfc75ea28 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C @@ -27,14 +27,25 @@ License // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // +template +Foam::DragModel::DragModel(CloudType& owner) +: + dict_(dictionary::null), + coeffDict_(dictionary::null), + owner_(owner) +{} + + template Foam::DragModel::DragModel ( const dictionary& dict, - CloudType& owner + CloudType& owner, + const word& type ) : dict_(dict), + coeffDict_(dict.subDict(type + "Coeffs")), owner_(owner) {} @@ -62,6 +73,13 @@ const Foam::dictionary& Foam::DragModel::dict() const } +template +const Foam::dictionary& Foam::DragModel::coeffDict() const +{ + return coeffDict_; +} + + template Foam::scalar Foam::DragModel::utc ( diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H index e60126e1d0..e4fa349f8d 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H +++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H @@ -57,6 +57,9 @@ class DragModel //- The cloud dictionary const dictionary& dict_; + //- The model coefficients dictionary + const dictionary& coeffDict_; + //- Reference to the owner cloud class CloudType& owner_; @@ -82,11 +85,15 @@ public: // Constructors + //- Construct null from owner + DragModel(CloudType& owner); + //- Construct from components DragModel ( const dictionary& dict, - CloudType& owner + CloudType& owner, + const word& type ); @@ -110,6 +117,9 @@ public: //- Return the dictionary const dictionary& dict() const; + //- Return the coefficients dictionary + const dictionary& coeffDict() const; + // Member Functions diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C index d76a5bb8c3..584abfbac2 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C @@ -30,7 +30,7 @@ License template Foam::NoDrag::NoDrag(const dictionary& dict, CloudType& owner) : - DragModel(dict, owner) + DragModel(owner) {} diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NonSphereDrag/NonSphereDrag.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NonSphereDrag/NonSphereDrag.C new file mode 100644 index 0000000000..a106e307a3 --- /dev/null +++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NonSphereDrag/NonSphereDrag.C @@ -0,0 +1,84 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 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 "NonSphereDrag.H" + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +template +Foam::NonSphereDrag::NonSphereDrag +( + const dictionary& dict, + CloudType& owner +) +: + DragModel(dict, owner, typeName), + phi_(readScalar(this->coeffDict().lookup("phi"))), + a_(exp(2.3288 - 6.4581*phi_ + 2.4486*sqr(phi_))), + b_(0.0964 + 0.5565*phi_), + c_(exp(4.9050 - 13.8944*phi_ + 18.4222*sqr(phi_) - 10.2599*pow3(phi_))), + d_(exp(1.4681 + 12.2584*phi_ - 20.7322*sqr(phi_) + 15.8855*pow3(phi_))) +{ + if (phi_ <= 0 || phi_ > 1) + { + FatalErrorIn + ( + "NonSphereDrag::NonSphereDrag" + "(" + "const dictionary&, " + "CloudType&" + ")" + ) << "Ratio of surface of sphere having same volume as particle to " + << "actual surface area of particle (phi) must be greater than 0 " + << "and less than or equal to 1" << exit(FatalError); + } +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +template +Foam::NonSphereDrag::~NonSphereDrag() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template +bool Foam::NonSphereDrag::active() const +{ + return true; +} + + +template +Foam::scalar Foam::NonSphereDrag::Cd(const scalar Re) const +{ + return 24.0/(Re + ROOTVSMALL)*(1.0 + a_*pow(Re, b_)) + Re*c_/(Re + d_); +} + + +// ************************************************************************* // diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NonSphereDrag/NonSphereDrag.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NonSphereDrag/NonSphereDrag.H new file mode 100644 index 0000000000..095805d5e5 --- /dev/null +++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NonSphereDrag/NonSphereDrag.H @@ -0,0 +1,142 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 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 + +Class + Foam::NonSphereDrag + +Description + Drag model for non-spherical particles. + + Takes the form of + + 24.0/Re*(1.0 + a_*pow(Re, b_)) + Re*c_/(Re + d_); + + Where a(phi), b(phi), c(phi) and d(phi) are model coefficients, with phi + defined as: + + area of sphere with same volume as particle + phi = ------------------------------------------- + actual particle area + + Equation used is Eqn (11) of reference below - good to within 2 to 4 % of + RMS values from experiment. + + H and L also give a simplified model with greater error compared to + results from experiment - Eqn 12 - but since phi is presumed + constant, it offers little benefit. + + Reference: + @verbatim + "Drag coefficient and terminal velocity of spherical and nonspherical + particles" + A. Haider and O. Levenspiel, + Powder Technology + Volume 58, Issue 1, May 1989, Pages 63-70 + @endverbatim + + +\*---------------------------------------------------------------------------*/ + +#ifndef NonSphereDrag_H +#define NonSphereDrag_H + +#include "DragModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +/*---------------------------------------------------------------------------*\ + Class NonSphereDrag Declaration +\*---------------------------------------------------------------------------*/ + +template +class NonSphereDrag +: + public DragModel +{ +protected: + + // Protected Data + + //- Flag to indicate `Simple model' + bool simpleModel_; + + //- Ratio of surface of sphere having same volume as particle to + // actual surface area of particle (0 < phi <= 1) + scalar phi_; + + + // Model coefficients + + scalar a_; + + scalar b_; + + scalar c_; + + scalar d_; + + +public: + + //- Runtime type information + TypeName("NonSphereDrag"); + + + // Constructors + + //- Construct from dictionary + NonSphereDrag(const dictionary& dict, CloudType& owner); + + + //- Destructor + virtual ~NonSphereDrag(); + + + // Member Functions + + //- Flag to indicate whether model activates drag model + bool active() const; + + //- Return drag coefficient + scalar Cd(const scalar Re) const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository +# include "NonSphereDrag.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C index fafc2e3cb7..ba4253bfc9 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C @@ -30,11 +30,11 @@ License template Foam::SphereDrag::SphereDrag ( - const dictionary& dict, + const dictionary&, CloudType& owner ) : - DragModel(dict, owner) + DragModel(owner) {} From 8845442bfd0ecaf792752b719a5c0ca4880299cd Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 20 Oct 2010 09:40:09 +0100 Subject: [PATCH 09/83] ENH: Moved random class into random subfolder --- src/OpenFOAM/Make/files | 2 +- src/OpenFOAM/primitives/random/{ => Random}/Random.C | 0 src/OpenFOAM/primitives/random/{ => Random}/Random.H | 0 src/OpenFOAM/primitives/random/{ => Random}/random.3 | 0 src/OpenFOAM/primitives/random/{ => Random}/random.c | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename src/OpenFOAM/primitives/random/{ => Random}/Random.C (100%) rename src/OpenFOAM/primitives/random/{ => Random}/Random.H (100%) rename src/OpenFOAM/primitives/random/{ => Random}/random.3 (100%) rename src/OpenFOAM/primitives/random/{ => Random}/random.c (100%) diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index 97513b339d..32249f8da4 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -61,7 +61,7 @@ sha1 = primitives/hashes/SHA1 $(sha1)/SHA1.C $(sha1)/SHA1Digest.C -primitives/random/Random.C +primitives/random/Random/Random.C containers/HashTables/HashTable/HashTableCore.C containers/HashTables/StaticHashTable/StaticHashTableCore.C diff --git a/src/OpenFOAM/primitives/random/Random.C b/src/OpenFOAM/primitives/random/Random/Random.C similarity index 100% rename from src/OpenFOAM/primitives/random/Random.C rename to src/OpenFOAM/primitives/random/Random/Random.C diff --git a/src/OpenFOAM/primitives/random/Random.H b/src/OpenFOAM/primitives/random/Random/Random.H similarity index 100% rename from src/OpenFOAM/primitives/random/Random.H rename to src/OpenFOAM/primitives/random/Random/Random.H diff --git a/src/OpenFOAM/primitives/random/random.3 b/src/OpenFOAM/primitives/random/Random/random.3 similarity index 100% rename from src/OpenFOAM/primitives/random/random.3 rename to src/OpenFOAM/primitives/random/Random/random.3 diff --git a/src/OpenFOAM/primitives/random/random.c b/src/OpenFOAM/primitives/random/Random/random.c similarity index 100% rename from src/OpenFOAM/primitives/random/random.c rename to src/OpenFOAM/primitives/random/Random/random.c From 610ae314b752b6d8bace16dd8a50421c7b987552 Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 20 Oct 2010 09:42:14 +0100 Subject: [PATCH 10/83] ENH: Added cachedRandom class --- src/OpenFOAM/Make/files | 1 + .../random/cachedRandom/cachedRandom.C | 159 +++++++++++++++ .../random/cachedRandom/cachedRandom.H | 182 ++++++++++++++++++ .../random/cachedRandom/cachedRandomI.H | 55 ++++++ .../cachedRandom/cachedRandomTemplates.C | 65 +++++++ 5 files changed, 462 insertions(+) create mode 100644 src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C create mode 100644 src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H create mode 100644 src/OpenFOAM/primitives/random/cachedRandom/cachedRandomI.H create mode 100644 src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files index 32249f8da4..531202fc8e 100644 --- a/src/OpenFOAM/Make/files +++ b/src/OpenFOAM/Make/files @@ -62,6 +62,7 @@ $(sha1)/SHA1.C $(sha1)/SHA1Digest.C primitives/random/Random/Random.C +primitives/random/cachedRandom/cachedRandom.H containers/HashTables/HashTable/HashTableCore.C containers/HashTables/StaticHashTable/StaticHashTableCore.C diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C new file mode 100644 index 0000000000..3865f60fe1 --- /dev/null +++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C @@ -0,0 +1,159 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 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 "cachedRandom.H" +#include + +#if INT_MAX != 2147483647 +# error "INT_MAX != 2147483647" +# error "The random number generator may not work!" +#endif + +// * * * * * * * * * * * * * private Member Functions * * * * * * * * * * * // + +Foam::scalar Foam::cachedRandom::scalar01() +{ + if (sampleI_ < 0) + { + return drand48(); + } + + if (sampleI_ == samples_.size() - 1) + { + scalar s = samples_[sampleI_]; + sampleI_ = 0; + return s; + } + else + { + scalar s = samples_[sampleI_]; + sampleI_++; + return s; + } +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::cachedRandom::cachedRandom(const label seed, const label count) +: + seed_(1), + samples_(0), + sampleI_(-1) +{ + if (seed > 1) + { + seed_ = seed; + } + + // Samples will be cached if count > 0 + if (count > 0) + { + samples_.setSize(count); + sampleI_ = 0; + } + + // Initialise samples + srand48(seed_); + forAll(samples_, i) + { + samples_[i] = drand48(); + } +} + + +Foam::cachedRandom::cachedRandom(const cachedRandom& cr, const bool reset) +: + seed_(cr.seed_), + samples_(cr.samples_), + sampleI_(cr.sampleI_) +{ + if (sampleI_ == -1) + { + WarningIn + ( + "Foam::cachedRandom::cachedRandom(const cachedRandom& cr)" + ) << "Copy constructor called, but samples not being cached. " + << "This may lead to non-repeatable behaviour" << endl; + + srand48(seed_); + } + else if (reset) + { + sampleI_ = 0; + } +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::cachedRandom::~cachedRandom() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +template<> +Foam::label Foam::cachedRandom::sample01() +{ + return round(scalar01()); +} + + +template<> +Foam::scalar Foam::cachedRandom::sample01() +{ + return scalar01(); +} + + +template<> +Foam::label Foam::cachedRandom::position(const label& start, const label& end) +{ + return start + round(scalar01()*(end - start)); +} + + +template<> +Foam::scalar Foam::cachedRandom::position +( + const scalar& start, + const scalar& end +) +{ + return start + scalar01()*(end - start); +} + + +void Foam::cachedRandom::operator=(const cachedRandom& cr) +{ + seed_ = cr.seed_; + samples_ = cr.samples_; + sampleI_ = cr.sampleI_; +} + + +// ************************************************************************* // diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H new file mode 100644 index 0000000000..76da5228e6 --- /dev/null +++ b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H @@ -0,0 +1,182 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2010-2010 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 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 + +Class + Foam::cachedRandom + +Description + Random number generator. + + Pre-computes and caches samples on construction, so that when sample01() + is called, the function simply returns the next (pre-computed) sample. On + reaching the last sample, the sample sequence is repeated. + + Constructed using a seed and sample count. If the supplied count is + negative, no caching is performed, and a new sample is generated on each + call to sample01(). + + Note: the copy constructor cannot be used if count = -1. + +SourceFiles + cachedRandomI.H + cachedRandom.C + cachedRandomTemplates.C + +\*---------------------------------------------------------------------------*/ + +#ifndef cachedRandom_H +#define cachedRandom_H + +#include "scalarList.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// Forward declaration of classes +class cachedRandom; + +/*---------------------------------------------------------------------------*\ + Class cachedRandom Declaration +\*---------------------------------------------------------------------------*/ + +class cachedRandom +{ +private: + + // Private data + + //- Initial random number seed + label seed_; + + //- List of scalar samples + scalarList samples_; + + //- Current sample marker + label sampleI_; + + + // Private Member Functions + + //- Returns the current sample + scalar scalar01(); + + +public: + + + // Constructors + + //- Construct given seed and sample count + cachedRandom(const label seed, const label count); + + //- Copy constructor with optional reset of sampleI + cachedRandom(const cachedRandom& cr, const bool reset = false); + + + // Destructor + ~cachedRandom(); + + + // Member functions + + // Access + + //- Return const access to the initial random number seed + inline label seed() const; + + //- Return const access to the list of samples + inline const scalarList& samples() const; + + //- Return the current sample marker + inline label sampleI() const; + + + // Manipulation + + //- Return non-const access to the sample marker + inline label& sampleI(); + + + // Evaluation + + //- Return a sample whose components lie in the range 0-1 + template + Type sample01(); + + //- Return a sample between start and end + template + Type position(const Type& start, const Type& end); + + //- Randomise value in the range 0-1 + template + void randomise01(Type& value); + + + // Operators + + //- Assignment operator + void operator=(const cachedRandom& cr); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// Template specialisations + +template<> +label cachedRandom::sample01