diff --git a/src/fvOptions/fvOptions/fvOption.C b/src/fvOptions/fvOptions/fvOption.C index 1a46a99794a25dd36132dca04e79be3130856857..bc68775f083ac40ea176b38e2c4c16416869b334 100644 --- a/src/fvOptions/fvOptions/fvOption.C +++ b/src/fvOptions/fvOptions/fvOption.C @@ -255,6 +255,7 @@ Foam::fv::option::option ) : name_(name), + modelType_(modelType), mesh_(mesh), dict_(dict), coeffs_(dict.subDict(modelType + "Coeffs")), diff --git a/src/fvOptions/fvOptions/fvOption.H b/src/fvOptions/fvOptions/fvOption.H index 28509ee4c0636cb66e86e5a78c353ea5fb65147b..a3cb760f5f9c7eed12d1b45239469641ecf66ed2 100644 --- a/src/fvOptions/fvOptions/fvOption.H +++ b/src/fvOptions/fvOptions/fvOption.H @@ -94,7 +94,10 @@ protected: // Protected data //- Source name - word name_; + const word name_; + + //- Model type + const word modelType_; //- Reference to the mesh database const fvMesh& mesh_; diff --git a/src/fvOptions/fvOptions/fvOptionIO.C b/src/fvOptions/fvOptions/fvOptionIO.C index c51b6b9b483e5acbb030c20e7c24056add040fc0..612a5fdd4a805dd76d1f7853f1d0a33b1b7e9456 100644 --- a/src/fvOptions/fvOptions/fvOptionIO.C +++ b/src/fvOptions/fvOptions/fvOptionIO.C @@ -96,7 +96,7 @@ bool Foam::fv::option::read(const dictionary& dict) dict.lookup("duration") >> duration_; } - coeffs_ = dict.subDict(type() + "Coeffs"); + coeffs_ = dict.subDict(modelType_ + "Coeffs"); return true; } diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C index 9b4beff0eeeb1929458ad0d1d3a0a961d0e3dc91..cbe7b18c9846e52629a3821ee07c9747f07281af 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C @@ -347,7 +347,7 @@ void Foam::ReactingMultiphaseParcel<ParcelType>::calc if (td.cloud().solution().coupled()) { - scalar dm = np0*mass1; + scalar dm = np0*mass0; // Absorb parcel into carrier phase forAll(YGas_, i) diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H index 5f1093b36d5a6216bfc16e2578606fa94906975e..98febeb510228ecef853da496f45ccd64ae583cf 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H @@ -124,7 +124,6 @@ public: const scalar Cp0, const scalar epsilon0, const scalar f0, - const scalar Pr, const scalar pMin, const Switch& constantVolume, const scalar TDevol diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H index 0b062a642622ac8fc734a62523712e0d0f12e31e..844766abd02c9d1faecf3927a687073da4b2c51c 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H @@ -100,7 +100,6 @@ constantProperties const scalar Cp0, const scalar epsilon0, const scalar f0, - const scalar Pr, const scalar pMin, const Switch& constantVolume, const scalar TDevol @@ -120,7 +119,6 @@ constantProperties Cp0, epsilon0, f0, - Pr, pMin, constantVolume ), diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index 9d9a4cdbe8554bd6cdd49b8188636ffc903b1905..553fb7ebfdf51521a7533b2c59a50a0b6fb283b4 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -516,7 +516,7 @@ void Foam::ReactingParcel<ParcelType>::calc if (td.cloud().solution().coupled()) { - scalar dm = np0*mass1; + scalar dm = np0*mass0; // Absorb parcel into carrier phase forAll(Y_, i) diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H index 2edffd92beb77278c58e902a0f5f5cbe64e6d9f4..2abf01ad16e113e1b6e906fe8c141def01d7c645 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H @@ -113,7 +113,6 @@ public: const scalar Cp0, const scalar epsilon0, const scalar f0, - const scalar Pr, const scalar pMin, const Switch& constantVolume ); diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H index fd5700f05b7a2951732a041f6b9d3b1be9d045af..c78e89cb450f05078f5a8dbf6c686be8f953806a 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H @@ -85,7 +85,6 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties const scalar Cp0, const scalar epsilon0, const scalar f0, - const scalar Pr, const scalar pMin, const Switch& constantVolume ) @@ -103,8 +102,7 @@ inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties TMax, Cp0, epsilon0, - f0, - Pr + f0 ), pMin_(pMin), constantVolume_(constantVolume) diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C index 5c1dd3566a6dd709efd957369c79bdaeb5e45c14..74ece702505eb89c42e01856fe7b40805884a179 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C @@ -151,12 +151,10 @@ void Foam::ThermoParcel<ParcelType>::calcSurfaceValues tetIndices tetIs = this->currentTetIndices(); mus = td.muInterp().interpolate(this->position(), tetIs)/TRatio; + kappas = td.kappaInterp().interpolate(this->position(), tetIs)/TRatio; - Pr = td.cloud().constProps().Pr(); + Pr = Cpc_*mus/kappas; Pr = max(ROOTVSMALL, Pr); - - kappas = Cpc_*mus/Pr; - kappas = max(ROOTVSMALL, kappas); } diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H index bf02ee118314508e663114e76962933e2fd3e062..f5afc1506ab95c8614019c8c842b79130ba8adcd 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H @@ -94,9 +94,6 @@ public: //- Particle scattering factor [] (radiation) scalar f0_; - //- Default carrier Prandtl number [] - scalar Pr_; - public: @@ -129,8 +126,7 @@ public: const scalar TMax, const scalar Cp0, const scalar epsilon0, - const scalar f0, - const scalar Pr + const scalar f0 ); @@ -161,9 +157,6 @@ public: //- Return const access to the particle scattering factor [] // Active for radiation only inline scalar f0() const; - - //- Return const access to the default carrier Prandtl number [] - inline scalar Pr() const; }; @@ -180,6 +173,10 @@ public: // Cp not stored on carrier thermo, but returned as tmp<...> const volScalarField Cp_; + //- Local copy of carrier thermal conductivity field + // kappa not stored on carrier thermo, but returned as tmp<...> + const volScalarField kappa_; + // Interpolators for continuous phase fields @@ -189,11 +186,13 @@ public: //- Specific heat capacity field interpolator autoPtr<interpolation<scalar> > CpInterp_; + //- Thermal conductivity field interpolator + autoPtr<interpolation<scalar> > kappaInterp_; + //- Radiation field interpolator autoPtr<interpolation<scalar> > GInterp_; - public: typedef typename ParcelType::template TrackingData<CloudType>::trackPart @@ -215,6 +214,9 @@ public: //- Return access to the locally stored carrier Cp field inline const volScalarField& Cp() const; + //- Return access to the locally stored carrier kappa field + inline const volScalarField& kappa() const; + //- Return const access to the interpolator for continuous // phase temperature field inline const interpolation<scalar>& TInterp() const; @@ -223,6 +225,10 @@ public: // phase specific heat capacity field inline const interpolation<scalar>& CpInterp() const; + //- Return const access to the interpolator for continuous + // phase thermal conductivity field + inline const interpolation<scalar>& kappaInterp() const; + //- Return const access to the interpolator for continuous // radiation field inline const interpolation<scalar>& GInterp() const; diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H index 73456a5519325bcc856eadc995f67f7f2ec6178f..05e9e68c179d6616626c5cc0592a6c53615bdddb 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H @@ -34,8 +34,7 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties() TMax_(VGREAT), Cp0_(0.0), epsilon0_(0.0), - f0_(0.0), - Pr_(0.0) + f0_(0.0) {} @@ -51,8 +50,7 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties TMax_(cp.TMax_), Cp0_(cp.Cp0_), epsilon0_(cp.epsilon0_), - f0_(cp.f0_), - Pr_(cp.Pr_) + f0_(cp.f0_) {} @@ -69,8 +67,7 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties TMax_(5000), Cp0_(0.0), epsilon0_(0.0), - f0_(0.0), - Pr_(0.0) + f0_(0.0) { if (readFields) { @@ -87,7 +84,6 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties this->dict().lookup("Cp0") >> Cp0_; this->dict().lookup("epsilon0") >> epsilon0_; this->dict().lookup("f0") >> f0_; - this->dict().lookup("Pr") >> Pr_; } } @@ -106,8 +102,7 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties const scalar TMax, const scalar Cp0, const scalar epsilon0, - const scalar f0, - const scalar Pr + const scalar f0 ) : ParcelType::constantProperties @@ -124,8 +119,7 @@ inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties TMax_(TMax), Cp0_(Cp0), epsilon0_(epsilon0), - f0_(f0), - Pr_(Pr) + f0_(f0) {} @@ -248,14 +242,6 @@ Foam::ThermoParcel<ParcelType>::constantProperties::f0() const } -template<class ParcelType> -inline Foam::scalar -Foam::ThermoParcel<ParcelType>::constantProperties::Pr() const -{ - return Pr_; -} - - // * * * * * * * * * * ThermoParcel Member Functions * * * * * * * * * * * * // template<class ParcelType> diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H index 34c30dd35667f2d6e4f4d14ce0bdcf292440f7b7..5b0c42ed87bfb63e255fecfc9361501e8ef0debb 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelTrackingDataI.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -33,6 +33,7 @@ inline Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::TrackingData : ParcelType::template TrackingData<CloudType>(cloud, part), Cp_(cloud.thermo().thermo().Cp()), + kappa_(cloud.thermo().thermo().kappa()), TInterp_ ( interpolation<scalar>::New @@ -49,6 +50,14 @@ inline Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::TrackingData Cp_ ) ), + kappaInterp_ + ( + interpolation<scalar>::New + ( + cloud.solution().interpolationSchemes(), + kappa_ + ) + ), GInterp_(NULL) { if (cloud.radiation()) @@ -75,6 +84,15 @@ Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::Cp() const } +template<class ParcelType> +template<class CloudType> +inline const Foam::volScalarField& +Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::kappa() const +{ + return kappa_; +} + + template<class ParcelType> template<class CloudType> inline const Foam::interpolation<Foam::scalar>& @@ -93,6 +111,15 @@ Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::CpInterp() const } +template<class ParcelType> +template<class CloudType> +inline const Foam::interpolation<Foam::scalar>& +Foam::ThermoParcel<ParcelType>::TrackingData<CloudType>::kappaInterp() const +{ + return kappaInterp_(); +} + + template<class ParcelType> template<class CloudType> inline const Foam::interpolation<Foam::scalar>& diff --git a/src/postProcessing/functionObjects/forces/forces/forces.C b/src/postProcessing/functionObjects/forces/forces/forces.C index ee739be63e92e8190f49a8a913449fc7c2c09c08..9830719c86cfe7e970fd6217c36010d1c41da5e5 100644 --- a/src/postProcessing/functionObjects/forces/forces/forces.C +++ b/src/postProcessing/functionObjects/forces/forces/forces.C @@ -512,7 +512,6 @@ Foam::forces::forces binDx_(0.0), binMin_(GREAT), binPoints_(), - binFormat_("undefined"), binCumulative_(true), initialised_(false) { @@ -573,7 +572,6 @@ Foam::forces::forces binDx_(0.0), binMin_(GREAT), binPoints_(), - binFormat_("undefined"), binCumulative_(true), initialised_(false) { @@ -702,8 +700,6 @@ void Foam::forces::read(const dictionary& dict) binPoints_[i] = (i + 0.5)*binDir_*binDx_; } - binDict.lookup("format") >> binFormat_; - binDict.lookup("cumulative") >> binCumulative_; // allocate storage for forces and moments diff --git a/src/postProcessing/functionObjects/forces/forces/forces.H b/src/postProcessing/functionObjects/forces/forces/forces.H index ce2bcf4fe76a3a77b875ac255850d4f3c4ae9870..c104284f0a850c2c8548bf362c7ed4097a361cda 100644 --- a/src/postProcessing/functionObjects/forces/forces/forces.H +++ b/src/postProcessing/functionObjects/forces/forces/forces.H @@ -208,9 +208,6 @@ protected: //- Bin positions along binDir List<point> binPoints_; - //- Write format for bin data - word binFormat_; - //- Should bin data be cumulative? bool binCumulative_; diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties index 1de9320ac1ad84e40ae98d77419d38d6289d429e..5408eb79286d532b22943152d2dd300a53e7df0d 100644 --- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties +++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/reactingCloud1Properties @@ -63,8 +63,6 @@ constantProperties epsilon0 1; f0 0.5; Pr 0.7; - Tvap 273; - Tbp 373; constantVolume false; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties index 1de9320ac1ad84e40ae98d77419d38d6289d429e..5408eb79286d532b22943152d2dd300a53e7df0d 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/reactingCloud1Properties @@ -63,8 +63,6 @@ constantProperties epsilon0 1; f0 0.5; Pr 0.7; - Tvap 273; - Tbp 373; constantVolume false; } diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties index 1de9320ac1ad84e40ae98d77419d38d6289d429e..5408eb79286d532b22943152d2dd300a53e7df0d 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/reactingCloud1Properties @@ -63,8 +63,6 @@ constantProperties epsilon0 1; f0 0.5; Pr 0.7; - Tvap 273; - Tbp 373; constantVolume false; } diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 689d846bac0305fa6e88f9019276a77866184547..c3e3442c2fbda1ecf5d4729f2cda5b757d4b70f4 100644 --- a/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -47,6 +47,7 @@ solution thermo:mu cell; T cell; Cp cell; + kappa cell; p cell; } @@ -70,7 +71,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; TDevol 273; LDevol 0; hRetentionCoeff 1; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 4f2f0020dc82692aa1dd57301954805796aaa7f1..7c71c8971e010aedd13939d95be5dcdaf2e804b7 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -41,6 +41,7 @@ solution thermo:mu cell; T cell; Cp cell; + kappa cell; p cell; G cell; } @@ -64,7 +65,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; TDevol 400; LDevol 0; hRetentionCoeff 1; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 1177f8fc321c5ec9277ae8a9816a8150dedf3f33..4b5b5393e4aa55f5cb6144b4a1398e7852cdd835 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -38,6 +38,7 @@ solution thermo:mu cell; U cellPoint; Cp cell; + kappa cell; T cell; G cell; } @@ -62,8 +63,6 @@ constantProperties epsilon0 1; f0 0.5; - - Pr 0.7; } subModels diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties index 041e9be531f3aa0b4cb634dc5813076d5b0eeef2..c96b27a4b431e83c8d3c072702116c8dabf64169 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/constant/reactingCloud1Properties @@ -41,6 +41,7 @@ solution thermo:mu cell; T cell; Cp cell; + kappa cell; p cell; } @@ -62,7 +63,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; constantVolume false; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties index 5cfe94ef379c0c9f73c86f0f96fa0cb4415943d4..e6afd3b55db5a2f4bb1a1fa6d6edfdebbffefeaf 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/constant/reactingCloud1Properties @@ -41,6 +41,7 @@ solution thermo:mu cell; T cell; Cp cell; + kappa cell; p cell; } @@ -62,7 +63,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; constantVolume false; } diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties index d3342565067111514ae3f949aa6075bd439b28ab..5652c17be95df699bfb9377eedd9fda9c9e05007 100644 --- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/constant/reactingCloud1Properties @@ -41,6 +41,7 @@ solution thermo:mu cell; T cell; Cp cell; + kappa cell; p cell; } @@ -62,7 +63,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; constantVolume false; } diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties index 4938ce470667c45f0695d8bcc85626c36d62ffb1..94ede2729a9786ded409557727a2f1594b191905 100644 --- a/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/filter/constant/reactingCloud1Properties @@ -41,6 +41,7 @@ solution thermo:mu cell; T cell; Cp cell; + kapppa cell; p cell; } @@ -64,7 +65,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; TDevol 273; LDevol 0; hRetentionCoeff 1; diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index f24057a445d25aaa6494f13a423e19766d0244fa..41fe1084d400bdb1b83d286911d2cd5b6e9536e0 100644 --- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -41,6 +41,7 @@ solution thermo:mu cell; T cell; Cp cell; + kappa cell; p cell; } @@ -64,7 +65,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; TDevol 284; LDevol 0; hRetentionCoeff 1; diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index be1d4e51042b1494f41ea42d7844b5b5ddf3df0f..70524de8a8dab2b8adf0a9a10b41004f51edfec1 100644 --- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -41,6 +41,7 @@ solution thermo:mu cell; T cell; Cp cell; + kappa cell; p cell; } @@ -64,7 +65,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; TDevol 273; LDevol 0; hRetentionCoeff 1; diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 689d846bac0305fa6e88f9019276a77866184547..c3e3442c2fbda1ecf5d4729f2cda5b757d4b70f4 100644 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -47,6 +47,7 @@ solution thermo:mu cell; T cell; Cp cell; + kappa cell; p cell; } @@ -70,7 +71,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; TDevol 273; LDevol 0; hRetentionCoeff 1; diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties index 54f3e4dd33606aa232d16eed8408598b4df2343c..b0989cc8b9d477ceadf413ca4ed3a7ef8a056a1e 100644 --- a/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties +++ b/tutorials/lagrangian/sprayFoam/aachenBomb/constant/sprayCloudProperties @@ -41,6 +41,7 @@ solution thermo:mu cell; T cell; Cp cell; + kappa cell; p cell; } @@ -67,7 +68,6 @@ constantProperties epsilon0 1; f0 0.5; - Pr 0.7; constantVolume false; }