diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index 91f07d24db..968b1cedf6 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -50,16 +50,19 @@ void Foam::ReactingParcel::setCellValues if (pc_ < td.cloud().constProps().pMin()) { - WarningIn - ( - "void Foam::ReactingParcel::setCellValues" - "(" - "TrackData&, " - "const scalar, " - "const label" - ")" - ) << "Limiting observed pressure in cell " << cellI << " to " - << td.cloud().constProps().pMin() << nl << endl; + if (debug) + { + WarningIn + ( + "void Foam::ReactingParcel::setCellValues" + "(" + "TrackData&, " + "const scalar, " + "const label" + ")" + ) << "Limiting observed pressure in cell " << cellI << " to " + << td.cloud().constProps().pMin() << nl << endl; + } pc_ = td.cloud().constProps().pMin(); } @@ -86,54 +89,50 @@ void Foam::ReactingParcel::cellValueSourceCorrection return; } - scalar massCell = this->massCell(cellI); + const scalar massCell = this->massCell(cellI); - const scalar V = td.cloud().pMesh().cellVolumes()[cellI]; - this->rhoc_ += addedMass/V; + this->rhoc_ += addedMass/td.cloud().pMesh().cellVolumes()[cellI]; - scalar massCellNew = massCell + addedMass; + const scalar massCellNew = massCell + addedMass; this->Uc_ += td.cloud().UTrans()[cellI]/massCellNew; scalar CpEff = 0.0; - scalar CsEff = 0.0; - scalar Csc = 0.0; if (addedMass > ROOTVSMALL) { forAll(td.cloud().rhoTrans(), i) { scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass; CpEff += Y*td.cloud().composition().carrier().Cp(i, this->Tc_); - - scalar W = td.cloud().composition().carrier().W(i); - CsEff += td.cloud().rhoTrans(i)[cellI]/V*Y/W; - scalar Yc = td.cloud().composition().carrier().Y(i)[cellI]; - Csc += massCell/V*Yc/W; } } - CsEff = (massCell*Csc + addedMass*CsEff)/massCellNew; const scalar Cpc = td.CpInterp().psi()[cellI]; this->Cpc_ = (massCell*Cpc + addedMass*CpEff)/massCellNew; this->Tc_ += td.cloud().hsTrans()[cellI]/(this->Cpc_*massCellNew); - if (this->Tc_ < td.cloud().constProps().TMin()) + if (debug && (this->Tc_ < td.cloud().constProps().TMin())) { - WarningIn - ( - "void Foam::ReactingParcel::cellValueSourceCorrection" - "(" - "TrackData&, " - "const scalar, " - "const label" - ")" - ) << "Limiting observed temperature in cell " << cellI << " to " - << td.cloud().constProps().TMin() << nl << endl; + if (debug) + { + WarningIn + ( + "void Foam::ReactingParcel::" + "cellValueSourceCorrection" + "(" + "TrackData&, " + "const scalar, " + "const label" + ")" + ) << "Limiting observed temperature in cell " << cellI << " to " + << td.cloud().constProps().TMin() << nl << endl; + } this->Tc_ = td.cloud().constProps().TMin(); } - this->pc_ = CsEff*specie::RR*this->Tc_; +// constant pressure +// this->pc_ = this->pc_; } diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C index b95ba03f8c..153ac45fa6 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C @@ -49,16 +49,19 @@ void Foam::ThermoParcel::setCellValues if (Tc_ < td.cloud().constProps().TMin()) { - WarningIn - ( - "void Foam::ThermoParcel::setCellValues" - "(" - "TrackData&, " - "const scalar, " - "const label" - ")" - ) << "Limiting observed temperature in cell " << cellI << " to " - << td.cloud().constProps().TMin() << nl << endl; + if (debug) + { + WarningIn + ( + "void Foam::ThermoParcel::setCellValues" + "(" + "TrackData&, " + "const scalar, " + "const label" + ")" + ) << "Limiting observed temperature in cell " << cellI << " to " + << td.cloud().constProps().TMin() << nl << endl; + } Tc_ = td.cloud().constProps().TMin(); } @@ -81,16 +84,19 @@ void Foam::ThermoParcel::cellValueSourceCorrection if (Tc_ < td.cloud().constProps().TMin()) { - WarningIn - ( - "void Foam::ThermoParcel::cellValueSourceCorrection" - "(" - "TrackData&, " - "const scalar, " - "const label" - ")" - ) << "Limiting observed temperature in cell " << cellI << " to " - << td.cloud().constProps().TMin() << nl << endl; + if (debug) + { + WarningIn + ( + "void Foam::ThermoParcel::cellValueSourceCorrection" + "(" + "TrackData&, " + "const scalar, " + "const label" + ")" + ) << "Limiting observed temperature in cell " << cellI << " to " + << td.cloud().constProps().TMin() << nl << endl; + } Tc_ = td.cloud().constProps().TMin(); } @@ -116,21 +122,24 @@ void Foam::ThermoParcel::calcSurfaceValues if (Ts < td.cloud().constProps().TMin()) { - WarningIn - ( - "void Foam::ThermoParcel::calcSurfaceValues" - "(" - "TrackData&, " - "const label, " - "const scalar, " - "scalar&, " - "scalar&, " - "scalar&, " - "scalar&, " - "scalar&" - ") const" - ) << "Limiting parcel surface temperature to " - << td.cloud().constProps().TMin() << nl << endl; + if (debug) + { + WarningIn + ( + "void Foam::ThermoParcel::calcSurfaceValues" + "(" + "TrackData&, " + "const label, " + "const scalar, " + "scalar&, " + "scalar&, " + "scalar&, " + "scalar&, " + "scalar&" + ") const" + ) << "Limiting parcel surface temperature to " + << td.cloud().constProps().TMin() << nl << endl; + } Ts = td.cloud().constProps().TMin(); }