diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C index cbe13fd0d2..49f9016dc1 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshVolume.C @@ -359,4 +359,5 @@ vtkUnstructuredGrid* Foam::vtkPV3Foam::volumeVTKMesh return vtkmesh; } + // ************************************************************************* // diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C index 3151813864..14c5da92c2 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C @@ -38,7 +38,6 @@ Description // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - vtkPolyData* Foam::vtkPV3Foam::faceZoneVTKMesh ( const fvMesh& mesh, @@ -111,7 +110,6 @@ vtkPolyData* Foam::vtkPV3Foam::faceZoneVTKMesh } - vtkPolyData* Foam::vtkPV3Foam::pointZoneVTKMesh ( const fvMesh& mesh, @@ -148,4 +146,5 @@ vtkPolyData* Foam::vtkPV3Foam::pointZoneVTKMesh return vtkmesh; } + // ************************************************************************* // diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C index 310a12efdf..59e445e341 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUpdateInfo.C @@ -519,6 +519,5 @@ void Foam::vtkPV3Foam::updateInfoLagrangianFields() } } -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // ************************************************************************* // diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C index 9d37d2e1bf..aff0ea4eec 100644 --- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C +++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3FoamUtilities.C @@ -338,4 +338,5 @@ void Foam::vtkPV3Foam::printMemory() } } + // ************************************************************************* // diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties new file mode 100644 index 0000000000..1dcc0258d5 --- /dev/null +++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties @@ -0,0 +1,25 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5.x | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object particleTrackProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +cloudName reactingCloud1; + +sampleFrequency 1; + +maxPositions 1000000; + + +// ************************************************************************* // diff --git a/bin/foamTemplates/source/foamTemplate.C b/bin/foamTemplates/source/foamTemplate.C index 903fe66b5f..1f86ef69f8 100644 --- a/bin/foamTemplates/source/foamTemplate.C +++ b/bin/foamTemplates/source/foamTemplate.C @@ -31,7 +31,13 @@ License const dataType Foam::className::staticData(); -// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * // +// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // + + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + + +// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -71,12 +77,6 @@ Foam::className::~className() {} -// * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // - - -// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * // - - // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // diff --git a/bin/foamTemplates/source/newSource b/bin/foamTemplates/source/newSource old mode 100644 new mode 100755 diff --git a/src/conversion/meshTables/remappingDict b/src/conversion/meshTables/remappingDict index 1a53982f79..bde8b0b38a 100644 --- a/src/conversion/meshTables/remappingDict +++ b/src/conversion/meshTables/remappingDict @@ -1,9 +1,9 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | -| \\ / A nd | | -| \\/ M anipulation | www.OpenFOAM.org | +| \\ / O peration | Version: 1.5.x | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { diff --git a/src/conversion/polyDualMesh/polyDualMesh.C b/src/conversion/polyDualMesh/polyDualMesh.C index 0db23c7ed6..1332d90fd4 100644 --- a/src/conversion/polyDualMesh/polyDualMesh.C +++ b/src/conversion/polyDualMesh/polyDualMesh.C @@ -1640,16 +1640,4 @@ Foam::polyDualMesh::~polyDualMesh() {} -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * Friend Functions * * * * * * * * * * * * * // - - -// * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // - - // ************************************************************************* // diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C index b1733762e5..8d388e6d66 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C @@ -298,7 +298,7 @@ void Foam::ReactingParcel::calcPhaseChange dt, cellI, d, - T, + min(T, td.constProps().Tbp()), // Limit to boiling temperature pc_, this->Tc_, this->muc_/(this->rhoc_ + ROOTVSMALL), diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H index 8e351f96f0..f17cd21171 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H @@ -91,6 +91,9 @@ public: //- Vaporisation temperature [K] const scalar Tvap_; + //- Boiling point [K] + const scalar Tbp_; + public: @@ -107,7 +110,10 @@ public: //- Return const access to the vaporisation temperature inline scalar Tvap() const; - }; + + //- Return const access to the boiling point + inline scalar Tbp() const; + }; //- Class used to pass reacting tracking data to the trackToFace function diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H index 5c2b3c7b2d..55aa90eb7e 100644 --- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H +++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H @@ -35,7 +35,8 @@ inline Foam::ReactingParcel::constantProperties::constantProperties ThermoParcel::constantProperties(parentDict), pMin_(dimensionedScalar(this->dict().lookup("pMin")).value()), constantVolume_(this->dict().lookup("constantVolume")), - Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value()) + Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value()), + Tbp_(dimensionedScalar(this->dict().lookup("Tbp")).value()) {} @@ -145,6 +146,14 @@ Foam::ReactingParcel::constantProperties::Tvap() const } +template +inline Foam::scalar +Foam::ReactingParcel::constantProperties::Tbp() const +{ + return Tbp_; +} + + // * * * * * * * * * * * trackData Member Functions * * * * * * * * * * * * // template diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C index 32191a8bfc..a0268ea59f 100644 --- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C @@ -41,19 +41,20 @@ namespace LESModels // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -muSgsWallFunctionFvPatchScalarField:: -muSgsWallFunctionFvPatchScalarField +muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF ) : - fixedValueFvPatchScalarField(p, iF) + fixedValueFvPatchScalarField(p, iF), + UName_("U"), + rhoName_("rho"), + muName_("mu") {} -muSgsWallFunctionFvPatchScalarField:: -muSgsWallFunctionFvPatchScalarField +muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField ( const muSgsWallFunctionFvPatchScalarField& ptf, const fvPatch& p, @@ -61,52 +62,49 @@ muSgsWallFunctionFvPatchScalarField const fvPatchFieldMapper& mapper ) : - fixedValueFvPatchScalarField(ptf, p, iF, mapper) + fixedValueFvPatchScalarField(ptf, p, iF, mapper), + UName_(ptf.UName_), + rhoName_(ptf.rhoName_), + muName_(ptf.muName_) {} -muSgsWallFunctionFvPatchScalarField:: -muSgsWallFunctionFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - Istream& is -) -: - fixedValueFvPatchScalarField(p, iF, is) -{} - - -muSgsWallFunctionFvPatchScalarField:: -muSgsWallFunctionFvPatchScalarField +muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, const dictionary& dict ) : - fixedValueFvPatchScalarField(p, iF, dict) + fixedValueFvPatchScalarField(p, iF, dict), + UName_(dict.lookupOrDefault("U", "U")), + rhoName_(dict.lookupOrDefault("rho", "rho")), + muName_(dict.lookupOrDefault("mu", "mu")) {} -muSgsWallFunctionFvPatchScalarField:: -muSgsWallFunctionFvPatchScalarField +muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField ( - const muSgsWallFunctionFvPatchScalarField& tppsf + const muSgsWallFunctionFvPatchScalarField& mwfpsf ) : - fixedValueFvPatchScalarField(tppsf) + fixedValueFvPatchScalarField(mwfpsf), + UName_(mwfpsf.UName_), + rhoName_(mwfpsf.rhoName_), + muName_(mwfpsf.muName_) {} -muSgsWallFunctionFvPatchScalarField:: -muSgsWallFunctionFvPatchScalarField +muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField ( - const muSgsWallFunctionFvPatchScalarField& tppsf, + const muSgsWallFunctionFvPatchScalarField& mwfpsf, const DimensionedField& iF ) : - fixedValueFvPatchScalarField(tppsf, iF) + fixedValueFvPatchScalarField(mwfpsf, iF), + UName_(mwfpsf.UName_), + rhoName_(mwfpsf.rhoName_), + muName_(mwfpsf.muName_) {} @@ -125,15 +123,15 @@ void muSgsWallFunctionFvPatchScalarField::evaluate const scalarField& ry = patch().deltaCoeffs(); const fvPatchVectorField& U = - patch().lookupPatchField("U"); + patch().lookupPatchField(UName_); scalarField magUp = mag(U.patchInternalField() - U); const scalarField& muw = - patch().lookupPatchField("mu"); + patch().lookupPatchField(muName_); const scalarField& rhow = - patch().lookupPatchField("rho"); + patch().lookupPatchField(rhoName_); scalarField& muSgsw = *this; @@ -143,13 +141,10 @@ void muSgsWallFunctionFvPatchScalarField::evaluate { scalar magUpara = magUp[facei]; - scalar utau = sqrt - ( - (muSgsw[facei] + muw[facei]) - *magFaceGradU[facei]/rhow[facei] - ); + scalar utau = + sqrt((muSgsw[facei] + muw[facei])*magFaceGradU[facei]/rhow[facei]); - if(utau > 0) + if (utau > 0) { int iter = 0; scalar err = GREAT; @@ -176,7 +171,11 @@ void muSgsWallFunctionFvPatchScalarField::evaluate } while (utau > VSMALL && err > 0.01 && ++iter < 10); muSgsw[facei] = - max(rhow[facei]*sqr(utau)/magFaceGradU[facei] - muw[facei],0.0); + max + ( + rhow[facei]*sqr(utau)/magFaceGradU[facei] - muw[facei], + 0.0 + ); } else { @@ -186,6 +185,16 @@ void muSgsWallFunctionFvPatchScalarField::evaluate } +void muSgsWallFunctionFvPatchScalarField::write(Ostream& os) const +{ + fvPatchField::write(os); + writeEntryIfDifferent(os, "U", "U", UName_); + writeEntryIfDifferent(os, "rho", "rho", rhoName_); + writeEntryIfDifferent(os, "mu", "mu", muName_); + writeEntry("value", os); +} + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // makePatchTypeField diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H index 916685fd7c..0f55216d51 100644 --- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H @@ -58,6 +58,15 @@ class muSgsWallFunctionFvPatchScalarField { // Private data + //- Name of velocity field + word UName_; + + //- Name of density field + word rhoName_; + + //- Name of laminar viscosity field + word muName_; + public: @@ -74,14 +83,6 @@ public: const DimensionedField& ); - //- Construct from patch, internal field and Istream - muSgsWallFunctionFvPatchScalarField - ( - const fvPatch&, - const DimensionedField&, - Istream& - ); - //- Construct from patch, internal field and dictionary muSgsWallFunctionFvPatchScalarField ( @@ -149,6 +150,11 @@ public: ( const Pstream::commsTypes commsType=Pstream::blocking ); + + // I-O + + //- Write + void write(Ostream&) const; }; diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C index cf78541322..36a3b819de 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C @@ -157,8 +157,6 @@ void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::evaluate patch().lookupPatchField(muName_); scalarField& mutw = *this; - scalarField magFaceGradU = mag(U.snGrad()); - if (roughnessHeight_ > 0.0) { // Rough Walls. diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C index 610c1bf96b..b5d7b80c6e 100644 --- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C @@ -48,7 +48,9 @@ nuSgsWallFunctionFvPatchScalarField const DimensionedField& iF ) : - fixedValueFvPatchScalarField(p, iF) + fixedValueFvPatchScalarField(p, iF), + UName_("U"), + nuName_("nu") {} @@ -61,7 +63,9 @@ nuSgsWallFunctionFvPatchScalarField const fvPatchFieldMapper& mapper ) : - fixedValueFvPatchScalarField(ptf, p, iF, mapper) + fixedValueFvPatchScalarField(ptf, p, iF, mapper), + UName_(ptf.UName_), + nuName_(ptf.nuName_) {} @@ -73,28 +77,34 @@ nuSgsWallFunctionFvPatchScalarField const dictionary& dict ) : - fixedValueFvPatchScalarField(p, iF, dict) + fixedValueFvPatchScalarField(p, iF, dict), + UName_(dict.lookupOrDefault("U", "U")), + nuName_(dict.lookupOrDefault("nu", "nu")) {} nuSgsWallFunctionFvPatchScalarField:: nuSgsWallFunctionFvPatchScalarField ( - const nuSgsWallFunctionFvPatchScalarField& tppsf + const nuSgsWallFunctionFvPatchScalarField& nwfpsf ) : - fixedValueFvPatchScalarField(tppsf) + fixedValueFvPatchScalarField(nwfpsf), + UName_(nwfpsf.UName_), + nuName_(nwfpsf.nuName_) {} nuSgsWallFunctionFvPatchScalarField:: nuSgsWallFunctionFvPatchScalarField ( - const nuSgsWallFunctionFvPatchScalarField& tppsf, + const nuSgsWallFunctionFvPatchScalarField& nwfpsf, const DimensionedField& iF ) : - fixedValueFvPatchScalarField(tppsf, iF) + fixedValueFvPatchScalarField(nwfpsf, iF), + UName_(nwfpsf.UName_), + nuName_(nwfpsf.nuName_) {} @@ -117,12 +127,12 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate const scalarField& ry = patch().deltaCoeffs(); const fvPatchVectorField& U = - patch().lookupPatchField("U"); + patch().lookupPatchField(UName_); scalarField magUp = mag(U.patchInternalField() - U); const scalarField& nuw = - patch().lookupPatchField("nu"); + patch().lookupPatchField(nuName_); scalarField& nuSgsw = *this; @@ -134,7 +144,7 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate scalar utau = sqrt((nuSgsw[facei] + nuw[facei])*magFaceGradU[facei]); - if(utau > VSMALL) + if (utau > VSMALL) { int iter = 0; scalar err = GREAT; @@ -171,6 +181,15 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate } +void nuSgsWallFunctionFvPatchScalarField::write(Ostream& os) const +{ + fvPatchField::write(os); + writeEntryIfDifferent(os, "U", "U", UName_); + writeEntryIfDifferent(os, "nu", "nu", nuName_); + writeEntry("value", os); +} + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // makePatchTypeField diff --git a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H index d3f06ece81..9db775556e 100644 --- a/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H @@ -58,6 +58,12 @@ class nuSgsWallFunctionFvPatchScalarField { // Private data + //- Name of velocity field + word UName_; + + //- Name of laminar viscosity field + word nuName_; + public: @@ -141,6 +147,12 @@ public: ( const Pstream::commsTypes commsType=Pstream::blocking ); + + + // I-O + + //- Write + void write(Ostream&) const; }; diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C index 4c8d457aff..35193acaf3 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C @@ -132,8 +132,6 @@ void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::evaluate patch().lookupPatchField(nuName_); scalarField& nutw = *this; - scalarField magFaceGradU = mag(U.snGrad()); - forAll(nutw, facei) { scalar magUpara = magUp[facei]; diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 7fcb35b37c..9af50d799d 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -55,6 +55,7 @@ constantProperties epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; f0 f0 [ 0 0 0 0 0 ] 0.5; 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; constantVolume true; diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties index 76e55a95ea..8f4467796d 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties @@ -51,6 +51,7 @@ constantProperties 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 Tvap [ 0 0 0 1 0 ] 373; constantVolume false; } diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties index ca03722b1c..fa4bbd94e6 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties @@ -21,10 +21,6 @@ radiationModel none; solverFreq 10; -noRadiation -{ -} - P1Coeffs { C C [ 0 0 0 0 0 0 0 ] 0; @@ -49,7 +45,10 @@ binaryAbsorptionEmissionCoeffs absorptionEmissionModel cloudAbsorptionEmission; cloudAbsorptionEmissionCoeffs { - cloudNames ( coalCloud1 limestoneCloud1 ); + cloudNames + ( + reactingCloud1 + ); } } } @@ -58,7 +57,10 @@ scatterModel cloudScatter; cloudScatterCoeffs { - cloudNames ( coalCloud1 limestoneCloud1 ); + cloudNames + ( + reactingCloud1 + ); } diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index 6a53da3143..38aa2b9837 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -51,6 +51,7 @@ constantProperties 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 Tvap [ 0 0 0 1 0 ] 373; constantVolume false; } @@ -72,7 +73,7 @@ integrationSchemes particleForces { - gravity on; + gravity off; virtualMass off; pressureGradient off; } diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict index 9aa53af3ad..9b8fb0ea7f 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/controlDict @@ -23,13 +23,13 @@ startTime 0; stopAt endTime; -endTime 1; +endTime 0.5; -deltaT 0.001; +deltaT 1e-03; writeControl adjustableRunTime; -writeInterval 0.1; +writeInterval 0.05; purgeWrite 0; @@ -49,7 +49,7 @@ adjustTimeStep yes; maxCo 0.3; -maxDeltaT 1e-3; +maxDeltaT 1e-03; // ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution index 294428ed7b..6811ddc336 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSolution @@ -33,8 +33,8 @@ solvers } p { - solver PBiCG; - preconditioner DILU; + solver PCG; + preconditioner DIC; tolerance 1e-06; relTol 0; } @@ -52,13 +52,6 @@ solvers tolerance 1e-06; relTol 0; } - CO2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } O2 { solver PBiCG; @@ -73,20 +66,6 @@ solvers tolerance 1e-06; relTol 0; } - CH4 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } - H2 - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } H2O { solver PBiCG; @@ -94,13 +73,6 @@ solvers tolerance 1e-06; relTol 0; } - CO - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-06; - relTol 0; - } h { solver PBiCG; @@ -108,13 +80,6 @@ solvers tolerance 1e-05; relTol 0; } - R - { - solver PBiCG; - preconditioner DILU; - tolerance 1e-05; - relTol 0; - } k { solver PBiCG; @@ -133,7 +98,7 @@ solvers PISO { - transonic yes; + transonic no; nCorrectors 2; nNonOrthogonalCorrectors 0; momentumPredictor yes;