From 08f2d3a123044f331c5149c3d8eb5c75d7185397 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 25 May 2009 10:00:40 +0200 Subject: [PATCH 001/172] buildParaViewFunctions - warn/ignore QMAKE_PATH if it points somewhere silly --- bin/tools/buildParaViewFunctions | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions index 5b3ae1fec9..f0873998af 100644 --- a/bin/tools/buildParaViewFunctions +++ b/bin/tools/buildParaViewFunctions @@ -173,7 +173,16 @@ addQtSupport() if [ -n "$QMAKE_PATH" ] then - addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=$QMAKE_PATH + if [ -x "$QMAKE_PATH" ] + then + addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=$QMAKE_PATH + else + echo + echo "specified QMAKE_PATH does not exist on this machine" + echo " QMAKE_PATH=$QMAKE_PATH" + echo "leaving unspecified" + echo + fi fi } From 9cc8fae278a1dd6c91bd1153d81818f4d84463ec Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 3 Jun 2009 13:59:40 +0200 Subject: [PATCH 002/172] upgrade to paraview-3.7-cvs --- etc/apps/paraview3/bashrc | 4 ++-- etc/apps/paraview3/cshrc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc index f49288b36e..48e9919734 100644 --- a/etc/apps/paraview3/bashrc +++ b/etc/apps/paraview3/bashrc @@ -46,8 +46,8 @@ do fi done -paraviewMajor=paraview-3.5 -export ParaView_VERSION=3.5-cvs +paraviewMajor=paraview-3.7 +export ParaView_VERSION=3.7-cvs export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc index 1c500f4962..d9ccffd81c 100644 --- a/etc/apps/paraview3/cshrc +++ b/etc/apps/paraview3/cshrc @@ -44,8 +44,8 @@ foreach cmake ( cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 ) endif end -set paraviewMajor=paraview-3.5 -setenv ParaView_VERSION 3.5-cvs +set paraviewMajor=paraview-3.7 +setenv ParaView_VERSION 3.7-cvs setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER From 7534cd17ef773adca9c9060f5cfb6bf6556992de Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 2 Jul 2009 14:54:37 +0200 Subject: [PATCH 003/172] improved backwardsCompatibility for compressible RASModel - read type "turbulentMixingLengthDissipationRateInlet" and write as "compressible::turbulentMixingLengthDissipationRateInlet" - read type "turbulentMixingLengthFrequencyInlet" and write as "compressible::turbulentMixingLengthFrequencyInlet" --- .../compressible/RAS/Make/files | 4 +- ...urbulentMixingLengthDissipationRateInlet.C | 156 +++++++++++++++++ ...urbulentMixingLengthDissipationRateInlet.H | 158 +++++++++++++++++ ...ilityTurbulentMixingLengthFrequencyInlet.C | 163 ++++++++++++++++++ ...ilityTurbulentMixingLengthFrequencyInlet.H | 162 +++++++++++++++++ .../backwardsCompatibilityWallFunctions.C | 0 .../backwardsCompatibilityWallFunctions.H | 0 ...wardsCompatibilityWallFunctionsTemplates.C | 0 ...entHeatFluxTemperatureFvPatchScalarField.C | 4 +- ...thDissipationRateInletFvPatchScalarField.H | 2 +- ...ngLengthFrequencyInletFvPatchScalarField.C | 2 +- ...ngLengthFrequencyInletFvPatchScalarField.H | 2 +- 12 files changed, 647 insertions(+), 6 deletions(-) create mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C create mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H create mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C create mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H rename src/turbulenceModels/compressible/RAS/{backwardsCompatibilityWallFunctions => backwardsCompatibility/wallFunctions}/backwardsCompatibilityWallFunctions.C (100%) rename src/turbulenceModels/compressible/RAS/{backwardsCompatibilityWallFunctions => backwardsCompatibility/wallFunctions}/backwardsCompatibilityWallFunctions.H (100%) rename src/turbulenceModels/compressible/RAS/{backwardsCompatibilityWallFunctions => backwardsCompatibility/wallFunctions}/backwardsCompatibilityWallFunctionsTemplates.C (100%) diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files index 4d00100ad6..56644ea6d3 100644 --- a/src/turbulenceModels/compressible/RAS/Make/files +++ b/src/turbulenceModels/compressible/RAS/Make/files @@ -37,6 +37,8 @@ derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFv derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C -backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C +backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C +backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C +backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C LIB = $(FOAM_LIBBIN)/libcompressibleRASModels diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C new file mode 100644 index 0000000000..83902514a0 --- /dev/null +++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C @@ -0,0 +1,156 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2006-2009 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 "backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H" +#include "addToRunTimeSelectionTable.H" +#include "fvPatchFieldMapper.H" +#include "surfaceFields.H" +#include "volFields.H" +#include "RASModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace compressible +{ + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField:: +backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF +) +: + fixedValueFvPatchField(p, iF), + mixingLength_(0.001) +{} + +backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField:: +backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField +( + const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchField(ptf, p, iF, mapper), + mixingLength_(ptf.mixingLength_) +{} + +backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField:: +backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict), + mixingLength_(readScalar(dict.lookup("mixingLength"))) +{} + +backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField:: +backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField +( + const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf +) +: + fixedValueFvPatchField(ptf), + mixingLength_(ptf.mixingLength_) +{} + +backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField:: +backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField +( + const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf, + const DimensionedField& iF +) +: + fixedValueFvPatchField(ptf, iF), + mixingLength_(ptf.mixingLength_) +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs() +{ + if (updated()) + { + return; + } + + // Lookup Cmu corresponding to the turbulence model selected + const RASModel& rasModel = db().lookupObject("RASProperties"); + + const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu")); + const scalar Cmu75 = pow(Cmu, 0.75); + + const fvPatchField& kp = + patch().lookupPatchField("k"); + + operator==(Cmu75*kp*sqrt(kp)/mixingLength_); + + fixedValueFvPatchField::updateCoeffs(); +} + + +void backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField::write +( + Ostream& os +) const +{ + // write with prefix for forwards compatibility + // mimic - fvPatchField::write(os); + + os.writeKeyword("type") + << "compressible::" << type() << token::END_STATEMENT << nl; + + os.writeKeyword("mixingLength") + << mixingLength_ << token::END_STATEMENT << nl; + writeEntry("value", os); +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +makePatchTypeField +( + fvPatchScalarField, + backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField +); + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace compressible +} // End namespace Foam + +// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H new file mode 100644 index 0000000000..fec530e1fc --- /dev/null +++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H @@ -0,0 +1,158 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2006-2009 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::compressible:: + backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField + +Description + Compatibility for the new namespace qualifier + Foam::compressible::turbulentMixingLengthDissipationRateInletFvPatchScalarField + +SourceFiles + backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C + +\*---------------------------------------------------------------------------*/ + +#ifndef backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet_H +#define backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet_H + +#include "fixedValueFvPatchFields.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace compressible +{ + +/*---------------------------------------------------------------------------*\ + Class backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField Declaration +\*---------------------------------------------------------------------------*/ + +class backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField +: + public fixedValueFvPatchScalarField +{ + // Private data + + //- turbulent length scale + scalar mixingLength_; + +public: + + //- Runtime type information + TypeName("turbulentMixingLengthDissipationRateInlet"); + + + // Constructors + + //- Construct from patch and internal field + backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField + ( + const fvPatch&, + const DimensionedField& + ); + + //- Construct from patch, internal field and dictionary + backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField + ( + const fvPatch&, + const DimensionedField&, + const dictionary& + ); + + //- Construct by mapping given + // backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField + // onto a new patch + backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField + ( + const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField&, + const fvPatch&, + const DimensionedField&, + const fvPatchFieldMapper& + ); + + //- Construct as copy + backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField + ( + const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField& + ); + + //- Construct and return a clone + virtual tmp clone() const + { + return tmp + ( + new backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField + ( + *this + ) + ); + } + + //- Construct as copy setting internal field reference + backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField + ( + const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField&, + const DimensionedField& + ); + + //- Construct and return a clone setting internal field reference + virtual tmp clone + ( + const DimensionedField& iF + ) const + { + return tmp + ( + new backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField + ( + *this, + iF + ) + ); + } + + + // Member functions + + //- Update the coefficients associated with the patch field + virtual void updateCoeffs(); + + //- Write + virtual void write(Ostream&) const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace compressible +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C new file mode 100644 index 0000000000..e9e1cd11b4 --- /dev/null +++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C @@ -0,0 +1,163 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2006-2009 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 "backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H" +#include "addToRunTimeSelectionTable.H" +#include "fvPatchFieldMapper.H" +#include "surfaceFields.H" +#include "volFields.H" +#include "RASModel.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace compressible +{ + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField:: +backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF +) +: + fixedValueFvPatchField(p, iF), + mixingLength_(0.0), + kName_("k") +{} + +backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField:: +backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField +( + const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField& ptf, + const fvPatch& p, + const DimensionedField& iF, + const fvPatchFieldMapper& mapper +) +: + fixedValueFvPatchField(ptf, p, iF, mapper), + mixingLength_(ptf.mixingLength_), + kName_(ptf.kName_) +{} + +backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField:: +backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField +( + const fvPatch& p, + const DimensionedField& iF, + const dictionary& dict +) +: + fixedValueFvPatchField(p, iF, dict), + mixingLength_(readScalar(dict.lookup("mixingLength"))), + kName_(dict.lookupOrDefault("k", "k")) +{} + +backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField:: +backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField +( + const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField& ptf +) +: + fixedValueFvPatchField(ptf), + mixingLength_(ptf.mixingLength_), + kName_(ptf.kName_) +{} + +backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField:: +backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField +( + const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField& ptf, + const DimensionedField& iF +) +: + fixedValueFvPatchField(ptf, iF), + mixingLength_(ptf.mixingLength_), + kName_(ptf.kName_) +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs() +{ + if (updated()) + { + return; + } + + // Lookup Cmu corresponding to the turbulence model selected + const RASModel& rasModel = db().lookupObject("RASProperties"); + + const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu")); + const scalar Cmu25 = pow(Cmu, 0.25); + + const fvPatchField& kp = + patch().lookupPatchField(kName_); + + operator==(sqrt(kp)/(Cmu25*mixingLength_)); + + fixedValueFvPatchField::updateCoeffs(); +} + + +void backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField::write +( + Ostream& os +) const +{ + // write with prefix for forwards compatibility + // mimic - fvPatchField::write(os); + + os.writeKeyword("type") + << "compressible::" << type() << token::END_STATEMENT << nl; + + os.writeKeyword("mixingLength") + << mixingLength_ << token::END_STATEMENT << nl; + + os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl; + writeEntry("value", os); +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +makePatchTypeField +( + fvPatchScalarField, + backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField +); + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace compressible +} // End namespace Foam + +// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H new file mode 100644 index 0000000000..ebe6e5445e --- /dev/null +++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H @@ -0,0 +1,162 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2006-2009 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::compressible:: + backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField + +Description + Compatibility for the new namespace qualifier + Foam::compressible::turbulentMixingLengthFrequencyInletFvPatchScalarField + +SourceFiles + backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField.C + +\*---------------------------------------------------------------------------*/ + +#ifndef compressiblebackwardsCompatibilityTurbulentMixingLengthFrequencyInlet_H +#define compressiblebackwardsCompatibilityTurbulentMixingLengthFrequencyInlet_H + +#include "fixedValueFvPatchFields.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace compressible +{ + +/*---------------------------------------------------------------------------*\ + Class backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField Declaration +\*---------------------------------------------------------------------------*/ + +class backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField +: + public fixedValueFvPatchScalarField +{ + // Private data + + //- Turbulent length scale + scalar mixingLength_; + + //- Name of the turbulent kinetic energy field + word kName_; + + +public: + + //- Runtime type information + TypeName("turbulentMixingLengthFrequencyInlet"); + + + // Constructors + + //- Construct from patch and internal field + backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField + ( + const fvPatch&, + const DimensionedField& + ); + + //- Construct from patch, internal field and dictionary + backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField + ( + const fvPatch&, + const DimensionedField&, + const dictionary& + ); + + //- Construct by mapping given + // backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField + // onto a new patch + backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField + ( + const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField&, + const fvPatch&, + const DimensionedField&, + const fvPatchFieldMapper& + ); + + //- Construct as copy + backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField + ( + const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField& + ); + + //- Construct and return a clone + virtual tmp clone() const + { + return tmp + ( + new backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField + ( + *this + ) + ); + } + + //- Construct as copy setting internal field reference + backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField + ( + const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField&, + const DimensionedField& + ); + + //- Construct and return a clone setting internal field reference + virtual tmp clone + ( + const DimensionedField& iF + ) const + { + return tmp + ( + new backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField + ( + *this, + iF + ) + ); + } + + + // Member functions + + //- Update the coefficients associated with the patch field + virtual void updateCoeffs(); + + //- Write + virtual void write(Ostream&) const; +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace compressible +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C similarity index 100% rename from src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C rename to src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.H b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H similarity index 100% rename from src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.H rename to src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C similarity index 100% rename from src/turbulenceModels/compressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C rename to src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C index bb43576ac8..2f54baf7c2 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C @@ -48,7 +48,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(p, iF), q_(p.size(), 0.0), - rhoName_("undefinedRho") + rhoName_("rho") {} @@ -77,7 +77,7 @@ turbulentHeatFluxTemperatureFvPatchScalarField : fixedGradientFvPatchScalarField(p, iF), q_("q", dict, p.size()), - rhoName_(dict.lookup("rho")) + rhoName_(dict.lookupOrDefault("rho", "rho")) { fvPatchField::operator=(patchInternalField()); gradient() = 0.0; diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H index 1eb669f06b..ac669c1bba 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H @@ -33,7 +33,7 @@ Description @verbatim inlet { - type turbulentMixingLengthDissipationRateInlet; + type compressible::turbulentMixingLengthDissipationRateInlet; mixingLength 0.005; // 5 mm value uniform 200; // placeholder } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C index 4032af3586..60a8e9c9e3 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C @@ -49,7 +49,7 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField : fixedValueFvPatchField(p, iF), mixingLength_(0.0), - kName_("undefined-k") + kName_("k") {} turbulentMixingLengthFrequencyInletFvPatchScalarField:: diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H index 45d8d2663c..ea49be141b 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H @@ -32,7 +32,7 @@ Description @verbatim inlet { - type turbulentMixingLengthFrequencyInlet; + type compressible::turbulentMixingLengthFrequencyInlet; mixingLength 0.005; // 5 mm k k; // turbulent k field value uniform 5; // initial value From 44e5615e05e933fef8469c3027d5f21fd9c58a87 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 3 Jul 2009 09:54:20 +0200 Subject: [PATCH 004/172] removed erroneous .directory file (dolphin), minor adjustment to .gitignore - in .gitignore, added other common build targets to be ignored. Finalized the move of wmkdep etc to wmake/utilbin/ --- .gitignore | 19 ++++++++++--------- .../basic/rhoThermo/.directory | 5 ----- 2 files changed, 10 insertions(+), 14 deletions(-) delete mode 100644 src/thermophysicalModels/basic/rhoThermo/.directory diff --git a/.gitignore b/.gitignore index b030d74e09..b124c8d887 100644 --- a/.gitignore +++ b/.gitignore @@ -27,18 +27,19 @@ core # dependency files - anywhere *.dep -# lnInclude folders - anywhere +# lnInclude (symlink) folders - anywhere lnInclude -# linux build folder(s) - anywhere -linux*Gcc* +# build folder(s) - anywhere +linux*Gcc*/ +linux*Icc*/ +linuxming*/ +SiCortex*Gcc*/ +solaris*Gcc*/ +SunOS*Gcc*/ -# reinstate wmake/rules that look like build folders -!wmake/rules/linux* - -# but do continue to ignore the derived wmake files -wmake/rules/*/dirToString -wmake/rules/*/wmkdep +# reinstate wmake/rules that might look like build folders +!wmake/rules/*/ # doxygen generated documentation doc/[Dd]oxygen/html diff --git a/src/thermophysicalModels/basic/rhoThermo/.directory b/src/thermophysicalModels/basic/rhoThermo/.directory deleted file mode 100644 index 72608b79a0..0000000000 --- a/src/thermophysicalModels/basic/rhoThermo/.directory +++ /dev/null @@ -1,5 +0,0 @@ -[Dolphin] -AdditionalInfo=3 -SortOrder=0 -Timestamp=2009,6,10,15,58,20 -ViewMode=1 From fd191e771f31fe34d9f187b9911d1cf9f45a36eb Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 9 Jul 2009 08:48:59 +0200 Subject: [PATCH 005/172] revert to paraview-3.6 (in name at least) --- etc/apps/paraview3/bashrc | 4 ++-- etc/apps/paraview3/cshrc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/apps/paraview3/bashrc b/etc/apps/paraview3/bashrc index 48e9919734..6536eb32ce 100644 --- a/etc/apps/paraview3/bashrc +++ b/etc/apps/paraview3/bashrc @@ -46,8 +46,8 @@ do fi done -paraviewMajor=paraview-3.7 -export ParaView_VERSION=3.7-cvs +paraviewMajor=paraview-3.6 +export ParaView_VERSION=3.6 export ParaView_INST_DIR=$WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION export ParaView_DIR=$ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER diff --git a/etc/apps/paraview3/cshrc b/etc/apps/paraview3/cshrc index d9ccffd81c..66c7e1a54f 100644 --- a/etc/apps/paraview3/cshrc +++ b/etc/apps/paraview3/cshrc @@ -44,8 +44,8 @@ foreach cmake ( cmake-2.6.4 cmake-2.6.2 cmake-2.4.6 ) endif end -set paraviewMajor=paraview-3.7 -setenv ParaView_VERSION 3.7-cvs +set paraviewMajor=paraview-3.6 +setenv ParaView_VERSION 3.6 setenv ParaView_INST_DIR $WM_THIRD_PARTY_DIR/paraview-$ParaView_VERSION setenv ParaView_DIR $ParaView_INST_DIR/platforms/$WM_ARCH$WM_COMPILER From d4d31594b1c385b2caf8aa67da9f2916bf9c10ff Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 9 Jul 2009 08:57:59 +0200 Subject: [PATCH 006/172] fixed inverted directory-test logic in IOobject.C --- src/OpenFOAM/db/IOobject/IOobject.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C index 0368b02e2e..1de0811573 100644 --- a/src/OpenFOAM/db/IOobject/IOobject.C +++ b/src/OpenFOAM/db/IOobject/IOobject.C @@ -36,7 +36,7 @@ defineTypeNameAndDebug(Foam::IOobject, 0); // Return components following the IOobject requirements // -// behaviour +// behaviour // input IOobject(instance, local, name) // ----- ------ // "foo" ("", "", "foo") @@ -58,7 +58,7 @@ bool Foam::IOobject::IOobject::fileNameComponents name.clear(); // called with directory - if (!isDir(path)) + if (isDir(path)) { WarningIn("IOobject::fileNameComponents(const fileName&, ...)") << " called with directory: " << path << "\n"; From 222d3e41f6327c3942ea6494bb857d065248c112 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 13 Jul 2009 09:27:38 +0200 Subject: [PATCH 007/172] porousZone - output 'note' entry (if it exists) too --- src/finiteVolume/cfdTools/general/porousMedia/porousZone.C | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C index f13e344375..34e85c2e27 100644 --- a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C +++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C @@ -370,6 +370,12 @@ void Foam::porousZone::writeDict(Ostream& os, bool subDict) const << indent << token::BEGIN_BLOCK << incrIndent << nl; } + if (dict_.found("note")) + { + os.writeKeyword("note") << string(dict_.lookup("note")) + << token::END_STATEMENT << nl; + } + coordSys_.writeDict(os, true); if (dict_.found("porosity")) From 0fa8ffcf7af9c7d30a33555bf5d8c4a751aca615 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 9 Jul 2009 08:57:59 +0200 Subject: [PATCH 008/172] fixed inverted directory-test logic in IOobject.C --- src/OpenFOAM/db/IOobject/IOobject.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C index 0368b02e2e..1de0811573 100644 --- a/src/OpenFOAM/db/IOobject/IOobject.C +++ b/src/OpenFOAM/db/IOobject/IOobject.C @@ -36,7 +36,7 @@ defineTypeNameAndDebug(Foam::IOobject, 0); // Return components following the IOobject requirements // -// behaviour +// behaviour // input IOobject(instance, local, name) // ----- ------ // "foo" ("", "", "foo") @@ -58,7 +58,7 @@ bool Foam::IOobject::IOobject::fileNameComponents name.clear(); // called with directory - if (!isDir(path)) + if (isDir(path)) { WarningIn("IOobject::fileNameComponents(const fileName&, ...)") << " called with directory: " << path << "\n"; From 7cbcc02d099aa24b4a509a1aa35016d428a6484e Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 10 Jul 2009 21:47:58 +0200 Subject: [PATCH 009/172] turbulence models get thermal dissipation source term(s) - thermalDissipation() corresponds to the energy lost due to viscous efffects and what exits the energy cascade via dissipation. - thermalDissipationEff() corresponds to the energy lost due to effective viscous efffects. Everything that is lost from momentum. Thus essentially assumes turbulent equilibrium, but is what STAR-CD and Fluent seem to be using. Thus even if it's wrong, provide it anyhow. - minor consistency update in comments --- .../compressible/LES/LESModel/LESModel.C | 50 +++++++++++++++ .../compressible/LES/LESModel/LESModel.H | 22 +++++-- .../compressible/RAS/RASModel/RASModel.C | 49 ++++++++++++++ .../compressible/RAS/RASModel/RASModel.H | 9 +++ .../compressible/RAS/laminar/laminar.C | 44 +++++++++++++ .../compressible/RAS/laminar/laminar.H | 30 +++++---- .../turbulenceModel/laminar/laminar.C | 64 ++++++++++++++----- .../turbulenceModel/laminar/laminar.H | 28 ++++++-- .../turbulenceModel/turbulenceModel.C | 6 -- .../turbulenceModel/turbulenceModel.H | 14 +++- .../incompressible/LES/LESModel/LESModel.C | 59 ++++++++++++++--- .../incompressible/LES/LESModel/LESModel.H | 24 +++++-- .../LES/dynOneEqEddy/dynOneEqEddy.C | 6 -- .../LES/dynOneEqEddy/dynOneEqEddy.H | 3 +- .../LES/dynSmagorinsky/dynSmagorinsky.C | 6 -- .../LES/dynSmagorinsky/dynSmagorinsky.H | 3 +- .../LES/locDynOneEqEddy/locDynOneEqEddy.C | 6 -- .../LES/locDynOneEqEddy/locDynOneEqEddy.H | 3 +- .../LES/scaleSimilarity/scaleSimilarity.C | 6 -- .../LES/scaleSimilarity/scaleSimilarity.H | 3 +- .../incompressible/RAS/RASModel/RASModel.C | 55 ++++++++++++++-- .../incompressible/RAS/RASModel/RASModel.H | 18 ++++-- .../incompressible/RAS/laminar/laminar.C | 50 +++++++++++++-- .../incompressible/RAS/laminar/laminar.H | 16 ++++- .../turbulenceModel/laminar/laminar.C | 44 +++++++++++++ .../turbulenceModel/laminar/laminar.H | 11 +++- .../turbulenceModel/turbulenceModel.C | 6 -- .../turbulenceModel/turbulenceModel.H | 12 +++- .../les/pitzDaily/constant/LESProperties | 2 + .../les/pitzDaily3D/constant/LESProperties | 2 + .../les/pitzDaily/constant/LESProperties | 2 + 31 files changed, 537 insertions(+), 116 deletions(-) diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C index 7301318b16..1bf5cc2b52 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C @@ -76,6 +76,7 @@ LESModel::LESModel ) ), + turbulence_(true), // TODO: turbulence_(lookup("turbulence")), printCoeffs_(lookupOrDefault("printCoeffs", false)), coeffDict_(subDictPtr(type + "Coeffs")), @@ -180,6 +181,55 @@ autoPtr LESModel::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +tmp LESModel::thermalDissipation() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipation", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( + ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + this->rho() * this->epsilon() + ) + ); +} + + +tmp LESModel::thermalDissipationEff() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipationEff", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( + this->muEff()*dev(twoSymm(tgradU())) + - ((2.0/3.0)*I) * this->rho() * this->k() + ) && tgradU() + ) + ); +} + + void LESModel::correct(const tmp&) { delta_().correct(); diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H index ca87dd64ed..7a87a71315 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H @@ -33,13 +33,13 @@ Class Foam::compressible::LESModel Description - Class for all compressible flow LES SGS models. + Base class for all compressible flow LES SGS models. - This class defines the basic interface for a compressible flow SGS model, - and encapsulates data of value to all possible models. In particular - this includes references to all the dependent fields (rho, U, phi), - the physical viscosity mu, and the LESProperties dictionary, - which contains the model selection and model coefficients. + This class defines the basic interface for a compressible flow SGS + model, and encapsulates data of value to all possible models. + In particular this includes references to all the dependent fields + (rho, U, phi), the physical viscosity mu, and the LESProperties + dictionary, which contains the model selection and model coefficients. SourceFiles LESModel.C @@ -80,6 +80,7 @@ protected: // Protected data + Switch turbulence_; Switch printCoeffs_; dictionary coeffDict_; @@ -292,6 +293,15 @@ public: } + //- The source for the enthalpy equation resulting from + // viscous and turbulent dissipation + virtual tmp thermalDissipation() const; + + //- The source for the enthalpy equation resulting from + // the effective viscous dissipation + // (ie, when turbulent production and dissipation are in equilibrium) + virtual tmp thermalDissipationEff() const; + //- Correct Eddy-Viscosity and related properties. // This calls correct(const tmp& gradU) by supplying // gradU calculated locally. diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C index 5d46b78788..849f25f01a 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C @@ -191,6 +191,55 @@ autoPtr RASModel::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +tmp RASModel::thermalDissipation() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipation", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( + ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + this->rho() * this->epsilon() + ) + ); +} + + +tmp RASModel::thermalDissipationEff() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipationEff", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( + this->muEff()*dev(twoSymm(tgradU())) + - ((2.0/3.0)*I) * this->rho() * this->k() + ) && tgradU() + ) + ); +} + + scalar RASModel::yPlusLam(const scalar kappa, const scalar E) const { scalar ypl = 11.0; diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H index 7c787d8ceb..22295848d4 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H @@ -345,6 +345,15 @@ public: //- Return the source term for the momentum equation virtual tmp divDevRhoReff(volVectorField& U) const = 0; + //- The source for the enthalpy equation resulting from + // viscous and turbulent dissipation + virtual tmp thermalDissipation() const; + + //- The source for the enthalpy equation resulting from + // the effective viscous dissipation + // (ie, when turbulent production and dissipation are in equilibrium) + virtual tmp thermalDissipationEff() const; + //- Return yPlus for the given patch virtual tmp yPlus(const label patchI) const; diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C index 415dedee72..2f55ecdee5 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C @@ -177,6 +177,50 @@ tmp laminar::divDevRhoReff(volVectorField& U) const } +tmp laminar::thermalDissipation() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipation", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + ); +} + + +tmp laminar::thermalDissipationEff() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipationEff", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + ); +} + + bool laminar::read() { return RASModel::read(); diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H index cfd5e57352..1e26261da7 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.H @@ -30,7 +30,6 @@ Description SourceFiles laminar.C - laminarCorrect.C \*---------------------------------------------------------------------------*/ @@ -82,42 +81,51 @@ public: // Member Functions //- Return the turbulence viscosity, i.e. 0 for laminar flow - tmp mut() const; + virtual tmp mut() const; //- Return the effective viscosity, i.e. the laminar viscosity - tmp muEff() const + virtual tmp muEff() const { return tmp(new volScalarField("muEff", mu())); } //- Return the effective turbulent thermal diffusivity, // i.e. the laminar thermal diffusivity - tmp alphaEff() const + virtual tmp alphaEff() const { return tmp(new volScalarField("alphaEff", alpha())); } //- Return the turbulence kinetic energy, i.e. 0 for laminar flow - tmp k() const; + virtual tmp k() const; //- Return the turbulence kinetic energy dissipation rate, // i.e. 0 for laminar flow - tmp epsilon() const; + virtual tmp epsilon() const; //- Return the Reynolds stress tensor, i.e. 0 for laminar flow - tmp R() const; + virtual tmp R() const; //- Return the effective stress tensor, i.e. the laminar stress - tmp devRhoReff() const; + virtual tmp devRhoReff() const; //- Return the source term for the momentum equation - tmp divDevRhoReff(volVectorField& U) const; + virtual tmp divDevRhoReff(volVectorField& U) const; + + //- The source for the enthalpy equation resulting from + // viscous and turbulent dissipation + virtual tmp thermalDissipation() const; + + //- The source for the enthalpy equation resulting from + // the effective viscous dissipation + // (ie, when turbulent production and dissipation are in equilibrium) + virtual tmp thermalDissipationEff() const; //- Correct the laminar viscosity - void correct(); + virtual void correct(); //- Read RASProperties dictionary - bool read(); + virtual bool read(); }; diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C index c4213fdd8a..be8e2f1da6 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C @@ -52,10 +52,10 @@ laminar::laminar const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const basicThermo& thermoPhysicalModel + const basicThermo& thermophysicalModel ) : - turbulenceModel(rho, U, phi, thermoPhysicalModel) + turbulenceModel(rho, U, phi, thermophysicalModel) {} @@ -66,10 +66,10 @@ autoPtr laminar::New const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const basicThermo& thermoPhysicalModel + const basicThermo& thermophysicalModel ) { - return autoPtr(new laminar(rho, U, phi, thermoPhysicalModel)); + return autoPtr(new laminar(rho, U, phi, thermophysicalModel)); } @@ -96,18 +96,6 @@ tmp laminar::mut() const } -tmp laminar::muEff() const -{ - return tmp(new volScalarField("muEff", mu())); -} - - -tmp laminar::alphaEff() const -{ - return tmp(new volScalarField("alphaEff", alpha())); -} - - tmp laminar::k() const { return tmp @@ -207,6 +195,50 @@ tmp laminar::divDevRhoReff(volVectorField& U) const } +tmp laminar::thermalDissipation() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipation", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + ); +} + + +tmp laminar::thermalDissipationEff() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipationEff", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + ); +} + + bool laminar::read() { return true; diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H index 7931e45bee..3b9b4d8fbd 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H @@ -67,7 +67,7 @@ public: const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const basicThermo& thermoPhysicalModel + const basicThermo& thermophysicalModel ); @@ -79,7 +79,7 @@ public: const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const basicThermo& thermoPhysicalModel + const basicThermo& thermophysicalModel ); @@ -94,10 +94,17 @@ public: virtual tmp mut() const; //- Return the effective viscosity, i.e. the laminar viscosity - virtual tmp muEff() const; + virtual tmp muEff() const + { + return tmp(new volScalarField("muEff", mu())); + } - //- Return the effective turbulent thermal diffusivity - virtual tmp alphaEff() const; + //- Return the effective turbulent thermal diffusivity, + // i.e. the laminar thermal diffusivity + virtual tmp alphaEff() const + { + return tmp(new volScalarField("alphaEff", alpha())); + } //- Return the turbulence kinetic energy, i.e. 0 for laminar flow virtual tmp k() const; @@ -109,12 +116,21 @@ public: //- Return the Reynolds stress tensor, i.e. 0 for laminar flow virtual tmp R() const; - //- Return the effective stress tensor including the laminar stress + //- Return the effective stress tensor, i.e. the laminar stress virtual tmp devRhoReff() const; //- Return the source term for the momentum equation virtual tmp divDevRhoReff(volVectorField& U) const; + //- The source for the enthalpy equation resulting from + // viscous and turbulent dissipation + virtual tmp thermalDissipation() const; + + //- The source for the enthalpy equation resulting from + // the effective viscous dissipation + // (ie, when turbulent production and dissipation are in equilibrium) + virtual tmp thermalDissipationEff() const; + //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C index 18f61ea286..15cce81cc1 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C +++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C @@ -117,12 +117,6 @@ autoPtr turbulenceModel::New } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -turbulenceModel::~turbulenceModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void turbulenceModel::correct() diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H index a3cce25b51..3e4ff24e43 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H +++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H @@ -65,7 +65,7 @@ namespace compressible { /*---------------------------------------------------------------------------*\ - Class turbulenceModel Declaration + Class turbulenceModel Declaration \*---------------------------------------------------------------------------*/ class turbulenceModel @@ -144,7 +144,8 @@ public: //- Destructor - virtual ~turbulenceModel(); + virtual ~turbulenceModel() + {} // Member Functions @@ -209,6 +210,15 @@ public: //- Return the source term for the momentum equation virtual tmp divDevRhoReff(volVectorField& U) const = 0; + //- The source for the enthalpy equation resulting from + // viscous and turbulent dissipation + virtual tmp thermalDissipation() const = 0; + + //- The source for the enthalpy equation resulting from + // the effective viscous dissipation + // (ie, when turbulent production and dissipation are in equilibrium) + virtual tmp thermalDissipationEff() const = 0; + //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct() = 0; diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C index 3ee9619340..62f18f3981 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C @@ -125,8 +125,8 @@ autoPtr LESModel::New { FatalErrorIn ( - "LESModel::select(const volVectorField&, const " - "surfaceScalarField&, transportModel&)" + "LESModel::New(const volVectorField& U, const " + "surfaceScalarField& phi, transportModel&)" ) << "Unknown LESModel type " << modelName << endl << endl << "Valid LESModel types are :" << endl @@ -138,14 +138,57 @@ autoPtr LESModel::New } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -LESModel::~LESModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +tmp LESModel::thermalDissipation() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipation", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( + ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + this->epsilon() + ) + ); +} + + +tmp LESModel::thermalDissipationEff() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipationEff", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( + this->nuEff()*dev(twoSymm(tgradU())) + - ((2.0/3.0)*I) * this->k() + ) && tgradU() + ) + ); +} + + void LESModel::correct(const tmp&) { turbulenceModel::correct(); diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H index 766cc63fc0..5c0c615eb6 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H @@ -35,10 +35,10 @@ Description Base class for all incompressible flow LES SGS models. This class defines the basic interface for an incompressible flow SGS - model, and encapsulates data of value to all possible models. In - particular this includes references to all the dependent fields (U, - phi), the physical viscosity nu, and the LESProperties - dictionary which contains the model selection and model coefficients. + model, and encapsulates data of value to all possible models. + In particular this includes references to all the dependent fields + (U, phi), the physical viscosity nu, and the LESProperties + dictionary, which contains the model selection and model coefficients. SourceFiles LESModel.C @@ -152,7 +152,8 @@ public: //- Destructor - virtual ~LESModel(); + virtual ~LESModel() + {} // Member Functions @@ -241,14 +242,23 @@ public: } - //- Correct Eddy-Viscosity and related properties - virtual void correct(const tmp& gradU); + //- The source for the enthalpy equation resulting from + // viscous and turbulent dissipation + virtual tmp thermalDissipation() const; + + //- The source for the enthalpy equation resulting from + // the effective viscous dissipation + // (ie, when turbulent production and dissipation are in equilibrium) + virtual tmp thermalDissipationEff() const; //- Correct Eddy-Viscosity and related properties. // This calls correct(const tmp& gradU) by supplying // gradU calculated locally. void correct(); + //- Correct Eddy-Viscosity and related properties + virtual void correct(const tmp& gradU); + //- Read LESProperties dictionary virtual bool read() = 0; }; diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C index 4342712d80..4aadf02bf2 100644 --- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C +++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C @@ -133,12 +133,6 @@ dynOneEqEddy::dynOneEqEddy } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -dynOneEqEddy::~dynOneEqEddy() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void dynOneEqEddy::correct(const tmp& gradU) diff --git a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H index 15f0ac56d1..9b1a4064d6 100644 --- a/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H +++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H @@ -116,7 +116,8 @@ public: //- Destructor - virtual ~dynOneEqEddy(); + virtual ~dynOneEqEddy() + {} // Member Functions diff --git a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C index e260a6d16d..fedd18ee7d 100644 --- a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C +++ b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C @@ -124,12 +124,6 @@ dynSmagorinsky::dynSmagorinsky } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -dynSmagorinsky::~dynSmagorinsky() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void dynSmagorinsky::correct(const tmp& gradU) diff --git a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H index 93e85a808b..b0bd7868f0 100644 --- a/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H +++ b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H @@ -125,7 +125,8 @@ public: //- Destructor - virtual ~dynSmagorinsky(); + virtual ~dynSmagorinsky() + {} // Member Functions diff --git a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C index 7d34bbb981..f463e3f208 100644 --- a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C +++ b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C @@ -126,12 +126,6 @@ locDynOneEqEddy::locDynOneEqEddy } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -locDynOneEqEddy::~locDynOneEqEddy() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void locDynOneEqEddy::correct(const tmp& gradU) diff --git a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H index 1ff8fc07dd..ef6a9edcff 100644 --- a/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H +++ b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H @@ -138,7 +138,8 @@ public: //- Destructor - virtual ~locDynOneEqEddy(); + virtual ~locDynOneEqEddy() + {} // Member Functions diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C index 0499ffca68..226054bf14 100644 --- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C +++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C @@ -56,12 +56,6 @@ scaleSimilarity::scaleSimilarity } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -scaleSimilarity::~scaleSimilarity() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // tmp scaleSimilarity::k() const diff --git a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H index 3f4f55535f..69d06a892c 100644 --- a/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H +++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H @@ -90,7 +90,8 @@ public: //- Destructor - virtual ~scaleSimilarity(); + virtual ~scaleSimilarity() + {} // Member Functions diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C index 272d0f60fe..4cc9fd07b9 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C @@ -174,14 +174,57 @@ autoPtr RASModel::New } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -RASModel::~RASModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // +tmp RASModel::thermalDissipation() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipation", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( + ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + this->epsilon() + ) + ); +} + + +tmp RASModel::thermalDissipationEff() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipationEff", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( + this->nuEff()*dev(twoSymm(tgradU())) + - ((2.0/3.0)*I) * this->k() + ) && tgradU() + ) + ); +} + + scalar RASModel::yPlusLam(const scalar kappa, const scalar E) const { scalar ypl = 11.0; diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H index c934488bb3..3a2f0aa7e9 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H @@ -182,7 +182,8 @@ public: //- Destructor - virtual ~RASModel(); + virtual ~RASModel() + {} // Member Functions @@ -310,9 +311,6 @@ public: ); } - //- Return yPlus for the given patch - virtual tmp yPlus(const label patchI) const; - //- Return the turbulence kinetic energy virtual tmp k() const = 0; @@ -328,6 +326,18 @@ public: //- Return the source term for the momentum equation virtual tmp divDevReff(volVectorField& U) const = 0; + //- The source for the enthalpy equation resulting from + // viscous and turbulent dissipation + virtual tmp thermalDissipation() const; + + //- The source for the enthalpy equation resulting from + // the effective viscous dissipation + // (ie, when turbulent production and dissipation are in equilibrium) + virtual tmp thermalDissipationEff() const; + + //- Return yPlus for the given patch + virtual tmp yPlus(const label patchI) const; + //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct() = 0; diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C index a88b319268..83e8913525 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C @@ -77,12 +77,6 @@ tmp laminar::nut() const } -tmp laminar::nuEff() const -{ - return tmp(new volScalarField("nuEff", nu())); -} - - tmp laminar::k() const { return tmp @@ -182,6 +176,50 @@ tmp laminar::divDevReff(volVectorField& U) const } +tmp laminar::thermalDissipation() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipation", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + ); +} + + +tmp laminar::thermalDissipationEff() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipationEff", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + ); +} + + bool laminar::read() { return RASModel::read(); diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H index b139f0fad3..1617d60064 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H @@ -83,7 +83,10 @@ public: virtual tmp nut() const; //- Return the effective viscosity, i.e. the laminar viscosity - virtual tmp nuEff() const; + virtual tmp nuEff() const + { + return tmp(new volScalarField("nuEff", nu())); + } //- Return the turbulence kinetic energy, i.e. 0 for laminar flow virtual tmp k() const; @@ -95,12 +98,21 @@ public: //- Return the Reynolds stress tensor, i.e. 0 for laminar flow virtual tmp R() const; - //- Return the effective stress tensor including the laminar stress + //- Return the effective stress tensor, i.e. the laminar stress virtual tmp devReff() const; //- Return the source term for the momentum equation virtual tmp divDevReff(volVectorField& U) const; + //- The source for the enthalpy equation resulting from + // viscous and turbulent dissipation + virtual tmp thermalDissipation() const; + + //- The source for the enthalpy equation resulting from + // the effective viscous dissipation + // (ie, when turbulent production and dissipation are in equilibrium) + virtual tmp thermalDissipationEff() const; + //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C index f1dca5b4ad..e3a9c30fd7 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C @@ -199,6 +199,50 @@ tmp laminar::divDevReff(volVectorField& U) const } +tmp laminar::thermalDissipation() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipation", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + ); +} + + +tmp laminar::thermalDissipationEff() const +{ + tmp tgradU = fvc::grad(this->U()); + + return tmp + ( + new volScalarField + ( + IOobject + ( + "thermalDissipationEff", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + ) + ); +} + + bool laminar::read() { return true; diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H index a64884da91..aa83346820 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H @@ -104,12 +104,21 @@ public: //- Return the Reynolds stress tensor, i.e. 0 for laminar flow virtual tmp R() const; - //- Return the effective stress tensor including the laminar stress + //- Return the effective stress tensor, i.e. the laminar stress virtual tmp devReff() const; //- Return the source term for the momentum equation virtual tmp divDevReff(volVectorField& U) const; + //- The source for the enthalpy equation resulting from + // viscous and turbulent dissipation + virtual tmp thermalDissipation() const; + + //- The source for the enthalpy equation resulting from + // the effective viscous dissipation + // (ie, when turbulent production and dissipation are in equilibrium) + virtual tmp thermalDissipationEff() const; + //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C index da4c39dcaa..cdbb61fa70 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C @@ -110,12 +110,6 @@ autoPtr turbulenceModel::New } -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -turbulenceModel::~turbulenceModel() -{} - - // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // void turbulenceModel::correct() diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H index 4399e85120..a9d1465e77 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H +++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H @@ -139,7 +139,8 @@ public: //- Destructor - virtual ~turbulenceModel(); + virtual ~turbulenceModel() + {} // Member Functions @@ -189,6 +190,15 @@ public: //- Return the source term for the momentum equation virtual tmp divDevReff(volVectorField& U) const = 0; + //- The source for the enthalpy equation resulting from + // viscous and turbulent dissipation + virtual tmp thermalDissipation() const = 0; + + //- The source for the enthalpy equation resulting from + // the effective viscous dissipation + // (ie, when turbulent production and dissipation are in equilibrium) + virtual tmp thermalDissipationEff() const = 0; + //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct() = 0; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties index 56c915c924..5e1ce2213a 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties @@ -19,6 +19,8 @@ LESModel oneEqEddy; delta cubeRootVol; +turbulence on; + printCoeffs on; laminarCoeffs diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties index 95bb1c14f8..a051384982 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties @@ -19,6 +19,8 @@ LESModel oneEqEddy; delta cubeRootVol; +turbulence on; + printCoeffs on; laminarCoeffs diff --git a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties index 25be4174a3..251fe1ae80 100644 --- a/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties +++ b/tutorials/compressible/rhoPisoFoam/les/pitzDaily/constant/LESProperties @@ -17,6 +17,8 @@ FoamFile LESModel oneEqEddy; +turbulence on; + printCoeffs on; delta cubeRootVol; From 043098fb7c1b3a35192bed54486b800e49fc85fa Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 10 Jul 2009 22:29:42 +0200 Subject: [PATCH 010/172] added dissipationSelector - first stab at a simple runtime selection for extra turbulence-related features - the code duplication seems to indicate that a common ancestor for compressible and incompressible turbulence models could be good --- .../compressible/turbulenceModel/Make/files | 1 + .../compressible/turbulenceModel/Make/options | 1 + .../dissipationSelector/dissipationSelector.C | 111 ++++++++++++ .../dissipationSelector/dissipationSelector.H | 158 ++++++++++++++++++ .../incompressible/turbulenceModel/Make/files | 1 + .../turbulenceModel/Make/options | 1 + .../dissipationSelector/dissipationSelector.C | 111 ++++++++++++ .../dissipationSelector/dissipationSelector.H | 158 ++++++++++++++++++ 8 files changed, 542 insertions(+) create mode 100644 src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C create mode 100644 src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.H create mode 100644 src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C create mode 100644 src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.H diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/files b/src/turbulenceModels/compressible/turbulenceModel/Make/files index 3f01b20354..d105907440 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/Make/files +++ b/src/turbulenceModels/compressible/turbulenceModel/Make/files @@ -1,4 +1,5 @@ turbulenceModel.C laminar/laminar.C +dissipationSelector/dissipationSelector.C LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModel diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/options b/src/turbulenceModels/compressible/turbulenceModel/Make/options index 65d3ed1e01..075a03796e 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/Make/options +++ b/src/turbulenceModels/compressible/turbulenceModel/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude LIB_LIBS = \ diff --git a/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C b/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C new file mode 100644 index 0000000000..aa630ee977 --- /dev/null +++ b/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C @@ -0,0 +1,111 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2009 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 "dissipationSelector.H" +#include "dictionary.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace compressible +{ + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +template<> +const char* NamedEnum::names[] = +{ + "none", + "cascade", + "equilibrium" +}; + +const NamedEnum + dissipationSelector::typeNames; + + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + + +dissipationSelector::dissipationSelector +( + const turbulenceModel& turbModel, + const treatment treatmentType +) +: + turbModel_(turbModel), + treatment_(treatmentType) +{} + + +dissipationSelector::dissipationSelector +( + const turbulenceModel& turbModel, + const dictionary& dict +) +: + turbModel_(turbModel), + treatment_(none) +{ + + word modelType; + + if (dict.readIfPresent("dissipation", modelType)) + { + treatment_ = typeNames[modelType]; + } +} + + +tmp +dissipationSelector::dissipation() const +{ + if (treatment_ == cascade) + { + return turbModel_.thermalDissipation(); + } + else if (treatment_ == equilibrium) + { + return turbModel_.thermalDissipationEff(); + } + else + { + // a bit wasteful, but we'll avoid it with 'enabled' query anyhow + tmp tField = turbModel_.thermalDissipation(); + tField() = 0.0; + + return tField; + } +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace compressible +} // End namespace Foam + +// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.H b/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.H new file mode 100644 index 0000000000..c1b440e4b6 --- /dev/null +++ b/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.H @@ -0,0 +1,158 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2009 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::compressible::dissipationSelector + +Description + Simplistic runtime selectable handling of thermal dissipation + + Example use: + @code + dissipationSelector thermalDissipation(turbulence, dictionary); + + fvScalarMatrix hEqn ( ... ); + + if (thermalDissipation.enabled()) + { + hEqn += thermalDissipation.dissipation(); + } + @endcode + +SourceFiles + dissipationSelector.C + +\*---------------------------------------------------------------------------*/ + +#ifndef compressibledissipationSelector_H +#define compressibledissipationSelector_H + +#include "NamedEnum.H" +#include "dictionary.H" +#include "compressible/turbulenceModel/turbulenceModel.H" +#include "volFields.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +namespace compressible +{ + +/*---------------------------------------------------------------------------*\ + Class dissipationSelector Declaration +\*---------------------------------------------------------------------------*/ + +class dissipationSelector +{ + +public: + + //- Type of treatment + enum treatment + { + none, + cascade, + equilibrium + }; + + static const NamedEnum typeNames; + +protected: + + // Protected data + + const turbulenceModel& turbModel_; + + //- Type of treatment + treatment treatment_; + +public: + + // Declare name of the class and its debug switch + ClassName("dissipationSelector"); + + + // Constructors + + //- Construct given treatment type + dissipationSelector + ( + const turbulenceModel&, + const treatment = none + ); + + //- Construct given treatment type + dissipationSelector + ( + const turbulenceModel&, + const dictionary& + ); + + + // Member functions + + //- Get the treatment type + treatment treatmentType() const + { + return treatment_; + } + + //- Set the treatment type, return old value + treatment treatmentType(const treatment val) + { + treatment old = treatment_; + treatment_ = val; + return old; + } + + + //- Set the treatment type, return old value + const char* name() const + { + return typeNames[treatment_]; + } + + //- Set the treatment type, return old value + bool enabled() const + { + return treatment_ != none; + } + + tmp dissipation() const; + +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace compressible +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/turbulenceModels/incompressible/turbulenceModel/Make/files b/src/turbulenceModels/incompressible/turbulenceModel/Make/files index a77efed2ab..1133b2aaab 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/Make/files +++ b/src/turbulenceModels/incompressible/turbulenceModel/Make/files @@ -1,4 +1,5 @@ turbulenceModel.C laminar/laminar.C +dissipationSelector/dissipationSelector.C LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModel diff --git a/src/turbulenceModels/incompressible/turbulenceModel/Make/options b/src/turbulenceModels/incompressible/turbulenceModel/Make/options index 6ade117347..2af4fa4baf 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/Make/options +++ b/src/turbulenceModels/incompressible/turbulenceModel/Make/options @@ -1,5 +1,6 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/turbulenceModels \ -I$(LIB_SRC)/transportModels LIB_LIBS = \ diff --git a/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C b/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C new file mode 100644 index 0000000000..07ca14c373 --- /dev/null +++ b/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C @@ -0,0 +1,111 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2009 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 "dissipationSelector.H" +#include "dictionary.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ +namespace incompressible +{ + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +template<> +const char* NamedEnum::names[] = +{ + "none", + "cascade", + "equilibrium" +}; + +const NamedEnum + dissipationSelector::typeNames; + + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + + +dissipationSelector::dissipationSelector +( + const turbulenceModel& turbModel, + const treatment treatmentType +) +: + turbModel_(turbModel), + treatment_(treatmentType) +{} + + +dissipationSelector::dissipationSelector +( + const turbulenceModel& turbModel, + const dictionary& dict +) +: + turbModel_(turbModel), + treatment_(none) +{ + + word modelType; + + if (dict.readIfPresent("dissipation", modelType)) + { + treatment_ = typeNames[modelType]; + } +} + + +tmp +dissipationSelector::dissipation() const +{ + if (treatment_ == cascade) + { + return turbModel_.thermalDissipation(); + } + else if (treatment_ == equilibrium) + { + return turbModel_.thermalDissipationEff(); + } + else + { + // a bit wasteful, but we'll avoid it with 'enabled' query anyhow + tmp tField = turbModel_.thermalDissipation(); + tField() = 0.0; + + return tField; + } +} + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace incompressible +} // End namespace Foam + +// ************************************************************************* // diff --git a/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.H b/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.H new file mode 100644 index 0000000000..9f2426c518 --- /dev/null +++ b/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.H @@ -0,0 +1,158 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2009 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::incompressible::dissipationSelector + +Description + Simplistic runtime selectable handling of thermal dissipation + + Example use: + @code + dissipationSelector thermalDissipation(turbulence, dictionary); + + fvScalarMatrix hEqn ( ... ); + + if (thermalDissipation.enabled()) + { + hEqn += thermalDissipation.dissipation(); + } + @endcode + +SourceFiles + dissipationSelector.C + +\*---------------------------------------------------------------------------*/ + +#ifndef dissipationSelector_H +#define dissipationSelector_H + +#include "NamedEnum.H" +#include "dictionary.H" +#include "incompressible/turbulenceModel/turbulenceModel.H" +#include "volFields.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +namespace incompressible +{ + +/*---------------------------------------------------------------------------*\ + Class dissipationSelector Declaration +\*---------------------------------------------------------------------------*/ + +class dissipationSelector +{ + +public: + + //- Type of treatment + enum treatment + { + none, + cascade, + equilibrium + }; + + static const NamedEnum typeNames; + +protected: + + // Protected data + + const turbulenceModel& turbModel_; + + //- Type of treatment + treatment treatment_; + +public: + + // Declare name of the class and its debug switch + ClassName("dissipationSelector"); + + + // Constructors + + //- Construct given treatment type + dissipationSelector + ( + const turbulenceModel&, + const treatment = none + ); + + //- Construct given treatment type + dissipationSelector + ( + const turbulenceModel&, + const dictionary& + ); + + + // Member functions + + //- Get the treatment type + treatment treatmentType() const + { + return treatment_; + } + + //- Set the treatment type, return old value + treatment treatmentType(const treatment val) + { + treatment old = treatment_; + treatment_ = val; + return old; + } + + + //- Set the treatment type, return old value + const char* name() const + { + return typeNames[treatment_]; + } + + //- Set the treatment type, return old value + bool enabled() const + { + return treatment_ != none; + } + + tmp dissipation() const; + +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace incompressible +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // From d01f653d3291b15c927cb7f05a013b9c37e6dc26 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 13 Jul 2009 09:27:38 +0200 Subject: [PATCH 011/172] porousZone - output 'note' entry (if it exists) too --- src/finiteVolume/cfdTools/general/porousMedia/porousZone.C | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C index f13e344375..34e85c2e27 100644 --- a/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C +++ b/src/finiteVolume/cfdTools/general/porousMedia/porousZone.C @@ -370,6 +370,12 @@ void Foam::porousZone::writeDict(Ostream& os, bool subDict) const << indent << token::BEGIN_BLOCK << incrIndent << nl; } + if (dict_.found("note")) + { + os.writeKeyword("note") << string(dict_.lookup("note")) + << token::END_STATEMENT << nl; + } + coordSys_.writeDict(os, true); if (dict_.found("porosity")) From 51d68d011a2676aa707b1cf81b5b571886bbba21 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 13 Jul 2009 14:37:36 +0100 Subject: [PATCH 012/172] adding example dictionary for particleTracks --- .../particleTracks/particleTrackProperties | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties 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; + + +// ************************************************************************* // From 3b14fad33c250817f8fcb9e465c6b7d7265dcb89 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 13 Jul 2009 14:38:29 +0100 Subject: [PATCH 013/172] header update --- src/conversion/meshTables/remappingDict | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 { From d8145ab60898bbf57926626e786e18339cdfc751 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 13 Jul 2009 14:38:56 +0100 Subject: [PATCH 014/172] cosmetics/coding style updates --- .../vtkPV3Foam/vtkPV3FoamMeshVolume.C | 1 + .../PV3FoamReader/vtkPV3Foam/vtkPV3FoamMeshZone.C | 3 +-- .../vtkPV3Foam/vtkPV3FoamUpdateInfo.C | 1 - .../vtkPV3Foam/vtkPV3FoamUtilities.C | 1 + src/conversion/polyDualMesh/polyDualMesh.C | 12 ------------ .../muSgsWallFunctionFvPatchScalarField.C | 15 ++++++++------- 6 files changed, 11 insertions(+), 22 deletions(-) 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/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/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C index 32191a8bfc..eee0b2c4c7 100644 --- a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C @@ -143,13 +143,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 +173,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 { From 5b09b44b1670dbee082b327564d58bbdefe55101 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 13 Jul 2009 16:08:58 +0200 Subject: [PATCH 015/172] sign change on thermalDissipation source (consistency with momentum source) - rename thermalDissipationEff() -> thermalDissipationEquilibrium() --- .../compressible/LES/LESModel/LESModel.C | 11 ++++++----- .../compressible/LES/LESModel/LESModel.H | 2 +- .../compressible/RAS/RASModel/RASModel.C | 11 ++++++----- .../compressible/RAS/RASModel/RASModel.H | 2 +- .../compressible/RAS/laminar/laminar.C | 8 ++++---- .../compressible/RAS/laminar/laminar.H | 2 +- .../dissipationSelector/dissipationSelector.C | 2 +- .../compressible/turbulenceModel/laminar/laminar.C | 8 ++++---- .../compressible/turbulenceModel/laminar/laminar.H | 2 +- .../compressible/turbulenceModel/turbulenceModel.H | 2 +- .../incompressible/LES/LESModel/LESModel.C | 11 ++++++----- .../incompressible/LES/LESModel/LESModel.H | 2 +- .../incompressible/RAS/RASModel/RASModel.C | 11 ++++++----- .../incompressible/RAS/RASModel/RASModel.H | 2 +- .../incompressible/RAS/laminar/laminar.C | 8 ++++---- .../incompressible/RAS/laminar/laminar.H | 2 +- .../dissipationSelector/dissipationSelector.C | 2 +- .../incompressible/turbulenceModel/laminar/laminar.C | 8 ++++---- .../incompressible/turbulenceModel/laminar/laminar.H | 2 +- .../incompressible/turbulenceModel/turbulenceModel.H | 2 +- 20 files changed, 52 insertions(+), 48 deletions(-) diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C index 1bf5cc2b52..2f35a8bfd2 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C @@ -197,15 +197,16 @@ tmp LESModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->rho() * this->epsilon() + ) + - this->rho() * this->epsilon() ) ); } -tmp LESModel::thermalDissipationEff() const +tmp LESModel::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -215,13 +216,13 @@ tmp LESModel::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( this->muEff()*dev(twoSymm(tgradU())) - ((2.0/3.0)*I) * this->rho() * this->k() ) && tgradU() diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H index 7a87a71315..8808c1e41a 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H @@ -300,7 +300,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Correct Eddy-Viscosity and related properties. // This calls correct(const tmp& gradU) by supplying diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C index 849f25f01a..9ce1db5ef9 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C @@ -207,15 +207,16 @@ tmp RASModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->rho() * this->epsilon() + ) + - this->rho() * this->epsilon() ) ); } -tmp RASModel::thermalDissipationEff() const +tmp RASModel::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -225,13 +226,13 @@ tmp RASModel::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( this->muEff()*dev(twoSymm(tgradU())) - ((2.0/3.0)*I) * this->rho() * this->k() ) && tgradU() diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H index 22295848d4..0e27f72924 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H @@ -352,7 +352,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Return yPlus for the given patch virtual tmp yPlus(const label patchI) const; diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C index 2f55ecdee5..a2ec1a7f3b 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C @@ -193,13 +193,13 @@ tmp laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp laminar::thermalDissipationEff() const +tmp laminar::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -209,13 +209,13 @@ tmp laminar::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H index 1e26261da7..f58db6c9e4 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.H @@ -119,7 +119,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C b/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C index aa630ee977..c15dc89b15 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C +++ b/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C @@ -90,7 +90,7 @@ dissipationSelector::dissipation() const } else if (treatment_ == equilibrium) { - return turbModel_.thermalDissipationEff(); + return turbModel_.thermalDissipationEquilibrium(); } else { diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C index be8e2f1da6..74b6b5fb06 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C @@ -211,13 +211,13 @@ tmp laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp laminar::thermalDissipationEff() const +tmp laminar::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -227,13 +227,13 @@ tmp laminar::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H index 3b9b4d8fbd..6bd3c5bdfa 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H @@ -129,7 +129,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H index 3e4ff24e43..8c80b4ab57 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H +++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H @@ -217,7 +217,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEff() const = 0; + virtual tmp thermalDissipationEquilibrium() const = 0; //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct() = 0; diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C index 62f18f3981..87d9f4fb41 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C @@ -156,15 +156,16 @@ tmp LESModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->epsilon() + ) + - this->epsilon() ) ); } -tmp LESModel::thermalDissipationEff() const +tmp LESModel::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -174,13 +175,13 @@ tmp LESModel::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( this->nuEff()*dev(twoSymm(tgradU())) - ((2.0/3.0)*I) * this->k() ) && tgradU() diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H index 5c0c615eb6..e5bd2545b8 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H @@ -249,7 +249,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Correct Eddy-Viscosity and related properties. // This calls correct(const tmp& gradU) by supplying diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C index 4cc9fd07b9..4d1d58db70 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C @@ -192,15 +192,16 @@ tmp RASModel::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) + this->epsilon() + ) + - this->epsilon() ) ); } -tmp RASModel::thermalDissipationEff() const +tmp RASModel::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -210,13 +211,13 @@ tmp RASModel::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( + - ( this->nuEff()*dev(twoSymm(tgradU())) - ((2.0/3.0)*I) * this->k() ) && tgradU() diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H index 3a2f0aa7e9..4d895ea53f 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H @@ -333,7 +333,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Return yPlus for the given patch virtual tmp yPlus(const label patchI) const; diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C index 83e8913525..a58d944196 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C @@ -192,13 +192,13 @@ tmp laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp laminar::thermalDissipationEff() const +tmp laminar::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -208,13 +208,13 @@ tmp laminar::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H index 1617d60064..7bb4ba1b7b 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H @@ -111,7 +111,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C b/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C index 07ca14c373..d9318d2a82 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C @@ -90,7 +90,7 @@ dissipationSelector::dissipation() const } else if (treatment_ == equilibrium) { - return turbModel_.thermalDissipationEff(); + return turbModel_.thermalDissipationEquilibrium(); } else { diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C index e3a9c30fd7..93fdbc813d 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C @@ -215,13 +215,13 @@ tmp laminar::thermalDissipation() const IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } -tmp laminar::thermalDissipationEff() const +tmp laminar::thermalDissipationEquilibrium() const { tmp tgradU = fvc::grad(this->U()); @@ -231,13 +231,13 @@ tmp laminar::thermalDissipationEff() const ( IOobject ( - "thermalDissipationEff", + "thermalDissipationEquilibrium", runTime_.timeName(), mesh_, IOobject::NO_READ, IOobject::NO_WRITE ), - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() + - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() ) ); } diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H index aa83346820..ba0c59201c 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H @@ -117,7 +117,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEff() const; + virtual tmp thermalDissipationEquilibrium() const; //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H index a9d1465e77..d6fa7f2ca2 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H +++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H @@ -197,7 +197,7 @@ public: //- The source for the enthalpy equation resulting from // the effective viscous dissipation // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEff() const = 0; + virtual tmp thermalDissipationEquilibrium() const = 0; //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct() = 0; From 7d06bbd26a5acce03231c8677c83ff97165f58b8 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 13 Jul 2009 16:53:28 +0100 Subject: [PATCH 016/172] removing redundant code --- ...SpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C | 2 -- .../nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C | 2 -- 2 files changed, 4 deletions(-) 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/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]; From 1c9e051ddc74bf946c06ed43c4a7397d80850a7e Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 13 Jul 2009 17:15:29 +0100 Subject: [PATCH 017/172] removed hard-coding for field names --- .../muSgsWallFunctionFvPatchScalarField.C | 72 ++++++++++--------- .../muSgsWallFunctionFvPatchScalarField.H | 22 +++--- .../nuSgsWallFunctionFvPatchScalarField.C | 39 +++++++--- .../nuSgsWallFunctionFvPatchScalarField.H | 12 ++++ 4 files changed, 95 insertions(+), 50 deletions(-) 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 eee0b2c4c7..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; @@ -187,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/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; }; From 27bcbc53ea28668debea49a4d2ada5c74250634e Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 13 Jul 2009 18:25:13 +0100 Subject: [PATCH 018/172] added +x permissions --- bin/foamTemplates/source/newSource | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/foamTemplates/source/newSource diff --git a/bin/foamTemplates/source/newSource b/bin/foamTemplates/source/newSource old mode 100644 new mode 100755 From beb66860e1a5ff60672d032ff36f670c77f0d6d0 Mon Sep 17 00:00:00 2001 From: andy Date: Mon, 13 Jul 2009 18:31:08 +0100 Subject: [PATCH 019/172] moved private and protected to above constructor --- bin/foamTemplates/source/foamTemplate.C | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 * * * * * * * * * * * * * * // From 61a8ed2cd12894dc3ec42a5b61161f13c062f9bf Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 14 Jul 2009 11:45:06 +0100 Subject: [PATCH 020/172] re-instating Tbp --- .../parcels/Templates/ReactingParcel/ReactingParcel.C | 2 +- .../parcels/Templates/ReactingParcel/ReactingParcel.H | 8 +++++++- .../Templates/ReactingParcel/ReactingParcelI.H | 11 ++++++++++- 3 files changed, 18 insertions(+), 3 deletions(-) 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 From a463585a7fd9b78ce2058567557544e3569eba8b Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 14 Jul 2009 11:45:52 +0100 Subject: [PATCH 021/172] tutorial updates --- .../constant/coalCloud1Properties | 1 + .../filter/constant/reactingCloud1Properties | 1 + .../constant/radiationProperties | 14 ++++--- .../constant/reactingCloud1Properties | 3 +- .../evaporationTest/system/controlDict | 8 ++-- .../evaporationTest/system/fvSolution | 41 ++----------------- 6 files changed, 19 insertions(+), 49 deletions(-) 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; From c3dcdcdc4aa7503d79f3474ad527594352b5b391 Mon Sep 17 00:00:00 2001 From: andy Date: Tue, 14 Jul 2009 13:04:30 +0100 Subject: [PATCH 022/172] cosmetics - code formatting --- .../isoSurface/sampledIsoSurface.C | 38 +++++++++---------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C index c2f32da1b6..235af8607a 100644 --- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C +++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C @@ -35,7 +35,13 @@ License namespace Foam { defineTypeNameAndDebug(sampledIsoSurface, 0); - addNamedToRunTimeSelectionTable(sampledSurface, sampledIsoSurface, word, isoSurface); + addNamedToRunTimeSelectionTable + ( + sampledSurface, + sampledIsoSurface, + word, + isoSurface + ); } // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -574,8 +580,7 @@ bool Foam::sampledIsoSurface::update() } -Foam::tmp -Foam::sampledIsoSurface::sample +Foam::tmp Foam::sampledIsoSurface::sample ( const volScalarField& vField ) const @@ -584,8 +589,7 @@ Foam::sampledIsoSurface::sample } -Foam::tmp -Foam::sampledIsoSurface::sample +Foam::tmp Foam::sampledIsoSurface::sample ( const volVectorField& vField ) const @@ -594,8 +598,7 @@ Foam::sampledIsoSurface::sample } -Foam::tmp -Foam::sampledIsoSurface::sample +Foam::tmp Foam::sampledIsoSurface::sample ( const volSphericalTensorField& vField ) const @@ -604,8 +607,7 @@ Foam::sampledIsoSurface::sample } -Foam::tmp -Foam::sampledIsoSurface::sample +Foam::tmp Foam::sampledIsoSurface::sample ( const volSymmTensorField& vField ) const @@ -614,8 +616,7 @@ Foam::sampledIsoSurface::sample } -Foam::tmp -Foam::sampledIsoSurface::sample +Foam::tmp Foam::sampledIsoSurface::sample ( const volTensorField& vField ) const @@ -624,8 +625,7 @@ Foam::sampledIsoSurface::sample } -Foam::tmp -Foam::sampledIsoSurface::interpolate +Foam::tmp Foam::sampledIsoSurface::interpolate ( const interpolation& interpolator ) const @@ -634,8 +634,7 @@ Foam::sampledIsoSurface::interpolate } -Foam::tmp -Foam::sampledIsoSurface::interpolate +Foam::tmp Foam::sampledIsoSurface::interpolate ( const interpolation& interpolator ) const @@ -643,8 +642,7 @@ Foam::sampledIsoSurface::interpolate return interpolateField(interpolator); } -Foam::tmp -Foam::sampledIsoSurface::interpolate +Foam::tmp Foam::sampledIsoSurface::interpolate ( const interpolation& interpolator ) const @@ -653,8 +651,7 @@ Foam::sampledIsoSurface::interpolate } -Foam::tmp -Foam::sampledIsoSurface::interpolate +Foam::tmp Foam::sampledIsoSurface::interpolate ( const interpolation& interpolator ) const @@ -663,8 +660,7 @@ Foam::sampledIsoSurface::interpolate } -Foam::tmp -Foam::sampledIsoSurface::interpolate +Foam::tmp Foam::sampledIsoSurface::interpolate ( const interpolation& interpolator ) const From ccee5806a3c48709d68a26d9f22cec420150645b Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Tue, 14 Jul 2009 15:56:19 +0200 Subject: [PATCH 023/172] added first draft of ReleaseNotes-1.6 - IMO we should retain ReleaseNotes-1.5 and distribute it with OpenFOAM-1.6 as well. --- ReleaseNotes-1.6 | 213 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 213 insertions(+) create mode 100644 ReleaseNotes-1.6 diff --git a/ReleaseNotes-1.6 b/ReleaseNotes-1.6 new file mode 100644 index 0000000000..3abe7072e2 --- /dev/null +++ b/ReleaseNotes-1.6 @@ -0,0 +1,213 @@ +# -*- mode: org; -*- +# +#+TITLE: OpenFOAM release notes for version 1.6 +#+AUTHOR: OpenCFD Ltd. +#+DATE: 29 August 2009 +#+LINK: http://www.opencfd.co.uk +#+OPTIONS: author:nil ^:{} + + +* Regular Expressions + + new regExp class: support for accessing POSIX extended regular + expresssions from within OpenFOAM. + + + new wordRe class: can contain a word or a regExp. + The match() method matches appropriately (as word or regExp). + + + new stringListOps: search string lists based on regular expressions, wordRe + or wordReList. + + + Istream and Ostream now retain backslashes when reading/writing strings. + The backslash continues to be used as an escape character for double-quote + and newline, but otherwise get passed through "as-is" without any other + special meaning (ie, they are *not* C-style strings). This especially + helps with input/output of regular expressions. + + +* Dictionary improvements/changes + + dictionaries can use words (unquoted) or regular expressions (quoted) + for their keywords. When searching, an exact match has priority + over a regular expression match. + + + The default inputMode is now 'merge', which corresponds to the most + general usage. The inputMode 'warn' corresponds to the previous default + behaviour. + + + The new inputMode 'protect' can be used to conditionally merge default + values into existing dictionaries. + + + new digest() method to calculate and return the SHA1 message digest + + +* Improved List containers + + It is now possible to append a UList to an existing List or DynamicList. + + + DynamicList is now much more flexible. It can be used with the append() + method, or with the setSize() method and operator[], as per List. + DynamicList also has more methods for adjusting the space allocated. + + + SortableList now uses stable sort and allows reverseSort as well. + SortableList is also more versatile - the indices mostly remain + unallocated until they are required in the sort() method. + The sort indices can be deallocated with the shrink() method. + Works as expected with transfer() and assignment from other Lists. + + + specialization for UList::operator[](..) const to return false for + out-of-range elements. This allows lazy evaluation with no noticeable + change in performance. + + + PackedList has much better performance, lazy evaluation and auto-vivify + of elements on assignment. Any auto-vivified elements will also + flood-fill the gaps with zero. The append() method can be used like in + DynamicList to append a single element. The set() method can be used + like in labelHashSet. + + + new UIndirectList for an indirect list without storing the addressing. + + +* New hashing algorithms + + Bob Jenkins' hash routine for performance improvement (5-10% faster for + string hashing than the previous algorithm) and fewer collisions. + + + SHA1 hashing and SHA1 message digests (NIST specification FIPS-180-1) + added. The SHA1 digest provides a compact (20 bytes) means of + determining if the contents of an object have changed. The OSHA1stream + can be used to calculate SHA1 digests for anything that can write to an + output stream. + + +* HashTable/HashSet improvements + + Performance improvements for querying on empty tables + + + The erase() method can take a list of keys or the keys from any + another HashTable/HashSet. + + + HashSet has an operator[]() const that allows the same syntax + to be used for boolList, PackedBoolList and labelHashSet. + + + HashSet has additional operators '+=', '-=', '&=' to add, remove or + intersect keys, respectively. + + +* Improved bool/Switch + + Switch: reduced the storage to be on par with bool. + It is now more flexible and behaves much more like a bool. + + + bool: IO uses Switch internally so the end-user doesn't need to know if + a particular class used bool or Switch internally. + + +* Miscellaneous container class improvments + + boost-style StaticAssert added. + Useful to catch invalid template sizes, for example. + + + various containers now have C++0x-style cbegin(), cend() iterator methods. + + + various containers now have STL-style empty() method, which may be more + readable than !size() or !valid(). + + + various containers now have an xfer() method for yielding their contents + to a corresponding Xfer class. + + +* New surfMesh library + Provides a more efficient storage mechanism than possible with triSurface + without restrictions on the shape of the face (templated parameter). + It will however take quite some time before it can fully replace triSurface. + + + MeshedSurface class: with zero or more contiguous surfZones. + + + UnsortedMeshedSurface class: unordered surface zones (as per triSurface) + + + surfMesh class: for reading/writing in native OpenFOAM format + + +* New Xfer class + Provides finer grained control over copying or transferring objects with + very little overhead. It can be used for any object that has a transfer() + method and a operator=() copy method. + Since it is decided upon construction of the Xfer object whether the + parameter is to be copied or transferred, the contents of the resulting + Xfer object can be transferred unconditionally. This greatly simplifies + defining constructors or methods in other classes with mixed + transfer/copy semantics without requiring 2^N different versions. + + + xferCopy(), xferMove() and xferCopyTo(), xferMoveTo() functions + to ease the use of the Xfer class. + + +* Improvements for functionObjects and time-looping + + The functionObjectList retains the order of the functionObject order, + which allows a chaining of operations. It is thus internally more + efficient when system/controlDict uses functions {..} instead of + functions (..), but the both forms are supported. + + + The functionObjects now have an additional end() method that gets called + when Time::loop() or Time::run() determines that the time-loop exits. + Accordingly, one of these two idioms should be used in solver code: + 1. while (runTime.loop() { ... } + 2. while (runTime.run()) { runTime++; ... } + + + functionObjectList now tracks the SHA1 message digest of the + sub-directories. This avoids reloading a functionObject when something + unrelated in system/controlDict changed. + + +* Solver control improvments + Use dictionary entries instead of an Istream for the solver controls. + + allows dictionary substitutions and regular expressions in + system/fvSolution + + + old solver control syntax is still supported (warning emitted), but the + foamUpgradeFvSolution application can be used to convert + system/fvSolution to the new format. + + +* Convenience changes + + IOobject: new constructor for creating an IOobject from a + single-path specification (eg, see blockMesh -dict option). + + + argList: convenience methods for accessing options more directly. + option(), optionFound(), optionLookup(), optionRead(), + optionReadIfPresent(). + + + readList(Istream&) can read a bracket-delimited list or handle a single + value as a list of size 1. This can be a useful convenience when + processing command-line options. + + +* Misc. improvements + + improved consistency and interoperability between face and triFace classes. + + + face::triangles() can split and append to a DynamicList + + + coordinateSystems can access global systems (similar to MeshObject) + + +* Improvements to utilities + + blockMesh: -dict option for specifying an alternative dictionary for the + block mesh description. The 'convertToMeters' entry is now optional, and + the alternative 'scale' entry can be used for less typing. + + + foamToEnsight: the -noPatches option suppresses generation of patches + + + foamToEnsightParts: the -noMesh option and the -index option can + be used when post-processing incrementally. + + + timeSelector: can combine -time ranges and -latestTime options. More + reliable behaviour for cases missing constant/ or 0/ directories. When + the -noZero option is available, -latestTime will not select the 0/ + directory unless the -zeroTime option is also given. This helps avoid + ill effects caused by accidentally using the 0/ directory for certain + utilities (eg, reconstructPar). + + +* Improvements to Paraview reader module + + PV3FoamReader: added mesh region handling. The region name is parsed + from the filename. Eg, case{region}.OpenFOAM + + + paraFoam: new -region option for specifying an alternative region. A new + -touch option to generate the .OpenFOAM file only. Only creates (and + removes) .OpenFOAM files if they didn't already exist, which is useful + in connection with the -touch option. + From bf60ede87830c798b5c86775b24f3ec0c7437c4a Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 14 Jul 2009 21:07:53 +0100 Subject: [PATCH 024/172] Updates to tutorials --- ReleaseNotes-1.5 => ReleaseNotes-1.6 | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/0/K | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/0/T | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/0/U | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/0/alphat | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/0/cp | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/0/epsilon | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/0/k | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/0/p | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/0/rho | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/Allclean | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/Allrun | 0 .../snappyMultiRegionHeater}/constant/bottomAir/RASProperties | 0 .../snappyMultiRegionHeater}/constant/bottomAir/g | 0 .../constant/bottomAir/thermophysicalProperties | 0 .../constant/bottomAir/turbulenceProperties | 0 .../snappyMultiRegionHeater}/constant/polyMesh/blockMeshDict | 0 .../snappyMultiRegionHeater}/constant/polyMesh/boundary | 0 .../snappyMultiRegionHeater}/constant/regionProperties | 0 .../snappyMultiRegionHeater}/constant/topAir/RASProperties | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/constant/topAir/g | 0 .../constant/topAir/thermophysicalProperties | 0 .../snappyMultiRegionHeater}/constant/topAir/turbulenceProperties | 0 .../snappyMultiRegionHeater}/constant/triSurface/bottomAir.stl | 0 .../snappyMultiRegionHeater}/constant/triSurface/heater.stl | 0 .../snappyMultiRegionHeater}/constant/triSurface/leftSolid.stl | 0 .../snappyMultiRegionHeater}/constant/triSurface/rightSolid.stl | 0 .../snappyMultiRegionHeater}/constant/triSurface/topAir.stl | 0 .../snappyMultiRegionHeater}/makeCellSets.setSet | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/system/README | 0 .../system/bottomAir/changeDictionaryDict | 0 .../snappyMultiRegionHeater}/system/bottomAir/decomposeParDict | 0 .../snappyMultiRegionHeater}/system/bottomAir/fvSchemes | 0 .../snappyMultiRegionHeater}/system/bottomAir/fvSolution | 0 .../snappyMultiRegionHeater}/system/controlDict | 0 .../snappyMultiRegionHeater}/system/decomposeParDict | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/system/fvSchemes | 0 .../chtMultiRegionFoam/snappyMultiRegionHeater}/system/fvSolution | 0 .../snappyMultiRegionHeater}/system/heater/changeDictionaryDict | 0 .../snappyMultiRegionHeater}/system/heater/decomposeParDict | 0 .../snappyMultiRegionHeater}/system/heater/fvSchemes | 0 .../snappyMultiRegionHeater}/system/heater/fvSolution | 0 .../system/leftSolid/changeDictionaryDict | 0 .../snappyMultiRegionHeater}/system/leftSolid/decomposeParDict | 0 .../snappyMultiRegionHeater}/system/leftSolid/fvSchemes | 0 .../snappyMultiRegionHeater}/system/leftSolid/fvSolution | 0 .../system/rightSolid/changeDictionaryDict | 0 .../snappyMultiRegionHeater}/system/rightSolid/decomposeParDict | 0 .../snappyMultiRegionHeater}/system/rightSolid/fvSchemes | 0 .../snappyMultiRegionHeater}/system/rightSolid/fvSolution | 0 .../snappyMultiRegionHeater}/system/snappyHexMeshDict | 0 .../snappyMultiRegionHeater}/system/topAir/changeDictionaryDict | 0 .../snappyMultiRegionHeater}/system/topAir/decomposeParDict | 0 .../snappyMultiRegionHeater}/system/topAir/fvSchemes | 0 .../snappyMultiRegionHeater}/system/topAir/fvSolution | 0 55 files changed, 0 insertions(+), 0 deletions(-) rename ReleaseNotes-1.5 => ReleaseNotes-1.6 (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/0/K (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/0/T (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/0/U (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/0/alphat (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/0/cp (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/0/epsilon (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/0/k (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/0/p (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/0/rho (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/Allclean (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/Allrun (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/bottomAir/RASProperties (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/bottomAir/g (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/bottomAir/thermophysicalProperties (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/bottomAir/turbulenceProperties (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/polyMesh/blockMeshDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/polyMesh/boundary (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/regionProperties (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/topAir/RASProperties (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/topAir/g (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/topAir/thermophysicalProperties (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/topAir/turbulenceProperties (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/triSurface/bottomAir.stl (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/triSurface/heater.stl (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/triSurface/leftSolid.stl (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/triSurface/rightSolid.stl (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/constant/triSurface/topAir.stl (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/makeCellSets.setSet (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/README (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/bottomAir/changeDictionaryDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/bottomAir/decomposeParDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/bottomAir/fvSchemes (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/bottomAir/fvSolution (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/controlDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/decomposeParDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/fvSchemes (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/fvSolution (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/heater/changeDictionaryDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/heater/decomposeParDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/heater/fvSchemes (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/heater/fvSolution (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/leftSolid/changeDictionaryDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/leftSolid/decomposeParDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/leftSolid/fvSchemes (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/leftSolid/fvSolution (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/rightSolid/changeDictionaryDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/rightSolid/decomposeParDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/rightSolid/fvSchemes (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/rightSolid/fvSolution (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/snappyHexMeshDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/topAir/changeDictionaryDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/topAir/decomposeParDict (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/topAir/fvSchemes (100%) rename tutorials/{mesh/snappyHexMesh/multiRegionMesh => heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater}/system/topAir/fvSolution (100%) diff --git a/ReleaseNotes-1.5 b/ReleaseNotes-1.6 similarity index 100% rename from ReleaseNotes-1.5 rename to ReleaseNotes-1.6 diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/K b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/K rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/K diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/T b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/T rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/T diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/U b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/U rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/U diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/alphat b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/alphat similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/alphat rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/alphat diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/cp b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/cp rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/cp diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/epsilon b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/epsilon similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/epsilon rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/epsilon diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/k b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/k similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/k rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/k diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/p b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/p rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/p diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/0/rho b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/0/rho rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/0/rho diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allclean b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/Allclean rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allclean diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/Allrun rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/Allrun diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/RASProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/RASProperties diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/g similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/g rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/g diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/thermophysicalProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/thermophysicalProperties diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/bottomAir/turbulenceProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/bottomAir/turbulenceProperties diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/polyMesh/blockMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/polyMesh/blockMeshDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/blockMeshDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/polyMesh/boundary b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/polyMesh/boundary rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/polyMesh/boundary diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/regionProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/regionProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/regionProperties diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/RASProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/RASProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/RASProperties diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/g similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/g rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/g diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/thermophysicalProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/thermophysicalProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/thermophysicalProperties diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/turbulenceProperties b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/topAir/turbulenceProperties rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/topAir/turbulenceProperties diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/bottomAir.stl b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/bottomAir.stl similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/bottomAir.stl rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/bottomAir.stl diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/heater.stl b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/heater.stl similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/heater.stl rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/heater.stl diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/leftSolid.stl b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/leftSolid.stl similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/leftSolid.stl rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/leftSolid.stl diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/rightSolid.stl b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/rightSolid.stl similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/rightSolid.stl rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/rightSolid.stl diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/topAir.stl b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/topAir.stl similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/constant/triSurface/topAir.stl rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/constant/triSurface/topAir.stl diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/makeCellSets.setSet b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/makeCellSets.setSet similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/makeCellSets.setSet rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/makeCellSets.setSet diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/README b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/README similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/README rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/README diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/changeDictionaryDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/changeDictionaryDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/decomposeParDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/decomposeParDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/fvSchemes rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/bottomAir/fvSolution rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSolution diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/controlDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/controlDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/controlDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/decomposeParDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/decomposeParDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/fvSchemes rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSchemes diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/fvSolution rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/fvSolution diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/changeDictionaryDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/changeDictionaryDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/decomposeParDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/decomposeParDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/fvSchemes rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSchemes diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/heater/fvSolution rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/heater/fvSolution diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/changeDictionaryDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/changeDictionaryDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/decomposeParDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/decomposeParDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/fvSchemes rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSchemes diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/leftSolid/fvSolution rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/leftSolid/fvSolution diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/changeDictionaryDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/changeDictionaryDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/decomposeParDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/decomposeParDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/fvSchemes rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSchemes diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/rightSolid/fvSolution rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/rightSolid/fvSolution diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/snappyHexMeshDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/snappyHexMeshDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/snappyHexMeshDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/changeDictionaryDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/changeDictionaryDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/decomposeParDict b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/decomposeParDict rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/decomposeParDict diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/fvSchemes b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/fvSchemes rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes diff --git a/tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/fvSolution b/tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution similarity index 100% rename from tutorials/mesh/snappyHexMesh/multiRegionMesh/system/topAir/fvSolution rename to tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSolution From e7d9bf9a356244c0f8f658872e319ad0a702e6fe Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 14 Jul 2009 21:08:52 +0100 Subject: [PATCH 025/172] Force Unity Lewis number constraint by using alphaEff in b and ft equations. --- applications/solvers/combustion/XiFoam/UEqn.H | 2 ++ .../solvers/combustion/XiFoam/XiFoam.C | 20 +++++++++++-------- applications/solvers/combustion/XiFoam/bEqn.H | 4 ++-- .../solvers/combustion/XiFoam/ftEqn.H | 4 ++-- applications/solvers/combustion/XiFoam/hEqn.H | 5 ++++- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/applications/solvers/combustion/XiFoam/UEqn.H b/applications/solvers/combustion/XiFoam/UEqn.H index 2a7753e14e..9697c6e1ed 100644 --- a/applications/solvers/combustion/XiFoam/UEqn.H +++ b/applications/solvers/combustion/XiFoam/UEqn.H @@ -7,6 +7,8 @@ rho*g ); + UEqn.relax(); + if (momentumPredictor) { solve(UEqn == -fvc::grad(p)); diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index 4c544b433e..6e804be977 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/applications/solvers/combustion/XiFoam/XiFoam.C @@ -87,12 +87,12 @@ int main(int argc, char *argv[]) runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; - #include "rhoEqn.H" - #include "UEqn.H" - - // --- PISO loop - for (int corr=1; corr<=nCorr; corr++) + // --- Pressure-velocity PIMPLE corrector loop + for (int oCorr=0; oCorrcorrect(); + turbulence->correct(); + } rho = thermo.rho(); diff --git a/applications/solvers/combustion/XiFoam/bEqn.H b/applications/solvers/combustion/XiFoam/bEqn.H index 33ef24bfe6..d06ec2e5f0 100644 --- a/applications/solvers/combustion/XiFoam/bEqn.H +++ b/applications/solvers/combustion/XiFoam/bEqn.H @@ -52,7 +52,7 @@ if (ign.ignited()) + mvConvection->fvmDiv(phi, b) + fvm::div(phiSt, b, "div(phiSt,b)") - fvm::Sp(fvc::div(phiSt), b) - - fvm::laplacian(turbulence->muEff(), b) + - fvm::laplacian(turbulence->alphaEff(), b) ); @@ -90,7 +90,7 @@ if (ign.ignited()) // ~~~~~~~~~~~~~~~~~ surfaceScalarField phiXi = phiSt - - fvc::interpolate(fvc::laplacian(turbulence->muEff(), b)/mgb)*nf + - fvc::interpolate(fvc::laplacian(turbulence->alphaEff(), b)/mgb)*nf + fvc::interpolate(rho)*fvc::interpolate(Su*(1.0/Xi - Xi))*nf; diff --git a/applications/solvers/combustion/XiFoam/ftEqn.H b/applications/solvers/combustion/XiFoam/ftEqn.H index 519cbd7cbe..46d7aeae82 100644 --- a/applications/solvers/combustion/XiFoam/ftEqn.H +++ b/applications/solvers/combustion/XiFoam/ftEqn.H @@ -1,7 +1,7 @@ tmp > mvConvection ( fv::convectionScheme::New - ( + ( mesh, fields, phi, @@ -17,6 +17,6 @@ if (composition.contains("ft")) ( fvm::ddt(rho, ft) + mvConvection->fvmDiv(phi, ft) - - fvm::laplacian(turbulence->muEff(), ft) + - fvm::laplacian(turbulence->alphaEff(), ft) ); } diff --git a/applications/solvers/combustion/XiFoam/hEqn.H b/applications/solvers/combustion/XiFoam/hEqn.H index ebce30e24e..513ae60441 100644 --- a/applications/solvers/combustion/XiFoam/hEqn.H +++ b/applications/solvers/combustion/XiFoam/hEqn.H @@ -1,5 +1,5 @@ { - solve + fvScalarMatrix hEqn ( fvm::ddt(rho, h) + mvConvection->fvmDiv(phi, h) @@ -8,5 +8,8 @@ DpDt ); + hEqn.relax(); + hEqn.solve(); + thermo.correct(); } From 110b65add1344e5dcb80568608c52d6ceb0a8d3b Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 14 Jul 2009 21:09:15 +0100 Subject: [PATCH 026/172] Put UEqn in PIMPLE loop. --- .../solvers/combustion/rhoReactingFoam/rhoReactingFoam.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C index 680bd784e0..578d8c051c 100644 --- a/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C +++ b/applications/solvers/combustion/rhoReactingFoam/rhoReactingFoam.C @@ -68,10 +68,10 @@ int main(int argc, char *argv[]) #include "chemistry.H" #include "rhoEqn.H" - #include "UEqn.H" for (label ocorr=1; ocorr <= nOuterCorr; ocorr++) { + #include "UEqn.H" #include "YEqn.H" #include "hEqn.H" From 2ded45bbaf79c279fbd79544804863b1070a2d16 Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 14 Jul 2009 21:09:55 +0100 Subject: [PATCH 027/172] Correct destructor for objects owned by registry. --- src/OpenFOAM/db/objectRegistry/objectRegistry.C | 14 ++++++++++---- src/OpenFOAM/db/regIOobject/regIOobjectI.H | 8 ++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.C b/src/OpenFOAM/db/objectRegistry/objectRegistry.C index 9d01de9d90..452ad35ac6 100644 --- a/src/OpenFOAM/db/objectRegistry/objectRegistry.C +++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.C @@ -82,15 +82,21 @@ Foam::objectRegistry::objectRegistry Foam::objectRegistry::~objectRegistry() { + List myObjects(size()); + label nMyObjects = 0; + for (iterator iter = begin(); iter != end(); ++iter) { if (iter()->ownedByRegistry()) { - regIOobject* object = iter(); - erase(iter); - delete object; + myObjects[nMyObjects++] = iter(); } } + + for (label i=0; i& atPtr) } -void Foam::regIOobject::release() +inline void Foam::regIOobject::release() { ownedByRegistry_ = false; } -Foam::label Foam::regIOobject::eventNo() const +inline Foam::label Foam::regIOobject::eventNo() const { return eventNo_; } -Foam::label& Foam::regIOobject::eventNo() +inline Foam::label& Foam::regIOobject::eventNo() { return eventNo_; } From bb11fcdbad81e179f5df0ab3fe8cab47f388efa4 Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 14 Jul 2009 21:11:09 +0100 Subject: [PATCH 028/172] Remove unused "turbulence" switch. --- src/turbulenceModels/incompressible/LES/LESModel/LESModel.C | 1 - src/turbulenceModels/incompressible/LES/LESModel/LESModel.H | 1 - 2 files changed, 2 deletions(-) diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C index 3ee9619340..a845089e33 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C @@ -75,7 +75,6 @@ LESModel::LESModel ) ), - turbulence_(lookup("turbulence")), printCoeffs_(lookupOrDefault("printCoeffs", false)), coeffDict_(subDictPtr(type + "Coeffs")), diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H index 766cc63fc0..e784535b73 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H @@ -80,7 +80,6 @@ protected: // Protected data - Switch turbulence_; Switch printCoeffs_; dictionary coeffDict_; From ce79182495961cb9b25fa84be57cf402f945bb81 Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 14 Jul 2009 21:11:36 +0100 Subject: [PATCH 029/172] Minor reformatting. --- .../fieldAverage/fieldAverageTemplates.C | 53 ++++++++++--------- .../fixedEnthalpyFvPatchScalarField.C | 5 +- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C index a69dce41b7..4e59e8a30b 100644 --- a/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C +++ b/src/postProcessing/functionObjects/field/fieldAverage/fieldAverage/fieldAverageTemplates.C @@ -63,21 +63,22 @@ void Foam::fieldAverage::addMeanField const fieldType& baseField = obr_.lookupObject(fieldName); - fieldType* fPtr = new fieldType - ( - IOobject - ( - meanFieldName, - obr_.time().timeName(), - obr_, - IOobject::READ_IF_PRESENT, - IOobject::NO_WRITE - ), - baseField - ); - // Store on registry - fPtr->store(); + obr_.store + ( + new fieldType + ( + IOobject + ( + meanFieldName, + obr_.time().timeName(), + obr_, + IOobject::READ_IF_PRESENT, + IOobject::NO_WRITE + ), + 1*baseField + ) + ); meanFieldList[fieldI] = meanFieldName; } @@ -121,22 +122,22 @@ void Foam::fieldAverage::addPrime2MeanField const fieldType1& meanField = obr_.lookupObject(meanFieldList[fieldI]); - fieldType2* fPtr = new fieldType2 + obr_.store ( - IOobject + new fieldType2 ( - meanFieldName, - obr_.time().timeName(), - obr_, - IOobject::READ_IF_PRESENT, - IOobject::NO_WRITE - ), - sqr(baseField) - sqr(meanField) + IOobject + ( + meanFieldName, + obr_.time().timeName(), + obr_, + IOobject::READ_IF_PRESENT, + IOobject::NO_WRITE + ), + sqr(baseField) - sqr(meanField) + ) ); - // Store on registry - fPtr->store(); - prime2MeanFieldList[fieldI] = meanFieldName; } } diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C index e409d243c8..19e345abe0 100644 --- a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C +++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C @@ -102,12 +102,13 @@ void fixedEnthalpyFvPatchScalarField::updateCoeffs() ( "thermophysicalProperties" ); - + const label patchi = patch().index(); - fvPatchScalarField& Tw = + fvPatchScalarField& Tw = const_cast(thermo.T().boundaryField()[patchi]); Tw.evaluate(); + operator==(thermo.h(Tw, patchi)); fixedValueFvPatchScalarField::updateCoeffs(); From 6f48a922d0128f5b914cc5be322db8c09f268a6b Mon Sep 17 00:00:00 2001 From: henry Date: Tue, 14 Jul 2009 21:16:33 +0100 Subject: [PATCH 030/172] Further corrections to tutorials following a complete Allrun. --- ReleaseNotes-1.6 | 363 +++--- .../boxTurb16/constant/polyMesh/boundary | 5 +- tutorials/combustion/XiFoam/les/pitzDaily/0/B | 50 - .../combustion/XiFoam/les/pitzDaily/0/Su | 10 +- tutorials/combustion/XiFoam/les/pitzDaily/0/T | 10 +- .../combustion/XiFoam/les/pitzDaily/0/Tu | 10 +- tutorials/combustion/XiFoam/les/pitzDaily/0/U | 10 +- .../combustion/XiFoam/les/pitzDaily/0/Xi | 10 +- .../XiFoam/les/pitzDaily/0/alphaSgs | 14 +- tutorials/combustion/XiFoam/les/pitzDaily/0/b | 10 +- tutorials/combustion/XiFoam/les/pitzDaily/0/k | 8 +- .../combustion/XiFoam/les/pitzDaily/0/muSgs | 14 +- tutorials/combustion/XiFoam/les/pitzDaily/0/p | 10 +- .../pitzDaily/constant/combustionProperties | 33 +- .../XiFoam/les/pitzDaily/system/controlDict | 6 +- .../XiFoam/les/pitzDaily/system/fvSchemes | 13 +- .../XiFoam/les/pitzDaily/system/fvSolution | 1 + .../pitzDaily3D/constant/combustionProperties | 27 +- .../pitzDaily3D/constant/polyMesh/boundary | 25 +- .../XiFoam/les/pitzDaily3D/system/controlDict | 2 +- .../constant/polyMesh/boundary | 5 +- .../constant/polyMesh/boundary | 5 +- .../biconic25-55Run35/constant/points.tmp | 4 +- .../forwardStep/constant/polyMesh/boundary | 5 +- .../obliqueShock/constant/polyMesh/boundary | 5 +- .../shockTube/constant/polyMesh/boundary | 5 +- .../wedge15Ma5/constant/polyMesh/boundary | 5 +- .../angledDuct/constant/polyMesh/boundary | 82 +- .../constant/polyMesh/boundary | 58 + .../forwardStep/constant/polyMesh/boundary | 82 +- .../compressible/rhoSonicFoam/shockTube/0/T | 1017 ++++++++++++++++- .../compressible/rhoSonicFoam/shockTube/0/U | 11 +- .../compressible/rhoSonicFoam/shockTube/0/p | 1017 ++++++++++++++++- .../shockTube/constant/polyMesh/boundary | 30 +- .../shockTube/constant/polyMesh/boundary | 30 +- .../wedge15Ma5/constant/polyMesh/boundary | 82 +- .../forwardStep/constant/polyMesh/boundary | 82 +- .../shockTube/constant/polyMesh/boundary | 30 +- .../nacaAirfoil/constant/polyMesh/boundary | 56 +- .../ras/nacaAirfoil/system/controlDict | 4 +- .../compressible/sonicFoam/ras/prism/0/alphat | 56 + .../sonicFoam/ras/prism/0/epsilon | 26 +- .../compressible/sonicFoam/ras/prism/0/k | 26 +- .../compressible/sonicFoam/ras/prism/0/mut | 56 + .../ras/prism/constant/polyMesh/boundary | 5 +- .../constant/polyMesh/boundary | 5 +- .../lagrangian/dsmc/particleProperties | 24 + .../lagrangian/dsmc/particleProperties | 24 + .../chargedWire/constant/polyMesh/boundary | 5 +- .../mhdFoam/hartmann/0/Ux} | 39 +- .../electromagnetics/mhdFoam/hartmann/0/Uy | 51 + .../electromagnetics/mhdFoam/hartmann/0/Uz | 51 + .../hartmann/constant/polyMesh/boundary | 2 +- .../europeanCall/constant/polyMesh/boundary | 5 +- .../constant/polyMesh/boundary | 76 ++ .../hotRadiationRoom/0/alphat} | 23 +- .../hotRadiationRoom/0/epsilon | 37 +- .../hotRadiationRoom/0/k | 37 +- .../hotRadiationRoom/0/mut} | 23 +- .../constant/polyMesh/boundary | 5 +- .../constant/polyMesh/boundary | 2 +- .../constant/polyMesh/blockMeshDict | 265 ++++- .../mixerVessel2D/constant/polyMesh/boundary | 56 +- .../constant/polyMesh/boundary | 5 +- .../constant/polyMesh/boundary | 5 +- .../channel395/constant/LESProperties | 2 - .../channel395/constant/polyMesh/boundary | 5 +- .../icoFoam/cavity/constant/polyMesh/boundary | 5 +- .../cavityClipped/constant/polyMesh/boundary | 5 +- .../cavityGrade/constant/polyMesh/boundary | 5 +- .../icoFoam/elbow/constant/polyMesh/boundary | 5 +- .../offsetCylinder/constant/polyMesh/boundary | 82 +- .../t-junction/constant/polyMesh/boundary | 4 +- .../les/pitzDaily/constant/LESProperties | 2 - .../constant/LESProperties | 2 - .../constant/polyMesh/boundary | 3 +- .../ras/cavity/constant/polyMesh/boundary | 2 +- .../simpleFoam/airFoil2D/Allclean | 1 + .../motorBike/constant/polyMesh/boundary | 262 ++--- .../pitzDaily/constant/polyMesh/boundary | 52 + .../constant/polyMesh/boundary | 69 +- .../mixer/constant/polyMesh/boundary | 53 + .../simplifiedSiwek/0/alphat | 50 + .../coalChemistryFoam/simplifiedSiwek/0/mut} | 32 +- .../constant/polyMesh/boundary | 52 + .../filter/Allclean | 14 +- .../constant/polyMesh/boundary} | 37 +- .../simplifiedSiwek/0/alphat | 50 + .../simplifiedSiwek/0/mut} | 32 +- .../snappyHexMesh/snappyMultiRegionHeater | 1 + .../bubbleColumn/constant/polyMesh/boundary | 5 +- .../les/throttle/constant/LESProperties | 2 - .../les/throttle/constant/polyMesh/boundary | 16 +- .../les/throttle3D/constant/LESProperties | 2 - .../les/throttle3D/constant/polyMesh/boundary | 16 +- .../les/depthCharge2D/0/alpha1.gz | Bin 0 -> 523 bytes .../les/depthCharge2D/0/p.gz | Bin 0 -> 641 bytes .../les/depthCharge2D/constant/LESProperties | 2 - .../depthCharge2D/constant/polyMesh/boundary | 6 +- .../les/depthCharge3D/constant/LESProperties | 2 - .../depthCharge3D/constant/polyMesh/boundary | 6 +- .../constant/polyMesh/boundary | 5 +- .../constant/polyMesh/blockMeshDict | 4 +- .../sloshingTank2D/constant/polyMesh/boundary | 4 +- .../constant/polyMesh/blockMeshDict | 4 +- .../sloshingTank3D/constant/polyMesh/boundary | 4 +- .../constant/polyMesh/blockMeshDict | 4 +- .../constant/polyMesh/boundary | 4 +- .../constant/polyMesh/blockMeshDict | 4 +- .../constant/polyMesh/boundary | 4 +- .../les/nozzleFlow2D/constant/LESProperties | 2 - .../les/nozzleFlow2D/system/cellSetDict | 2 +- .../multiphase/interFoam/ras/damBreak/0/nut | 51 + .../ras/damBreak/constant/polyMesh/boundary | 69 +- .../laminar/damBreak4phase/0/alphas | 2 +- .../damBreak4phase/constant/polyMesh/boundary | 69 +- .../laminar/damBreak4phaseFine/0/alphas | 2 +- .../ras/dahl/constant/polyMesh/boundary | 82 +- .../settlingFoam/ras/tank3D/Allclean | 1 + .../bed/constant/polyMesh/boundary | 5 +- .../bed2/constant/polyMesh/boundary | 2 +- .../bubbleColumn/constant/polyMesh/boundary | 56 +- .../plateHole/constant/polyMesh/boundary | 82 +- .../beamEndLoad/constant/polyMesh/boundary | 69 +- 124 files changed, 4275 insertions(+), 1295 deletions(-) delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/B create mode 100644 tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary create mode 100644 tutorials/compressible/sonicFoam/ras/prism/0/alphat create mode 100644 tutorials/compressible/sonicFoam/ras/prism/0/mut create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/particleProperties create mode 100644 tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/particleProperties rename tutorials/{combustion/XiFoam/les/pitzDaily/0/ft => electromagnetics/mhdFoam/hartmann/0/Ux} (64%) create mode 100644 tutorials/electromagnetics/mhdFoam/hartmann/0/Uy create mode 100644 tutorials/electromagnetics/mhdFoam/hartmann/0/Uz create mode 100644 tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom/0/k.old => buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat} (65%) rename tutorials/heatTransfer/{buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon.old => buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut} (69%) create mode 100644 tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/boundary create mode 100644 tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary create mode 100644 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat rename tutorials/{heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/epsilon.old => lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut} (65%) create mode 100644 tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary rename tutorials/{multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1 => lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary} (64%) create mode 100644 tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat rename tutorials/{heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k.old => lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut} (65%) create mode 120000 tutorials/mesh/snappyHexMesh/snappyMultiRegionHeater create mode 100644 tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.gz create mode 100644 tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.gz create mode 100644 tutorials/multiphase/interFoam/ras/damBreak/0/nut diff --git a/ReleaseNotes-1.6 b/ReleaseNotes-1.6 index fab8b8826e..0fe2691f91 100644 --- a/ReleaseNotes-1.6 +++ b/ReleaseNotes-1.6 @@ -1,176 +1,235 @@ # -*- mode: org; -*- # -#+TITLE: *OpenFOAM release notes for version 1.5* +#+TITLE: *OpenFOAM release notes for version 1.6* #+AUTHOR: OpenCFD Ltd. -#+DATE: 07 October 2008 +#+DATE: July 2009 #+LINK: http://www.opencfd.co.uk #+OPTIONS: author:nil ^:{} * Overview - OpenFOAM-1.5 is is a significant upgrade to version 1.4 in ways which are + OpenFOAM-1.6 is is a significant upgrade to version 1.5 in ways which are outlined below. This release passes all our standard tests and the tutorials have been broadly checked. If there are any bugs, please report them using the instructions set out in: http://www.OpenFOAM.org/bugs.html. - Most of the developments for this release are in: new applications, e.g. for - multiphase flow and cavitation, buoyancy-flow and heat transfer, high speed - flows and even molecular dynamics; new utilities, e.g. for meshing and case - monitoring; and, new modelling, e.g. in Lagrangian particle tracking, - radiation and rotating frames of reference. With these new applications come - numerous new example cases. - * GNU/Linux version - The 64bit binary packs of the OpenFOAM release were compiled on a machine - running SuSE GNU/Linux version 10.3 and the 32bit on a machine running Ubuntu - GNU/Linux version 7.1 and also tested on Ubuntu 8.04. We recommend that - users run OpenFOAM on one of these or a similar recent version of GNU/Linux. - This release has also been successfully compiled and tested on older GNU/Linux - releases but this requires the installation of Qt 4.3.? for ParaView-3 to run. + The 32bit and 64bit binary packs of the OpenFOAM release were compiled on a + machine running SuSE GNU/Linux version 11.1 and also tested on Ubuntu 9. We + recommend that users run OpenFOAM on one of these or a similar recent version + of GNU/Linux. This release has also been successfully compiled and tested on + older GNU/Linux releases but this requires the installation of Qt 4.3.? (the + sources for which are supplied with OpenFOAM-1.6, see README) for ParaView-3 + to run. * C++ Compiler version - + Released compiled with GCC 4.3.1, the latest version. + + Release compiled with GCC 4.3.3. + Built in support for the Intel C++ 10.? compiler (untested). - + The choice of the compiler is controlled by the setting of the $WM_COMPILER - and $WM_COMPILER_ARCH environment variables in the OpenFOAM-1.5/etc/bashrc - (or cshrc) file. + + The choice of the compiler is controlled by the setting of the + ~$WM_COMPILER~ and ~$WM_COMPILER_ARCH~ environment variables in the + /OpenFOAM-1.6/etc/bashrc/ (or /cshrc/) file. + The location of the installation of the compiler is controlled by the - $compilerInstall environment variable in the OpenFOAM-1.5/etc/settings.sh - (or settings.csh) file. + ~$compilerInstall~ environment variable in the + /OpenFOAM-1.6/etc/settings.sh/ (or /settings.csh/) file. -* Developments to solvers (applications) - + New rhoCentralFoam solver for high-speed, viscous, compressible flows using - non-oscillatory, central-upwind schemes. - + New interDyMFoam solver for 2 incompressible, isothermal, immiscible fluids - using a VoF phase-fraction based interface capturing approach, with optional - mesh motion and mesh topology changes including adaptive mesh - (un)refinement. Useful for simulations such as tank filling, sloshing --- - using solid body motion e.g. SDA or SKA (6DoF) --- and slamming (using the - mesh motion solver) and other large-scale applications that benefit from the - efficiency gain of adaptive mesh (un)refinement of the interface. - + New compressibleInterFoam solver for 2 compressible, isothermal, immiscible - fluids using a volume of fluid (VoF) phase-fraction approach for - interface-capturing. The momentum and other fluid properties are of the - "mixture" and a single momentum equation is solved. Turbulence is modelled - using a run-time selectable incompressible LES model. - + New interPhaseChangeFoam solver for 2 incompressible, isothermal, immiscible - fluids with phase-change, e.g. cavitation. Uses VoF interface capturing, - with momentum and other fluid properties described for the ``mixture'' and a - single momentum equation is solved. The set of phase-change models provided - are designed to simulate cavitation but other mechanisms of phase-change are - supported within this solver framework. - + New rasCavitatingFoam solver for transient cavitation using a barotropic - compressibility model, with RAS turbulence. - + New lesCavitatingFoam solver for transient cavitation using a barotropic - compressibility model, with LES turbulence. - + New chtMultiRegionFoam solver that couples conjugate heat transfer in a - solid to a buoyancy-driven flow simulation. - + New PDRFoam solver for compressible premixed/partially-premixed turbulent - combustion that includes porosity/distributed resistance (PDR) modelling to - handle regions containing solid blockages which cannot be resolved by the - mesh. Requires the PDR fields. - + New lesBuoyantFoam solver for transient, buoyant, turbulent flow of - compressible fluids for ventilation and heat-transfer. Turbulence is - modelled using a run-time selectable compressible LES model. - + New rhoPimpleFoam solver for transient, turbulent flow of compressible - fluids for ventilation and heat-transfer. Uses the flexible PIMPLE - (PISO-SIMPLE) solution for time-resolved and pseudo-transient simulations. - + New buoyantSimpleRadiationFoam solver for steady-state, buoyant, turbulent - flow of compressible fluids with radiation, for ventilation and - heat-transfer. - + New rhoTurbTwinParcelFoam solver for transient for compressible, turbulent - flow with two thermo-clouds. - + New gnemdFOAM solver for general purpose molecular dynamics that simulates - atoms in arbitrary shaped domains and average atomic/molecular quantities to - the mesh to create field data. - + New mdEqulibrationFoam solver to equilibrates and/or preconditions molecular - dynamics systems. - + Demonstration SRFSimpleFoam solver based on simpleFoam that incorporates the - SRF extensions (see below) for rotating flows. +* Library developments -* Automatic mesher - New snappyHexMesh utility that generates split-hex meshes automatically from - triangulated (STL) surface geometries. The mesh approximately conforms to - the surface by iteratively refining a starting mesh and morphing the - resulting split-hex mesh to the surface. An optional phase will shrink back - the resulting mesh and insert cell layers. It has a flexible specification - of mesh refinement level and robust surface handling with a pre-specified - final mesh quality. It runs in parallel with a load balancing step every - iteration. +*** Turbulence modelling + + Major development of turbulence model libraries to give extra flexibility + at the solver level. For solvers that can support either RAS/LES + computations, the selection is made in the + /constant/turbulenceProperties/, + by setting the =simulationType= keyword to: + - =laminar= + - =RASModel= + - =LESModel= + + Depending on the selection, the model is the instantiated from /constant// + - /RASProperties/ + - /LESProperties/ -* Developments to utilities - + New extrude2DMesh utility that extrudes 2D meshes into a 3D mesh. 2D meshes - are described by faces with 2 points, so can be used in combination with 2D - meshes converted with ccm26ToFoam. - + New couplePatches functionality integrated into createPatch, which - optionally synchronises ("couples") points and faces of coupled (cyclic, - processor) patches. - + New applyBoundaryLayer pre-processing utility to apply 1/7th power-law - boundary layers at walls, starting from uniform or potential flow solutions. - + New execFlowFunctionObjects utility executes functionObjects as a - post-processing activity, e.g. probes, sampling, force calculation. - + New changeDictionary utility makes batch changes to OpenFOAM input files, - e.g. to change boundary conditions of field files. - + New foamCalc utility, a generic post-processing field calculator tool - + New molConfig pre-processing utility for molecular dynamics cases. Fills - zones of a mesh with single crystal lattices of specified structure, - density, orientation, alignment and temperature. - + Extended splitMeshRegions utility to split multi-zone meshes, e.g. defined - through cellZones, into separate meshes. - + Extended the foamToVTK, decomposePar, reconstructPar and mapFields utilities - to include support for multiple particle clouds in parallel processing. +***** RAS wall functions + Wall functions are now run-time selectable per patch for RAS. -* Migration from ParaView 2.4 to ParaView 3.x - + Rewritten OpenFOAM Reader Module for version 3, a major redesign of - ParaView. - + New features include viewing patch names, reading of Lagrangian data, - handling of cell, face and point sets, multiple views. +******* Velocity: + + Apply to turbulent viscosities =nut= or =mut= + + Apply to =k=, =Q=, =R= + + Apply to =epsilon=, =omega= -* Model development - + Overhauled the lagrangian library to support multiple clouds. - + New lagrangianIntermediate library incorporating a hierarchy of parcel and - cloud types, accommodating kinematic, thermodynamic and reacting - applications, including coupling to the new radiation library. Sub-models - are added at the relevant level of physics, e.g.: - - kinematic: injection, wall interaction, drag, dispersion; - - thermo: heat transfer; - - reacting: reacting composition, mass transfer, surface reactions. - + New single rotating frame of reference (SRF) library for rotating flow - applications, e.g. turbo-machinery. - + New radiation library including the P1 model and associated Marshak boundary - conditions for incident radiation. - + New displacementInterpolation motion solver for flexible mesh scaling. - + New molecularDynamics Lagrangian library to calculate intermolecular forces - between spherically symmetrical monatomic species in arbitrary geometries. +******* Temperature: + + Apply to turbulent thermal diffusivity, =alphat= (compressible only) -* New functionObjects - To aid common monitoring and post-processing activities. - + forces: calculate the force and moment on a patch or set of patches, e.g. to - calculate the lift, drag and moment of an object in the flow. - + forceCoeffs: calculate the normalised force and moment on a patch or set of - patches, e.g. to calculate the lift, drag and moment coefficients of an - object in the flow. - + fieldAverage: calculate field arithmetic mean and prime-squared averages for - a list of fields. - + foamCalcFunctions: calculate field components, div, mag, magGrad or magSqr. +******* To apply wall functions: + + To recapture the functionality of previous OpenFOAM versions (v1.5 and + earlier) assign: + - for velocity: + - =nut=: =nutWallFunction= + - =mut=: =muWallFunction= + - =epsilon=: =epsilonWallFunction= + - =omega=: =omegaWallFunction= + - =k=, =Q=, =R=: =kQRWallFunction= + - for temperature: + - =alphat=: =alphatWallFunction= + + New =alphaSgsJayatillekeWallFunction= thermal wall function for + compressible LES -* Improvements to boundary conditions - + Generalised jumpCyclic type: cyclic condition with an additional prescribed - jump in value. - + fan type: specialisation of jumpCyclic, applying a prescribed jump in - pressure to simulate a fan within a mesh. - + Generalised advective outflow boundary condition based on solving D/Dt(psi, - U) = 0 at the boundary. - + Additional turbulent flow inlet to specify mixing length and frequency. - + Generalisation of time varying set of boundary conditions. +***** *New* LES turbulence models + + Spalart-Allmaras DDES + + Spalart-Allmaras IDDES -* Other - + New argument-free command execution, e.g typing "icoFoam" without root and - case directory arguments. - + Extended time command line options. - + Many enhancements to dictionary including macro substitution, optional - merging and default/overwrite behaviour, enhanced "#include" file handling - and the framework to support function evaluation. - + Cross-links between applications and Doxygen documentation with the "-doc" - argument. - + Non-blocking, non-buffered, parallel transfers with potential scaling - benefits for larger number of processors. +***** Upgrading: + + *New* utility - =applyWallFunctionBoundaryConditions= + + Solvers will automatically update existing cases + - New fields created based on the presence of the =nut/mut= field + - Boundary conditions include scoping, i.e compressibility:: for + compressible solvers + - Modified fields will be backed-up to /.old/ + + NOTE: + - Fields are only updated for those fields associated with the current + turbulence model selection, i.e. if fields exist for use with other + models, they will not be updated + - New specification is not backwards compatible + +*** Thermo-physical Models + + Old compressibility based thermo package renamed + =basicThermo= \rightarrow =basicPsiThermo= + + *New* =basicRhoThermo= thermo package + - Additional density field stored + - General form - can be used for other types of media, e.g. liquids + - Additional polynomial-based thermodynamics + - Equation of state: =icoPolynomial= + - Transport: =polynomialTransport= + - Thermo: =hPolynomialThermo= + + Removed earlier hard-coding of gas thermophysics for chemistry modelling: + - =reactingMixture= now templated on thermo package + - =chemistryModel= now templated on thermo package + - =chemistrySolver= now templated on thermo package + + *New* =fvDOM= radition model + - finite volume, discrete ordinates method + + *New* (reinstated) =eThermo= thermodynamics package + - internal energy based thermodynamics + +*** Lagrangian + +***** Intermediate + - Overhaul of the underlying framework + - Reacting now split into reacting and reacting multiphase + - New structure for variable composition + - Many new sub-models, including: + - Injection + - =PatchInjection= - injection local to patch face cells + - =FieldActivatedInjection= - injection based on satisfying external + criterion + - LookupTableInjection - explicity define injection locations and all + parcel properties + - Post-processing + - patch post-processing - collect data for parcels impacting user + defined patches + - Patch interaction + - generalised behaviour for parcel interaction with patch + - Phase change + - liquid evaporation + +***** Coal combustion + - *New* library - extension of reacting-multiphase functionality + - Surface reaction/combustion models + +*** Discrete methods + - *New* library offering DSMC simulation functionality - see =dsmcFoam= + below + - *New* libraries offering molecular dynamics simulation functionality - see + =mdFoam= and =mdEquilibrationFoam=: below. + +* Solver restructuring + The upgrade to the turbulence models means that the simulation type, i.e. + laminar, RAS or LES can be selected at run time. This has allowed a reduction + in the number of solvers, simplifying the overall code structure + + Solvers which support laminar, RAS and LES: + - =turbFoam=, =oodles= \rightarrow =pisoFoam= + - =turbDyMFoam= \rightarrow =pimpleDyMFoam= + - =rhoTurbFoam=, =coodles= \rightarrow =rhoPisoFoam= + - =xoodles= \rightarrow absorbed into =XiFoam= + - =buoyantFoam=, =lesBuoyantFoam= \rightarrow =buoyantPisoFoam= + - =interFoam=, rasInterFoam, =lesInterFoam= \rightarrow =interFoam= + - =lesCavitatingFoam=, =rasCavitatingFoam= \rightarrow =cavitatingFoam= + + Solvers which support LES only: + - =channelOodles= \rightarrow =channelFoam= (LES) + +* General changes + - pd to p ------------------------------------------------------------ [HENRY] + - gravity ------------------------------------------------------------ [HENRY] + +* Tutorial restructuring + to reflect solver application structure + +* Post-processing ---------------------------------------------------- [MATTIJS] + - SAMPLING - improved plane, iso-surface handling + +* *New* Solvers + + =buoyantBoussinesqSimpleFoam= + Steady state heat transfer solver using a Boussinesq approximation for + buoyancy, with laminar, RAS or LES turbulence modelling + + + =buoyantBoussinesqPisoFoam= + Transient heat transfer solver using a Boussinesq approximation for + buoyancy, with laminar, RAS or LES turbulence modelling + + + =coalChemistryFoam= + Transient, reacting lagrangian solver, employing a coal cloud and a thermo + cloud, with chemistry, and laminar, RAS or LES turbulence modelling + + + =porousExplicitSourceReactingParcelFoam= + Transient, reacting lagrangian solver, employing a single phase reacting + cloud, with porous media, explicit mass sources, and laminar, RAS or LES + turbulence modelling + + + =rhoReactingFoam= + Density-based thermodynamics variant of the reactingFoam solver, i.e. now + applicable to liquid systems + + + =dsmcFoam= + DSMC (Direct Simulation Monte-Carlo) solver for rarefied gas dynamics + simultions, able to simulate mixtures of an arbitrary number of gas species. + The variable hard sphere collision model with Larsen-Borgnakke internal + energy redistribution (see "Molecular Gas Dynamics and the Direct Simulation + of Gas Flows" G.A. Bird, 1994) is available; other run-time selectable + collision models can be easily added. + +* Updated solvers + + =mdFoam= + Molecular Dynamics (MD) solver able to simulate a mixture of an arbitrary + number of mono-atomic and small, rigid polyatomic (i.e. H2O, N2) molecular + species, with 6 degree of freedom motion, in complex geometries. A molecule + of any species can be built by specifying its sites of mass and charge. All + molecules interact with short-range dispersion forces and pairwise + electrostatic interactions using methods described in: + Fennell and Gezelter, J. Chem. Phys. 124, 234104 (2006) + + + =mdEquilibrationFoam= + Similar to mdFoam, but employs velocity scaling to adjust the simulation + temperature to a target value. Useful to equilibrate a case before + simulation. + +* Function objects + +*** *New* function objects: + - =systemCall= - executes a list of system instructions + - =fieldMinMax= - computes the min/max of a + - =staticPressure= - converts kinematic pressure to static pressure + - =dsmcFields= - calculates intensive fields (velocity and temperature) from + averaged extensive fields (i.e. momentum and energy) + +*** Usage + - Improved output control: =timeStep= or =outputTime= + +* Boundary conditions + - Improved set of direct mapped boundary conditions + - Buoyancy boundary condition ---------------------------------------- [HENRY] + +* *New* utilities + - =particleTracks= - generate particle tracks for lagrangian calculations + - =dsmcInitialise= - preprocessing utility to create initial configurations of + DSMC particles in a geometry + +*** *New* foamCalc functions + - =interpolate= - performs fvc::interpolate() + - =randomise= - randomises a by a given perturbation + - =addSubtract= - simple add/subtract field functionality diff --git a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary index f4b0d0b918..8d533e8d83 100644 --- a/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary +++ b/tutorials/DNS/dnsFoam/boxTurb16/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/B b/tutorials/combustion/XiFoam/les/pitzDaily/0/B deleted file mode 100644 index 42eef7d320..0000000000 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/B +++ /dev/null @@ -1,50 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volTensorField; - object B; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform (0 0 0 0 0 0 0 0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value uniform (0 0 0 0 0 0 0 0 0); - } - - outlet - { - type zeroGradient; - } - - upperWall - { - type zeroGradient; - } - - lowerWall - { - type zeroGradient; - } - - frontAndBack - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily/0/Su index e5dea103a4..716a8510a4 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Su +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Su @@ -20,30 +20,30 @@ internalField uniform 0.135; boundaryField { - inlet + inlet { type fixedValue; value uniform 0.135; } - outlet + outlet { type inletOutlet; inletValue uniform 0.135; value uniform 0.135; } - upperWall + upperWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/T b/tutorials/combustion/XiFoam/les/pitzDaily/0/T index e112d66884..c4bae6fa13 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/T +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/T @@ -20,32 +20,32 @@ internalField uniform 293; boundaryField { - inlet + inlet { type fixedValue; value uniform 293; } - outlet + outlet { type inletOutlet; inletValue uniform 293; value uniform 293; } - upperWall + upperWall { type fixedValue; value uniform 293; } - lowerWall + lowerWall { type fixedValue; value uniform 293; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu index 9e8560d90b..3e1d003deb 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu @@ -20,32 +20,32 @@ internalField uniform 293; boundaryField { - inlet + inlet { type fixedValue; value uniform 293; } - outlet + outlet { type inletOutlet; inletValue uniform 293; value uniform 293; } - upperWall + upperWall { type fixedValue; value uniform 293; } - lowerWall + lowerWall { type fixedValue; value uniform 293; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/U b/tutorials/combustion/XiFoam/les/pitzDaily/0/U index a69abfc235..d0f924b93e 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/U +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/U @@ -20,33 +20,33 @@ internalField uniform (0 0 0); boundaryField { - inlet + inlet { type turbulentInlet; referenceField uniform (13.3 0 0); fluctuationScale (0.04 0.02 0.02); } - outlet + outlet { type inletOutlet; inletValue uniform (0 0 0); value uniform (0 0 0); } - upperWall + upperWall { type fixedValue; value uniform (0 0 0); } - lowerWall + lowerWall { type fixedValue; value uniform (0 0 0); } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi index f1a4c1388d..299eca908c 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi @@ -20,30 +20,30 @@ internalField uniform 1; boundaryField { - inlet + inlet { type fixedValue; value uniform 1; } - outlet + outlet { type inletOutlet; inletValue uniform 1; value uniform 1; } - upperWall + upperWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs index 9a83c0337e..24c919196b 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs @@ -20,27 +20,31 @@ internalField uniform 0; boundaryField { - inlet + inlet { type zeroGradient; } - outlet + outlet { type zeroGradient; } - upperWall + upperWall { type zeroGradient; + //type compressible::alphaSgsWallFunction; + value uniform 0; } - lowerWall + lowerWall { type zeroGradient; + //type compressible::alphaSgsWallFunction; + value uniform 0; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/b b/tutorials/combustion/XiFoam/les/pitzDaily/0/b index b10da29e5a..5a487c3f1f 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/b +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/b @@ -20,30 +20,30 @@ internalField uniform 1; boundaryField { - inlet + inlet { type fixedValue; value uniform 1; } - outlet + outlet { type inletOutlet; inletValue uniform 1; value uniform 1; } - upperWall + upperWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/k b/tutorials/combustion/XiFoam/les/pitzDaily/0/k index 4544024e3b..43ac67fdfe 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/k +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/k @@ -35,14 +35,14 @@ boundaryField upperWall { - type fixedValue; - value uniform 1e-8; + type zeroGradient; + value uniform 2e-05; } lowerWall { - type fixedValue; - value uniform 1e-8; + type zeroGradient; + value uniform 2e-05; } frontAndBack diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs index 242527194d..a16e89fad9 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs @@ -20,27 +20,31 @@ internalField uniform 0; boundaryField { - inlet + inlet { type zeroGradient; } - outlet + outlet { type zeroGradient; } - upperWall + upperWall { type zeroGradient; + //type compressible::muSgsWallFunction; + value uniform 0; } - lowerWall + lowerWall { type zeroGradient; + //type compressible::muSgsWallFunction; + value uniform 0; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/p b/tutorials/combustion/XiFoam/les/pitzDaily/0/p index a3351cfeb3..3700ec72b5 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/p +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/p @@ -20,28 +20,28 @@ internalField uniform 100000; boundaryField { - inlet + inlet { type zeroGradient; } - outlet + outlet { type fixedValue; value uniform 100000; } - upperWall + upperWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - frontAndBack + frontAndBack { type empty; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties index c82a1b4cc9..86fcfc889a 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties @@ -19,21 +19,21 @@ laminarFlameSpeedCorrelation constant; fuel Propane; -Su Su [ 0 1 -1 0 0 0 0 ] 0.135; +Su Su [0 1 -1 0 0 0 0] 0.135; -SuModel transport; +SuModel unstrained; -equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 0.6; +equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6; -sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 338; +sigmaExt sigmaExt [0 0 -1 0 0 0 0] 338; XiModel transport; -XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62; +XiCoef XiCoef [0 0 0 0 0 0 0] 0.62; -XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1; +XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1; -uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1; +uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1; GuldersCoeffs { @@ -68,17 +68,26 @@ GuldersCoeffs } } -ignite no; +ignite yes; -ignitionSites ( ); +ignitionSites +( + { + location (0.005 -0.02 0); + diameter 0.003; + start 0; + duration 0.1; + strength 40; + } +); ignitionSphereFraction 0; -ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0; +ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0.001; -ignitionCircleFraction 0; +ignitionCircleFraction 1; -ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0; +ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0; // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict index 23b481bcaf..f5fe65e622 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict @@ -17,7 +17,7 @@ FoamFile application XiFoam; -startFrom startTime; +startFrom latestTime; startTime 0; @@ -27,9 +27,9 @@ endTime 10; deltaT 5e-06; -writeControl runTime; +writeControl adjustableRunTime; -writeInterval 0.1; +writeInterval 0.01; purgeWrite 0; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes index 78f524d421..e74dbeb191 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes @@ -38,7 +38,14 @@ divSchemes div(phiXi,Xi) Gauss limitedLinear 1; div(phiXi,Su) Gauss limitedLinear 1; div(phiSt,b) Gauss limitedLinear01 1; - div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; }; + div(phi,ft_b_h_hu) Gauss multivariateSelection + { + fu limitedLinear01 1; + ft limitedLinear01 1; + b limitedLinear01 1; + h limitedLinear 1; + hu limitedLinear 1; + }; div(U) Gauss linear; div((Su*grad(b))) Gauss linear; div((U+((Su*Xi)*grad(b)))) Gauss linear; @@ -52,8 +59,8 @@ laplacianSchemes laplacian(DkEff,k) Gauss linear corrected; laplacian(DBEff,B) Gauss linear corrected; laplacian((rho*(1|A(U))),p) Gauss linear corrected; - laplacian(muEff,b) Gauss linear corrected; - laplacian(muEff,ft) Gauss linear corrected; + laplacian(alphaEff,b) Gauss linear corrected; + laplacian(alphaEff,ft) Gauss linear corrected; laplacian(alphaEff,h) Gauss linear corrected; laplacian(alphaEff,hu) Gauss linear corrected; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution index cd3fb63f14..6e1d1ffd3e 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution @@ -124,6 +124,7 @@ solvers PISO { + nOuterCorrectors 1; nCorrectors 2; nNonOrthogonalCorrectors 0; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties index 1568261fe2..8d2c6962d7 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties @@ -19,21 +19,21 @@ laminarFlameSpeedCorrelation Gulders; fuel Propane; -Su Su [ 0 1 -1 0 0 0 0 ] 0.135; +Su Su [0 1 -1 0 0 0 0] 0.135; SuModel transport; -equivalenceRatio equivalenceRatio [ 0 0 0 0 0 0 0 ] 0.6; +equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6; -sigmaExt sigmaExt [ 0 0 -1 0 0 0 0 ] 338; +sigmaExt sigmaExt [0 0 -1 0 0 0 0] 338; XiModel transport; -XiCoef XiCoef [ 0 0 0 0 0 0 0 ] 0.62; +XiCoef XiCoef [0 0 0 0 0 0 0] 0.62; -XiShapeCoef XiShapeCoef [ 0 0 0 0 0 0 0 ] 1; +XiShapeCoef XiShapeCoef [0 0 0 0 0 0 0] 1; -uPrimeCoef uPrimeCoef [ 0 0 0 0 0 0 0 ] 1; +uPrimeCoef uPrimeCoef [0 0 0 0 0 0 0] 1; GuldersCoeffs { @@ -70,15 +70,24 @@ GuldersCoeffs ignite yes; -ignitionSites ( { location ( 0 0 0 ) ; diameter 0.003 ; start 0 ; duration 0.001 ; strength 2 ; } ); +ignitionSites +( + { + location (0 0 0); + diameter 0.003; + start 0; + duration 0.001; + strength 2; + } +); ignitionSphereFraction 1; -ignitionThickness ignitionThickness [ 0 1 0 0 0 0 0 ] 0; +ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0; ignitionCircleFraction 0; -ignitionKernelArea ignitionKernelArea [ 0 2 0 0 0 0 0 ] 0; +ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0; // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary index e9e872c1a8..19a09dd2c7 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,45 +10,44 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -( inlet +5 +( + inlet { type patch; - startFace 715675; nFaces 600; + startFace 715675; } - outlet { type patch; - startFace 716275; nFaces 1140; + startFace 716275; } - upperWall { type wall; - startFace 717415; nFaces 4460; + startFace 717415; } - lowerWall { type wall; - startFace 721875; nFaces 5000; + startFace 721875; } - frontAndBack { type cyclic; - startFace 726875; nFaces 24450; + startFace 726875; + featureCos 0.9; } - ) // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict index b9073e146d..cd473319ff 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict @@ -27,7 +27,7 @@ endTime 0.02; deltaT 5e-06; -writeControl runTime; +writeControl adjustableRunTime; writeInterval 0.0005; diff --git a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary index 895e29387d..2c67db9e2b 100644 --- a/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary +++ b/tutorials/combustion/XiFoam/ras/moriyoshiHomogeneous/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary index 42aaf838ff..fde0c49a89 100644 --- a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp index 5b9e11a58a..6da3027bfa 100644 --- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/points.tmp @@ -890,7 +890,7 @@ (0.092027148309198 0.043035802795154 -7.5111607367588e-05) (0.09263207221129 0.043855929103565 -7.65429970772772e-05) (0.093192171617555 0.044640776830937 -7.79128140787704e-05) -(0.093752202168401 0.045432032540685 -7.92938151136726e-05) +(0.093752202168401 0.045432032540685 -7.92938151136725e-05) (0.094312245417969 0.046226095413819 -8.067971557046e-05) (0.09487228896823 0.047021673078023 -8.20682598350704e-05) (0.095432330811069 0.047818192791575 -8.34584482851299e-05) @@ -33658,7 +33658,7 @@ (0.092027148309198 0.043035802795154 7.5111607367588e-05) (0.09263207221129 0.043855929103565 7.65429970772772e-05) (0.093192171617555 0.044640776830937 7.79128140787704e-05) -(0.093752202168401 0.045432032540685 7.92938151136726e-05) +(0.093752202168401 0.045432032540685 7.92938151136725e-05) (0.094312245417969 0.046226095413819 8.067971557046e-05) (0.09487228896823 0.047021673078023 8.20682598350704e-05) (0.095432330811069 0.047818192791575 8.34584482851299e-05) diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary index 492c762fdb..3309b5780a 100644 --- a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary index e04508a4d9..d3011e4e00 100644 --- a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary index 606cf5f91c..b77edc65ce 100644 --- a/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary index 4dcb5b5d7f..454f459211 100644 --- a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary index 540223e58f..0abd1608ab 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,53 +10,49 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 6 ( -front -{ - type wall; - nFaces 700; - startFace 63400; -} - -back -{ - type wall; - nFaces 700; - startFace 64100; -} - -wall -{ - type wall; - nFaces 1400; - startFace 64800; -} - -porosityWall -{ - type wall; - nFaces 1600; - startFace 66200; -} - -inlet -{ - type patch; - nFaces 400; - startFace 67800; -} - -outlet -{ - type patch; - nFaces 400; - startFace 68200; -} + front + { + type wall; + nFaces 700; + startFace 63400; + } + back + { + type wall; + nFaces 700; + startFace 64100; + } + wall + { + type wall; + nFaces 1400; + startFace 64800; + } + porosityWall + { + type wall; + nFaces 1600; + startFace 66200; + } + inlet + { + type patch; + nFaces 400; + startFace 67800; + } + outlet + { + type patch; + nFaces 400; + startFace 68200; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary new file mode 100644 index 0000000000..a664893343 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary @@ -0,0 +1,58 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format binary; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +6 +( + front + { + type wall; + nFaces 700; + startFace 63400; + } + back + { + type wall; + nFaces 700; + startFace 64100; + } + wall + { + type wall; + nFaces 1400; + startFace 64800; + } + porosityWall + { + type wall; + nFaces 1600; + startFace 66200; + } + inlet + { + type patch; + nFaces 400; + startFace 67800; + } + outlet + { + type patch; + nFaces 400; + startFace 68200; + } +) + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary index 9b47629860..2abc731c97 100644 --- a/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoSonicFoam/forwardStep/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,53 +10,49 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 6 ( -inlet -{ - type patch; - nFaces 50; - startFace 10325; -} - -outlet -{ - type patch; - nFaces 40; - startFace 10375; -} - -bottom -{ - type symmetryPlane; - nFaces 25; - startFace 10415; -} - -top -{ - type symmetryPlane; - nFaces 125; - startFace 10440; -} - -obstacle -{ - type patch; - nFaces 110; - startFace 10565; -} - -defaultFaces -{ - type empty; - nFaces 10500; - startFace 10675; -} + inlet + { + type patch; + nFaces 50; + startFace 10325; + } + outlet + { + type patch; + nFaces 40; + startFace 10375; + } + bottom + { + type symmetryPlane; + nFaces 25; + startFace 10415; + } + top + { + type symmetryPlane; + nFaces 125; + startFace 10440; + } + obstacle + { + type patch; + nFaces 110; + startFace 10565; + } + defaultFaces + { + type empty; + nFaces 10500; + startFace 10675; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/T b/tutorials/compressible/rhoSonicFoam/shockTube/0/T index 6ad695f316..6caa8d38ec 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/0/T +++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/T @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,25 +10,1030 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object T; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [0 0 0 1 0 0 0]; -internalField uniform 1; +internalField nonuniform List +1000 +( +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +348.432 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +278.746 +) +; boundaryField { - sides + sides { type zeroGradient; } - - empty + empty { type empty; } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/U b/tutorials/compressible/rhoSonicFoam/shockTube/0/U index abe534b5fe..f0e3a05af4 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/0/U +++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/U @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volVectorField; + location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,15 +21,15 @@ internalField uniform (0 0 0); boundaryField { - sides + sides { type zeroGradient; } - - empty + empty { type empty; } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/0/p b/tutorials/compressible/rhoSonicFoam/shockTube/0/p index 85c9743d30..2e4f54ab6d 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/0/p +++ b/tutorials/compressible/rhoSonicFoam/shockTube/0/p @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,25 +10,1030 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // dimensions [1 -1 -2 0 0 0 0]; -internalField uniform 0; +internalField nonuniform List +1000 +( +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +100000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +10000 +) +; boundaryField { - sides + sides { type zeroGradient; } - - empty + empty { type empty; } } + // ************************************************************************* // diff --git a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary index 0f1a86e2ce..e4b48d35f4 100644 --- a/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoSonicFoam/shockTube/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,25 +10,25 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 2 ( -sides -{ - type patch; - nFaces 2; - startFace 999; -} - -empty -{ - type empty; - nFaces 4000; - startFace 1001; -} + sides + { + type patch; + nFaces 2; + startFace 999; + } + empty + { + type empty; + nFaces 4000; + startFace 1001; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary index 2e49b61dde..a38765097f 100644 --- a/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary +++ b/tutorials/compressible/rhopSonicFoam/shockTube/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,25 +10,25 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 2 ( -sides -{ - type patch; - nFaces 2; - startFace 99; -} - -empty -{ - type empty; - nFaces 400; - startFace 101; -} + sides + { + type patch; + nFaces 2; + startFace 99; + } + empty + { + type empty; + nFaces 400; + startFace 101; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary index a3ca808b34..454f459211 100644 --- a/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary +++ b/tutorials/compressible/rhopSonicFoam/wedge15Ma5/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,53 +10,49 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 6 ( -inlet -{ - type patch; - nFaces 40; - startFace 9440; -} - -outlet -{ - type patch; - nFaces 40; - startFace 9480; -} - -bottom -{ - type symmetryPlane; - nFaces 40; - startFace 9520; -} - -top -{ - type symmetryPlane; - nFaces 120; - startFace 9560; -} - -obstacle -{ - type patch; - nFaces 80; - startFace 9680; -} - -defaultFaces -{ - type empty; - nFaces 9600; - startFace 9760; -} + inlet + { + type patch; + nFaces 40; + startFace 9440; + } + outlet + { + type patch; + nFaces 40; + startFace 9480; + } + bottom + { + type symmetryPlane; + nFaces 40; + startFace 9520; + } + top + { + type symmetryPlane; + nFaces 120; + startFace 9560; + } + obstacle + { + type patch; + nFaces 80; + startFace 9680; + } + defaultFaces + { + type empty; + nFaces 9600; + startFace 9760; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary index 9b47629860..2abc731c97 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,53 +10,49 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 6 ( -inlet -{ - type patch; - nFaces 50; - startFace 10325; -} - -outlet -{ - type patch; - nFaces 40; - startFace 10375; -} - -bottom -{ - type symmetryPlane; - nFaces 25; - startFace 10415; -} - -top -{ - type symmetryPlane; - nFaces 125; - startFace 10440; -} - -obstacle -{ - type patch; - nFaces 110; - startFace 10565; -} - -defaultFaces -{ - type empty; - nFaces 10500; - startFace 10675; -} + inlet + { + type patch; + nFaces 50; + startFace 10325; + } + outlet + { + type patch; + nFaces 40; + startFace 10375; + } + bottom + { + type symmetryPlane; + nFaces 25; + startFace 10415; + } + top + { + type symmetryPlane; + nFaces 125; + startFace 10440; + } + obstacle + { + type patch; + nFaces 110; + startFace 10565; + } + defaultFaces + { + type empty; + nFaces 10500; + startFace 10675; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary index 0f1a86e2ce..e4b48d35f4 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,25 +10,25 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 2 ( -sides -{ - type patch; - nFaces 2; - startFace 999; -} - -empty -{ - type empty; - nFaces 4000; - startFace 1001; -} + sides + { + type patch; + nFaces 2; + startFace 999; + } + empty + { + type empty; + nFaces 4000; + startFace 1001; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary index cee40325b6..59a99aa3f0 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,39 +10,37 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 4 ( -INLE1 -{ - type patch; - nFaces 400; - startFace 79570; -} - -OUTL2 -{ - type patch; - nFaces 200; - startFace 79970; -} - -SYMP3 -{ - type empty; - nFaces 80000; - startFace 80170; -} - -WALL10 -{ - type wall; - nFaces 260; - startFace 160170; -} + INLE1 + { + type patch; + nFaces 400; + startFace 79570; + } + OUTL2 + { + type patch; + nFaces 200; + startFace 79970; + } + SYMP3 + { + type empty; + nFaces 80000; + startFace 80170; + } + WALL10 + { + type wall; + nFaces 260; + startFace 160170; + } ) // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict index 2929b3f01f..c10b44bf2d 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict @@ -23,13 +23,13 @@ startTime 0; stopAt endTime; -endTime 0.03; +endTime 0.01; deltaT 4e-08; writeControl runTime; -writeInterval 1e-05; +writeInterval 2e-04; purgeWrite 0; diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/alphat b/tutorials/compressible/sonicFoam/ras/prism/0/alphat new file mode 100644 index 0000000000..4eeae65666 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/0/alphat @@ -0,0 +1,56 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alphat; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type calculated; + value uniform 0; + } + outlet + { + type calculated; + value uniform 0; + } + bottomWall + { + type calculated; + value uniform 0; + } + topWall + { + type calculated; + value uniform 0; + } + prismWall + { + type compressible::alphatWallFunction; + value uniform 0; + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/epsilon b/tutorials/compressible/sonicFoam/ras/prism/0/epsilon index 18c90717aa..a7bd5b6bb0 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/0/epsilon +++ b/tutorials/compressible/sonicFoam/ras/prism/0/epsilon @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,42 +21,39 @@ internalField uniform 266000; boundaryField { - inlet + inlet { type fixedValue; value uniform 266000; } - - outlet + outlet { type inletOutlet; inletValue uniform 266000; value uniform 266000; } - - bottomWall + bottomWall { type inletOutlet; inletValue uniform 266000; value uniform 266000; } - - topWall + topWall { type inletOutlet; inletValue uniform 266000; value uniform 266000; } - - prismWall + prismWall { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 266000; } - - defaultFaces + defaultFaces { type empty; } } + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/k b/tutorials/compressible/sonicFoam/ras/prism/0/k index dc82052c52..77ca6b529a 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/0/k +++ b/tutorials/compressible/sonicFoam/ras/prism/0/k @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -20,42 +21,39 @@ internalField uniform 1000; boundaryField { - inlet + inlet { type fixedValue; value uniform 1000; } - - outlet + outlet { type inletOutlet; inletValue uniform 1000; value uniform 1000; } - - bottomWall + bottomWall { type inletOutlet; inletValue uniform 1000; value uniform 1000; } - - topWall + topWall { type inletOutlet; inletValue uniform 1000; value uniform 1000; } - - prismWall + prismWall { - type zeroGradient; + type compressible::kQRWallFunction; + value uniform 1000; } - - defaultFaces + defaultFaces { type empty; } } + // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/0/mut b/tutorials/compressible/sonicFoam/ras/prism/0/mut new file mode 100644 index 0000000000..e7ebcbc993 --- /dev/null +++ b/tutorials/compressible/sonicFoam/ras/prism/0/mut @@ -0,0 +1,56 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object mut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type calculated; + value uniform 0; + } + outlet + { + type calculated; + value uniform 0; + } + bottomWall + { + type calculated; + value uniform 0; + } + topWall + { + type calculated; + value uniform 0; + } + prismWall + { + type mutWallFunction; + value uniform 0; + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary index c8440081ea..635f185a35 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary index d2479db212..add55d69d6 100644 --- a/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary +++ b/tutorials/compressible/sonicLiquidFoam/decompressionTank/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/particleProperties b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/particleProperties new file mode 100644 index 0000000000..461aa98233 --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpacePeriodic/0/uniform/lagrangian/dsmc/particleProperties @@ -0,0 +1,24 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "0/uniform/lagrangian/dsmc"; + object particleProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +processor0 +{ + particleCount 63978; +} + + +// ************************************************************************* // diff --git a/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/particleProperties b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/particleProperties new file mode 100644 index 0000000000..461aa98233 --- /dev/null +++ b/tutorials/discreteMethods/dsmcFoam/freeSpaceStream/0/uniform/lagrangian/dsmc/particleProperties @@ -0,0 +1,24 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "0/uniform/lagrangian/dsmc"; + object particleProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +processor0 +{ + particleCount 63978; +} + + +// ************************************************************************* // diff --git a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary index 0ccf019b6d..19dcc8f12a 100644 --- a/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary +++ b/tutorials/electromagnetics/electrostaticFoam/chargedWire/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/ft b/tutorials/electromagnetics/mhdFoam/hartmann/0/Ux similarity index 64% rename from tutorials/combustion/XiFoam/les/pitzDaily/0/ft rename to tutorials/electromagnetics/mhdFoam/hartmann/0/Ux index 886886dd1a..710f0df1b2 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/ft +++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/Ux @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,43 +10,42 @@ FoamFile version 2.0; format ascii; class volScalarField; - object ft; + location "0"; + object Ux; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; +dimensions [0 1 -1 0 0 0 0]; internalField uniform 0; boundaryField { - inlet + inlet { - type fixedValue; + type calculated; + value uniform 1; + } + outlet + { + type calculated; value uniform 0; } - - outlet + lowerWall { - type inletOutlet; - inletValue uniform 0; + type calculated; value uniform 0; } - - upperWall + upperWall { - type zeroGradient; + type calculated; + value uniform 0; } - - lowerWall - { - type zeroGradient; - } - - frontAndBack + frontAndBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/Uy b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uy new file mode 100644 index 0000000000..7154a1fe5f --- /dev/null +++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uy @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object Uy; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type calculated; + value uniform 0; + } + outlet + { + type calculated; + value uniform 0; + } + lowerWall + { + type calculated; + value uniform 0; + } + upperWall + { + type calculated; + value uniform 0; + } + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/0/Uz b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uz new file mode 100644 index 0000000000..fb4475364a --- /dev/null +++ b/tutorials/electromagnetics/mhdFoam/hartmann/0/Uz @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object Uz; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type calculated; + value uniform 0; + } + outlet + { + type calculated; + value uniform 0; + } + lowerWall + { + type calculated; + value uniform 0; + } + upperWall + { + type calculated; + value uniform 0; + } + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary index 6b2eb17562..77a03408cd 100644 --- a/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary +++ b/tutorials/electromagnetics/mhdFoam/hartmann/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5-8cbffd16687e | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary index edc3f6e6e2..b2d00fdb82 100644 --- a/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary +++ b/tutorials/financial/financialFoam/europeanCall/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary new file mode 100644 index 0000000000..e0608ea9d7 --- /dev/null +++ b/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/iglooWithFridges/constant/polyMesh/boundary @@ -0,0 +1,76 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +9 +( + maxY + { + type empty; + nFaces 0; + startFace 60456; + } + minX + { + type empty; + nFaces 0; + startFace 60456; + } + maxX + { + type empty; + nFaces 0; + startFace 60456; + } + minY + { + type empty; + nFaces 0; + startFace 60456; + } + ground + { + type wall; + nFaces 590; + startFace 60456; + } + maxZ + { + type empty; + nFaces 0; + startFace 61046; + } + igloo_region0 + { + type wall; + nFaces 2260; + startFace 61046; + } + twoFridgeFreezers_seal_0 + { + type wall; + nFaces 1344; + startFace 63306; + } + twoFridgeFreezers_herring_1 + { + type wall; + nFaces 1116; + startFace 64650; + } +) + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k.old b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat similarity index 65% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k.old rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat index 4ec7f08960..a270cb2178 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/k.old +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/alphat @@ -11,30 +11,35 @@ FoamFile format ascii; class volScalarField; location "0"; - object k; + object alphat; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -1 0 0 0 0]; -internalField uniform 0.1; +internalField uniform 0; boundaryField { + box + { + type compressible::alphatWallFunction; + value uniform 0; + } floor { - type compressible::kQRWallFunction; - value uniform 0.1; + type compressible::alphatWallFunction; + value uniform 0; } ceiling { - type compressible::kQRWallFunction; - value uniform 0.1; + type compressible::alphatWallFunction; + value uniform 0; } fixedWalls { - type compressible::kQRWallFunction; - value uniform 0.1; + type compressible::alphatWallFunction; + value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon index d5e7b9cd02..312afc24a6 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/epsilon @@ -15,34 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [ 0 2 -3 0 0 0 0 ]; +dimensions [0 2 -3 0 0 0 0]; internalField uniform 0.01; boundaryField { - floor - { - type compressible::epsilonWallFunction; - value uniform 0; - } - - ceiling - { - type compressible::epsilonWallFunction; - value uniform 0; - } - - fixedWalls - { - type compressible::epsilonWallFunction; - value uniform 0; - } - box { type compressible::epsilonWallFunction; - value uniform 0; + value uniform 0.01; + } + floor + { + type compressible::epsilonWallFunction; + value uniform 0.01; + } + ceiling + { + type compressible::epsilonWallFunction; + value uniform 0.01; + } + fixedWalls + { + type compressible::epsilonWallFunction; + value uniform 0.01; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k index 5b206f8e4e..daee975209 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/k @@ -15,34 +15,31 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [ 0 2 -2 0 0 0 0 ]; +dimensions [0 2 -2 0 0 0 0]; internalField uniform 0.1; boundaryField { - floor - { - type compressible::kQRWallFunction; - value uniform 0; - } - - ceiling - { - type compressible::kQRWallFunction; - value uniform 0; - } - - fixedWalls - { - type compressible::kQRWallFunction; - value uniform 0; - } - box { type compressible::kQRWallFunction; - value uniform 0; + value uniform 0.1; + } + floor + { + type compressible::kQRWallFunction; + value uniform 0.1; + } + ceiling + { + type compressible::kQRWallFunction; + value uniform 0.1; + } + fixedWalls + { + type compressible::kQRWallFunction; + value uniform 0.1; } } diff --git a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon.old b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut similarity index 69% rename from tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon.old rename to tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut index 23851291dc..06d03ee778 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqSimpleFoam/hotRoom/0/epsilon.old +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/mut @@ -11,30 +11,35 @@ FoamFile format ascii; class volScalarField; location "0"; - object epsilon; + object mut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; +dimensions [1 -1 -1 0 0 0 0]; -internalField uniform 0.01; +internalField uniform 0; boundaryField { + box + { + type mutWallFunction; + value uniform 0; + } floor { - type compressible::epsilonWallFunction; - value uniform 0.01; + type mutWallFunction; + value uniform 0; } ceiling { - type compressible::epsilonWallFunction; - value uniform 0.01; + type mutWallFunction; + value uniform 0; } fixedWalls { - type compressible::epsilonWallFunction; - value uniform 0.01; + type mutWallFunction; + value uniform 0; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary index add6399d3f..ab64c00e28 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary index ab64c00e28..47d2c42505 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format ascii; + format binary; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict index 0679f5ee9a..554df2afd6 100644 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/blockMeshDict @@ -15,7 +15,16 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // General macros to create 2D/extruded-2D meshes -//define(calc, [esyscmd(echo $1 | bc | tr -d \\n)]) + + + + + + + + + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -23,33 +32,283 @@ convertToMeters 0.1; // Hub radius + // Impeller-tip radius + // Baffle-tip radius + // Tank radius + // MRF region radius + // Thickness of 2D slab + // Base z + // Top z + // Number of cells radially between hub and impeller tip + // Number of cells radially in each of the two regions between // impeller and baffle tips + // Number of cells radially between baffle tip and tank + // Number of cells azimuthally in each of the 8 blocks + // Number of cells in the thickness of the slab + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // vertices @@ -161,7 +420,7 @@ vertices (0.707106781821139 0.707106780551956 0.1) // Vertex R7st = 95 ); -blocks +blocks ( // block0 hex (0 2 13 12 48 50 61 60) @@ -433,7 +692,7 @@ edges arc 94 84 (0.923879532683006 0.382683431950523 0.1) ); -patches +patches ( wall rotor ( diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary index 301f1ff612..292f25b806 100644 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,39 +10,37 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 4 ( -rotor -{ - type wall; - nFaces 192; - startFace 5952; -} - -stator -{ - type wall; - nFaces 192; - startFace 6144; -} - -front -{ - type empty; - nFaces 3072; - startFace 6336; -} - -back -{ - type empty; - nFaces 3072; - startFace 9408; -} + rotor + { + type wall; + nFaces 192; + startFace 5952; + } + stator + { + type wall; + nFaces 192; + startFace 6144; + } + front + { + type empty; + nFaces 3072; + startFace 6336; + } + back + { + type empty; + nFaces 3072; + startFace 9408; + } ) // ************************************************************************* // diff --git a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary index 5ee792177a..34af32827c 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary +++ b/tutorials/incompressible/boundaryFoam/boundaryLaunderSharma/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary index 5ee792177a..34af32827c 100644 --- a/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary +++ b/tutorials/incompressible/boundaryFoam/boundaryWallFunctions/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/channelFoam/channel395/constant/LESProperties b/tutorials/incompressible/channelFoam/channel395/constant/LESProperties index 8c32bfa67c..9bcc936fc3 100644 --- a/tutorials/incompressible/channelFoam/channel395/constant/LESProperties +++ b/tutorials/incompressible/channelFoam/channel395/constant/LESProperties @@ -17,8 +17,6 @@ FoamFile LESModel oneEqEddy; -turbulence on; - printCoeffs on; delta vanDriest; diff --git a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary index fb95d69234..2f0b51717c 100644 --- a/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary +++ b/tutorials/incompressible/channelFoam/channel395/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary index cc15fe93fc..61feadd974 100644 --- a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary index 63b839343e..8c7162efda 100644 --- a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary index cc15fe93fc..61feadd974 100644 --- a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary index 0b3c204903..fbdbc176b3 100644 --- a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary index 31f0f41f93..7766ed29e4 100644 --- a/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary +++ b/tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,53 +10,49 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 6 ( -left -{ - type patch; - nFaces 35; - startFace 3485; -} - -right -{ - type patch; - nFaces 35; - startFace 3520; -} - -down -{ - type wall; - nFaces 40; - startFace 3555; -} - -up -{ - type wall; - nFaces 40; - startFace 3595; -} - -cylinder -{ - type wall; - nFaces 80; - startFace 3635; -} - -defaultFaces -{ - type empty; - nFaces 3600; - startFace 3715; -} + left + { + type patch; + nFaces 35; + startFace 3485; + } + right + { + type patch; + nFaces 35; + startFace 3520; + } + down + { + type wall; + nFaces 40; + startFace 3555; + } + up + { + type wall; + nFaces 40; + startFace 3595; + } + cylinder + { + type wall; + nFaces 80; + startFace 3635; + } + defaultFaces + { + type empty; + nFaces 3600; + startFace 3715; + } ) // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary index a6e8b86643..62bc7f68e6 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary +++ b/tutorials/incompressible/pimpleFoam/t-junction/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties index 0d948b7ff1..034085751a 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties +++ b/tutorials/incompressible/pisoFoam/les/pitzDaily/constant/LESProperties @@ -15,8 +15,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulence on; - LESModel oneEqEddy; delta cubeRootVol; diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties index 0d948b7ff1..034085751a 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/LESProperties @@ -15,8 +15,6 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -turbulence on; - LESModel oneEqEddy; delta cubeRootVol; diff --git a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary index 0b56bb9f5e..fb820c3f43 100644 --- a/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary +++ b/tutorials/incompressible/pisoFoam/les/pitzDailyDirectMapped/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -24,6 +24,7 @@ inlet nFaces 30; startFace 27238; sampleMode nearestCell; + sampleRegion region0; samplePatch none; offset ( 0.0495 0 0 ); } diff --git a/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary index d68c9a7036..61feadd974 100644 --- a/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary +++ b/tutorials/incompressible/pisoFoam/ras/cavity/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean index a657f303ba..f73c44df8a 100755 --- a/tutorials/incompressible/simpleFoam/airFoil2D/Allclean +++ b/tutorials/incompressible/simpleFoam/airFoil2D/Allclean @@ -3,3 +3,4 @@ # Clean time folders only rm -rf *[1-9]* +rm log.* diff --git a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary index 7a2e890684..b79c6ad432 100644 --- a/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary +++ b/tutorials/incompressible/simpleFoam/motorBike/constant/polyMesh/boundary @@ -21,433 +21,433 @@ FoamFile { type patch; nFaces 320; - startFace 955219; + startFace 1016586; } inlet { type patch; nFaces 64; - startFace 955539; + startFace 1016906; } outlet { type patch; nFaces 64; - startFace 955603; + startFace 1016970; } lowerWall { type wall; nFaces 5330; - startFace 955667; + startFace 1017034; } upperWall { type patch; nFaces 160; - startFace 960997; + startFace 1022364; } motorBike_frt-fairing:001%1 { type wall; - nFaces 9726; - startFace 961157; + nFaces 6626; + startFace 1022524; } motorBike_windshield:002%2 { type wall; - nFaces 86; - startFace 970883; + nFaces 50; + startFace 1029150; } motorBike_rr-wh-rim:005%5 { type wall; - nFaces 186; - startFace 970969; + nFaces 181; + startFace 1029200; } motorBike_rr-wh-rim:010%10 { type wall; - nFaces 355; - startFace 971155; + nFaces 340; + startFace 1029381; } motorBike_fr-wh-rim:011%11 { type wall; - nFaces 594; - startFace 971510; + nFaces 474; + startFace 1029721; } motorBike_fr-wh-brake-disk:012%12 { type wall; - nFaces 55; - startFace 972104; + nFaces 54; + startFace 1030195; } motorBike_frame:016-shadow%13 { type wall; - nFaces 163; - startFace 972159; + nFaces 131; + startFace 1030249; } motorBike_rear-susp:014%14 { type wall; - nFaces 1300; - startFace 972322; + nFaces 1073; + startFace 1030380; } motorBike_rear-susp:014-shadow%15 { type wall; - nFaces 166; - startFace 973622; + nFaces 159; + startFace 1031453; } motorBike_frame:016%16 { type wall; - nFaces 21; - startFace 973788; + nFaces 20; + startFace 1031612; } motorBike_rr-wh-rim:005-shadow%17 { type wall; nFaces 25; - startFace 973809; + startFace 1031632; } motorBike_rr-wh-chain-hub:022%22 { type wall; - nFaces 161; - startFace 973834; + nFaces 141; + startFace 1031657; } motorBike_rearseat%24 { type wall; - nFaces 543; - startFace 973995; + nFaces 432; + startFace 1031798; } motorBike_frt-fairing%25 { type wall; - nFaces 927; - startFace 974538; + nFaces 626; + startFace 1032230; } motorBike_windshield%26 { type wall; - nFaces 821; - startFace 975465; + nFaces 428; + startFace 1032856; } motorBike_headlights%27 { type wall; - nFaces 280; - startFace 976286; + nFaces 161; + startFace 1033284; } motorBike_driversseat%28 { type wall; - nFaces 457; - startFace 976566; + nFaces 367; + startFace 1033445; } motorBike_rear-body%29 { type wall; - nFaces 3081; - startFace 977023; + nFaces 2076; + startFace 1033812; } motorBike_fuel-tank%30 { type wall; - nFaces 1512; - startFace 980104; + nFaces 912; + startFace 1035888; } motorBike_exhaust%31 { type wall; - nFaces 3516; - startFace 981616; + nFaces 2391; + startFace 1036800; } motorBike_rr-wh-rim%32 { type wall; - nFaces 2128; - startFace 985132; + nFaces 1430; + startFace 1039191; } motorBike_fr-mud-guard%33 { type wall; - nFaces 1096; - startFace 987260; + nFaces 767; + startFace 1040621; } motorBike_fr-wh-rim%34 { type wall; - nFaces 954; - startFace 988356; + nFaces 592; + startFace 1041388; } motorBike_fr-wh-brake-disk%35 { type wall; nFaces 533; - startFace 989310; + startFace 1041980; } motorBike_fr-brake-caliper%36 { type wall; - nFaces 199; - startFace 989843; + nFaces 164; + startFace 1042513; } motorBike_fr-wh-tyre%37 { type wall; - nFaces 1855; - startFace 990042; + nFaces 1118; + startFace 1042677; } motorBike_hbars%38 { type wall; - nFaces 745; - startFace 991897; + nFaces 535; + startFace 1043795; } motorBike_fr-forks%39 { type wall; - nFaces 1637; - startFace 992642; + nFaces 1144; + startFace 1044330; } motorBike_chain%40 { type wall; - nFaces 484; - startFace 994279; + nFaces 474; + startFace 1045474; } motorBike_rr-wh-tyre%41 { type wall; - nFaces 3022; - startFace 994763; + nFaces 1785; + startFace 1045948; } motorBike_square-dial%42 { type wall; - nFaces 9; - startFace 997785; + nFaces 6; + startFace 1047733; } motorBike_round-dial%43 { type wall; - nFaces 24; - startFace 997794; + nFaces 18; + startFace 1047739; } motorBike_dial-holder%44 { type wall; - nFaces 120; - startFace 997818; + nFaces 87; + startFace 1047757; } motorBike_rear-susp%45 { type wall; - nFaces 2050; - startFace 997938; + nFaces 1787; + startFace 1047844; } motorBike_rear-brake-lights%46 { type wall; - nFaces 75; - startFace 999988; + nFaces 54; + startFace 1049631; } motorBike_rear-light-bracket%47 { type wall; - nFaces 226; - startFace 1000063; + nFaces 163; + startFace 1049685; } motorBike_frame%48 { type wall; - nFaces 2849; - startFace 1000289; + nFaces 2040; + startFace 1049848; } motorBike_rear-mud-guard%49 { type wall; - nFaces 1177; - startFace 1003138; + nFaces 804; + startFace 1051888; } motorBike_rear-susp-spring-damp%50 { type wall; - nFaces 138; - startFace 1004315; + nFaces 125; + startFace 1052692; } motorBike_fairing-inner-plate%51 { type wall; - nFaces 551; - startFace 1004453; + nFaces 446; + startFace 1052817; } motorBike_clutch-housing%52 { type wall; - nFaces 1199; - startFace 1005004; + nFaces 966; + startFace 1053263; } motorBike_radiator%53 { type wall; - nFaces 51; - startFace 1006203; + nFaces 48; + startFace 1054229; } motorBike_water-pipe%54 { type wall; - nFaces 112; - startFace 1006254; + nFaces 103; + startFace 1054277; } motorBike_water-pump%55 { type wall; - nFaces 96; - startFace 1006366; + nFaces 74; + startFace 1054380; } motorBike_engine%56 { type wall; - nFaces 2963; - startFace 1006462; + nFaces 2384; + startFace 1054454; } motorBike_rear-shock-link%57 { type wall; - nFaces 33; - startFace 1009425; + nFaces 29; + startFace 1056838; } motorBike_rear-brake-fluid-pot-bracket%58 { type wall; - nFaces 63; - startFace 1009458; + nFaces 59; + startFace 1056867; } motorBike_rear-brake-fluid-pot%59 { type wall; - nFaces 59; - startFace 1009521; + nFaces 53; + startFace 1056926; } motorBike_footpeg%60 { type wall; - nFaces 103; - startFace 1009580; + nFaces 87; + startFace 1056979; } motorBike_rr-wh-chain-hub%61 { type wall; - nFaces 160; - startFace 1009683; + nFaces 145; + startFace 1057066; } motorBike_rear-brake-caliper%62 { type wall; - nFaces 158; - startFace 1009843; + nFaces 142; + startFace 1057211; } motorBike_rider-helmet%65 { type wall; - nFaces 964; - startFace 1010001; + nFaces 583; + startFace 1057353; } motorBike_rider-visor%66 { type wall; - nFaces 170; - startFace 1010965; + nFaces 95; + startFace 1057936; } motorBike_rider-boots%67 { type wall; - nFaces 1657; - startFace 1011135; + nFaces 1025; + startFace 1058031; } motorBike_rider-gloves%68 { type wall; - nFaces 436; - startFace 1012792; + nFaces 320; + startFace 1059056; } motorBike_rider-body%69 { type wall; - nFaces 7207; - startFace 1013228; + nFaces 4555; + startFace 1059376; } motorBike_frame:0%70 { type wall; - nFaces 52; - startFace 1020435; + nFaces 37; + startFace 1063931; } motorBike_frt-fairing:001-shadow%74 { type wall; - nFaces 1340; - startFace 1020487; + nFaces 1274; + startFace 1063968; } motorBike_windshield-shadow%75 { type wall; - nFaces 111; - startFace 1021827; + nFaces 101; + startFace 1065242; } motorBike_fr-mud-guard-shadow%81 { type wall; - nFaces 135; - startFace 1021938; + nFaces 129; + startFace 1065343; } motorBike_fr-wh-brake-disk-shadow%83 { type wall; nFaces 77; - startFace 1022073; + startFace 1065472; } motorBike_rear-mud-guard-shadow%84 { type wall; - nFaces 143; - startFace 1022150; + nFaces 138; + startFace 1065549; } motorBike_rear-susp-spring-damp-shadow%85 { type wall; nFaces 15; - startFace 1022293; + startFace 1065687; } motorBike_radiator-shadow%86 { type wall; nFaces 12; - startFace 1022308; + startFace 1065702; } motorBike_rear-shock-link-shadow%87 { type wall; nFaces 7; - startFace 1022320; + startFace 1065714; } motorBike_rear-brake-fluid-pot-bracket-shadow%88 { type wall; nFaces 6; - startFace 1022327; + startFace 1065721; } motorBike_rr-wh-chain-hub-shadow%89 { type wall; nFaces 24; - startFace 1022333; + startFace 1065727; } ) diff --git a/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/boundary new file mode 100644 index 0000000000..313dcceba1 --- /dev/null +++ b/tutorials/incompressible/simpleFoam/pitzDaily/constant/polyMesh/boundary @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +5 +( + inlet + { + type patch; + nFaces 30; + startFace 24170; + } + outlet + { + type patch; + nFaces 57; + startFace 24200; + } + upperWall + { + type wall; + nFaces 223; + startFace 24257; + } + lowerWall + { + type wall; + nFaces 250; + startFace 24480; + } + frontAndBack + { + type empty; + nFaces 24450; + startFace 24730; + } +) + +// ************************************************************************* // diff --git a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary index 8eb7d98937..313dcceba1 100644 --- a/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary +++ b/tutorials/incompressible/simpleFoam/pitzDailyExptInlet/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,46 +10,43 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 5 ( -inlet -{ - type patch; - nFaces 30; - startFace 24170; -} - -outlet -{ - type patch; - nFaces 57; - startFace 24200; -} - -upperWall -{ - type wall; - nFaces 223; - startFace 24257; -} - -lowerWall -{ - type wall; - nFaces 250; - startFace 24480; -} - -frontAndBack -{ - type empty; - nFaces 24450; - startFace 24730; -} + inlet + { + type patch; + nFaces 30; + startFace 24170; + } + outlet + { + type patch; + nFaces 57; + startFace 24200; + } + upperWall + { + type wall; + nFaces 223; + startFace 24257; + } + lowerWall + { + type wall; + nFaces 250; + startFace 24480; + } + frontAndBack + { + type empty; + nFaces 24450; + startFace 24730; + } ) // ************************************************************************* // diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary new file mode 100644 index 0000000000..e752d70159 --- /dev/null +++ b/tutorials/incompressible/simpleSRFFoam/mixer/constant/polyMesh/boundary @@ -0,0 +1,53 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +5 +( + inlet + { + type patch; + nFaces 840; + startFace 96680; + } + outlet + { + type patch; + nFaces 840; + startFace 97520; + } + innerWall + { + type wall; + nFaces 2480; + startFace 98360; + } + outerWall + { + type wall; + nFaces 880; + startFace 100840; + } + cyclic + { + type cyclic; + nFaces 3200; + startFace 101720; + featureCos 0.9; + } +) + +// ************************************************************************* // diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat new file mode 100644 index 0000000000..8ceda71797 --- /dev/null +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/alphat @@ -0,0 +1,50 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alphat; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + top + { + type compressible::alphatWallFunction; + value uniform 0; + } + bottom + { + type compressible::alphatWallFunction; + value uniform 0; + } + walls + { + type compressible::alphatWallFunction; + value uniform 0; + } + symmetry + { + type symmetryPlane; + } + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/epsilon.old b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut similarity index 65% rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/epsilon.old rename to tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut index 23851291dc..c2fd24e8ef 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/epsilon.old +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/0/mut @@ -11,30 +11,38 @@ FoamFile format ascii; class volScalarField; location "0"; - object epsilon; + object mut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -3 0 0 0 0]; +dimensions [1 -1 -1 0 0 0 0]; -internalField uniform 0.01; +internalField uniform 0; boundaryField { - floor + top { - type compressible::epsilonWallFunction; - value uniform 0.01; + type mutWallFunction; + value uniform 0; } - ceiling + bottom { - type compressible::epsilonWallFunction; - value uniform 0.01; + type mutWallFunction; + value uniform 0; } - fixedWalls + walls { - type compressible::epsilonWallFunction; - value uniform 0.01; + type mutWallFunction; + value uniform 0; + } + symmetry + { + type symmetryPlane; + } + frontAndBack + { + type empty; } } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary new file mode 100644 index 0000000000..b130d7bc0a --- /dev/null +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/polyMesh/boundary @@ -0,0 +1,52 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +5 +( + top + { + type wall; + nFaces 5; + startFace 4855; + } + bottom + { + type wall; + nFaces 45; + startFace 4860; + } + walls + { + type wall; + nFaces 140; + startFace 4905; + } + symmetry + { + type symmetryPlane; + nFaces 100; + startFace 5045; + } + frontAndBack + { + type empty; + nFaces 5000; + startFace 5145; + } +) + +// ************************************************************************* // diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean index 9ded4bdec6..cb015f101f 100755 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/Allclean @@ -1,16 +1,12 @@ #!/bin/sh -set -x -# remove old cell sets -rm -rf constant/polyMesh/sets -foamClearPolyMesh +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions -# remove old time folders -rm -rf 0 *[1-9]* +cleanCase -# remove old log files -rm -f log* +# remove 0 directory +rm -rf 0 # copy 0.org to 0 cp -r 0.org 0 - diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1 b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary similarity index 64% rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1 rename to tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary index 8e28c332b7..52fb40b02f 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/alpha1 +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/polyMesh/boundary @@ -1,37 +1,34 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { version 2.0; format ascii; - class volScalarField; - object alpha1; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - front - { - type empty; - } - back - { - type empty; - } +2 +( walls { - type zeroGradient; + type wall; + nFaces 80; + startFace 760; } -} + frontAndBack + { + type empty; + nFaces 800; + startFace 840; + } +) // ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat new file mode 100644 index 0000000000..8ceda71797 --- /dev/null +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/alphat @@ -0,0 +1,50 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object alphat; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + top + { + type compressible::alphatWallFunction; + value uniform 0; + } + bottom + { + type compressible::alphatWallFunction; + value uniform 0; + } + walls + { + type compressible::alphatWallFunction; + value uniform 0; + } + symmetry + { + type symmetryPlane; + } + frontAndBack + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k.old b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut similarity index 65% rename from tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k.old rename to tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut index 4ec7f08960..c2fd24e8ef 100644 --- a/tutorials/heatTransfer/buoyantBoussinesqPisoFoam/hotRoom/0/k.old +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/mut @@ -11,30 +11,38 @@ FoamFile format ascii; class volScalarField; location "0"; - object k; + object mut; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [0 2 -2 0 0 0 0]; +dimensions [1 -1 -1 0 0 0 0]; -internalField uniform 0.1; +internalField uniform 0; boundaryField { - floor + top { - type compressible::kQRWallFunction; - value uniform 0.1; + type mutWallFunction; + value uniform 0; } - ceiling + bottom { - type compressible::kQRWallFunction; - value uniform 0.1; + type mutWallFunction; + value uniform 0; } - fixedWalls + walls { - type compressible::kQRWallFunction; - value uniform 0.1; + type mutWallFunction; + value uniform 0; + } + symmetry + { + type symmetryPlane; + } + frontAndBack + { + type empty; } } diff --git a/tutorials/mesh/snappyHexMesh/snappyMultiRegionHeater b/tutorials/mesh/snappyHexMesh/snappyMultiRegionHeater new file mode 120000 index 0000000000..4d5b442c46 --- /dev/null +++ b/tutorials/mesh/snappyHexMesh/snappyMultiRegionHeater @@ -0,0 +1 @@ +../../heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater \ No newline at end of file diff --git a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary index 70c4c3d9af..56e0a545c1 100644 --- a/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary +++ b/tutorials/multiphase/bubbleFoam/bubbleColumn/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties index b16fea4ab2..583bb94896 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties @@ -17,8 +17,6 @@ FoamFile LESModel oneEqEddy; -turbulence on; - delta smooth; laminarCoeffs diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary index b2c07faf58..f401f8d162 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -21,25 +21,25 @@ FoamFile { type patch; nFaces 51; - startFace 15151; + startFace 57362; } outlet { type patch; nFaces 51; - startFace 15202; + startFace 57413; } walls { type wall; - nFaces 436; - startFace 15253; + nFaces 836; + startFace 57464; } frontBack { type empty; - nFaces 15420; - startFace 15689; + nFaces 57540; + startFace 58300; } ) diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties index b16fea4ab2..583bb94896 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties @@ -17,8 +17,6 @@ FoamFile LESModel oneEqEddy; -turbulence on; - delta smooth; laminarCoeffs diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary index adffe02dd4..e48eb3773b 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -21,25 +21,25 @@ FoamFile { type patch; nFaces 510; - startFace 220900; + startFace 4413730; } outlet { type patch; nFaces 510; - startFace 221410; + startFace 4414240; } walls { type wall; - nFaces 4360; - startFace 221920; + nFaces 37840; + startFace 4414750; } frontBack { type wall; - nFaces 15420; - startFace 226280; + nFaces 57540; + startFace 4452590; } ) diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.gz b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/alpha1.gz new file mode 100644 index 0000000000000000000000000000000000000000..d976dd8e9473e71311d044ddf2a7067c8aea2690 GIT binary patch literal 523 zcmV+m0`&bKiwFP!000001MS^UkJ3OG$MO5Tipido4YcgZfSTZ%dU3;HH+m2cLp!?F zVWw#dh{Ahc`UgW+my*pUbd&G%xwO;r^w*Yzgv;Y~x((Io%FFX}*=;;=d+J22<(pl} z`?daOrK#52ev?VH?MWHPSet0C-#F1W7>}+7^5#~Td-B@N(@@LH;Jv(Y&P?5}d;RK$ z+jep+6P>C&cDC;KNvGL%Zy;r)7f0r+8W!#3NZM%ssQj#_gKB%ZT=sTpdoKNcsNc3> z*-lWGhdev>0!+tJnWMBvmch>aG1L~(&d^}x!DUG)56x%kbcGnH2fR2If@ zwHz9iWp%KHGuNRqDh-M^S{*ko{QEA>{IhD&O@HWc*UKcgsy`GP;d!$2WIRuZD4uCs z+({kqi!b+l9SRZKT&Grcw=!k-N-^eo9&yU%WfD2JvzRTV>1 N?f@T04#7KU007J{0bT$A literal 0 HcmV?d00001 diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.gz b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.gz new file mode 100644 index 0000000000000000000000000000000000000000..62a7129895c73d18cbc620886a4eed5adf6b334e GIT binary patch literal 641 zcmb2|=3oE==C_v|{cn3nus!(wrz_AuSF7N`7NxshTSC8W5@ipl)~Gf(x#8=&jmqi= zE*+}R7it$>bjeBkR?eZ%mYwCKiylJW@CH1vv9__cRTl)6^MzKC!6l6G~MU#ZvFP-&!0b^ zea$j|{p|ezQ?uF5J$`h1M)=VeTVixRR^Pk-(AMtu-qn*^>*mh?(rwgwKC!HM^S9Qs z`P=s1e0!F?|MfGK`CGJ49B*Ef(axS~C#Nq~7B>BN^PV%a|GnwncKvkKhxgknF4bP* zyXIcM^q^Aq74C4w(@D<{ZqwmTjF__|>zhFL*4i6g(wFa-z1enKey>1R)}&cl`oFvX zt$y`ti&ols$$I@`lf@tZ+`OkJG5h!QJaZe~=(~}OkRZoGZcy15YU3vtwZ_&yYK@|O z^cvw^?AjO1Ze{F^*cOpHO*d?IYWLN&n@L+Ew?%Mo;Vt2x*0Jp1|23^2EH0{JF^*b7 zaxLi##SaD6M)7`rwkUo{k%V2l#oEt%bdG;s{H-Qza(7^t`K#cpSNCVtL@dd=H2eIn xS?~L2@0#@{>~Q$c2k)(wE}hIMD*StYwSd#KqvxDM&usd@TGesOkRzFq0RT%k8dm@S literal 0 HcmV?d00001 diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties index dd76a64b43..14b6ce249d 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/LESProperties @@ -17,8 +17,6 @@ FoamFile LESModel laminar; -turbulence off; - delta cubeRootVol; laminarCoeffs diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary index 52529b0c3d..9eb64e8637 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/constant/polyMesh/boundary @@ -1,9 +1,9 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5-09ca1eb6b56f | -| \\ / A nd | | -| \\/ M anipulation | www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties index dd76a64b43..14b6ce249d 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/LESProperties @@ -17,8 +17,6 @@ FoamFile LESModel laminar; -turbulence off; - delta cubeRootVol; laminarCoeffs diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary index f3c84ef8fb..b16c01a16f 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/constant/polyMesh/boundary @@ -1,9 +1,9 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5-09ca1eb6b56f | -| \\ / A nd | | -| \\/ M anipulation | www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary index 924d99d937..8122fa3f3a 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict index c7d3ee2dcd..4a938bd66e 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/blockMeshDict @@ -15,9 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // General m4 macros - - - + diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary index 53b37c41f6..067ff53cc9 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict index 98820d1a00..da310caafc 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/blockMeshDict @@ -15,9 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // General m4 macros - - - + diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary index 31c74e19c2..20d992ff42 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict index 98820d1a00..da310caafc 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/blockMeshDict @@ -15,9 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // General m4 macros - - - + diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary index 31c74e19c2..20d992ff42 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict index 98820d1a00..da310caafc 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/blockMeshDict @@ -15,9 +15,7 @@ FoamFile // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // General m4 macros - - - + diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary index 31c74e19c2..20d992ff42 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties index 1d34e2477f..c4072e231d 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/constant/LESProperties @@ -17,8 +17,6 @@ FoamFile LESModel oneEqEddy; -turbulence on; - delta smooth; printCoeffs on; diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict index cc4838bb42..e5e1a3c5c9 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/cellSetDict @@ -11,7 +11,7 @@ FoamFile format ascii; class dictionary; location "system"; - object cellSetDict; + object cellSetDict.2; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/nut b/tutorials/multiphase/interFoam/ras/damBreak/0/nut new file mode 100644 index 0000000000..3d75dba791 --- /dev/null +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/nut @@ -0,0 +1,51 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + location "0"; + object nut; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [0 2 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + leftWall + { + type nutWallFunction; + value uniform 0; + } + rightWall + { + type nutWallFunction; + value uniform 0; + } + lowerWall + { + type nutWallFunction; + value uniform 0; + } + atmosphere + { + type calculated; + value uniform 0; + } + defaultFaces + { + type empty; + } +} + + +// ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary index ef32a0cb80..41c06d5f3f 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary +++ b/tutorials/multiphase/interFoam/ras/damBreak/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,46 +10,43 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 5 ( -leftWall -{ - type wall; - nFaces 50; - startFace 4432; -} - -rightWall -{ - type wall; - nFaces 50; - startFace 4482; -} - -lowerWall -{ - type wall; - nFaces 62; - startFace 4532; -} - -atmosphere -{ - type patch; - nFaces 46; - startFace 4594; -} - -defaultFaces -{ - type empty; - nFaces 4536; - startFace 4640; -} + leftWall + { + type wall; + nFaces 50; + startFace 4432; + } + rightWall + { + type wall; + nFaces 50; + startFace 4482; + } + lowerWall + { + type wall; + nFaces 62; + startFace 4532; + } + atmosphere + { + type patch; + nFaces 46; + startFace 4594; + } + defaultFaces + { + type empty; + nFaces 4536; + startFace 4640; + } ) // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas index 4d7076770a..a0f116ae89 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/alphas @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary index ef32a0cb80..41c06d5f3f 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,46 +10,43 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 5 ( -leftWall -{ - type wall; - nFaces 50; - startFace 4432; -} - -rightWall -{ - type wall; - nFaces 50; - startFace 4482; -} - -lowerWall -{ - type wall; - nFaces 62; - startFace 4532; -} - -atmosphere -{ - type patch; - nFaces 46; - startFace 4594; -} - -defaultFaces -{ - type empty; - nFaces 4536; - startFace 4640; -} + leftWall + { + type wall; + nFaces 50; + startFace 4432; + } + rightWall + { + type wall; + nFaces 50; + startFace 4482; + } + lowerWall + { + type wall; + nFaces 62; + startFace 4532; + } + atmosphere + { + type patch; + nFaces 46; + startFace 4594; + } + defaultFaces + { + type empty; + nFaces 4536; + startFace 4640; + } ) // ************************************************************************* // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas index 99b42c75e4..4184b5fb20 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/alphas @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary index 430ad36dbf..5723f355b5 100644 --- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary +++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,53 +10,49 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 6 ( -inlet -{ - type patch; - nFaces 40; - startFace 15760; -} - -outlet -{ - type patch; - nFaces 4; - startFace 15800; -} - -bottomWall -{ - type patch; - nFaces 200; - startFace 15804; -} - -endWall -{ - type wall; - nFaces 36; - startFace 16004; -} - -top -{ - type symmetryPlane; - nFaces 200; - startFace 16040; -} - -frontAndBack -{ - type empty; - nFaces 16000; - startFace 16240; -} + inlet + { + type patch; + nFaces 40; + startFace 15760; + } + outlet + { + type patch; + nFaces 4; + startFace 15800; + } + bottomWall + { + type patch; + nFaces 200; + startFace 15804; + } + endWall + { + type wall; + nFaces 36; + startFace 16004; + } + top + { + type symmetryPlane; + nFaces 200; + startFace 16040; + } + frontAndBack + { + type empty; + nFaces 16000; + startFace 16240; + } ) // ************************************************************************* // diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean index a657f303ba..f73c44df8a 100755 --- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean +++ b/tutorials/multiphase/settlingFoam/ras/tank3D/Allclean @@ -3,3 +3,4 @@ # Clean time folders only rm -rf *[1-9]* +rm log.* diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary index 3ffe962074..14035ec47a 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format binary; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary index a861e9875c..56005a65f5 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary +++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/constant/polyMesh/boundary @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5-8cbffd16687e | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary index cdffeb226b..56e0a545c1 100644 --- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary +++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,39 +10,37 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 4 ( -inlet -{ - type patch; - nFaces 25; - startFace 3650; -} - -outlet -{ - type patch; - nFaces 25; - startFace 3675; -} - -walls -{ - type wall; - nFaces 150; - startFace 3700; -} - -defaultFaces -{ - type empty; - nFaces 3750; - startFace 3850; -} + inlet + { + type patch; + nFaces 25; + startFace 3650; + } + outlet + { + type patch; + nFaces 25; + startFace 3675; + } + walls + { + type wall; + nFaces 150; + startFace 3700; + } + defaultFaces + { + type empty; + nFaces 3750; + startFace 3850; + } ) // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary index e58f9c5921..1d54b63e6b 100644 --- a/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary +++ b/tutorials/stressAnalysis/solidDisplacementFoam/plateHole/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,53 +10,49 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 6 ( -left -{ - type symmetryPlane; - nFaces 30; - startFace 1930; -} - -right -{ - type patch; - nFaces 30; - startFace 1960; -} - -down -{ - type symmetryPlane; - nFaces 30; - startFace 1990; -} - -up -{ - type patch; - nFaces 30; - startFace 2020; -} - -hole -{ - type patch; - nFaces 20; - startFace 2050; -} - -frontAndBack -{ - type empty; - nFaces 2000; - startFace 2070; -} + left + { + type symmetryPlane; + nFaces 30; + startFace 1930; + } + right + { + type patch; + nFaces 30; + startFace 1960; + } + down + { + type symmetryPlane; + nFaces 30; + startFace 1990; + } + up + { + type patch; + nFaces 30; + startFace 2020; + } + hole + { + type patch; + nFaces 20; + startFace 2050; + } + frontAndBack + { + type empty; + nFaces 2000; + startFace 2070; + } ) // ************************************************************************* // diff --git a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary index 89fde8381b..bc163bf797 100644 --- a/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary +++ b/tutorials/stressAnalysis/solidEquilibriumDisplacementFoam/beamEndLoad/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,46 +10,43 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 5 ( -topSurface -{ - type patch; - nFaces 6; - startFace 16; -} - -bottomSurface -{ - type patch; - nFaces 6; - startFace 22; -} - -fixedEnd -{ - type wall; - nFaces 2; - startFace 28; -} - -tractionEnd -{ - type patch; - nFaces 2; - startFace 30; -} - -defaultFaces -{ - type empty; - nFaces 24; - startFace 32; -} + topSurface + { + type patch; + nFaces 6; + startFace 16; + } + bottomSurface + { + type patch; + nFaces 6; + startFace 22; + } + fixedEnd + { + type wall; + nFaces 2; + startFace 28; + } + tractionEnd + { + type patch; + nFaces 2; + startFace 30; + } + defaultFaces + { + type empty; + nFaces 24; + startFace 32; + } ) // ************************************************************************* // From 8bc719e554357a7b255b79905f5c2c4a3ade1ad8 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 15 Jul 2009 09:35:45 +0200 Subject: [PATCH 031/172] merge in Mark's text into ReleaseNotes --- ReleaseNotes-1.6 | 439 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 331 insertions(+), 108 deletions(-) diff --git a/ReleaseNotes-1.6 b/ReleaseNotes-1.6 index 0fe2691f91..b9330fac0a 100644 --- a/ReleaseNotes-1.6 +++ b/ReleaseNotes-1.6 @@ -1,143 +1,307 @@ # -*- mode: org; -*- # -#+TITLE: *OpenFOAM release notes for version 1.6* +#+TITLE: OpenFOAM release notes for version 1.6 #+AUTHOR: OpenCFD Ltd. #+DATE: July 2009 #+LINK: http://www.opencfd.co.uk #+OPTIONS: author:nil ^:{} * Overview - OpenFOAM-1.6 is is a significant upgrade to version 1.5 in ways which are - outlined below. This release passes all our standard tests and the tutorials - have been broadly checked. If there are any bugs, please report them using - the instructions set out in: http://www.OpenFOAM.org/bugs.html. + OpenFOAM-1.6 is a significant upgrade to version 1.5 in ways that are + outlined below. This release passes all our standard tests and the + tutorials have been broadly checked. If there are any bugs, please report + them using the instructions set out here: + http://www.OpenFOAM.org/bugs.html * GNU/Linux version - The 32bit and 64bit binary packs of the OpenFOAM release were compiled on a - machine running SuSE GNU/Linux version 11.1 and also tested on Ubuntu 9. We - recommend that users run OpenFOAM on one of these or a similar recent version - of GNU/Linux. This release has also been successfully compiled and tested on - older GNU/Linux releases but this requires the installation of Qt 4.3.? (the - sources for which are supplied with OpenFOAM-1.6, see README) for ParaView-3 - to run. + The 32bit and 64bit binary packs of the OpenFOAM release were compiled on + a machine running openSUSE GNU/Linux version 11.1 and also tested on + Ubuntu 9. We recommend that users run OpenFOAM on one of these, or on a + similarly recent version of GNU/Linux. This release has also been + successfully compiled and tested on older GNU/Linux releases, but this + requires the installation of Qt 4.3.? (the sources for which are supplied + with OpenFOAM-1.6, see README) for ParaView-3 to run. * C++ Compiler version + Release compiled with GCC 4.3.3. - + Built in support for the Intel C++ 10.? compiler (untested). + + Built-in support for the Intel C++ 10.? compiler (untested). + The choice of the compiler is controlled by the setting of the ~$WM_COMPILER~ and ~$WM_COMPILER_ARCH~ environment variables in the /OpenFOAM-1.6/etc/bashrc/ (or /cshrc/) file. - + The location of the installation of the compiler is controlled by the + + The location of the compiler installation is controlled by the ~$compilerInstall~ environment variable in the /OpenFOAM-1.6/etc/settings.sh/ (or /settings.csh/) file. * Library developments -*** Turbulence modelling - + Major development of turbulence model libraries to give extra flexibility - at the solver level. For solvers that can support either RAS/LES - computations, the selection is made in the - /constant/turbulenceProperties/, - by setting the =simulationType= keyword to: - - =laminar= - - =RASModel= - - =LESModel= - + Depending on the selection, the model is the instantiated from /constant// - - /RASProperties/ - - /LESProperties/ +** Core library -***** RAS wall functions - Wall functions are now run-time selectable per patch for RAS. +*** Regular Expressions + The addition of regular expressions marks a major improvement in usability. -******* Velocity: - + Apply to turbulent viscosities =nut= or =mut= - + Apply to =k=, =Q=, =R= - + Apply to =epsilon=, =omega= + + *New* =regExp= class provides support for accessing POSIX extended regular + expresssions from within OpenFOAM. + See the manpages on your system (/man 7 regex/) for more information + about the extended regular expresssion syntax. Since entire strings are + matched, the =^= and =$= anchors are not required. -******* Temperature: - + Apply to turbulent thermal diffusivity, =alphat= (compressible only) + + *New* =wordRe= class can contain a =word= or a =regExp= . + The match() method matches appropriately (as a =word= or as a =regExp=). -******* To apply wall functions: - + To recapture the functionality of previous OpenFOAM versions (v1.5 and - earlier) assign: - - for velocity: - - =nut=: =nutWallFunction= - - =mut=: =muWallFunction= - - =epsilon=: =epsilonWallFunction= - - =omega=: =omegaWallFunction= - - =k=, =Q=, =R=: =kQRWallFunction= - - for temperature: - - =alphat=: =alphatWallFunction= - + New =alphaSgsJayatillekeWallFunction= thermal wall function for - compressible LES + + *New* =stringListOps= to search string lists based on regular expressions, + =wordRe= or =wordReList= . -***** *New* LES turbulence models - + Spalart-Allmaras DDES - + Spalart-Allmaras IDDES + + =Istream= and =Ostream= now retain backslashes when reading/writing strings. + The backslash continues to be used as an escape character for double-quote + and newline, but otherwise get passed through "as-is" without any other + special meaning (ie, they are /not/ C-style strings). This especially + helps with input/output of regular expressions. -***** Upgrading: - + *New* utility - =applyWallFunctionBoundaryConditions= - + Solvers will automatically update existing cases - - New fields created based on the presence of the =nut/mut= field - - Boundary conditions include scoping, i.e compressibility:: for - compressible solvers - - Modified fields will be backed-up to /.old/ - + NOTE: - - Fields are only updated for those fields associated with the current - turbulence model selection, i.e. if fields exist for use with other - models, they will not be updated - - New specification is not backwards compatible -*** Thermo-physical Models - + Old compressibility based thermo package renamed - =basicThermo= \rightarrow =basicPsiThermo= - + *New* =basicRhoThermo= thermo package - - Additional density field stored - - General form - can be used for other types of media, e.g. liquids - - Additional polynomial-based thermodynamics - - Equation of state: =icoPolynomial= - - Transport: =polynomialTransport= - - Thermo: =hPolynomialThermo= - + Removed earlier hard-coding of gas thermophysics for chemistry modelling: - - =reactingMixture= now templated on thermo package - - =chemistryModel= now templated on thermo package - - =chemistrySolver= now templated on thermo package - + *New* =fvDOM= radition model - - finite volume, discrete ordinates method - + *New* (reinstated) =eThermo= thermodynamics package - - internal energy based thermodynamics +*** Dictionary improvements/changes + + Dictionaries can use words (unquoted) or regular expressions (quoted) + for their keywords. When searching, an exact match has priority + over a regular expression match. -*** Lagrangian + + The default =#inputMode= is now '=merge=', which corresponds to the most + general usage. The =#inputMode warn= corresponds to the previous + default behaviour. -***** Intermediate - - Overhaul of the underlying framework - - Reacting now split into reacting and reacting multiphase - - New structure for variable composition - - Many new sub-models, including: - - Injection - - =PatchInjection= - injection local to patch face cells - - =FieldActivatedInjection= - injection based on satisfying external - criterion - - LookupTableInjection - explicity define injection locations and all - parcel properties - - Post-processing - - patch post-processing - collect data for parcels impacting user - defined patches - - Patch interaction - - generalised behaviour for parcel interaction with patch - - Phase change - - liquid evaporation + + The *new* =#inputMode protect= can be used to conditionally merge default + values into existing dictionaries. -***** Coal combustion - - *New* library - extension of reacting-multiphase functionality - - Surface reaction/combustion models + + *New* =digest()= method to calculate and return the SHA1 message digest -*** Discrete methods + +*** Improved list containers + + It is now possible to append a =UList= to an existing =List= or + =DynamicList= . + + + =DynamicList= is now much more flexible. It can be used with the + =append()= method, or with the =setSize()= method and =operator[]=, as + per =List= . =DynamicList= also has more methods for adjusting the + space allocated. + + + =SortableList= now uses stable sort and allows =reverseSort()= as well. + =SortableList= is also more versatile - the indices mostly remain + unallocated until they are required in the =sort()= method. + The sort indices can be deallocated with the =shrink()= method. + Works as expected with =transfer()= and assignment from other lists. + + + Specialization for =UList::operator[](..) const= to return =false= + for out-of-range elements. This allows lazy evaluation with no noticeable + change in performance. + + + =PackedList= has much better performance, *new* lazy evaluation and + *new* auto-vivify of elements on assignment. Any auto-vivified + elements will also flood-fill the gaps with zero. The =append()= method + can be used like in =DynamicList= to append a single element. The =set()= + method can be used like in =labelHashSet= . + A =PackedBoolList= can thus replace =labelHashSet= in many places. + + + *New* =UIndirectList= for an indirect list without storing the addressing. + + +*** New hashing algorithms + + Bob Jenkins' hash routine for performance improvement (5-10% faster for + string hashing than the previous algorithm) and fewer collisions. + + + SHA1 hashing and SHA1 message digests (NIST specification FIPS-180-1) + added. The SHA1 digest provides a compact (20 bytes) means of + determining if the contents of an object have changed. The *new* + =OSHA1stream= class can be used to calculate SHA1 digests for anything + that can write to an output stream. + + +*** HashTable/HashSet improvements + + Performance improvements for querying on empty tables + + + The =erase()= method can take a list of keys or the keys from any + another =HashTable=/=HashSet= . + + + =HashSet= has an =operator[]() const= that allows the same syntax + to be used for =boolList=, =PackedBoolList= and =labelHashSet= . + + + =HashSet has additional operators '+=', '-=', '&=' to add, remove or + intersect keys, respectively. + + +*** Improved bool/Switch + + The =Switch= class has reduced the storage to be on par with =bool= . + It is now more flexible and behaves much more like a =bool= . + + + The IO for =bool= uses =Switch= internally for reading, so the end-user + doesn't need to know if a particular class used =bool= or =Switch= . + + +*** Miscellaneous container class improvments + + *New* Boost-style =StaticAssert= added. + Which is useful to catch invalid template sizes, for example. + + + Various containers now have C++0x-style =cbegin()=, =cend()= iterator methods. + + + Various containers now have STL-style =empty()= method, which may be more + readable and universal than =!size()= or =!valid()= conditions. + + + various containers now have an =xfer()= method for yielding their contents + to a corresponding =Xfer= class. + + +*** *New* Xfer class + Provides finer grained control over copying or transferring objects with + very little overhead. It can be used for any object that has a =transfer()= + method and a =operator=()= copy method. + Since it is decided upon construction of the =Xfer= object whether the + parameter is to be copied or transferred, the contents of the resulting + Xfer object can be transferred unconditionally. This greatly simplifies + defining constructors or methods in other classes with mixed + transfer/copy semantics without requiring 2^N different versions. + + + =xferCopy()=, =xferMove()= and =xferCopyTo()=, =xferMoveTo()= functions + to ease the use of the =Xfer= class. + +*** Convenience changes + + =IOobject= has a *new* constructor for creating an =IOobject= from a + single-path specification (eg, see =blockMesh -dict= option). + + + =argList= has *new* convenience methods for accessing options more directly: + =option()=, =optionFound()=, =optionLookup()=, =optionRead()=, + =optionReadIfPresent()= . + + + The *new* =readList(Istream&)= can read a bracket-delimited list or + handle a single value as a list of size 1. This can be a useful + convenience when processing command-line options. + + +*** Misc. improvements + + Improved consistency and interoperability between =face= and =triFace= classes. + + + =face::triangles()= can split and append to a =DynamicList= + + + =coordinateSystems= can access global systems (similar to =MeshObject=) + + + +** Turbulence modelling + + Major development of turbulence model libraries to give extra flexibility + at the solver level. For solvers that can support either RAS/LES + computations, the selection is made in the + /constant/turbulenceProperties/, + by setting the =simulationType= keyword to: + - =laminar= + - =RASModel= + - =LESModel= + + Depending on the selection, the model is the instantiated from /constant// + - /RASProperties/ + - /LESProperties/ + +**** RAS wall functions + Wall functions are now run-time selectable per patch for RAS. + +****** Velocity: + + Apply to turbulent viscosities =nut= or =mut= + + Apply to =k=, =Q=, =R= + + Apply to =epsilon=, =omega= + +****** Temperature: + + Apply to turbulent thermal diffusivity, =alphat= (compressible only) + +****** To apply wall functions: + + To recapture the functionality of previous OpenFOAM versions (v1.5 and + earlier) assign: + - for velocity: + - =nut=: =nutWallFunction= + - =mut=: =muWallFunction= + - =epsilon=: =epsilonWallFunction= + - =omega=: =omegaWallFunction= + - =k=, =Q=, =R=: =kQRWallFunction= + - for temperature: + - =alphat=: =alphatWallFunction= + + New =alphaSgsJayatillekeWallFunction= thermal wall function for + compressible LES + +**** *New* LES turbulence models + + Spalart-Allmaras DDES + + Spalart-Allmaras IDDES + +**** Upgrading: + + *New* utility - =applyWallFunctionBoundaryConditions= + + Solvers will automatically update existing cases + - New fields created based on the presence of the =nut/mut= field + - Boundary conditions include scoping, i.e compressibility:: for + compressible solvers + - Modified fields will be backed-up to /.old/ + + NOTE: + - Fields are only updated for those fields associated with the current + turbulence model selection, i.e. if fields exist for use with other + models, they will not be updated + - The new specification is not backwards compatible + +** Thermo-physical Models + + Old compressibility-based thermo package renamed + =basicThermo= \rightarrow =basicPsiThermo= + + *New* =basicRhoThermo= thermo package + - Additional density field stored + - General form - can be used for other types of media, e.g. liquids + - Additional polynomial-based thermodynamics + - Equation of state: =icoPolynomial= + - Transport: =polynomialTransport= + - Thermo: =hPolynomialThermo= + + Removed earlier hard-coding of gas thermophysics for chemistry modelling: + - =reactingMixture= now templated on thermo package + - =chemistryModel= now templated on thermo package + - =chemistrySolver= now templated on thermo package + + *New* =fvDOM= radition model + - finite volume, discrete ordinates method + + *New* (reinstated) =eThermo= thermodynamics package + - internal energy-based thermodynamics + +** Lagrangian + +**** Intermediate + - Overhaul of the underlying framework + - Reacting now split into reacting and reacting multiphase + - New structure for variable composition + - Many new sub-models, including: + - Injection + - =PatchInjection= - injection local to patch face cells + - =FieldActivatedInjection= - injection based on satisfying external + criterion + - LookupTableInjection - explicity define injection locations and all + parcel properties + - Post-processing + - patch post-processing - collect data for parcels impacting user + defined patches + - Patch interaction + - generalised behaviour for parcel interaction with patch + - Phase change + - liquid evaporation + +**** Coal combustion + - *New* library - extension of reacting-multiphase functionality + - Surface reaction/combustion models + +** Discrete methods - *New* library offering DSMC simulation functionality - see =dsmcFoam= below - *New* libraries offering molecular dynamics simulation functionality - see =mdFoam= and =mdEquilibrationFoam=: below. + +** *New* surfMesh library + Provides a more efficient storage mechanism than possible with =triSurface= + without restrictions on the shape of the face (templated parameter). + It will however take quite some time before it can fully replace + =triSurface= . + + + =MeshedSurface= class - with zero or more contiguous =surfZones= . + + + =UnsortedMeshedSurface= class - unordered surface zones + (as per =triSurface=) + + + =surfMesh= class - for reading/writing in native OpenFOAM format + + * Solver restructuring The upgrade to the turbulence models means that the simulation type, i.e. laminar, RAS or LES can be selected at run time. This has allowed a reduction @@ -148,7 +312,7 @@ - =rhoTurbFoam=, =coodles= \rightarrow =rhoPisoFoam= - =xoodles= \rightarrow absorbed into =XiFoam= - =buoyantFoam=, =lesBuoyantFoam= \rightarrow =buoyantPisoFoam= - - =interFoam=, rasInterFoam, =lesInterFoam= \rightarrow =interFoam= + - =interFoam=, =rasInterFoam=, =lesInterFoam= \rightarrow =interFoam= - =lesCavitatingFoam=, =rasCavitatingFoam= \rightarrow =cavitatingFoam= + Solvers which support LES only: - =channelOodles= \rightarrow =channelFoam= (LES) @@ -157,11 +321,22 @@ - pd to p ------------------------------------------------------------ [HENRY] - gravity ------------------------------------------------------------ [HENRY] +** Solver control improvments + Use dictionary entries instead of an =Istream= for the solver controls. + + This Allows dictionary substitutions and regular expressions in + /system/fvSolution/ + + + The old solver control syntax is still supported (warning emitted), but + the *new* =foamUpgradeFvSolution= utility can be used to convert + /system/fvSolution/ to the new format. + + * Tutorial restructuring to reflect solver application structure * Post-processing ---------------------------------------------------- [MATTIJS] - SAMPLING - improved plane, iso-surface handling + - Output to any surface geometry format supported by the =surfMesh= library. * *New* Solvers + =buoyantBoussinesqSimpleFoam= @@ -187,7 +362,7 @@ + =dsmcFoam= DSMC (Direct Simulation Monte-Carlo) solver for rarefied gas dynamics - simultions, able to simulate mixtures of an arbitrary number of gas species. + simulations, able to simulate mixtures of an arbitrary number of gas species. The variable hard sphere collision model with Larsen-Borgnakke internal energy redistribution (see "Molecular Gas Dynamics and the Direct Simulation of Gas Flows" G.A. Bird, 1994) is available; other run-time selectable @@ -210,21 +385,51 @@ * Function objects -*** *New* function objects: +** Improvements for function objects and time-looping + + The =functionObjectList= retains the order of the =functionObject= order, + which allows a chaining of operations. It is thus internally more + efficient when /system/controlDict/ uses =functions {..}= instead of + =functions (..)=, but both forms are supported. + + + The =functionObject= now has an additional =end()= method that is called + when =Time::loop()= or =Time::run()= determine that the time-loop exits. + Accordingly, one of these two idioms should be used in solver code: + 1. =while (runTime.loop() { ... }= + 2. =while (runTime.run()) { runTime++; ... }= + + + *New* - =functionObjectList= now tracks the SHA1 message digest of the + sub-directories. This avoids reloading a =functionObject= when + something unrelated in /system/controlDict/ changed. + +** *New* function objects: - =systemCall= - executes a list of system instructions - =fieldMinMax= - computes the min/max of a - =staticPressure= - converts kinematic pressure to static pressure - =dsmcFields= - calculates intensive fields (velocity and temperature) from averaged extensive fields (i.e. momentum and energy) -*** Usage +** Usage - Improved output control: =timeStep= or =outputTime= * Boundary conditions - Improved set of direct mapped boundary conditions - Buoyancy boundary condition ---------------------------------------- [HENRY] -* *New* utilities +* Utilities + +** Improvements + + =blockMesh= has a *new* =-dict= option for specifying an alternative + dictionary for the block mesh description. The '=convertToMeters=' entry + is now optional, and the alternative '=scale=' entry can be used for + less typing. + + + =foamToEnsight= has a *new* =-noPatches= option to suppress generation + of patches. + + + =foamToEnsightParts= has *new* =-noMesh= and =-index= options that can + be useful when post-processing results incrementally. + +** *New* utilities - =particleTracks= - generate particle tracks for lagrangian calculations - =dsmcInitialise= - preprocessing utility to create initial configurations of DSMC particles in a geometry @@ -233,3 +438,21 @@ - =interpolate= - performs fvc::interpolate() - =randomise= - randomises a by a given perturbation - =addSubtract= - simple add/subtract field functionality + +** Usage + + =timeSelector= can now combine =-time ranges= and =-latestTime= options. + More reliable behaviour for cases missing /constant// or /0// + directories. When the =-noZero= option is enabled, =-latestTime= will not + select the =0/= directory unless the =-zeroTime= option is given. + This helps avoid ill effects caused by accidentally using the + /0// directory in certain utilities (eg, =reconstructPar=). + +** Improvements to Paraview reader module + + =PV3FoamReader= added mesh region handling. The region name is parsed + from the filename. Eg, /case{region}.OpenFOAM/ + + + =paraFoam= with a *new* =-region= option for specifying an alternative + region. A *new* =-touch= option to generate the /.OpenFOAM/ file only. + Only creates (and removes) /.OpenFOAM/ files if they didn't already + exist, which is useful in connection with the =-touch= option. + From c0057f33c1cf7a45671f27b42ef514bdf5a48dba Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 15 Jul 2009 09:35:45 +0200 Subject: [PATCH 032/172] merge in Mark's text into ReleaseNotes --- ReleaseNotes-1.6 | 439 +++++++++++++++++++++++++++++++++++------------ 1 file changed, 331 insertions(+), 108 deletions(-) diff --git a/ReleaseNotes-1.6 b/ReleaseNotes-1.6 index 0fe2691f91..b9330fac0a 100644 --- a/ReleaseNotes-1.6 +++ b/ReleaseNotes-1.6 @@ -1,143 +1,307 @@ # -*- mode: org; -*- # -#+TITLE: *OpenFOAM release notes for version 1.6* +#+TITLE: OpenFOAM release notes for version 1.6 #+AUTHOR: OpenCFD Ltd. #+DATE: July 2009 #+LINK: http://www.opencfd.co.uk #+OPTIONS: author:nil ^:{} * Overview - OpenFOAM-1.6 is is a significant upgrade to version 1.5 in ways which are - outlined below. This release passes all our standard tests and the tutorials - have been broadly checked. If there are any bugs, please report them using - the instructions set out in: http://www.OpenFOAM.org/bugs.html. + OpenFOAM-1.6 is a significant upgrade to version 1.5 in ways that are + outlined below. This release passes all our standard tests and the + tutorials have been broadly checked. If there are any bugs, please report + them using the instructions set out here: + http://www.OpenFOAM.org/bugs.html * GNU/Linux version - The 32bit and 64bit binary packs of the OpenFOAM release were compiled on a - machine running SuSE GNU/Linux version 11.1 and also tested on Ubuntu 9. We - recommend that users run OpenFOAM on one of these or a similar recent version - of GNU/Linux. This release has also been successfully compiled and tested on - older GNU/Linux releases but this requires the installation of Qt 4.3.? (the - sources for which are supplied with OpenFOAM-1.6, see README) for ParaView-3 - to run. + The 32bit and 64bit binary packs of the OpenFOAM release were compiled on + a machine running openSUSE GNU/Linux version 11.1 and also tested on + Ubuntu 9. We recommend that users run OpenFOAM on one of these, or on a + similarly recent version of GNU/Linux. This release has also been + successfully compiled and tested on older GNU/Linux releases, but this + requires the installation of Qt 4.3.? (the sources for which are supplied + with OpenFOAM-1.6, see README) for ParaView-3 to run. * C++ Compiler version + Release compiled with GCC 4.3.3. - + Built in support for the Intel C++ 10.? compiler (untested). + + Built-in support for the Intel C++ 10.? compiler (untested). + The choice of the compiler is controlled by the setting of the ~$WM_COMPILER~ and ~$WM_COMPILER_ARCH~ environment variables in the /OpenFOAM-1.6/etc/bashrc/ (or /cshrc/) file. - + The location of the installation of the compiler is controlled by the + + The location of the compiler installation is controlled by the ~$compilerInstall~ environment variable in the /OpenFOAM-1.6/etc/settings.sh/ (or /settings.csh/) file. * Library developments -*** Turbulence modelling - + Major development of turbulence model libraries to give extra flexibility - at the solver level. For solvers that can support either RAS/LES - computations, the selection is made in the - /constant/turbulenceProperties/, - by setting the =simulationType= keyword to: - - =laminar= - - =RASModel= - - =LESModel= - + Depending on the selection, the model is the instantiated from /constant// - - /RASProperties/ - - /LESProperties/ +** Core library -***** RAS wall functions - Wall functions are now run-time selectable per patch for RAS. +*** Regular Expressions + The addition of regular expressions marks a major improvement in usability. -******* Velocity: - + Apply to turbulent viscosities =nut= or =mut= - + Apply to =k=, =Q=, =R= - + Apply to =epsilon=, =omega= + + *New* =regExp= class provides support for accessing POSIX extended regular + expresssions from within OpenFOAM. + See the manpages on your system (/man 7 regex/) for more information + about the extended regular expresssion syntax. Since entire strings are + matched, the =^= and =$= anchors are not required. -******* Temperature: - + Apply to turbulent thermal diffusivity, =alphat= (compressible only) + + *New* =wordRe= class can contain a =word= or a =regExp= . + The match() method matches appropriately (as a =word= or as a =regExp=). -******* To apply wall functions: - + To recapture the functionality of previous OpenFOAM versions (v1.5 and - earlier) assign: - - for velocity: - - =nut=: =nutWallFunction= - - =mut=: =muWallFunction= - - =epsilon=: =epsilonWallFunction= - - =omega=: =omegaWallFunction= - - =k=, =Q=, =R=: =kQRWallFunction= - - for temperature: - - =alphat=: =alphatWallFunction= - + New =alphaSgsJayatillekeWallFunction= thermal wall function for - compressible LES + + *New* =stringListOps= to search string lists based on regular expressions, + =wordRe= or =wordReList= . -***** *New* LES turbulence models - + Spalart-Allmaras DDES - + Spalart-Allmaras IDDES + + =Istream= and =Ostream= now retain backslashes when reading/writing strings. + The backslash continues to be used as an escape character for double-quote + and newline, but otherwise get passed through "as-is" without any other + special meaning (ie, they are /not/ C-style strings). This especially + helps with input/output of regular expressions. -***** Upgrading: - + *New* utility - =applyWallFunctionBoundaryConditions= - + Solvers will automatically update existing cases - - New fields created based on the presence of the =nut/mut= field - - Boundary conditions include scoping, i.e compressibility:: for - compressible solvers - - Modified fields will be backed-up to /.old/ - + NOTE: - - Fields are only updated for those fields associated with the current - turbulence model selection, i.e. if fields exist for use with other - models, they will not be updated - - New specification is not backwards compatible -*** Thermo-physical Models - + Old compressibility based thermo package renamed - =basicThermo= \rightarrow =basicPsiThermo= - + *New* =basicRhoThermo= thermo package - - Additional density field stored - - General form - can be used for other types of media, e.g. liquids - - Additional polynomial-based thermodynamics - - Equation of state: =icoPolynomial= - - Transport: =polynomialTransport= - - Thermo: =hPolynomialThermo= - + Removed earlier hard-coding of gas thermophysics for chemistry modelling: - - =reactingMixture= now templated on thermo package - - =chemistryModel= now templated on thermo package - - =chemistrySolver= now templated on thermo package - + *New* =fvDOM= radition model - - finite volume, discrete ordinates method - + *New* (reinstated) =eThermo= thermodynamics package - - internal energy based thermodynamics +*** Dictionary improvements/changes + + Dictionaries can use words (unquoted) or regular expressions (quoted) + for their keywords. When searching, an exact match has priority + over a regular expression match. -*** Lagrangian + + The default =#inputMode= is now '=merge=', which corresponds to the most + general usage. The =#inputMode warn= corresponds to the previous + default behaviour. -***** Intermediate - - Overhaul of the underlying framework - - Reacting now split into reacting and reacting multiphase - - New structure for variable composition - - Many new sub-models, including: - - Injection - - =PatchInjection= - injection local to patch face cells - - =FieldActivatedInjection= - injection based on satisfying external - criterion - - LookupTableInjection - explicity define injection locations and all - parcel properties - - Post-processing - - patch post-processing - collect data for parcels impacting user - defined patches - - Patch interaction - - generalised behaviour for parcel interaction with patch - - Phase change - - liquid evaporation + + The *new* =#inputMode protect= can be used to conditionally merge default + values into existing dictionaries. -***** Coal combustion - - *New* library - extension of reacting-multiphase functionality - - Surface reaction/combustion models + + *New* =digest()= method to calculate and return the SHA1 message digest -*** Discrete methods + +*** Improved list containers + + It is now possible to append a =UList= to an existing =List= or + =DynamicList= . + + + =DynamicList= is now much more flexible. It can be used with the + =append()= method, or with the =setSize()= method and =operator[]=, as + per =List= . =DynamicList= also has more methods for adjusting the + space allocated. + + + =SortableList= now uses stable sort and allows =reverseSort()= as well. + =SortableList= is also more versatile - the indices mostly remain + unallocated until they are required in the =sort()= method. + The sort indices can be deallocated with the =shrink()= method. + Works as expected with =transfer()= and assignment from other lists. + + + Specialization for =UList::operator[](..) const= to return =false= + for out-of-range elements. This allows lazy evaluation with no noticeable + change in performance. + + + =PackedList= has much better performance, *new* lazy evaluation and + *new* auto-vivify of elements on assignment. Any auto-vivified + elements will also flood-fill the gaps with zero. The =append()= method + can be used like in =DynamicList= to append a single element. The =set()= + method can be used like in =labelHashSet= . + A =PackedBoolList= can thus replace =labelHashSet= in many places. + + + *New* =UIndirectList= for an indirect list without storing the addressing. + + +*** New hashing algorithms + + Bob Jenkins' hash routine for performance improvement (5-10% faster for + string hashing than the previous algorithm) and fewer collisions. + + + SHA1 hashing and SHA1 message digests (NIST specification FIPS-180-1) + added. The SHA1 digest provides a compact (20 bytes) means of + determining if the contents of an object have changed. The *new* + =OSHA1stream= class can be used to calculate SHA1 digests for anything + that can write to an output stream. + + +*** HashTable/HashSet improvements + + Performance improvements for querying on empty tables + + + The =erase()= method can take a list of keys or the keys from any + another =HashTable=/=HashSet= . + + + =HashSet= has an =operator[]() const= that allows the same syntax + to be used for =boolList=, =PackedBoolList= and =labelHashSet= . + + + =HashSet has additional operators '+=', '-=', '&=' to add, remove or + intersect keys, respectively. + + +*** Improved bool/Switch + + The =Switch= class has reduced the storage to be on par with =bool= . + It is now more flexible and behaves much more like a =bool= . + + + The IO for =bool= uses =Switch= internally for reading, so the end-user + doesn't need to know if a particular class used =bool= or =Switch= . + + +*** Miscellaneous container class improvments + + *New* Boost-style =StaticAssert= added. + Which is useful to catch invalid template sizes, for example. + + + Various containers now have C++0x-style =cbegin()=, =cend()= iterator methods. + + + Various containers now have STL-style =empty()= method, which may be more + readable and universal than =!size()= or =!valid()= conditions. + + + various containers now have an =xfer()= method for yielding their contents + to a corresponding =Xfer= class. + + +*** *New* Xfer class + Provides finer grained control over copying or transferring objects with + very little overhead. It can be used for any object that has a =transfer()= + method and a =operator=()= copy method. + Since it is decided upon construction of the =Xfer= object whether the + parameter is to be copied or transferred, the contents of the resulting + Xfer object can be transferred unconditionally. This greatly simplifies + defining constructors or methods in other classes with mixed + transfer/copy semantics without requiring 2^N different versions. + + + =xferCopy()=, =xferMove()= and =xferCopyTo()=, =xferMoveTo()= functions + to ease the use of the =Xfer= class. + +*** Convenience changes + + =IOobject= has a *new* constructor for creating an =IOobject= from a + single-path specification (eg, see =blockMesh -dict= option). + + + =argList= has *new* convenience methods for accessing options more directly: + =option()=, =optionFound()=, =optionLookup()=, =optionRead()=, + =optionReadIfPresent()= . + + + The *new* =readList(Istream&)= can read a bracket-delimited list or + handle a single value as a list of size 1. This can be a useful + convenience when processing command-line options. + + +*** Misc. improvements + + Improved consistency and interoperability between =face= and =triFace= classes. + + + =face::triangles()= can split and append to a =DynamicList= + + + =coordinateSystems= can access global systems (similar to =MeshObject=) + + + +** Turbulence modelling + + Major development of turbulence model libraries to give extra flexibility + at the solver level. For solvers that can support either RAS/LES + computations, the selection is made in the + /constant/turbulenceProperties/, + by setting the =simulationType= keyword to: + - =laminar= + - =RASModel= + - =LESModel= + + Depending on the selection, the model is the instantiated from /constant// + - /RASProperties/ + - /LESProperties/ + +**** RAS wall functions + Wall functions are now run-time selectable per patch for RAS. + +****** Velocity: + + Apply to turbulent viscosities =nut= or =mut= + + Apply to =k=, =Q=, =R= + + Apply to =epsilon=, =omega= + +****** Temperature: + + Apply to turbulent thermal diffusivity, =alphat= (compressible only) + +****** To apply wall functions: + + To recapture the functionality of previous OpenFOAM versions (v1.5 and + earlier) assign: + - for velocity: + - =nut=: =nutWallFunction= + - =mut=: =muWallFunction= + - =epsilon=: =epsilonWallFunction= + - =omega=: =omegaWallFunction= + - =k=, =Q=, =R=: =kQRWallFunction= + - for temperature: + - =alphat=: =alphatWallFunction= + + New =alphaSgsJayatillekeWallFunction= thermal wall function for + compressible LES + +**** *New* LES turbulence models + + Spalart-Allmaras DDES + + Spalart-Allmaras IDDES + +**** Upgrading: + + *New* utility - =applyWallFunctionBoundaryConditions= + + Solvers will automatically update existing cases + - New fields created based on the presence of the =nut/mut= field + - Boundary conditions include scoping, i.e compressibility:: for + compressible solvers + - Modified fields will be backed-up to /.old/ + + NOTE: + - Fields are only updated for those fields associated with the current + turbulence model selection, i.e. if fields exist for use with other + models, they will not be updated + - The new specification is not backwards compatible + +** Thermo-physical Models + + Old compressibility-based thermo package renamed + =basicThermo= \rightarrow =basicPsiThermo= + + *New* =basicRhoThermo= thermo package + - Additional density field stored + - General form - can be used for other types of media, e.g. liquids + - Additional polynomial-based thermodynamics + - Equation of state: =icoPolynomial= + - Transport: =polynomialTransport= + - Thermo: =hPolynomialThermo= + + Removed earlier hard-coding of gas thermophysics for chemistry modelling: + - =reactingMixture= now templated on thermo package + - =chemistryModel= now templated on thermo package + - =chemistrySolver= now templated on thermo package + + *New* =fvDOM= radition model + - finite volume, discrete ordinates method + + *New* (reinstated) =eThermo= thermodynamics package + - internal energy-based thermodynamics + +** Lagrangian + +**** Intermediate + - Overhaul of the underlying framework + - Reacting now split into reacting and reacting multiphase + - New structure for variable composition + - Many new sub-models, including: + - Injection + - =PatchInjection= - injection local to patch face cells + - =FieldActivatedInjection= - injection based on satisfying external + criterion + - LookupTableInjection - explicity define injection locations and all + parcel properties + - Post-processing + - patch post-processing - collect data for parcels impacting user + defined patches + - Patch interaction + - generalised behaviour for parcel interaction with patch + - Phase change + - liquid evaporation + +**** Coal combustion + - *New* library - extension of reacting-multiphase functionality + - Surface reaction/combustion models + +** Discrete methods - *New* library offering DSMC simulation functionality - see =dsmcFoam= below - *New* libraries offering molecular dynamics simulation functionality - see =mdFoam= and =mdEquilibrationFoam=: below. + +** *New* surfMesh library + Provides a more efficient storage mechanism than possible with =triSurface= + without restrictions on the shape of the face (templated parameter). + It will however take quite some time before it can fully replace + =triSurface= . + + + =MeshedSurface= class - with zero or more contiguous =surfZones= . + + + =UnsortedMeshedSurface= class - unordered surface zones + (as per =triSurface=) + + + =surfMesh= class - for reading/writing in native OpenFOAM format + + * Solver restructuring The upgrade to the turbulence models means that the simulation type, i.e. laminar, RAS or LES can be selected at run time. This has allowed a reduction @@ -148,7 +312,7 @@ - =rhoTurbFoam=, =coodles= \rightarrow =rhoPisoFoam= - =xoodles= \rightarrow absorbed into =XiFoam= - =buoyantFoam=, =lesBuoyantFoam= \rightarrow =buoyantPisoFoam= - - =interFoam=, rasInterFoam, =lesInterFoam= \rightarrow =interFoam= + - =interFoam=, =rasInterFoam=, =lesInterFoam= \rightarrow =interFoam= - =lesCavitatingFoam=, =rasCavitatingFoam= \rightarrow =cavitatingFoam= + Solvers which support LES only: - =channelOodles= \rightarrow =channelFoam= (LES) @@ -157,11 +321,22 @@ - pd to p ------------------------------------------------------------ [HENRY] - gravity ------------------------------------------------------------ [HENRY] +** Solver control improvments + Use dictionary entries instead of an =Istream= for the solver controls. + + This Allows dictionary substitutions and regular expressions in + /system/fvSolution/ + + + The old solver control syntax is still supported (warning emitted), but + the *new* =foamUpgradeFvSolution= utility can be used to convert + /system/fvSolution/ to the new format. + + * Tutorial restructuring to reflect solver application structure * Post-processing ---------------------------------------------------- [MATTIJS] - SAMPLING - improved plane, iso-surface handling + - Output to any surface geometry format supported by the =surfMesh= library. * *New* Solvers + =buoyantBoussinesqSimpleFoam= @@ -187,7 +362,7 @@ + =dsmcFoam= DSMC (Direct Simulation Monte-Carlo) solver for rarefied gas dynamics - simultions, able to simulate mixtures of an arbitrary number of gas species. + simulations, able to simulate mixtures of an arbitrary number of gas species. The variable hard sphere collision model with Larsen-Borgnakke internal energy redistribution (see "Molecular Gas Dynamics and the Direct Simulation of Gas Flows" G.A. Bird, 1994) is available; other run-time selectable @@ -210,21 +385,51 @@ * Function objects -*** *New* function objects: +** Improvements for function objects and time-looping + + The =functionObjectList= retains the order of the =functionObject= order, + which allows a chaining of operations. It is thus internally more + efficient when /system/controlDict/ uses =functions {..}= instead of + =functions (..)=, but both forms are supported. + + + The =functionObject= now has an additional =end()= method that is called + when =Time::loop()= or =Time::run()= determine that the time-loop exits. + Accordingly, one of these two idioms should be used in solver code: + 1. =while (runTime.loop() { ... }= + 2. =while (runTime.run()) { runTime++; ... }= + + + *New* - =functionObjectList= now tracks the SHA1 message digest of the + sub-directories. This avoids reloading a =functionObject= when + something unrelated in /system/controlDict/ changed. + +** *New* function objects: - =systemCall= - executes a list of system instructions - =fieldMinMax= - computes the min/max of a - =staticPressure= - converts kinematic pressure to static pressure - =dsmcFields= - calculates intensive fields (velocity and temperature) from averaged extensive fields (i.e. momentum and energy) -*** Usage +** Usage - Improved output control: =timeStep= or =outputTime= * Boundary conditions - Improved set of direct mapped boundary conditions - Buoyancy boundary condition ---------------------------------------- [HENRY] -* *New* utilities +* Utilities + +** Improvements + + =blockMesh= has a *new* =-dict= option for specifying an alternative + dictionary for the block mesh description. The '=convertToMeters=' entry + is now optional, and the alternative '=scale=' entry can be used for + less typing. + + + =foamToEnsight= has a *new* =-noPatches= option to suppress generation + of patches. + + + =foamToEnsightParts= has *new* =-noMesh= and =-index= options that can + be useful when post-processing results incrementally. + +** *New* utilities - =particleTracks= - generate particle tracks for lagrangian calculations - =dsmcInitialise= - preprocessing utility to create initial configurations of DSMC particles in a geometry @@ -233,3 +438,21 @@ - =interpolate= - performs fvc::interpolate() - =randomise= - randomises a by a given perturbation - =addSubtract= - simple add/subtract field functionality + +** Usage + + =timeSelector= can now combine =-time ranges= and =-latestTime= options. + More reliable behaviour for cases missing /constant// or /0// + directories. When the =-noZero= option is enabled, =-latestTime= will not + select the =0/= directory unless the =-zeroTime= option is given. + This helps avoid ill effects caused by accidentally using the + /0// directory in certain utilities (eg, =reconstructPar=). + +** Improvements to Paraview reader module + + =PV3FoamReader= added mesh region handling. The region name is parsed + from the filename. Eg, /case{region}.OpenFOAM/ + + + =paraFoam= with a *new* =-region= option for specifying an alternative + region. A *new* =-touch= option to generate the /.OpenFOAM/ file only. + Only creates (and removes) /.OpenFOAM/ files if they didn't already + exist, which is useful in connection with the =-touch= option. + From 8b9e7c2d3d504a0d8896aff710a9c80be37a3097 Mon Sep 17 00:00:00 2001 From: henry Date: Wed, 15 Jul 2009 11:23:37 +0100 Subject: [PATCH 033/172] Make formatting consistent. --- ReleaseNotes-1.6 | 241 ++++++++++++++++++----------------------------- 1 file changed, 93 insertions(+), 148 deletions(-) diff --git a/ReleaseNotes-1.6 b/ReleaseNotes-1.6 index b9330fac0a..6336192857 100644 --- a/ReleaseNotes-1.6 +++ b/ReleaseNotes-1.6 @@ -38,155 +38,120 @@ *** Regular Expressions The addition of regular expressions marks a major improvement in usability. - + *New* =regExp= class provides support for accessing POSIX extended regular - expresssions from within OpenFOAM. - See the manpages on your system (/man 7 regex/) for more information - about the extended regular expresssion syntax. Since entire strings are - matched, the =^= and =$= anchors are not required. - - + *New* =wordRe= class can contain a =word= or a =regExp= . - The match() method matches appropriately (as a =word= or as a =regExp=). - + expresssions from within OpenFOAM. See the manpages on your system (/man + 7 regex/) for more information about the extended regular expression + syntax. Since entire strings are matched, the =^= and =$= anchors are not + required. + + *New* =wordRe= class can contain a =word= or a =regExp= . The match() + method matches appropriately (as a =word= or as a =regExp=). + *New* =stringListOps= to search string lists based on regular expressions, =wordRe= or =wordReList= . - - + =Istream= and =Ostream= now retain backslashes when reading/writing strings. - The backslash continues to be used as an escape character for double-quote - and newline, but otherwise get passed through "as-is" without any other - special meaning (ie, they are /not/ C-style strings). This especially - helps with input/output of regular expressions. - + + =Istream= and =Ostream= now retain backslashes when reading/writing + strings. The backslash continues to be used as an escape character for + double-quote and newline, but otherwise get passed through "as-is" without + any other special meaning (ie, they are /not/ C-style strings). This + especially helps with input/output of regular expressions. *** Dictionary improvements/changes - + Dictionaries can use words (unquoted) or regular expressions (quoted) - for their keywords. When searching, an exact match has priority - over a regular expression match. - + + Dictionaries can use words (unquoted) or regular expressions (quoted) for + their keywords. When searching, an exact match has priority over a regular + expression match. + The default =#inputMode= is now '=merge=', which corresponds to the most - general usage. The =#inputMode warn= corresponds to the previous - default behaviour. - - + The *new* =#inputMode protect= can be used to conditionally merge default + general usage. The =#inputMode warn= corresponds to the previous default + behaviour. + + The *new* =#inputMode protect= can be used to conditionally merge default values into existing dictionaries. - + *New* =digest()= method to calculate and return the SHA1 message digest - *** Improved list containers + It is now possible to append a =UList= to an existing =List= or =DynamicList= . - + =DynamicList= is now much more flexible. It can be used with the - =append()= method, or with the =setSize()= method and =operator[]=, as - per =List= . =DynamicList= also has more methods for adjusting the - space allocated. - + =append()= method, or with the =setSize()= method and =operator[]=, as per + =List= . =DynamicList= also has more methods for adjusting the space + allocated. + =SortableList= now uses stable sort and allows =reverseSort()= as well. =SortableList= is also more versatile - the indices mostly remain - unallocated until they are required in the =sort()= method. - The sort indices can be deallocated with the =shrink()= method. - Works as expected with =transfer()= and assignment from other lists. - + unallocated until they are required in the =sort()= method. The sort + indices can be deallocated with the =shrink()= method. Works as expected + with =transfer()= and assignment from other lists. + Specialization for =UList::operator[](..) const= to return =false= for out-of-range elements. This allows lazy evaluation with no noticeable change in performance. - - + =PackedList= has much better performance, *new* lazy evaluation and - *new* auto-vivify of elements on assignment. Any auto-vivified - elements will also flood-fill the gaps with zero. The =append()= method - can be used like in =DynamicList= to append a single element. The =set()= - method can be used like in =labelHashSet= . - A =PackedBoolList= can thus replace =labelHashSet= in many places. - + + =PackedList= has much better performance, *new* lazy evaluation and *new* + auto-vivify of elements on assignment. Any auto-vivified elements will + also flood-fill the gaps with zero. The =append()= method can be used + like in =DynamicList= to append a single element. The =set()= method can + be used like in =labelHashSet= . A =PackedBoolList= can thus replace + =labelHashSet= in many places. + *New* =UIndirectList= for an indirect list without storing the addressing. - *** New hashing algorithms + Bob Jenkins' hash routine for performance improvement (5-10% faster for string hashing than the previous algorithm) and fewer collisions. - + SHA1 hashing and SHA1 message digests (NIST specification FIPS-180-1) - added. The SHA1 digest provides a compact (20 bytes) means of - determining if the contents of an object have changed. The *new* - =OSHA1stream= class can be used to calculate SHA1 digests for anything - that can write to an output stream. - + added. The SHA1 digest provides a compact (20 bytes) means of determining + if the contents of an object have changed. The *new* =OSHA1stream= class + can be used to calculate SHA1 digests for anything that can write to an + output stream. *** HashTable/HashSet improvements + Performance improvements for querying on empty tables - - + The =erase()= method can take a list of keys or the keys from any - another =HashTable=/=HashSet= . - - + =HashSet= has an =operator[]() const= that allows the same syntax - to be used for =boolList=, =PackedBoolList= and =labelHashSet= . - + + The =erase()= method can take a list of keys or the keys from any another + =HashTable=/=HashSet= . + + =HashSet= has an =operator[]() const= that allows the same syntax to be + used for =boolList=, =PackedBoolList= and =labelHashSet= . + =HashSet has additional operators '+=', '-=', '&=' to add, remove or intersect keys, respectively. - *** Improved bool/Switch - + The =Switch= class has reduced the storage to be on par with =bool= . - It is now more flexible and behaves much more like a =bool= . - + + The =Switch= class has reduced the storage to be on par with =bool= . It + is now more flexible and behaves much more like a =bool= . + The IO for =bool= uses =Switch= internally for reading, so the end-user doesn't need to know if a particular class used =bool= or =Switch= . - *** Miscellaneous container class improvments - + *New* Boost-style =StaticAssert= added. - Which is useful to catch invalid template sizes, for example. - - + Various containers now have C++0x-style =cbegin()=, =cend()= iterator methods. - + + *New* Boost-style =StaticAssert= added. Which is useful to catch invalid + template sizes, for example. + + Various containers now have C++0x-style =cbegin()=, =cend()= iterator + methods. + Various containers now have STL-style =empty()= method, which may be more readable and universal than =!size()= or =!valid()= conditions. - + various containers now have an =xfer()= method for yielding their contents to a corresponding =Xfer= class. - *** *New* Xfer class Provides finer grained control over copying or transferring objects with very little overhead. It can be used for any object that has a =transfer()= - method and a =operator=()= copy method. - Since it is decided upon construction of the =Xfer= object whether the - parameter is to be copied or transferred, the contents of the resulting - Xfer object can be transferred unconditionally. This greatly simplifies - defining constructors or methods in other classes with mixed - transfer/copy semantics without requiring 2^N different versions. - - + =xferCopy()=, =xferMove()= and =xferCopyTo()=, =xferMoveTo()= functions - to ease the use of the =Xfer= class. + method and a =operator=()= copy method. Since it is decided upon + construction of the =Xfer= object whether the parameter is to be copied or + transferred, the contents of the resulting Xfer object can be transferred + unconditionally. This greatly simplifies defining constructors or methods in + other classes with mixed transfer/copy semantics without requiring 2^N + different versions. + + =xferCopy()=, =xferMove()= and =xferCopyTo()=, =xferMoveTo()= functions to + ease the use of the =Xfer= class. *** Convenience changes + =IOobject= has a *new* constructor for creating an =IOobject= from a single-path specification (eg, see =blockMesh -dict= option). - - + =argList= has *new* convenience methods for accessing options more directly: - =option()=, =optionFound()=, =optionLookup()=, =optionRead()=, + + =argList= has *new* convenience methods for accessing options more + directly: =option()=, =optionFound()=, =optionLookup()=, =optionRead()=, =optionReadIfPresent()= . - - + The *new* =readList(Istream&)= can read a bracket-delimited list or - handle a single value as a list of size 1. This can be a useful - convenience when processing command-line options. - + + The *new* =readList(Istream&)= can read a bracket-delimited list or handle + a single value as a list of size 1. This can be a useful convenience when + processing command-line options. *** Misc. improvements + Improved consistency and interoperability between =face= and =triFace= classes. - + =face::triangles()= can split and append to a =DynamicList= - + =coordinateSystems= can access global systems (similar to =MeshObject=) - - ** Turbulence modelling + Major development of turbulence model libraries to give extra flexibility at the solver level. For solvers that can support either RAS/LES - computations, the selection is made in the - /constant/turbulenceProperties/, + computations, the selection is made in the /constant/turbulenceProperties/, by setting the =simulationType= keyword to: - =laminar= - =RASModel= @@ -197,17 +162,15 @@ **** RAS wall functions Wall functions are now run-time selectable per patch for RAS. + + Velocity: + - Apply to turbulent viscosities =nut= or =mut= + - Apply to =k=, =Q=, =R= + - Apply to =epsilon=, =omega= + + Temperature: + - Apply to turbulent thermal diffusivity, =alphat= (compressible only) -****** Velocity: - + Apply to turbulent viscosities =nut= or =mut= - + Apply to =k=, =Q=, =R= - + Apply to =epsilon=, =omega= - -****** Temperature: - + Apply to turbulent thermal diffusivity, =alphat= (compressible only) - -****** To apply wall functions: - + To recapture the functionality of previous OpenFOAM versions (v1.5 and + + To apply wall functions: + - To recapture the functionality of previous OpenFOAM versions (v1.5 and earlier) assign: - for velocity: - =nut=: =nutWallFunction= @@ -217,7 +180,7 @@ - =k=, =Q=, =R=: =kQRWallFunction= - for temperature: - =alphat=: =alphatWallFunction= - + New =alphaSgsJayatillekeWallFunction= thermal wall function for + - New =alphaSgsJayatillekeWallFunction= thermal wall function for compressible LES **** *New* LES turbulence models @@ -259,10 +222,10 @@ ** Lagrangian **** Intermediate - - Overhaul of the underlying framework - - Reacting now split into reacting and reacting multiphase - - New structure for variable composition - - Many new sub-models, including: + + Overhaul of the underlying framework + + Reacting now split into reacting and reacting multiphase + + New structure for variable composition + + Many new sub-models, including: - Injection - =PatchInjection= - injection local to patch face cells - =FieldActivatedInjection= - injection based on satisfying external @@ -278,30 +241,24 @@ - liquid evaporation **** Coal combustion - - *New* library - extension of reacting-multiphase functionality + + *New* library - extension of reacting-multiphase functionality - Surface reaction/combustion models ** Discrete methods - - *New* library offering DSMC simulation functionality - see =dsmcFoam= + + *New* library offering DSMC simulation functionality - see =dsmcFoam= below - - *New* libraries offering molecular dynamics simulation functionality - see + + *New* libraries offering molecular dynamics simulation functionality - see =mdFoam= and =mdEquilibrationFoam=: below. - ** *New* surfMesh library Provides a more efficient storage mechanism than possible with =triSurface= - without restrictions on the shape of the face (templated parameter). - It will however take quite some time before it can fully replace - =triSurface= . - + without restrictions on the shape of the face (templated parameter). It will + however take quite some time before it can fully replace =triSurface= . + =MeshedSurface= class - with zero or more contiguous =surfZones= . - - + =UnsortedMeshedSurface= class - unordered surface zones - (as per =triSurface=) - + + =UnsortedMeshedSurface= class - unordered surface zones (as per + =triSurface=) + =surfMesh= class - for reading/writing in native OpenFOAM format - * Solver restructuring The upgrade to the turbulence models means that the simulation type, i.e. laminar, RAS or LES can be selected at run time. This has allowed a reduction @@ -318,48 +275,41 @@ - =channelOodles= \rightarrow =channelFoam= (LES) * General changes - - pd to p ------------------------------------------------------------ [HENRY] - - gravity ------------------------------------------------------------ [HENRY] + + pd to p ------------------------------------------------------------ [HENRY] + + gravity ------------------------------------------------------------ [HENRY] ** Solver control improvments Use dictionary entries instead of an =Istream= for the solver controls. + This Allows dictionary substitutions and regular expressions in /system/fvSolution/ - + The old solver control syntax is still supported (warning emitted), but the *new* =foamUpgradeFvSolution= utility can be used to convert /system/fvSolution/ to the new format. - * Tutorial restructuring to reflect solver application structure * Post-processing ---------------------------------------------------- [MATTIJS] - - SAMPLING - improved plane, iso-surface handling - - Output to any surface geometry format supported by the =surfMesh= library. + + SAMPLING - improved plane, iso-surface handling + + Output to any surface geometry format supported by the =surfMesh= library. * *New* Solvers + =buoyantBoussinesqSimpleFoam= Steady state heat transfer solver using a Boussinesq approximation for buoyancy, with laminar, RAS or LES turbulence modelling - + =buoyantBoussinesqPisoFoam= Transient heat transfer solver using a Boussinesq approximation for buoyancy, with laminar, RAS or LES turbulence modelling - + =coalChemistryFoam= Transient, reacting lagrangian solver, employing a coal cloud and a thermo cloud, with chemistry, and laminar, RAS or LES turbulence modelling - + =porousExplicitSourceReactingParcelFoam= Transient, reacting lagrangian solver, employing a single phase reacting cloud, with porous media, explicit mass sources, and laminar, RAS or LES turbulence modelling - + =rhoReactingFoam= Density-based thermodynamics variant of the reactingFoam solver, i.e. now applicable to liquid systems - + =dsmcFoam= DSMC (Direct Simulation Monte-Carlo) solver for rarefied gas dynamics simulations, able to simulate mixtures of an arbitrary number of gas species. @@ -377,7 +327,6 @@ molecules interact with short-range dispersion forces and pairwise electrostatic interactions using methods described in: Fennell and Gezelter, J. Chem. Phys. 124, 234104 (2006) - + =mdEquilibrationFoam= Similar to mdFoam, but employs velocity scaling to adjust the simulation temperature to a target value. Useful to equilibrate a case before @@ -390,30 +339,28 @@ which allows a chaining of operations. It is thus internally more efficient when /system/controlDict/ uses =functions {..}= instead of =functions (..)=, but both forms are supported. - + The =functionObject= now has an additional =end()= method that is called when =Time::loop()= or =Time::run()= determine that the time-loop exits. Accordingly, one of these two idioms should be used in solver code: 1. =while (runTime.loop() { ... }= 2. =while (runTime.run()) { runTime++; ... }= - + *New* - =functionObjectList= now tracks the SHA1 message digest of the sub-directories. This avoids reloading a =functionObject= when something unrelated in /system/controlDict/ changed. ** *New* function objects: - - =systemCall= - executes a list of system instructions - - =fieldMinMax= - computes the min/max of a - - =staticPressure= - converts kinematic pressure to static pressure - - =dsmcFields= - calculates intensive fields (velocity and temperature) from + + =systemCall= - executes a list of system instructions + + =fieldMinMax= - computes the min/max of a + + =staticPressure= - converts kinematic pressure to static pressure + + =dsmcFields= - calculates intensive fields (velocity and temperature) from averaged extensive fields (i.e. momentum and energy) ** Usage - - Improved output control: =timeStep= or =outputTime= + + Improved output control: =timeStep= or =outputTime= * Boundary conditions - - Improved set of direct mapped boundary conditions - - Buoyancy boundary condition ---------------------------------------- [HENRY] + + Improved set of direct mapped boundary conditions + + Buoyancy boundary condition ---------------------------------------- [HENRY] * Utilities @@ -430,14 +377,14 @@ be useful when post-processing results incrementally. ** *New* utilities - - =particleTracks= - generate particle tracks for lagrangian calculations - - =dsmcInitialise= - preprocessing utility to create initial configurations of + + =particleTracks= - generate particle tracks for lagrangian calculations + + =dsmcInitialise= - preprocessing utility to create initial configurations of DSMC particles in a geometry *** *New* foamCalc functions - - =interpolate= - performs fvc::interpolate() - - =randomise= - randomises a by a given perturbation - - =addSubtract= - simple add/subtract field functionality + + =interpolate= - performs fvc::interpolate() + + =randomise= - randomises a by a given perturbation + + =addSubtract= - simple add/subtract field functionality ** Usage + =timeSelector= can now combine =-time ranges= and =-latestTime= options. @@ -450,9 +397,7 @@ ** Improvements to Paraview reader module + =PV3FoamReader= added mesh region handling. The region name is parsed from the filename. Eg, /case{region}.OpenFOAM/ - + =paraFoam= with a *new* =-region= option for specifying an alternative region. A *new* =-touch= option to generate the /.OpenFOAM/ file only. Only creates (and removes) /.OpenFOAM/ files if they didn't already exist, which is useful in connection with the =-touch= option. - From 0e5e84f4edebcb92b0448808b4e0a8444838329d Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 15 Jul 2009 12:26:12 +0200 Subject: [PATCH 034/172] removed last remnants of LAM support --- bin/foamJob | 18 --------------- bin/mpirunDebug | 6 ----- etc/bashrc | 4 ++-- etc/cshrc | 4 ++-- etc/settings.csh | 15 +------------ etc/settings.sh | 35 ++++++++++-------------------- wmake/rules/linux64Gcc/mplibLAM | 3 --- wmake/rules/linux64Gcc42/mplibLAM | 3 --- wmake/rules/linux64Gcc43/mplibLAM | 3 --- wmake/rules/linux64Icc/mplibLAM | 3 --- wmake/rules/linuxGcc/mplibLAM | 3 --- wmake/rules/linuxGcc42/mplibLAM | 3 --- wmake/rules/linuxGcc43/mplibLAM | 3 --- wmake/rules/linuxIA64Gcc/mplibLAM | 3 --- wmake/rules/linuxIA64Icc/mplibLAM | 3 --- wmake/rules/linuxIcc/mplibLAM | 3 --- wmake/rules/linuxPPC64Gcc/mplibLAM | 3 --- wmake/rules/linuxmingw32/mplibLAM | 3 --- wmake/rules/solarisGcc/mplibLAM | 3 --- 19 files changed, 16 insertions(+), 105 deletions(-) delete mode 100644 wmake/rules/linux64Gcc/mplibLAM delete mode 100644 wmake/rules/linux64Gcc42/mplibLAM delete mode 100644 wmake/rules/linux64Gcc43/mplibLAM delete mode 100644 wmake/rules/linux64Icc/mplibLAM delete mode 100644 wmake/rules/linuxGcc/mplibLAM delete mode 100644 wmake/rules/linuxGcc42/mplibLAM delete mode 100644 wmake/rules/linuxGcc43/mplibLAM delete mode 100644 wmake/rules/linuxIA64Gcc/mplibLAM delete mode 100644 wmake/rules/linuxIA64Icc/mplibLAM delete mode 100644 wmake/rules/linuxIcc/mplibLAM delete mode 100644 wmake/rules/linuxPPC64Gcc/mplibLAM delete mode 100644 wmake/rules/linuxmingw32/mplibLAM delete mode 100644 wmake/rules/solarisGcc/mplibLAM diff --git a/bin/foamJob b/bin/foamJob index 0f679d7275..289d430d83 100755 --- a/bin/foamJob +++ b/bin/foamJob @@ -204,24 +204,6 @@ else # echo "Parallel processing using $WM_MPLIB with $NPROCS processors" case "$WM_MPLIB" in - LAM) - lamPid=`getPID lamd` - if [ ! "$lamPid" ] ; then - echo "No LAM daemon running." - if [ -r system/machines ] ; then - echo "system/machines file exists" - echo "Try starting the LAM multicomputer with \"lamboot -v system/machines\"" - exit 1 - else - echo "Cannot find a 'machines' file for LAM in system/" - echo "required to start a LAM multicomputer" - consultGuide - exit 1 - fi - else - echo "LAM daemon running (PID $lamPid). Proceeding with MPI run." - fi - ;; OPENMPI) # add hostfile info for hostfile in \ diff --git a/bin/mpirunDebug b/bin/mpirunDebug index 66bc86e42b..57df760873 100755 --- a/bin/mpirunDebug +++ b/bin/mpirunDebug @@ -162,10 +162,6 @@ do if [ .$WM_MPLIB = .OPENMPI ]; then node="-np 1 " - elif [ .$WM_MPLIB = .LAM ]; then - if [ "$spawn" -eq 2 ]; then - node="c${proc} " - fi fi echo "#!/bin/sh" > $procCmdFile @@ -210,8 +206,6 @@ done cmd="" if [ .$WM_MPLIB = .OPENMPI ]; then cmd="mpirun -app $PWD/mpirun.schema Date: Wed, 15 Jul 2009 12:26:12 +0200 Subject: [PATCH 035/172] removed last remnants of LAM support --- bin/foamJob | 18 --------------- bin/mpirunDebug | 6 ----- etc/bashrc | 4 ++-- etc/cshrc | 4 ++-- etc/settings.csh | 15 +------------ etc/settings.sh | 35 ++++++++++-------------------- wmake/rules/linux64Gcc/mplibLAM | 3 --- wmake/rules/linux64Gcc42/mplibLAM | 3 --- wmake/rules/linux64Gcc43/mplibLAM | 3 --- wmake/rules/linux64Icc/mplibLAM | 3 --- wmake/rules/linuxGcc/mplibLAM | 3 --- wmake/rules/linuxGcc42/mplibLAM | 3 --- wmake/rules/linuxGcc43/mplibLAM | 3 --- wmake/rules/linuxIA64Gcc/mplibLAM | 3 --- wmake/rules/linuxIA64Icc/mplibLAM | 3 --- wmake/rules/linuxIcc/mplibLAM | 3 --- wmake/rules/linuxPPC64Gcc/mplibLAM | 3 --- wmake/rules/linuxmingw32/mplibLAM | 3 --- wmake/rules/solarisGcc/mplibLAM | 3 --- 19 files changed, 16 insertions(+), 105 deletions(-) delete mode 100644 wmake/rules/linux64Gcc/mplibLAM delete mode 100644 wmake/rules/linux64Gcc42/mplibLAM delete mode 100644 wmake/rules/linux64Gcc43/mplibLAM delete mode 100644 wmake/rules/linux64Icc/mplibLAM delete mode 100644 wmake/rules/linuxGcc/mplibLAM delete mode 100644 wmake/rules/linuxGcc42/mplibLAM delete mode 100644 wmake/rules/linuxGcc43/mplibLAM delete mode 100644 wmake/rules/linuxIA64Gcc/mplibLAM delete mode 100644 wmake/rules/linuxIA64Icc/mplibLAM delete mode 100644 wmake/rules/linuxIcc/mplibLAM delete mode 100644 wmake/rules/linuxPPC64Gcc/mplibLAM delete mode 100644 wmake/rules/linuxmingw32/mplibLAM delete mode 100644 wmake/rules/solarisGcc/mplibLAM diff --git a/bin/foamJob b/bin/foamJob index 0f679d7275..289d430d83 100755 --- a/bin/foamJob +++ b/bin/foamJob @@ -204,24 +204,6 @@ else # echo "Parallel processing using $WM_MPLIB with $NPROCS processors" case "$WM_MPLIB" in - LAM) - lamPid=`getPID lamd` - if [ ! "$lamPid" ] ; then - echo "No LAM daemon running." - if [ -r system/machines ] ; then - echo "system/machines file exists" - echo "Try starting the LAM multicomputer with \"lamboot -v system/machines\"" - exit 1 - else - echo "Cannot find a 'machines' file for LAM in system/" - echo "required to start a LAM multicomputer" - consultGuide - exit 1 - fi - else - echo "LAM daemon running (PID $lamPid). Proceeding with MPI run." - fi - ;; OPENMPI) # add hostfile info for hostfile in \ diff --git a/bin/mpirunDebug b/bin/mpirunDebug index 66bc86e42b..57df760873 100755 --- a/bin/mpirunDebug +++ b/bin/mpirunDebug @@ -162,10 +162,6 @@ do if [ .$WM_MPLIB = .OPENMPI ]; then node="-np 1 " - elif [ .$WM_MPLIB = .LAM ]; then - if [ "$spawn" -eq 2 ]; then - node="c${proc} " - fi fi echo "#!/bin/sh" > $procCmdFile @@ -210,8 +206,6 @@ done cmd="" if [ .$WM_MPLIB = .OPENMPI ]; then cmd="mpirun -app $PWD/mpirun.schema Date: Wed, 15 Jul 2009 12:03:43 +0100 Subject: [PATCH 036/172] extraneous include files --- applications/utilities/mesh/manipulation/setSet/setSet.C | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/applications/utilities/mesh/manipulation/setSet/setSet.C b/applications/utilities/mesh/manipulation/setSet/setSet.C index 42ad6110ea..5290750d4c 100644 --- a/applications/utilities/mesh/manipulation/setSet/setSet.C +++ b/applications/utilities/mesh/manipulation/setSet/setSet.C @@ -31,12 +31,11 @@ Description #include "Time.H" #include "polyMesh.H" #include "globalMeshData.H" -#include "topoSetSource.H" -#include "topoSet.H" #include "IStringStream.H" -#include "topoSet.H" #include "cellSet.H" #include "faceSet.H" +#include "pointSet.H" +#include "topoSetSource.H" #include "OFstream.H" #include "IFstream.H" #include "demandDrivenData.H" From b8077f9c197901dd5eeb6034759c8ec5f664d06a Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 15 Jul 2009 13:28:24 +0200 Subject: [PATCH 037/172] dropped pvm --- src/Pstream/Allwmake | 2 +- src/Pstream/pvm/IPread.C | 114 ---------- src/Pstream/pvm/Make/files | 5 - src/Pstream/pvm/Make/options | 4 - src/Pstream/pvm/OPwrite.C | 68 ------ src/Pstream/pvm/Pstream.C | 393 ----------------------------------- 6 files changed, 1 insertion(+), 585 deletions(-) delete mode 100644 src/Pstream/pvm/IPread.C delete mode 100644 src/Pstream/pvm/Make/files delete mode 100644 src/Pstream/pvm/Make/options delete mode 100644 src/Pstream/pvm/OPwrite.C delete mode 100644 src/Pstream/pvm/Pstream.C diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake index a24dd16a5d..a01538cc38 100755 --- a/src/Pstream/Allwmake +++ b/src/Pstream/Allwmake @@ -5,7 +5,7 @@ set -x wmake libso dummy case "$WM_MPLIB" in -LAM | *MPI* ) +*MPI*) set +x echo echo "Note: ignore spurious warnings about missing mpicxx.h headers" diff --git a/src/Pstream/pvm/IPread.C b/src/Pstream/pvm/IPread.C deleted file mode 100644 index 5a035bf388..0000000000 --- a/src/Pstream/pvm/IPread.C +++ /dev/null @@ -1,114 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 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 - -Description - Read token and binary block from IPstream using pvm. - -\*---------------------------------------------------------------------------*/ - -#include "error.H" - -#include "IPstream.H" - -#include - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * // - -IPstream::IPstream -( - const int fromProcNo, - const label bufSize, - streamFormat format, - versionNumber version -) -: - Pstream(bufSize), - Istream(format, version), - fromProcNo_(fromProcNo), - messageSize_(0) -{ - setOpened(); - setGood(); - - int bufid, tag, tid; - - // If the buffer size is not specified then probe the incomming message - - if (!bufSize) - { - // Probe read buffer until message arrives. - while (!(bufid = pvm_probe(procID(fromProcNo_), msgType()))); - - // When the message arrives find its size - pvm_bufinfo(bufid, &messageSize_, &tag, &tid); - - // Resize buffer to message size - buf_.setSize(messageSize_); - } - - - // Read message into buffer - - if - ( - pvm_precv - ( - procID(fromProcNo_), - msgType(), - buf_.begin(), - buf_.size(), - PVM_BYTE, - &tid, &tag, &messageSize_ - ) != PvmOk - ) - { - FatalErrorIn("IPstream::IPstream(const int fromProcNo)") - << "pvm_precv cannot receive incomming message" - << ::abort; - } - - - // Check size of message read - - if (messageSize_ > buf_.size()) - { - FatalErrorIn("IPstream::IPstream(const int fromProcNo)") - << "buffer (" << buf_.size() - << ") not large enough for incomming message (" - << messageSize_ << ')' - << ::abort; - } -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/Pstream/pvm/Make/files b/src/Pstream/pvm/Make/files deleted file mode 100644 index 8a94fb2f05..0000000000 --- a/src/Pstream/pvm/Make/files +++ /dev/null @@ -1,5 +0,0 @@ -OPwrite.C -IPread.C -Pstream.C - -LIB = $(FOAM_LIBBIN)/pvm-$(LAM_VERSION)/libPstream diff --git a/src/Pstream/pvm/Make/options b/src/Pstream/pvm/Make/options deleted file mode 100644 index 90632e801e..0000000000 --- a/src/Pstream/pvm/Make/options +++ /dev/null @@ -1,4 +0,0 @@ -include $(RULES)/mplib$(WM_MPLIB) - -EXE_INC = $(PFLAGS) $(PINC) -LIB_LIBS = $(PLIBS) diff --git a/src/Pstream/pvm/OPwrite.C b/src/Pstream/pvm/OPwrite.C deleted file mode 100644 index 454f6d1eb8..0000000000 --- a/src/Pstream/pvm/OPwrite.C +++ /dev/null @@ -1,68 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 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 - -Description - Write primitive and binary block from OPstream using pvm. - -\*---------------------------------------------------------------------------*/ - -#include "error.H" - -#include "OPstream.H" - -#include - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -OPstream::~OPstream() -{ - if - ( - pvm_psend - ( - procID(toProcNo_), - msgType(), - buf_.begin(), - bufPosition_, - PVM_BYTE - ) != PvmOk - ) - { - FatalErrorIn("OPstream::~OPstream()") - << "pvm_psend cannot send outgoing message" - << ::abort; - } -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/Pstream/pvm/Pstream.C b/src/Pstream/pvm/Pstream.C deleted file mode 100644 index c76e2df115..0000000000 --- a/src/Pstream/pvm/Pstream.C +++ /dev/null @@ -1,393 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 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 "Pstream.H" -#include "PstreamReduceOps.H" - -#include -#include -#include - -#include - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -void Pstream::addValidParOptions(HashTable& validParOptions) -{ - validParOptions.insert("np", ""); - validParOptions.insert("p4pg", "PI file"); - validParOptions.insert("p4wd", "directory"); - validParOptions.insert("p4amslave", ""); - validParOptions.insert("p4yourname", "hostname"); -} - - -bool Pstream::init(int& argc, char**& argv) -{ - // Set the comunications options - pvm_setopt(PvmRoute, PvmRouteDirect); - - // Get the ID of this processor - int mytid = pvm_mytid(); - -#ifdef USECRAYSHMEM - - // Get the size of the NULL group - procIDs_.setSize(pvm_gsize(NULL)); - - // For each processor of the NULL group get its ID - for (int proci=0; proci& bop) -{ - if (Pstream::parRun()) - { -# ifdef PVM_REDUCE - if - ( - pvm_reduce - ( - PvmSum, - &Value, - 1, - PVM_DOUBLE, - Pstream::msgType(), - "foam", - 0 - ) != PvmOk - ) - { - FatalErrorIn - ( - "reduce(scalar& Value, const sumOp& sumOp)" - ) << "pvm_reduce failed" - << abort(FatalError); - } -# endif - - if (Pstream::master()) - { - for - ( - int slave=Pstream::firstSlave(); - slave<=Pstream::lastSlave(); - slave++ - ) - { - scalar value; - int atid, atag, alen; - - if - ( - pvm_precv - ( - Pstream::procID(slave), - Pstream::msgType(), - &value, - 1, - PVM_DOUBLE, - &atid, &atag, &alen - ) != PvmOk - ) - { - FatalErrorIn - ( - "reduce(scalar& Value, const sumOp& sumOp)" - ) << "pvm_precv failed" - << abort(FatalError); - } - - Value = bop(Value, value); - } - } - else - { - if - ( - pvm_psend - ( - Pstream::procID(Pstream::masterNo()), - Pstream::msgType(), - &Value, - 1, - PVM_DOUBLE - ) != PvmOk - ) - { - FatalErrorIn - ( - "reduce(scalar& Value, const sumOp& sumOp)" - ) << "pvm_psend failed" - << abort(FatalError); - } - } - - - if (Pstream::master()) - { - pvm_initsend(PvmDataDefault); - pvm_pkdouble(&Value, 1, 1); - - if - ( - pvm_mcast - ( - (int*)Pstream::procIDs().begin(), - Pstream::nProcs(), - Pstream::msgType() - ) != PvmOk - ) - { - FatalErrorIn - ( - "reduce(scalar& Value, const sumOp& sumOp)" - ) << "pvm_mcast failed" - << abort(FatalError); - } - } - else - { - if - ( - pvm_recv - ( - Pstream::procID(Pstream::masterNo()), - Pstream::msgType() - ) <= 0 - ) - { - FatalErrorIn - ( - "reduce(scalar& Value, const sumOp& sumOp)" - ) << "pvm_psend failed" - << abort(FatalError); - } - - pvm_upkdouble(&Value, 1, 1); - } - } -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // From 7b74d029bcc89aeac3c896eda1166434aa3f0ca0 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 15 Jul 2009 13:28:24 +0200 Subject: [PATCH 038/172] dropped pvm --- src/Pstream/Allwmake | 2 +- src/Pstream/pvm/IPread.C | 114 ---------- src/Pstream/pvm/Make/files | 5 - src/Pstream/pvm/Make/options | 4 - src/Pstream/pvm/OPwrite.C | 68 ------ src/Pstream/pvm/Pstream.C | 393 ----------------------------------- 6 files changed, 1 insertion(+), 585 deletions(-) delete mode 100644 src/Pstream/pvm/IPread.C delete mode 100644 src/Pstream/pvm/Make/files delete mode 100644 src/Pstream/pvm/Make/options delete mode 100644 src/Pstream/pvm/OPwrite.C delete mode 100644 src/Pstream/pvm/Pstream.C diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake index a24dd16a5d..a01538cc38 100755 --- a/src/Pstream/Allwmake +++ b/src/Pstream/Allwmake @@ -5,7 +5,7 @@ set -x wmake libso dummy case "$WM_MPLIB" in -LAM | *MPI* ) +*MPI*) set +x echo echo "Note: ignore spurious warnings about missing mpicxx.h headers" diff --git a/src/Pstream/pvm/IPread.C b/src/Pstream/pvm/IPread.C deleted file mode 100644 index 5a035bf388..0000000000 --- a/src/Pstream/pvm/IPread.C +++ /dev/null @@ -1,114 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 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 - -Description - Read token and binary block from IPstream using pvm. - -\*---------------------------------------------------------------------------*/ - -#include "error.H" - -#include "IPstream.H" - -#include - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * // - -IPstream::IPstream -( - const int fromProcNo, - const label bufSize, - streamFormat format, - versionNumber version -) -: - Pstream(bufSize), - Istream(format, version), - fromProcNo_(fromProcNo), - messageSize_(0) -{ - setOpened(); - setGood(); - - int bufid, tag, tid; - - // If the buffer size is not specified then probe the incomming message - - if (!bufSize) - { - // Probe read buffer until message arrives. - while (!(bufid = pvm_probe(procID(fromProcNo_), msgType()))); - - // When the message arrives find its size - pvm_bufinfo(bufid, &messageSize_, &tag, &tid); - - // Resize buffer to message size - buf_.setSize(messageSize_); - } - - - // Read message into buffer - - if - ( - pvm_precv - ( - procID(fromProcNo_), - msgType(), - buf_.begin(), - buf_.size(), - PVM_BYTE, - &tid, &tag, &messageSize_ - ) != PvmOk - ) - { - FatalErrorIn("IPstream::IPstream(const int fromProcNo)") - << "pvm_precv cannot receive incomming message" - << ::abort; - } - - - // Check size of message read - - if (messageSize_ > buf_.size()) - { - FatalErrorIn("IPstream::IPstream(const int fromProcNo)") - << "buffer (" << buf_.size() - << ") not large enough for incomming message (" - << messageSize_ << ')' - << ::abort; - } -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/Pstream/pvm/Make/files b/src/Pstream/pvm/Make/files deleted file mode 100644 index 8a94fb2f05..0000000000 --- a/src/Pstream/pvm/Make/files +++ /dev/null @@ -1,5 +0,0 @@ -OPwrite.C -IPread.C -Pstream.C - -LIB = $(FOAM_LIBBIN)/pvm-$(LAM_VERSION)/libPstream diff --git a/src/Pstream/pvm/Make/options b/src/Pstream/pvm/Make/options deleted file mode 100644 index 90632e801e..0000000000 --- a/src/Pstream/pvm/Make/options +++ /dev/null @@ -1,4 +0,0 @@ -include $(RULES)/mplib$(WM_MPLIB) - -EXE_INC = $(PFLAGS) $(PINC) -LIB_LIBS = $(PLIBS) diff --git a/src/Pstream/pvm/OPwrite.C b/src/Pstream/pvm/OPwrite.C deleted file mode 100644 index 454f6d1eb8..0000000000 --- a/src/Pstream/pvm/OPwrite.C +++ /dev/null @@ -1,68 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 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 - -Description - Write primitive and binary block from OPstream using pvm. - -\*---------------------------------------------------------------------------*/ - -#include "error.H" - -#include "OPstream.H" - -#include - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // - -OPstream::~OPstream() -{ - if - ( - pvm_psend - ( - procID(toProcNo_), - msgType(), - buf_.begin(), - bufPosition_, - PVM_BYTE - ) != PvmOk - ) - { - FatalErrorIn("OPstream::~OPstream()") - << "pvm_psend cannot send outgoing message" - << ::abort; - } -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/Pstream/pvm/Pstream.C b/src/Pstream/pvm/Pstream.C deleted file mode 100644 index c76e2df115..0000000000 --- a/src/Pstream/pvm/Pstream.C +++ /dev/null @@ -1,393 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 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 "Pstream.H" -#include "PstreamReduceOps.H" - -#include -#include -#include - -#include - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -void Pstream::addValidParOptions(HashTable& validParOptions) -{ - validParOptions.insert("np", ""); - validParOptions.insert("p4pg", "PI file"); - validParOptions.insert("p4wd", "directory"); - validParOptions.insert("p4amslave", ""); - validParOptions.insert("p4yourname", "hostname"); -} - - -bool Pstream::init(int& argc, char**& argv) -{ - // Set the comunications options - pvm_setopt(PvmRoute, PvmRouteDirect); - - // Get the ID of this processor - int mytid = pvm_mytid(); - -#ifdef USECRAYSHMEM - - // Get the size of the NULL group - procIDs_.setSize(pvm_gsize(NULL)); - - // For each processor of the NULL group get its ID - for (int proci=0; proci& bop) -{ - if (Pstream::parRun()) - { -# ifdef PVM_REDUCE - if - ( - pvm_reduce - ( - PvmSum, - &Value, - 1, - PVM_DOUBLE, - Pstream::msgType(), - "foam", - 0 - ) != PvmOk - ) - { - FatalErrorIn - ( - "reduce(scalar& Value, const sumOp& sumOp)" - ) << "pvm_reduce failed" - << abort(FatalError); - } -# endif - - if (Pstream::master()) - { - for - ( - int slave=Pstream::firstSlave(); - slave<=Pstream::lastSlave(); - slave++ - ) - { - scalar value; - int atid, atag, alen; - - if - ( - pvm_precv - ( - Pstream::procID(slave), - Pstream::msgType(), - &value, - 1, - PVM_DOUBLE, - &atid, &atag, &alen - ) != PvmOk - ) - { - FatalErrorIn - ( - "reduce(scalar& Value, const sumOp& sumOp)" - ) << "pvm_precv failed" - << abort(FatalError); - } - - Value = bop(Value, value); - } - } - else - { - if - ( - pvm_psend - ( - Pstream::procID(Pstream::masterNo()), - Pstream::msgType(), - &Value, - 1, - PVM_DOUBLE - ) != PvmOk - ) - { - FatalErrorIn - ( - "reduce(scalar& Value, const sumOp& sumOp)" - ) << "pvm_psend failed" - << abort(FatalError); - } - } - - - if (Pstream::master()) - { - pvm_initsend(PvmDataDefault); - pvm_pkdouble(&Value, 1, 1); - - if - ( - pvm_mcast - ( - (int*)Pstream::procIDs().begin(), - Pstream::nProcs(), - Pstream::msgType() - ) != PvmOk - ) - { - FatalErrorIn - ( - "reduce(scalar& Value, const sumOp& sumOp)" - ) << "pvm_mcast failed" - << abort(FatalError); - } - } - else - { - if - ( - pvm_recv - ( - Pstream::procID(Pstream::masterNo()), - Pstream::msgType() - ) <= 0 - ) - { - FatalErrorIn - ( - "reduce(scalar& Value, const sumOp& sumOp)" - ) << "pvm_psend failed" - << abort(FatalError); - } - - pvm_upkdouble(&Value, 1, 1); - } - } -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace Foam - -// ************************************************************************* // From 75080ab867acbe8c8357409fd623823846e43c87 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 15 Jul 2009 13:34:51 +0200 Subject: [PATCH 039/172] dropped pvm --- wmake/rules/solarisGcc/mplibPVM | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 wmake/rules/solarisGcc/mplibPVM diff --git a/wmake/rules/solarisGcc/mplibPVM b/wmake/rules/solarisGcc/mplibPVM deleted file mode 100644 index 9652e427d8..0000000000 --- a/wmake/rules/solarisGcc/mplibPVM +++ /dev/null @@ -1,3 +0,0 @@ -PFLAGS = -PINC = -I$(PVM_ROOT)/include -PLIBS = -L$(PVM_ROOT)/lib/$(PVM_ARCH) -lgpvm3 -lpvm3s From a9699afbb46a764d05b98276ca58c267794f9b8d Mon Sep 17 00:00:00 2001 From: andy Date: Wed, 15 Jul 2009 12:47:01 +0100 Subject: [PATCH 040/172] updated project versions to 1.6 + removed references to JAVAC --- etc/bashrc | 6 +----- etc/cshrc | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/etc/bashrc b/etc/bashrc index 218880e311..0c460577e9 100644 --- a/etc/bashrc +++ b/etc/bashrc @@ -33,8 +33,7 @@ #------------------------------------------------------------------------------ export WM_PROJECT=OpenFOAM -# export WM_PROJECT_VERSION=1.6.x -: ${WM_PROJECT_VERSION:=dev}; export WM_PROJECT_VERSION +export WM_PROJECT_VERSION=1.6 ################################################################################ # USER EDITABLE PART @@ -102,9 +101,6 @@ export WM_COMPILER_LIB_ARCH= # WM_COMPILE_OPTION = Opt | Debug | Prof : ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION -# WM_JAVAC_OPTION = Opt | Debug -: ${WM_JAVAC_OPTION:=Opt}; export WM_JAVAC_OPTION - # WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI : ${WM_MPLIB:=OPENMPI}; export WM_MPLIB diff --git a/etc/cshrc b/etc/cshrc index 0ead9b1a65..bc5f325dd6 100644 --- a/etc/cshrc +++ b/etc/cshrc @@ -32,8 +32,7 @@ #------------------------------------------------------------------------------ setenv WM_PROJECT OpenFOAM -# setenv WM_PROJECT_VERSION 1.6.x -if ( ! $?WM_PROJECT_VERSION ) setenv WM_PROJECT_VERSION dev +setenv WM_PROJECT_VERSION 1.6 ################################################################################ # USER EDITABLE PART @@ -96,9 +95,6 @@ if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP # WM_COMPILE_OPTION = Opt | Debug | Prof if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt -# WM_JAVAC_OPTION = Opt | Debug -if ( ! $?WM_JAVAC_OPTION ) setenv WM_JAVAC_OPTION Opt - # WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI From a98c4e845be6e8890cb4da983719f04b7fa220c6 Mon Sep 17 00:00:00 2001 From: henry Date: Wed, 15 Jul 2009 13:20:25 +0100 Subject: [PATCH 041/172] Changed OpenMPI version. --- etc/settings.csh | 3 +-- etc/settings.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/etc/settings.csh b/etc/settings.csh index edafa90716..495c9324e9 100644 --- a/etc/settings.csh +++ b/etc/settings.csh @@ -118,8 +118,7 @@ unset MPI_ARCH_PATH switch ("$WM_MPLIB") case OPENMPI: - # set mpi_version=openmpi-1.3.3 - set mpi_version=openmpi-1.3.2 + set mpi_version=openmpi-1.3.3 setenv MPI_HOME $WM_THIRD_PARTY_DIR/$mpi_version setenv MPI_ARCH_PATH $MPI_HOME/platforms/$WM_OPTIONS diff --git a/etc/settings.sh b/etc/settings.sh index 1203a843a0..6d640d2068 100644 --- a/etc/settings.sh +++ b/etc/settings.sh @@ -142,8 +142,7 @@ unset MPI_ARCH_PATH case "$WM_MPLIB" in OPENMPI) - # mpi_version=openmpi-1.3.3 - mpi_version=openmpi-1.3.2 + mpi_version=openmpi-1.3.3 export MPI_HOME=$WM_THIRD_PARTY_DIR/$mpi_version export MPI_ARCH_PATH=$MPI_HOME/platforms/$WM_OPTIONS From d89d2eadd5dcf93ba397cd350e62fa8d1e6d1fbb Mon Sep 17 00:00:00 2001 From: henry Date: Wed, 15 Jul 2009 23:12:06 +0100 Subject: [PATCH 042/172] Reinstate editing the paths in the .cmake files as the default behaviour. --- bin/buildParaView | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/buildParaView b/bin/buildParaView index cceee96487..e7c6c6f9b0 100755 --- a/bin/buildParaView +++ b/bin/buildParaView @@ -114,7 +114,7 @@ runCONFIG=true runMAKE=true runMAKEDOC=true runINSTALL=true -runENVPATH=false +runENVPATH=true # parse options @@ -153,6 +153,7 @@ do shift ;; -envpath) # optional: change cmake files to use env variables + # This is now the default behaviour runCONFIG=false runMAKE=false runMAKEDOC=false From 7ae5e62f3984dd8c21f43049b8cf0b6ccefe9625 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 16 Jul 2009 08:27:40 +0200 Subject: [PATCH 043/172] drop thermalDissipation (effective, equilibrium or otherwise) from turbulenceModels - keeps sources in sync for the 1.6 release and it'll get fiddled with for the 1.7 release anyhow --- .../compressible/LES/LESModel/LESModel.C | 51 ------ .../compressible/LES/LESModel/LESModel.H | 10 -- .../compressible/RAS/RASModel/RASModel.C | 50 ------ .../compressible/RAS/RASModel/RASModel.H | 9 - .../compressible/RAS/laminar/laminar.C | 44 ----- .../compressible/RAS/laminar/laminar.H | 9 - .../compressible/turbulenceModel/Make/files | 1 - .../dissipationSelector/dissipationSelector.C | 111 ------------ .../dissipationSelector/dissipationSelector.H | 158 ------------------ .../turbulenceModel/laminar/laminar.C | 44 ----- .../turbulenceModel/laminar/laminar.H | 9 - .../turbulenceModel/turbulenceModel.H | 9 - .../incompressible/LES/LESModel/LESModel.C | 50 ------ .../incompressible/LES/LESModel/LESModel.H | 9 - .../incompressible/RAS/RASModel/RASModel.C | 49 ------ .../incompressible/RAS/RASModel/RASModel.H | 9 - .../incompressible/RAS/laminar/laminar.C | 44 ----- .../incompressible/RAS/laminar/laminar.H | 9 - .../incompressible/turbulenceModel/Make/files | 1 - .../dissipationSelector/dissipationSelector.C | 111 ------------ .../dissipationSelector/dissipationSelector.H | 158 ------------------ .../turbulenceModel/laminar/laminar.C | 44 ----- .../turbulenceModel/laminar/laminar.H | 9 - .../turbulenceModel/turbulenceModel.H | 9 - 24 files changed, 1007 deletions(-) delete mode 100644 src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C delete mode 100644 src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.H delete mode 100644 src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C delete mode 100644 src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.H diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C index 2f35a8bfd2..7301318b16 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C @@ -76,7 +76,6 @@ LESModel::LESModel ) ), - turbulence_(true), // TODO: turbulence_(lookup("turbulence")), printCoeffs_(lookupOrDefault("printCoeffs", false)), coeffDict_(subDictPtr(type + "Coeffs")), @@ -181,56 +180,6 @@ autoPtr LESModel::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp LESModel::thermalDissipation() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipation", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - - this->rho() * this->epsilon() - ) - ); -} - - -tmp LESModel::thermalDissipationEquilibrium() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipationEquilibrium", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( - this->muEff()*dev(twoSymm(tgradU())) - - ((2.0/3.0)*I) * this->rho() * this->k() - ) && tgradU() - ) - ); -} - - void LESModel::correct(const tmp&) { delta_().correct(); diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H index 8808c1e41a..3012b4124a 100644 --- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.H +++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H @@ -80,7 +80,6 @@ protected: // Protected data - Switch turbulence_; Switch printCoeffs_; dictionary coeffDict_; @@ -293,15 +292,6 @@ public: } - //- The source for the enthalpy equation resulting from - // viscous and turbulent dissipation - virtual tmp thermalDissipation() const; - - //- The source for the enthalpy equation resulting from - // the effective viscous dissipation - // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEquilibrium() const; - //- Correct Eddy-Viscosity and related properties. // This calls correct(const tmp& gradU) by supplying // gradU calculated locally. diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C index 9ce1db5ef9..5d46b78788 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C @@ -191,56 +191,6 @@ autoPtr RASModel::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp RASModel::thermalDissipation() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipation", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - - this->rho() * this->epsilon() - ) - ); -} - - -tmp RASModel::thermalDissipationEquilibrium() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipationEquilibrium", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( - this->muEff()*dev(twoSymm(tgradU())) - - ((2.0/3.0)*I) * this->rho() * this->k() - ) && tgradU() - ) - ); -} - - scalar RASModel::yPlusLam(const scalar kappa, const scalar E) const { scalar ypl = 11.0; diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H index 0e27f72924..7c787d8ceb 100644 --- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H +++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H @@ -345,15 +345,6 @@ public: //- Return the source term for the momentum equation virtual tmp divDevRhoReff(volVectorField& U) const = 0; - //- The source for the enthalpy equation resulting from - // viscous and turbulent dissipation - virtual tmp thermalDissipation() const; - - //- The source for the enthalpy equation resulting from - // the effective viscous dissipation - // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEquilibrium() const; - //- Return yPlus for the given patch virtual tmp yPlus(const label patchI) const; diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C index a2ec1a7f3b..415dedee72 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C @@ -177,50 +177,6 @@ tmp laminar::divDevRhoReff(volVectorField& U) const } -tmp laminar::thermalDissipation() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipation", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - ); -} - - -tmp laminar::thermalDissipationEquilibrium() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipationEquilibrium", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - ); -} - - bool laminar::read() { return RASModel::read(); diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H index f58db6c9e4..227bddf11a 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.H @@ -112,15 +112,6 @@ public: //- Return the source term for the momentum equation virtual tmp divDevRhoReff(volVectorField& U) const; - //- The source for the enthalpy equation resulting from - // viscous and turbulent dissipation - virtual tmp thermalDissipation() const; - - //- The source for the enthalpy equation resulting from - // the effective viscous dissipation - // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEquilibrium() const; - //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/files b/src/turbulenceModels/compressible/turbulenceModel/Make/files index d105907440..3f01b20354 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/Make/files +++ b/src/turbulenceModels/compressible/turbulenceModel/Make/files @@ -1,5 +1,4 @@ turbulenceModel.C laminar/laminar.C -dissipationSelector/dissipationSelector.C LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModel diff --git a/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C b/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C deleted file mode 100644 index c15dc89b15..0000000000 --- a/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.C +++ /dev/null @@ -1,111 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 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 "dissipationSelector.H" -#include "dictionary.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressible -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -template<> -const char* NamedEnum::names[] = -{ - "none", - "cascade", - "equilibrium" -}; - -const NamedEnum - dissipationSelector::typeNames; - - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - - -dissipationSelector::dissipationSelector -( - const turbulenceModel& turbModel, - const treatment treatmentType -) -: - turbModel_(turbModel), - treatment_(treatmentType) -{} - - -dissipationSelector::dissipationSelector -( - const turbulenceModel& turbModel, - const dictionary& dict -) -: - turbModel_(turbModel), - treatment_(none) -{ - - word modelType; - - if (dict.readIfPresent("dissipation", modelType)) - { - treatment_ = typeNames[modelType]; - } -} - - -tmp -dissipationSelector::dissipation() const -{ - if (treatment_ == cascade) - { - return turbModel_.thermalDissipation(); - } - else if (treatment_ == equilibrium) - { - return turbModel_.thermalDissipationEquilibrium(); - } - else - { - // a bit wasteful, but we'll avoid it with 'enabled' query anyhow - tmp tField = turbModel_.thermalDissipation(); - tField() = 0.0; - - return tField; - } -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressible -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.H b/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.H deleted file mode 100644 index c1b440e4b6..0000000000 --- a/src/turbulenceModels/compressible/turbulenceModel/dissipationSelector/dissipationSelector.H +++ /dev/null @@ -1,158 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 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::compressible::dissipationSelector - -Description - Simplistic runtime selectable handling of thermal dissipation - - Example use: - @code - dissipationSelector thermalDissipation(turbulence, dictionary); - - fvScalarMatrix hEqn ( ... ); - - if (thermalDissipation.enabled()) - { - hEqn += thermalDissipation.dissipation(); - } - @endcode - -SourceFiles - dissipationSelector.C - -\*---------------------------------------------------------------------------*/ - -#ifndef compressibledissipationSelector_H -#define compressibledissipationSelector_H - -#include "NamedEnum.H" -#include "dictionary.H" -#include "compressible/turbulenceModel/turbulenceModel.H" -#include "volFields.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -namespace compressible -{ - -/*---------------------------------------------------------------------------*\ - Class dissipationSelector Declaration -\*---------------------------------------------------------------------------*/ - -class dissipationSelector -{ - -public: - - //- Type of treatment - enum treatment - { - none, - cascade, - equilibrium - }; - - static const NamedEnum typeNames; - -protected: - - // Protected data - - const turbulenceModel& turbModel_; - - //- Type of treatment - treatment treatment_; - -public: - - // Declare name of the class and its debug switch - ClassName("dissipationSelector"); - - - // Constructors - - //- Construct given treatment type - dissipationSelector - ( - const turbulenceModel&, - const treatment = none - ); - - //- Construct given treatment type - dissipationSelector - ( - const turbulenceModel&, - const dictionary& - ); - - - // Member functions - - //- Get the treatment type - treatment treatmentType() const - { - return treatment_; - } - - //- Set the treatment type, return old value - treatment treatmentType(const treatment val) - { - treatment old = treatment_; - treatment_ = val; - return old; - } - - - //- Set the treatment type, return old value - const char* name() const - { - return typeNames[treatment_]; - } - - //- Set the treatment type, return old value - bool enabled() const - { - return treatment_ != none; - } - - tmp dissipation() const; - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressible -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C index 74b6b5fb06..4a391c3db5 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C @@ -195,50 +195,6 @@ tmp laminar::divDevRhoReff(volVectorField& U) const } -tmp laminar::thermalDissipation() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipation", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - ); -} - - -tmp laminar::thermalDissipationEquilibrium() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipationEquilibrium", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( this->mu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - ); -} - - bool laminar::read() { return true; diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H index 6bd3c5bdfa..5bdfa3dac7 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H @@ -122,15 +122,6 @@ public: //- Return the source term for the momentum equation virtual tmp divDevRhoReff(volVectorField& U) const; - //- The source for the enthalpy equation resulting from - // viscous and turbulent dissipation - virtual tmp thermalDissipation() const; - - //- The source for the enthalpy equation resulting from - // the effective viscous dissipation - // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEquilibrium() const; - //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H index 8c80b4ab57..97638e5e49 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H +++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H @@ -210,15 +210,6 @@ public: //- Return the source term for the momentum equation virtual tmp divDevRhoReff(volVectorField& U) const = 0; - //- The source for the enthalpy equation resulting from - // viscous and turbulent dissipation - virtual tmp thermalDissipation() const = 0; - - //- The source for the enthalpy equation resulting from - // the effective viscous dissipation - // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEquilibrium() const = 0; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct() = 0; diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C index fd755e8ea0..3e3c952ffc 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C @@ -139,56 +139,6 @@ autoPtr LESModel::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp LESModel::thermalDissipation() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipation", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - - this->epsilon() - ) - ); -} - - -tmp LESModel::thermalDissipationEquilibrium() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipationEquilibrium", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( - this->nuEff()*dev(twoSymm(tgradU())) - - ((2.0/3.0)*I) * this->k() - ) && tgradU() - ) - ); -} - - void LESModel::correct(const tmp&) { turbulenceModel::correct(); diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H index 620d4f0f55..49fe52c454 100644 --- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H +++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H @@ -241,15 +241,6 @@ public: } - //- The source for the enthalpy equation resulting from - // viscous and turbulent dissipation - virtual tmp thermalDissipation() const; - - //- The source for the enthalpy equation resulting from - // the effective viscous dissipation - // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEquilibrium() const; - //- Correct Eddy-Viscosity and related properties. // This calls correct(const tmp& gradU) by supplying // gradU calculated locally. diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C index 4d1d58db70..620a3fe2af 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C @@ -176,55 +176,6 @@ autoPtr RASModel::New // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -tmp RASModel::thermalDissipation() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipation", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - - this->epsilon() - ) - ); -} - - -tmp RASModel::thermalDissipationEquilibrium() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipationEquilibrium", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( - this->nuEff()*dev(twoSymm(tgradU())) - - ((2.0/3.0)*I) * this->k() - ) && tgradU() - ) - ); -} - scalar RASModel::yPlusLam(const scalar kappa, const scalar E) const { diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H index 4d895ea53f..fdc2b2e3b7 100644 --- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H +++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H @@ -326,15 +326,6 @@ public: //- Return the source term for the momentum equation virtual tmp divDevReff(volVectorField& U) const = 0; - //- The source for the enthalpy equation resulting from - // viscous and turbulent dissipation - virtual tmp thermalDissipation() const; - - //- The source for the enthalpy equation resulting from - // the effective viscous dissipation - // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEquilibrium() const; - //- Return yPlus for the given patch virtual tmp yPlus(const label patchI) const; diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C index a58d944196..6f400a1c9a 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C @@ -176,50 +176,6 @@ tmp laminar::divDevReff(volVectorField& U) const } -tmp laminar::thermalDissipation() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipation", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - ); -} - - -tmp laminar::thermalDissipationEquilibrium() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipationEquilibrium", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - ); -} - - bool laminar::read() { return RASModel::read(); diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H index 7bb4ba1b7b..0169127eeb 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H @@ -104,15 +104,6 @@ public: //- Return the source term for the momentum equation virtual tmp divDevReff(volVectorField& U) const; - //- The source for the enthalpy equation resulting from - // viscous and turbulent dissipation - virtual tmp thermalDissipation() const; - - //- The source for the enthalpy equation resulting from - // the effective viscous dissipation - // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEquilibrium() const; - //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/incompressible/turbulenceModel/Make/files b/src/turbulenceModels/incompressible/turbulenceModel/Make/files index 1133b2aaab..a77efed2ab 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/Make/files +++ b/src/turbulenceModels/incompressible/turbulenceModel/Make/files @@ -1,5 +1,4 @@ turbulenceModel.C laminar/laminar.C -dissipationSelector/dissipationSelector.C LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModel diff --git a/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C b/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C deleted file mode 100644 index d9318d2a82..0000000000 --- a/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.C +++ /dev/null @@ -1,111 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 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 "dissipationSelector.H" -#include "dictionary.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace incompressible -{ - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - -template<> -const char* NamedEnum::names[] = -{ - "none", - "cascade", - "equilibrium" -}; - -const NamedEnum - dissipationSelector::typeNames; - - -// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // - - -dissipationSelector::dissipationSelector -( - const turbulenceModel& turbModel, - const treatment treatmentType -) -: - turbModel_(turbModel), - treatment_(treatmentType) -{} - - -dissipationSelector::dissipationSelector -( - const turbulenceModel& turbModel, - const dictionary& dict -) -: - turbModel_(turbModel), - treatment_(none) -{ - - word modelType; - - if (dict.readIfPresent("dissipation", modelType)) - { - treatment_ = typeNames[modelType]; - } -} - - -tmp -dissipationSelector::dissipation() const -{ - if (treatment_ == cascade) - { - return turbModel_.thermalDissipation(); - } - else if (treatment_ == equilibrium) - { - return turbModel_.thermalDissipationEquilibrium(); - } - else - { - // a bit wasteful, but we'll avoid it with 'enabled' query anyhow - tmp tField = turbModel_.thermalDissipation(); - tField() = 0.0; - - return tField; - } -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace incompressible -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.H b/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.H deleted file mode 100644 index 9f2426c518..0000000000 --- a/src/turbulenceModels/incompressible/turbulenceModel/dissipationSelector/dissipationSelector.H +++ /dev/null @@ -1,158 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 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::incompressible::dissipationSelector - -Description - Simplistic runtime selectable handling of thermal dissipation - - Example use: - @code - dissipationSelector thermalDissipation(turbulence, dictionary); - - fvScalarMatrix hEqn ( ... ); - - if (thermalDissipation.enabled()) - { - hEqn += thermalDissipation.dissipation(); - } - @endcode - -SourceFiles - dissipationSelector.C - -\*---------------------------------------------------------------------------*/ - -#ifndef dissipationSelector_H -#define dissipationSelector_H - -#include "NamedEnum.H" -#include "dictionary.H" -#include "incompressible/turbulenceModel/turbulenceModel.H" -#include "volFields.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ - -namespace incompressible -{ - -/*---------------------------------------------------------------------------*\ - Class dissipationSelector Declaration -\*---------------------------------------------------------------------------*/ - -class dissipationSelector -{ - -public: - - //- Type of treatment - enum treatment - { - none, - cascade, - equilibrium - }; - - static const NamedEnum typeNames; - -protected: - - // Protected data - - const turbulenceModel& turbModel_; - - //- Type of treatment - treatment treatment_; - -public: - - // Declare name of the class and its debug switch - ClassName("dissipationSelector"); - - - // Constructors - - //- Construct given treatment type - dissipationSelector - ( - const turbulenceModel&, - const treatment = none - ); - - //- Construct given treatment type - dissipationSelector - ( - const turbulenceModel&, - const dictionary& - ); - - - // Member functions - - //- Get the treatment type - treatment treatmentType() const - { - return treatment_; - } - - //- Set the treatment type, return old value - treatment treatmentType(const treatment val) - { - treatment old = treatment_; - treatment_ = val; - return old; - } - - - //- Set the treatment type, return old value - const char* name() const - { - return typeNames[treatment_]; - } - - //- Set the treatment type, return old value - bool enabled() const - { - return treatment_ != none; - } - - tmp dissipation() const; - -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace incompressible -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C index 93fdbc813d..f1dca5b4ad 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C @@ -199,50 +199,6 @@ tmp laminar::divDevReff(volVectorField& U) const } -tmp laminar::thermalDissipation() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipation", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - ); -} - - -tmp laminar::thermalDissipationEquilibrium() const -{ - tmp tgradU = fvc::grad(this->U()); - - return tmp - ( - new volScalarField - ( - IOobject - ( - "thermalDissipationEquilibrium", - runTime_.timeName(), - mesh_, - IOobject::NO_READ, - IOobject::NO_WRITE - ), - - ( this->nu()*dev(twoSymm(tgradU())) ) && tgradU() - ) - ); -} - - bool laminar::read() { return true; diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H index ba0c59201c..51eef7c436 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H @@ -110,15 +110,6 @@ public: //- Return the source term for the momentum equation virtual tmp divDevReff(volVectorField& U) const; - //- The source for the enthalpy equation resulting from - // viscous and turbulent dissipation - virtual tmp thermalDissipation() const; - - //- The source for the enthalpy equation resulting from - // the effective viscous dissipation - // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEquilibrium() const; - //- Correct the laminar viscosity virtual void correct(); diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H index d6fa7f2ca2..1474e5dfa3 100644 --- a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H +++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H @@ -190,15 +190,6 @@ public: //- Return the source term for the momentum equation virtual tmp divDevReff(volVectorField& U) const = 0; - //- The source for the enthalpy equation resulting from - // viscous and turbulent dissipation - virtual tmp thermalDissipation() const = 0; - - //- The source for the enthalpy equation resulting from - // the effective viscous dissipation - // (ie, when turbulent production and dissipation are in equilibrium) - virtual tmp thermalDissipationEquilibrium() const = 0; - //- Solve the turbulence equations and correct the turbulence viscosity virtual void correct() = 0; From 19d09fd3b569c5fec78d082afdb978128d51decf Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 16 Jul 2009 08:35:35 +0200 Subject: [PATCH 044/172] laminar models: consistency update in #ifndef/#define naming --- .../kQRWallFunction/kQRWallFunctionFvPatchField.C | 4 ++-- src/turbulenceModels/compressible/RAS/laminar/laminar.H | 4 ++-- .../compressible/turbulenceModel/laminar/laminar.H | 4 ++-- src/turbulenceModels/incompressible/LES/laminar/laminar.H | 4 ++-- src/turbulenceModels/incompressible/RAS/laminar/laminar.H | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.C index d0d1d1ef35..8286c1b149 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kQRWallFunctions/kQRWallFunction/kQRWallFunctionFvPatchField.C @@ -51,8 +51,8 @@ void kQRWallFunctionFvPatchField::checkType() << "Invalid wall function specification" << nl << " Patch type for patch " << this->patch().name() << " must be wall" << nl - << " Current patch type is " << this->patch().type() - << nl << endl << abort(FatalError); + << " Current patch type is " << this->patch().type() << nl << endl + << abort(FatalError); } } diff --git a/src/turbulenceModels/compressible/RAS/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H index 227bddf11a..af1f5e2bb2 100644 --- a/src/turbulenceModels/compressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.H @@ -33,8 +33,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef compressibleLaminar_H -#define compressibleLaminar_H +#ifndef compressibleRasLaminar_H +#define compressibleRasLaminar_H #include "RASModel.H" diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H index 5bdfa3dac7..d4379bfb2e 100644 --- a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H +++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H @@ -33,8 +33,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef laminar_H -#define laminar_H +#ifndef compressibleLaminar_H +#define compressibleLaminar_H #include "turbulenceModel.H" diff --git a/src/turbulenceModels/incompressible/LES/laminar/laminar.H b/src/turbulenceModels/incompressible/LES/laminar/laminar.H index 45500d6172..b428f102ab 100644 --- a/src/turbulenceModels/incompressible/LES/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.H @@ -34,8 +34,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef laminar_H -#define laminar_H +#ifndef lesLaminar_H +#define lesLaminar_H #include "LESModel.H" #include "volFields.H" diff --git a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H index 0169127eeb..8b328addf0 100644 --- a/src/turbulenceModels/incompressible/RAS/laminar/laminar.H +++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H @@ -33,8 +33,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef laminar_H -#define laminar_H +#ifndef rasLaminar_H +#define rasLaminar_H #include "RASModel.H" From 375e968bd1411477b9f0bcd78a6be5c0bd76aa53 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 16 Jul 2009 09:56:54 +0200 Subject: [PATCH 045/172] fixup foamPack* scripts - handle ThirdParty-VERSION properly - handle wmake/utilbin/ location - should the wmake/rules/* really be packed with a binary distribution? I think this is just left over from before. --- .gitignore | 4 --- bin/foamPack | 7 +++-- bin/foamPackBin | 56 +++++++++++++++++++---------------- bin/foamPackBinAll | 6 ++-- bin/foamPackDoxygen | 20 ++++++------- bin/foamPackGeneral | 12 ++++---- bin/foamPackSource | 39 +++++++++++++----------- bin/foamPackThirdPartyBin | 37 +++++++++++++---------- bin/foamPackThirdPartyGeneral | 15 +++++----- 9 files changed, 105 insertions(+), 91 deletions(-) diff --git a/.gitignore b/.gitignore index a95cd603ba..b124c8d887 100644 --- a/.gitignore +++ b/.gitignore @@ -41,10 +41,6 @@ SunOS*Gcc*/ # reinstate wmake/rules that might look like build folders !wmake/rules/*/ -# but do continue to ignore the derived wmake files -wmake/rules/*/dirToString -wmake/rules/*/wmkdep - # doxygen generated documentation doc/[Dd]oxygen/html doc/[Dd]oxygen/latex diff --git a/bin/foamPack b/bin/foamPack index 5f42ebbb2b..3f35f5b57d 100755 --- a/bin/foamPack +++ b/bin/foamPack @@ -86,9 +86,10 @@ find -H $packDir \ -a ! -name "log[0-9]*" \ -a ! -name "so_locations" \ | sed \ - -e "\@$packDir/.git/@d" \ -e "\@$packDir/lib/@d" \ - -e '\@applications/bin/@d' \ + -e '\@/\.git/@d' \ + -e '\@applications/bin/@d' \ + -e '\@wmake/utilbin/@d' \ -e '\@/t/@d' \ -e '\@Make[.A-Za-z]*/[^/]*/@d' \ -e '\@doc/[Dd]oxygen/html@d' \ @@ -100,7 +101,7 @@ find -H $packDir \ tar czpf $packFile --files-from $tmpFile -if [ $? = 0 ] +if [ $? -eq 0 ] then echo "Finished packing and compressing $packDir into file $packFile" else diff --git a/bin/foamPackBin b/bin/foamPackBin index 00ef0c5af3..5a60b405a9 100755 --- a/bin/foamPackBin +++ b/bin/foamPackBin @@ -33,14 +33,17 @@ if [ $# -eq 0 ] then - echo "Error: architecture type expected, exiting" - echo - echo "Usage : ${0##*/} [outputDir]" - echo - exit 1 + echo "Error: architecture type expected, exiting" + echo + echo "Usage : ${0##*/} [outputDir]" + echo + exit 1 fi arch=$1 +# base arch (w/o precision, optimization, etc) +baseArch=$(echo "$arch" | sed -e 's@[DS]P.*$@@') + timeStamp=$(date +%Y-%m-%d) packDir=$WM_PROJECT-$WM_PROJECT_VERSION packFile=${packDir}.${arch}_${timeStamp}.gtgz @@ -48,49 +51,50 @@ packFile=${packDir}.${arch}_${timeStamp}.gtgz # add optional output directory if [ -d "$2" ] then - packFile="$2/$packFile" + packFile="$2/$packFile" fi if [ -f $packFile ] then - echo "Error: $packFile already exists" - exit 1 + echo "Error: $packFile already exists" + exit 1 fi # check for essential directories for dir in $packDir $packDir/lib/$arch $packDir/applications/bin/$arch do - if [ ! -d $dir ] - then - echo "Error: directory $dir does not exist" - exit 1 - fi + if [ ! -d $dir ] + then + echo "Error: directory $dir does not exist" + exit 1 + fi done # get list of directories dirList=$( - for dir in \ - $packDir/lib/$arch \ - $packDir/applications/bin/$arch \ - $packDir/wmake/rules \ - ; - do - [ -d $dir ] && echo $dir - done + for dir in \ + $packDir/lib/$arch \ + $packDir/applications/bin/$arch \ + $packDir/wmake/rules \ + $packDir/wmake/utilbin/$baseArch \ + ; + do + [ -d $dir ] && echo $dir + done ) echo -echo "Packing $arch port of $packDir into $packFile" +echo "Packing $arch ($baseArch) port of $packDir into $packFile" echo tar czpf $packFile $dirList -if [ $? = 0 ] +if [ $? -eq 0 ] then - echo "Finished packing and compressing file $packFile" + echo "Finished packing and compressing file $packFile" else - echo "Error: failure packing $packFile" - rm -f $packFile 2>/dev/null + echo "Error: failure packing $packFile" + rm -f $packFile 2>/dev/null fi #------------------------------------------------------------------------------ diff --git a/bin/foamPackBinAll b/bin/foamPackBinAll index 01555787cb..57673e9803 100755 --- a/bin/foamPackBinAll +++ b/bin/foamPackBinAll @@ -34,14 +34,14 @@ packDir=$WM_PROJECT-$WM_PROJECT_VERSION if [ ! -d $packDir ] then - echo "Error: directory $packDir does not exist" - exit 1 + echo "Error: directory $packDir does not exist" + exit 1 fi # obtain arch types from lib/ for bin in $packDir/lib/* do - foamPackBin ${bin##*/} $@ + foamPackBin ${bin##*/} $@ done #------------------------------------------------------------------------------ diff --git a/bin/foamPackDoxygen b/bin/foamPackDoxygen index efdcdacc09..4503470846 100755 --- a/bin/foamPackDoxygen +++ b/bin/foamPackDoxygen @@ -41,7 +41,7 @@ Usage: ${0##*/} [-prefix DIR] [-o outputDir] Packs and compresses the OpenFOAM doxygen html for release USAGE - exit 1 + exit 1 } unset prefix outputDir @@ -87,16 +87,16 @@ fi # if [ -d "$outputDir" ] then - packFile="$outputDir/$packDir$packTag" + packFile="$outputDir/$packDir$packTag" else - packFile="$packDir$packTag" + packFile="$packDir$packTag" fi if [ -f $packFile ] then - echo "Error: $packFile already exists" - exit 1 + echo "Error: $packFile already exists" + exit 1 fi # Pack and compress the packFile using GNU tar @@ -107,16 +107,16 @@ echo if [ -n "$prefix" ] then - tar czpf $packFile --transform="s@^@$prefix/@" doc/Doxygen/html + tar czpf $packFile --transform="s@^@$prefix/@" doc/Doxygen/html else - tar czpf $packFile $packDir/doc/Doxygen/html + tar czpf $packFile $packDir/doc/Doxygen/html fi -if [ $? = 0 ] +if [ $? -eq 0 ] then - echo "Finished packing doxygen html into file $packFile" + echo "Finished packing doxygen html into file $packFile" else - echo "Error: failure packing doxygen html file $packFile" + echo "Error: failure packing doxygen html file $packFile" fi #------------------------------------------------------------------------------ diff --git a/bin/foamPackGeneral b/bin/foamPackGeneral index 3da4197226..e55d834bce 100755 --- a/bin/foamPackGeneral +++ b/bin/foamPackGeneral @@ -37,20 +37,20 @@ packFile=${packDir}.General_${timeStamp}.gtgz if [ ! -d $packDir ] then - echo "Error: directory $packDir does not exist" - exit 1 + echo "Error: directory $packDir does not exist" + exit 1 fi # add optional output directory if [ -d "$1" ] then - packFile="$1/$packFile" + packFile="$1/$packFile" fi if [ -f $packFile ] then - echo "Error: $packFile already exists" - exit 1 + echo "Error: $packFile already exists" + exit 1 fi # Create time stamp file @@ -62,7 +62,7 @@ echo $timeStamp 2>/dev/null > $packDir/.timeStamp # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -echo "Packing $packDir into $packFile" +echo "Packing $packDir source files into $packFile" echo foamPackSource $packDir $packFile diff --git a/bin/foamPackSource b/bin/foamPackSource index c4d0fc7eb4..b5e34c8a04 100755 --- a/bin/foamPackSource +++ b/bin/foamPackSource @@ -35,12 +35,12 @@ tmpFile=${TMPDIR:-/tmp}/foamPackFiles.$$ if [ $# -ne 2 ] then - echo "Usage : ${0##*/} directory tarFile" - echo "" - echo "Packs all .C and .H files and Make/options and Make/files into" - echo "" - echo "" - exit 1 + echo "Usage : ${0##*/} directory tarFile" + echo "" + echo "Packs all .C and .H files and Make/options and Make/files into" + echo "" + echo "" + exit 1 fi # canonical form (no double and no trailing dashes) @@ -49,14 +49,14 @@ packFile=$2 if [ ! -d $packDir ] then - echo "Error: directory $packDir does not exist" - exit 1 + echo "Error: directory $packDir does not exist" + exit 1 fi if [ -f $packFile ] then - echo "Error: $packFile already exists" - exit 1 + echo "Error: $packFile already exists" + exit 1 fi # Clean up on termination and on Ctrl-C @@ -78,24 +78,29 @@ find -H $packDir \ -a ! -name "log[0-9]*" \ -a ! -name "libccmio*" \ | sed \ - -e "\@$packDir/.git/@d" \ - -e "\@/.tags/@d" \ -e "\@$packDir/lib/@d" \ - -e "\@libccmio.*/@d" \ + -e '\@/\.git/@d' \ + -e '\@/\.tags/@d' \ -e '\@applications/bin/@d' \ + -e '\@wmake/utilbin/@d' \ -e '\@/t/@d' \ -e '\@/Make[.A-Za-z]*/[^/]*/@d'\ -e '\@/platforms/@d' \ + -e '\@libccmio.*/@d' \ > $tmpFile + +# provide some feedback +wc $tmpFile | awk '{print "Packing",$1,"files - this could take some time ..."}' + tar czpf $packFile --files-from $tmpFile -if [ $? = 0 ] +if [ $? -eq 0 ] then - echo "Finished packing and compressing $packDir into file $packFile" + echo "Finished packing and compressing $packDir into file $packFile" else - echo "Error: failure packing $packDir into file $packFile" - rm -f $packFile 2>/dev/null + echo "Error: failure packing $packDir into file $packFile" + rm -f $packFile 2>/dev/null fi #------------------------------------------------------------------------------ diff --git a/bin/foamPackThirdPartyBin b/bin/foamPackThirdPartyBin index 1e128db1da..b9363f6874 100755 --- a/bin/foamPackThirdPartyBin +++ b/bin/foamPackThirdPartyBin @@ -31,36 +31,43 @@ # #------------------------------------------------------------------------------ -if [ $# = 0 ] +if [ $# -eq 0 ] then - echo "Error: archOptions type expected, exiting" - echo - echo "Usage : ${0##*/} [outputDir]" - echo - exit 1 + echo "Error: archOptions type expected, exiting" + echo + echo "Usage : ${0##*/} [outputDir]" + echo + exit 1 fi archOptions=$1 arch=${archOptions%%G*} # TODO: works for Gcc only -arch3264=$(echo "$arch" | sed 's@64@-64@') +arch3264=$(echo "$arch" | sed -e 's@64@-64@') echo "archOptions=$archOptions" echo "arch=$arch" echo "arch3264=$arch3264" timeStamp=$(date +%Y-%m-%d) -packDir=ThirdParty +packDir=${WM_THIRD_PARTY_DIR:-ThirdParty} +packDir=${packDir##*/} packFile=${packDir}.${archOptions}_${timeStamp}.gtgz +if [ ! -d $packDir ] +then + echo "Error: directory $packDir does not exist" + exit 1 +fi + # add optional output directory if [ -d "$2" ] then - packFile="$2/$packFile" + packFile="$2/$packFile" fi if [ -f $packFile ] then - echo "Error: $packFile already exists" - exit 1 + echo "Error: $packFile already exists" + exit 1 fi # get list of directories @@ -71,12 +78,12 @@ echo tar czpf $packFile $dirList -if [ $? = 0 ] +if [ $? -eq 0 ] then - echo "Finished packing and compressing file $packFile" + echo "Finished packing and compressing file $packFile" else - echo "Error: failure packing $packFile" - rm -f $packFile 2>/dev/null + echo "Error: failure packing $packFile" + rm -f $packFile 2>/dev/null fi #------------------------------------------------------------------------------ diff --git a/bin/foamPackThirdPartyGeneral b/bin/foamPackThirdPartyGeneral index 845b2bfa47..a690f7f448 100755 --- a/bin/foamPackThirdPartyGeneral +++ b/bin/foamPackThirdPartyGeneral @@ -32,25 +32,26 @@ #------------------------------------------------------------------------------ timeStamp=$(date +%Y-%m-%d) -packDir=ThirdParty +packDir=${WM_THIRD_PARTY_DIR:-ThirdParty} +packDir=${packDir##*/} packFile=${packDir}.General_${timeStamp}.gtgz if [ ! -d $packDir ] then - echo "Error: directory $packDir does not exist" - exit 1 + echo "Error: directory $packDir does not exist" + exit 1 fi # add optional output directory if [ -d "$1" ] then - packFile="$1/$packFile" + packFile="$1/$packFile" fi if [ -f $packFile ] then - echo "Error: $packFile already exists" - exit 1 + echo "Error: $packFile already exists" + exit 1 fi # Create time stamp file @@ -62,7 +63,7 @@ echo $timeStamp 2>/dev/null > $packDir/.timeStamp # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -echo "Packing $packDir into $packFile" +echo "Packing $packDir source files into $packFile" echo foamPackSource $packDir $packFile From 7b3eb9da1407f7ffc32d8e48f1ebe70260d76bef Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 16 Jul 2009 13:17:40 +0200 Subject: [PATCH 046/172] needed to drop backwardsCompatibility/derivedFvPatchFields again - as Henry pointed out, they all go into one single table. So they'll clash with the correct incompressible versions. --- .../compressible/RAS/Make/files | 2 - ...urbulentMixingLengthDissipationRateInlet.C | 156 ----------------- ...urbulentMixingLengthDissipationRateInlet.H | 158 ----------------- ...ilityTurbulentMixingLengthFrequencyInlet.C | 163 ------------------ ...ilityTurbulentMixingLengthFrequencyInlet.H | 162 ----------------- .../incompressible/RAS/Make/files | 2 +- .../backwardsCompatibilityWallFunctions.C | 0 .../backwardsCompatibilityWallFunctions.H | 0 ...wardsCompatibilityWallFunctionsTemplates.C | 0 9 files changed, 1 insertion(+), 642 deletions(-) delete mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C delete mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H delete mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C delete mode 100644 src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H rename src/turbulenceModels/incompressible/RAS/{backwardsCompatibilityWallFunctions => backwardsCompatibility/wallFunctions}/backwardsCompatibilityWallFunctions.C (100%) rename src/turbulenceModels/incompressible/RAS/{backwardsCompatibilityWallFunctions => backwardsCompatibility/wallFunctions}/backwardsCompatibilityWallFunctions.H (100%) rename src/turbulenceModels/incompressible/RAS/{backwardsCompatibilityWallFunctions => backwardsCompatibility/wallFunctions}/backwardsCompatibilityWallFunctionsTemplates.C (100%) diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files index 56644ea6d3..7642142d56 100644 --- a/src/turbulenceModels/compressible/RAS/Make/files +++ b/src/turbulenceModels/compressible/RAS/Make/files @@ -38,7 +38,5 @@ derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLe derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C -backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C -backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C LIB = $(FOAM_LIBBIN)/libcompressibleRASModels diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C deleted file mode 100644 index 83902514a0..0000000000 --- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C +++ /dev/null @@ -1,156 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2006-2009 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 "backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H" -#include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" -#include "surfaceFields.H" -#include "volFields.H" -#include "RASModel.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressible -{ - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField:: -backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF -) -: - fixedValueFvPatchField(p, iF), - mixingLength_(0.001) -{} - -backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField:: -backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField -( - const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchField(ptf, p, iF, mapper), - mixingLength_(ptf.mixingLength_) -{} - -backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField:: -backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict), - mixingLength_(readScalar(dict.lookup("mixingLength"))) -{} - -backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField:: -backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField -( - const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf -) -: - fixedValueFvPatchField(ptf), - mixingLength_(ptf.mixingLength_) -{} - -backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField:: -backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField -( - const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField& ptf, - const DimensionedField& iF -) -: - fixedValueFvPatchField(ptf, iF), - mixingLength_(ptf.mixingLength_) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -void backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs() -{ - if (updated()) - { - return; - } - - // Lookup Cmu corresponding to the turbulence model selected - const RASModel& rasModel = db().lookupObject("RASProperties"); - - const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu")); - const scalar Cmu75 = pow(Cmu, 0.75); - - const fvPatchField& kp = - patch().lookupPatchField("k"); - - operator==(Cmu75*kp*sqrt(kp)/mixingLength_); - - fixedValueFvPatchField::updateCoeffs(); -} - - -void backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField::write -( - Ostream& os -) const -{ - // write with prefix for forwards compatibility - // mimic - fvPatchField::write(os); - - os.writeKeyword("type") - << "compressible::" << type() << token::END_STATEMENT << nl; - - os.writeKeyword("mixingLength") - << mixingLength_ << token::END_STATEMENT << nl; - writeEntry("value", os); -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -makePatchTypeField -( - fvPatchScalarField, - backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField -); - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressible -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H deleted file mode 100644 index fec530e1fc..0000000000 --- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.H +++ /dev/null @@ -1,158 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2006-2009 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::compressible:: - backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField - -Description - Compatibility for the new namespace qualifier - Foam::compressible::turbulentMixingLengthDissipationRateInletFvPatchScalarField - -SourceFiles - backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet.C - -\*---------------------------------------------------------------------------*/ - -#ifndef backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet_H -#define backwardsCompatibilityTurbulentMixingLengthDissipationRateInlet_H - -#include "fixedValueFvPatchFields.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressible -{ - -/*---------------------------------------------------------------------------*\ - Class backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField Declaration -\*---------------------------------------------------------------------------*/ - -class backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField -: - public fixedValueFvPatchScalarField -{ - // Private data - - //- turbulent length scale - scalar mixingLength_; - -public: - - //- Runtime type information - TypeName("turbulentMixingLengthDissipationRateInlet"); - - - // Constructors - - //- Construct from patch and internal field - backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField - ( - const fvPatch&, - const DimensionedField& - ); - - //- Construct from patch, internal field and dictionary - backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField - ( - const fvPatch&, - const DimensionedField&, - const dictionary& - ); - - //- Construct by mapping given - // backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField - // onto a new patch - backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField - ( - const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField&, - const fvPatch&, - const DimensionedField&, - const fvPatchFieldMapper& - ); - - //- Construct as copy - backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField - ( - const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField& - ); - - //- Construct and return a clone - virtual tmp clone() const - { - return tmp - ( - new backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField - ( - *this - ) - ); - } - - //- Construct as copy setting internal field reference - backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField - ( - const backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField&, - const DimensionedField& - ); - - //- Construct and return a clone setting internal field reference - virtual tmp clone - ( - const DimensionedField& iF - ) const - { - return tmp - ( - new backwardsCompatibilityTurbulentMixingLengthDissipationRateInletFvPatchScalarField - ( - *this, - iF - ) - ); - } - - - // Member functions - - //- Update the coefficients associated with the patch field - virtual void updateCoeffs(); - - //- Write - virtual void write(Ostream&) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressible -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C deleted file mode 100644 index e9e1cd11b4..0000000000 --- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.C +++ /dev/null @@ -1,163 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2006-2009 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 "backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H" -#include "addToRunTimeSelectionTable.H" -#include "fvPatchFieldMapper.H" -#include "surfaceFields.H" -#include "volFields.H" -#include "RASModel.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressible -{ - -// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // - -backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField:: -backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF -) -: - fixedValueFvPatchField(p, iF), - mixingLength_(0.0), - kName_("k") -{} - -backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField:: -backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField -( - const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField& ptf, - const fvPatch& p, - const DimensionedField& iF, - const fvPatchFieldMapper& mapper -) -: - fixedValueFvPatchField(ptf, p, iF, mapper), - mixingLength_(ptf.mixingLength_), - kName_(ptf.kName_) -{} - -backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField:: -backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField -( - const fvPatch& p, - const DimensionedField& iF, - const dictionary& dict -) -: - fixedValueFvPatchField(p, iF, dict), - mixingLength_(readScalar(dict.lookup("mixingLength"))), - kName_(dict.lookupOrDefault("k", "k")) -{} - -backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField:: -backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField -( - const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField& ptf -) -: - fixedValueFvPatchField(ptf), - mixingLength_(ptf.mixingLength_), - kName_(ptf.kName_) -{} - -backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField:: -backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField -( - const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField& ptf, - const DimensionedField& iF -) -: - fixedValueFvPatchField(ptf, iF), - mixingLength_(ptf.mixingLength_), - kName_(ptf.kName_) -{} - - -// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // - -void backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs() -{ - if (updated()) - { - return; - } - - // Lookup Cmu corresponding to the turbulence model selected - const RASModel& rasModel = db().lookupObject("RASProperties"); - - const scalar Cmu = readScalar(rasModel.coeffDict().lookup("Cmu")); - const scalar Cmu25 = pow(Cmu, 0.25); - - const fvPatchField& kp = - patch().lookupPatchField(kName_); - - operator==(sqrt(kp)/(Cmu25*mixingLength_)); - - fixedValueFvPatchField::updateCoeffs(); -} - - -void backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField::write -( - Ostream& os -) const -{ - // write with prefix for forwards compatibility - // mimic - fvPatchField::write(os); - - os.writeKeyword("type") - << "compressible::" << type() << token::END_STATEMENT << nl; - - os.writeKeyword("mixingLength") - << mixingLength_ << token::END_STATEMENT << nl; - - os.writeKeyword("k") << kName_ << token::END_STATEMENT << nl; - writeEntry("value", os); -} - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -makePatchTypeField -( - fvPatchScalarField, - backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField -); - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressible -} // End namespace Foam - -// ************************************************************************* // diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H deleted file mode 100644 index ebe6e5445e..0000000000 --- a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/derivedFvPatchFields/backwardsCompatibilityTurbulentMixingLengthFrequencyInlet.H +++ /dev/null @@ -1,162 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2006-2009 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::compressible:: - backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField - -Description - Compatibility for the new namespace qualifier - Foam::compressible::turbulentMixingLengthFrequencyInletFvPatchScalarField - -SourceFiles - backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField.C - -\*---------------------------------------------------------------------------*/ - -#ifndef compressiblebackwardsCompatibilityTurbulentMixingLengthFrequencyInlet_H -#define compressiblebackwardsCompatibilityTurbulentMixingLengthFrequencyInlet_H - -#include "fixedValueFvPatchFields.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -namespace Foam -{ -namespace compressible -{ - -/*---------------------------------------------------------------------------*\ - Class backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField Declaration -\*---------------------------------------------------------------------------*/ - -class backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField -: - public fixedValueFvPatchScalarField -{ - // Private data - - //- Turbulent length scale - scalar mixingLength_; - - //- Name of the turbulent kinetic energy field - word kName_; - - -public: - - //- Runtime type information - TypeName("turbulentMixingLengthFrequencyInlet"); - - - // Constructors - - //- Construct from patch and internal field - backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField - ( - const fvPatch&, - const DimensionedField& - ); - - //- Construct from patch, internal field and dictionary - backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField - ( - const fvPatch&, - const DimensionedField&, - const dictionary& - ); - - //- Construct by mapping given - // backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField - // onto a new patch - backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField - ( - const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField&, - const fvPatch&, - const DimensionedField&, - const fvPatchFieldMapper& - ); - - //- Construct as copy - backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField - ( - const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField& - ); - - //- Construct and return a clone - virtual tmp clone() const - { - return tmp - ( - new backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField - ( - *this - ) - ); - } - - //- Construct as copy setting internal field reference - backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField - ( - const backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField&, - const DimensionedField& - ); - - //- Construct and return a clone setting internal field reference - virtual tmp clone - ( - const DimensionedField& iF - ) const - { - return tmp - ( - new backwardsCompatibilityTurbulentMixingLengthFrequencyInletFvPatchScalarField - ( - *this, - iF - ) - ); - } - - - // Member functions - - //- Update the coefficients associated with the patch field - virtual void updateCoeffs(); - - //- Write - virtual void write(Ostream&) const; -}; - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -} // End namespace compressible -} // End namespace Foam - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/turbulenceModels/incompressible/RAS/Make/files b/src/turbulenceModels/incompressible/RAS/Make/files index d5736d3064..95322d4f68 100644 --- a/src/turbulenceModels/incompressible/RAS/Make/files +++ b/src/turbulenceModels/incompressible/RAS/Make/files @@ -42,6 +42,6 @@ derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFv derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C -backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C +backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C LIB = $(FOAM_LIBBIN)/libincompressibleRASModels diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C similarity index 100% rename from src/turbulenceModels/incompressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C rename to src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.H b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H similarity index 100% rename from src/turbulenceModels/incompressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.H rename to src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C similarity index 100% rename from src/turbulenceModels/incompressible/RAS/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C rename to src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C From 589a342e89a8abf77afa6cc28400725baebdb58a Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 16 Jul 2009 12:30:54 +0100 Subject: [PATCH 047/172] Added -qmake option to specify the location of qmake which defaults to the system one. The Qt version is now checked for >= 4.3. --- bin/buildParaView | 7 +++++-- bin/tools/buildParaViewFunctions | 25 +++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/bin/buildParaView b/bin/buildParaView index e7c6c6f9b0..622169e012 100755 --- a/bin/buildParaView +++ b/bin/buildParaView @@ -58,8 +58,6 @@ withQTSUPPORT=true # Set the path to the Qt-4.3.? qmake if the system Qt is other than this version QMAKE_PATH="" -#QMAKE_PATH=/usr/local/Trolltech/Qt-4.3.5/bin/qmake -#QMAKE_PATH=$WM_THIRD_PARTY_DIR/qt-x11-opensource-src-4.3.5/platforms/linux64GccDPOpt/bin/qmake # # No further editing below this line @@ -184,6 +182,11 @@ do withQTSUPPORT=true shift ;; + -qmake) + [ "$#" -ge 2 ] || usage "'$1' option requires an argument" + export QMAKE_PATH=$2 + shift 2 + ;; -verbose) withVERBOSE=true shift diff --git a/bin/tools/buildParaViewFunctions b/bin/tools/buildParaViewFunctions index f0873998af..ff37e259b5 100644 --- a/bin/tools/buildParaViewFunctions +++ b/bin/tools/buildParaViewFunctions @@ -171,10 +171,13 @@ addQtSupport() addCMakeVariable "PARAVIEW_BUILD_QT_GUI=ON" + qmakeExe=qmake + if [ -n "$QMAKE_PATH" ] then if [ -x "$QMAKE_PATH" ] then + qmakeExe=$QMAKE_PATH addCMakeVariable QT_QMAKE_EXECUTABLE:FILEPATH=$QMAKE_PATH else echo @@ -184,6 +187,28 @@ addQtSupport() echo fi fi + + # Check qmake can be found + if [ `which $qmakeExe` ] + then + # Check the Qt version selected + QtVersion=`$qmakeExe -v | grep Using | sed "s/.* version \(.\..\).*/\1/"` + QtMajor=`echo $QtVersion | sed "s/\(.\)\../\1/"` + QtMinor=`echo $QtVersion | sed "s/.\.\(.\)/\1/"` + + if [ $QtMajor -lt 4 -o $QtMinor -lt 3 ] + then + echo "*** Error: Qt version provided < 4.3" + echo "*** Please use the -qmake option to specify the location of a version of Qt >= 4.3 " + echo "*** e.g." + echo "*** -qmake /usr/local/Trolltech/Qt-4.3.5/bin/qmake" + echo "*** -qmake $WM_THIRD_PARTY_DIR/qt-x11-opensource-src-4.3.5/platforms/$WM_OPTIONS/bin/qmake" + exit 1 + fi + else + echo "*** Error: cannot find qmake either at \$QMAKE_PATH or in current \$PATH" + exit 1 + fi } From 33358fd38332f71ba772cac447ccac5a221012fb Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Thu, 16 Jul 2009 13:32:40 +0200 Subject: [PATCH 048/172] fix wmake bug introduced by a9699afbb46a764d05b98276ca58c267794f9b8d - skip including java rather than having recursive includes (and too many files open error) when WM_JAVAC_OPTION isn't defined. --- wmake/rules/General/java | 3 ++- wmake/rules/General/standard | 4 ++-- wmake/rules/linuxmingw32/general | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/wmake/rules/General/java b/wmake/rules/General/java index 4f5db4ce84..e2dd6ced7d 100644 --- a/wmake/rules/General/java +++ b/wmake/rules/General/java @@ -2,7 +2,8 @@ javac = javac -include $(GENERAL_RULES)/java$(WM_JAVAC_OPTION) +## avoid recursive include if WM_JAVAC_OPTION isn't defined +## include $(GENERAL_RULES)/java$(WM_JAVAC_OPTION) javaFLAGS = -classpath $(CLASS_PATH):$(CLASSES_DIR):. $(EXE_INC) $(javaOPT) $(javaDBUG) -d $(CLASSES_DIR) -deprecation diff --git a/wmake/rules/General/standard b/wmake/rules/General/standard index 7752bef084..679070ca25 100644 --- a/wmake/rules/General/standard +++ b/wmake/rules/General/standard @@ -5,7 +5,7 @@ include $(GENERAL_RULES)/sourceToDep include $(GENERAL_RULES)/java include $(GENERAL_RULES)/flex include $(GENERAL_RULES)/flex++ -#include $(GENERAL_RULES)/byacc -#include $(GENERAL_RULES)/btyacc++ +## include $(GENERAL_RULES)/byacc +## include $(GENERAL_RULES)/btyacc++ include $(GENERAL_RULES)/bison include $(GENERAL_RULES)/moc diff --git a/wmake/rules/linuxmingw32/general b/wmake/rules/linuxmingw32/general index 27ccb3c9db..27938b3de0 100644 --- a/wmake/rules/linuxmingw32/general +++ b/wmake/rules/linuxmingw32/general @@ -20,6 +20,6 @@ include $(RULES)/c++ SO = dll EXE_EXT = .exe -# Ensure we know what OS we are compiling for +# Ensure we know what OS we are compiling for # during MakefileFiles and MakefileOptions GFLAGS += -DWIN32 -DLITTLE_ENDIAN From 4363dac73fc5e0d937b2e7ec514330b2a8be35f3 Mon Sep 17 00:00:00 2001 From: henry Date: Thu, 16 Jul 2009 12:42:34 +0100 Subject: [PATCH 049/172] Further updates of the XiFoam tutorials. --- tutorials/combustion/XiFoam/les/pitzDaily/0/T | 2 +- .../combustion/XiFoam/les/pitzDaily/0/Tu | 2 +- .../XiFoam/les/pitzDaily/0/alphaSgs | 6 +- .../combustion/XiFoam/les/pitzDaily/0/muSgs | 6 +- tutorials/combustion/XiFoam/les/pitzDaily/0/p | 13 ++- .../les/pitzDaily/constant/LESProperties | 1 + .../pitzDaily/constant/combustionProperties | 8 +- .../pitzDaily/constant/polyMesh/blockMeshDict | 106 +++++++++--------- .../constant/thermophysicalProperties | 39 +++++-- .../XiFoam/les/pitzDaily/system/controlDict | 2 +- .../XiFoam/les/pitzDaily/system/fvSchemes | 25 ++--- .../XiFoam/les/pitzDaily/system/fvSolution | 4 +- .../combustion/XiFoam/les/pitzDaily3D/0/B | 50 --------- .../combustion/XiFoam/les/pitzDaily3D/0/Su | 10 +- .../combustion/XiFoam/les/pitzDaily3D/0/T | 12 +- .../combustion/XiFoam/les/pitzDaily3D/0/Tu | 12 +- .../combustion/XiFoam/les/pitzDaily3D/0/U | 10 +- .../combustion/XiFoam/les/pitzDaily3D/0/Xi | 10 +- .../XiFoam/les/pitzDaily3D/0/alphaSgs | 16 +-- .../combustion/XiFoam/les/pitzDaily3D/0/b | 10 +- .../combustion/XiFoam/les/pitzDaily3D/0/ft | 52 --------- .../combustion/XiFoam/les/pitzDaily3D/0/k | 8 +- .../combustion/XiFoam/les/pitzDaily3D/0/muSgs | 16 +-- .../combustion/XiFoam/les/pitzDaily3D/0/p | 23 ++-- .../les/pitzDaily3D/constant/LESProperties | 3 +- .../pitzDaily3D/constant/combustionProperties | 8 +- .../XiFoam/les/pitzDaily3D/constant/g | 2 +- .../constant/thermophysicalProperties | 41 +++++-- .../XiFoam/les/pitzDaily3D/system/controlDict | 4 +- .../XiFoam/les/pitzDaily3D/system/fvSchemes | 30 ++--- .../XiFoam/les/pitzDaily3D/system/fvSolution | 5 +- 31 files changed, 249 insertions(+), 287 deletions(-) delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/B delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/ft diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/T b/tutorials/combustion/XiFoam/les/pitzDaily/0/T index c4bae6fa13..d48433513d 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/T +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/T @@ -42,7 +42,7 @@ boundaryField lowerWall { type fixedValue; - value uniform 293; + value uniform 570; } frontAndBack diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu index 3e1d003deb..55c99ebb45 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu @@ -42,7 +42,7 @@ boundaryField lowerWall { type fixedValue; - value uniform 293; + value uniform 570; } frontAndBack diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs index 24c919196b..c66c8a1534 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs @@ -32,15 +32,13 @@ boundaryField upperWall { - type zeroGradient; - //type compressible::alphaSgsWallFunction; + type compressible::alphaSgsJayatillekeWallFunction; value uniform 0; } lowerWall { - type zeroGradient; - //type compressible::alphaSgsWallFunction; + type compressible::alphaSgsJayatillekeWallFunction; value uniform 0; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs index a16e89fad9..5c85d09493 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs @@ -32,15 +32,13 @@ boundaryField upperWall { - type zeroGradient; - //type compressible::muSgsWallFunction; + type compressible::muSgsWallFunction; value uniform 0; } lowerWall { - type zeroGradient; - //type compressible::muSgsWallFunction; + type compressible::muSgsWallFunction; value uniform 0; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/p b/tutorials/combustion/XiFoam/les/pitzDaily/0/p index 3700ec72b5..b8afbd8d1a 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/0/p +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/p @@ -16,7 +16,7 @@ FoamFile dimensions [1 -1 -2 0 0 0 0]; -internalField uniform 100000; +internalField uniform 1e5; boundaryField { @@ -27,8 +27,15 @@ boundaryField outlet { - type fixedValue; - value uniform 100000; + type waveTransmissive; + field p; + phi phi; + rho rho; + psi psi; + gamma 1.3; + fieldInf 1e5; + lInf 0.3; + value uniform 1e5; } upperWall diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties index 56c915c924..faa025c8e2 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties @@ -123,6 +123,7 @@ kappa 0.4187; wallFunctionCoeffs { E 9; + Prt 0.85; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties index 86fcfc889a..a20d6ae7ec 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties @@ -21,7 +21,7 @@ fuel Propane; Su Su [0 1 -1 0 0 0 0] 0.135; -SuModel unstrained; +SuModel transport; equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6; @@ -68,7 +68,7 @@ GuldersCoeffs } } -ignite yes; +ignite yes; ignitionSites ( @@ -76,8 +76,8 @@ ignitionSites location (0.005 -0.02 0); diameter 0.003; start 0; - duration 0.1; - strength 40; + duration 0.05; + strength 20; } ); diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict index 1030983582..4a24aa9a9d 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict @@ -16,55 +16,55 @@ FoamFile convertToMeters 0.001; -vertices +vertices ( - (-20.6 0 -0.5) - (-20.6 3 -0.5) - (-20.6 12.7 -0.5) - (-20.6 25.4 -0.5) - (0 -25.4 -0.5) - (0 -5 -0.5) - (0 0 -0.5) - (0 3 -0.5) - (0 12.7 -0.5) - (0 25.4 -0.5) - (206 -25.4 -0.5) - (206 -8.5 -0.5) - (206 0 -0.5) - (206 6.5 -0.5) - (206 17 -0.5) - (206 25.4 -0.5) - (290 -16.6 -0.5) - (290 -6.3 -0.5) - (290 0 -0.5) - (290 4.5 -0.5) - (290 11 -0.5) - (290 16.6 -0.5) - (-20.6 0 0.5) - (-20.6 3 0.5) - (-20.6 12.7 0.5) - (-20.6 25.4 0.5) - (0 -25.4 0.5) - (0 -5 0.5) - (0 0 0.5) - (0 3 0.5) - (0 12.7 0.5) - (0 25.4 0.5) - (206 -25.4 0.5) - (206 -8.5 0.5) - (206 0 0.5) - (206 6.5 0.5) - (206 17 0.5) - (206 25.4 0.5) - (290 -16.6 0.5) - (290 -6.3 0.5) - (290 0 0.5) - (290 4.5 0.5) - (290 11 0.5) - (290 16.6 0.5) + (-20.6 0 0) + (-20.6 3 0) + (-20.6 12.7 0) + (-20.6 25.4 0) + (0 -25.4 0) + (0 -5 0) + (0 0 0) + (0 3 0) + (0 12.7 0) + (0 25.4 0) + (206 -25.4 0) + (206 -8.5 0) + (206 0 0) + (206 6.5 0) + (206 17 0) + (206 25.4 0) + (290 -16.6 0) + (290 -6.3 0) + (290 0 0) + (290 4.5 0) + (290 11 0) + (290 16.6 0) + (-20.6 0 38.1) + (-20.6 3 38.1) + (-20.6 12.7 38.1) + (-20.6 25.4 38.1) + (0 -25.4 38.1) + (0 -5 38.1) + (0 0 38.1) + (0 3 38.1) + (0 12.7 38.1) + (0 25.4 38.1) + (206 -25.4 38.1) + (206 -8.5 38.1) + (206 0 38.1) + (206 6.5 38.1) + (206 17 38.1) + (206 25.4 38.1) + (290 -16.6 38.1) + (290 -6.3 38.1) + (290 0 38.1) + (290 4.5 38.1) + (290 11 38.1) + (290 16.6 38.1) ); -blocks +blocks ( hex (0 6 7 1 22 28 29 23) (18 7 1) simpleGrading (0.5 1.8 1) hex (1 7 8 2 23 29 30 24) (18 10 1) simpleGrading (0.5 4 1) @@ -81,19 +81,19 @@ blocks hex (14 20 21 15 36 42 43 37) (25 13 1) simpleGrading (2.5 0.25 1) ); -edges +edges ( ); -patches +patches ( - patch inlet + patch inlet ( (0 22 23 1) (1 23 24 2) (2 24 25 3) ) - patch outlet + patch outlet ( (16 17 39 38) (17 18 40 39) @@ -101,13 +101,13 @@ patches (19 20 42 41) (20 21 43 42) ) - wall upperWall + wall upperWall ( (3 25 31 9) (9 31 37 15) (15 37 43 21) ) - wall lowerWall + wall lowerWall ( (0 6 28 22) (6 5 27 28) @@ -115,7 +115,7 @@ patches (4 10 32 26) (10 16 38 32) ) - empty frontAndBack + empty frontAndBack ( (22 28 29 23) (23 29 30 24) diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties index 8e705f32e5..dc9f1dae0f 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties @@ -15,19 +15,44 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hhuMixtureThermo>>>>; +thermoType + hhuMixtureThermo>>>>; -stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675; +stoichiometricAirFuelMassRatio + stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675; -fuel fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672; +// phi = 0.57 +// ft = 0.0352993 +// Tad = 1650.1 -oxidant oxidant 1 28.8504 200 6000 1000 3.10205 0.00123963 -4.17512e-07 6.60292e-11 -3.87448e-15 -985.517 5.35187 3.58378 -0.0007269 1.66985e-06 -1.08452e-10 -4.31951e-13 -1050.53 3.11223 1.67212e-06 170.672; +fuel fuel 1 44.0962 + 100 5000 1000 + 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 + 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 + 1.67212e-06 170.672; -reactants reactants 24.8095 29.4649 200 5000 1000 3.28069 0.00195035 -6.53483e-07 1.00239e-10 -5.64653e-15 -1609.55 4.41496 3.47696 0.000367499 1.84866e-06 -9.8993e-10 -3.10214e-14 -1570.81 3.76075 1.67212e-06 170.672; +oxidant oxidant 1 28.8504 + 100 6000 1000 + 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 + 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 + 1.67212e-06 170.672; -products products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672; +reactants reactants 1 29.2068 + 100 5000 1000 + 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 + 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 + 1.67212e-06 170.672; -burntProducts burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672; +burntProducts burntProducts 1 28.3233 + 100 6000 1000 + 3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104 + 3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188 + 1.67212e-06 170.672; +products products 1 28.5396 + 100 5000 1000 + 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 + 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 + 1.67212e-06 170.672; // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict index f5fe65e622..ba28fbf560 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict @@ -23,7 +23,7 @@ startTime 0; stopAt endTime; -endTime 10; +endTime 0.5; deltaT 5e-06; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes index e74dbeb191..d4a2457583 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes @@ -17,34 +17,29 @@ FoamFile ddtSchemes { - default Euler; + default backward; } gradSchemes { default Gauss linear; - grad(p) Gauss linear; } divSchemes { default none; - div(phi,U) Gauss limitedLinearV 1; - div(phid,p) Gauss linear; + div(phi,U) Gauss linear; div(phiU,p) Gauss linear; - div(phi,k) Gauss limitedLinear 1; - div(phi,B) Gauss limitedLinear 1; - div(B) Gauss linear; - div(phiXi,Xi) Gauss limitedLinear 1; - div(phiXi,Su) Gauss limitedLinear 1; - div(phiSt,b) Gauss limitedLinear01 1; + div(phi,k) Gauss limitedLinear 0.1; + div(phiXi,Xi) Gauss limitedLinear01 0.1; + div(phiXi,Su) Gauss limitedLinear01 0.1; + div(phiSt,b) Gauss limitedLinear01 0.1; div(phi,ft_b_h_hu) Gauss multivariateSelection { - fu limitedLinear01 1; - ft limitedLinear01 1; - b limitedLinear01 1; - h limitedLinear 1; - hu limitedLinear 1; + ft limitedLinear01 0.1; + b limitedLinear01 0.1; + h limitedLinear 0.1; + hu limitedLinear 0.1; }; div(U) Gauss linear; div((Su*grad(b))) Gauss linear; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution index 6e1d1ffd3e..4dda010d66 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution +++ b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution @@ -124,8 +124,8 @@ solvers PISO { - nOuterCorrectors 1; - nCorrectors 2; + nOuterCorrectors 2; + nCorrectors 1; nNonOrthogonalCorrectors 0; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/B b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/B deleted file mode 100644 index 65544498af..0000000000 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/B +++ /dev/null @@ -1,50 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volTensorField; - object B; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform (0 0 0 0 0 0 0 0 0); - -boundaryField -{ - inlet - { - type fixedValue; - value uniform (0 0 0 0 0 0 0 0 0); - } - - outlet - { - type zeroGradient; - } - - upperWall - { - type zeroGradient; - } - - lowerWall - { - type zeroGradient; - } - - frontAndBack - { - type cyclic; - } -} - -// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su index 82eb5d80e3..024869330e 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su @@ -20,30 +20,30 @@ internalField uniform 0.135; boundaryField { - inlet + inlet { type fixedValue; value uniform 0.135; } - outlet + outlet { type inletOutlet; inletValue uniform 0.135; value uniform 0.135; } - upperWall + upperWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - frontAndBack + frontAndBack { type cyclic; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T index fdf764e06f..9c0947189b 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T @@ -20,32 +20,32 @@ internalField uniform 293; boundaryField { - inlet + inlet { type fixedValue; value uniform 293; } - outlet + outlet { type inletOutlet; inletValue uniform 293; value uniform 293; } - upperWall + upperWall { type fixedValue; value uniform 293; } - lowerWall + lowerWall { type fixedValue; - value uniform 293; + value uniform 570; } - frontAndBack + frontAndBack { type cyclic; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu index e1299d7435..e0b9959787 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu @@ -20,32 +20,32 @@ internalField uniform 293; boundaryField { - inlet + inlet { type fixedValue; value uniform 293; } - outlet + outlet { type inletOutlet; inletValue uniform 293; value uniform 293; } - upperWall + upperWall { type fixedValue; value uniform 293; } - lowerWall + lowerWall { type fixedValue; - value uniform 293; + value uniform 570; } - frontAndBack + frontAndBack { type cyclic; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U index ece734e9f3..c2ff1ef691 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U @@ -20,33 +20,33 @@ internalField uniform (0 0 0); boundaryField { - inlet + inlet { type turbulentInlet; referenceField uniform (13.3 0 0); fluctuationScale (0.04 0.02 0.02); } - outlet + outlet { type inletOutlet; inletValue uniform (0 0 0); value uniform (0 0 0); } - upperWall + upperWall { type fixedValue; value uniform (0 0 0); } - lowerWall + lowerWall { type fixedValue; value uniform (0 0 0); } - frontAndBack + frontAndBack { type cyclic; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi index 1b3b3cc930..ac3b5633fa 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi @@ -20,30 +20,30 @@ internalField uniform 1; boundaryField { - inlet + inlet { type fixedValue; value uniform 1; } - outlet + outlet { type inletOutlet; inletValue uniform 1; value uniform 1; } - upperWall + upperWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - frontAndBack + frontAndBack { type cyclic; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs index c5331748ae..5f7deec4ec 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs @@ -20,27 +20,29 @@ internalField uniform 0; boundaryField { - inlet + inlet { type zeroGradient; } - outlet + outlet { type zeroGradient; } - upperWall + upperWall { - type zeroGradient; + type compressible::alphaSgsJayatillekeWallFunction; + value uniform 0; } - lowerWall + lowerWall { - type zeroGradient; + type compressible::alphaSgsJayatillekeWallFunction; + value uniform 0; } - frontAndBack + frontAndBack { type cyclic; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b index 7be4cfc6ac..7ca894170f 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b @@ -20,30 +20,30 @@ internalField uniform 1; boundaryField { - inlet + inlet { type fixedValue; value uniform 1; } - outlet + outlet { type inletOutlet; inletValue uniform 1; value uniform 1; } - upperWall + upperWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - frontAndBack + frontAndBack { type cyclic; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/ft b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/ft deleted file mode 100644 index 8d16f22209..0000000000 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/ft +++ /dev/null @@ -1,52 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object ft; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - inlet - { - type fixedValue; - value uniform 0; - } - - outlet - { - type inletOutlet; - inletValue uniform 0; - value uniform 0; - } - - upperWall - { - type zeroGradient; - } - - lowerWall - { - type zeroGradient; - } - - frontAndBack - { - type cyclic; - } -} - -// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k index 69de845314..df6b081d5b 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k @@ -35,14 +35,14 @@ boundaryField upperWall { - type fixedValue; - value uniform 1e-8; + type zeroGradient; + value uniform 2e-05; } lowerWall { - type fixedValue; - value uniform 1e-8; + type zeroGradient; + value uniform 2e-05; } frontAndBack diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs index a6befb8a9d..ff6a524d0d 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs @@ -20,27 +20,29 @@ internalField uniform 0; boundaryField { - inlet + inlet { type zeroGradient; } - outlet + outlet { type zeroGradient; } - upperWall + upperWall { - type zeroGradient; + type compressible::muSgsWallFunction; + value uniform 0; } - lowerWall + lowerWall { - type zeroGradient; + type compressible::muSgsWallFunction; + value uniform 0; } - frontAndBack + frontAndBack { type cyclic; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p index 918b79c476..2a27d1e401 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p @@ -16,32 +16,39 @@ FoamFile dimensions [1 -1 -2 0 0 0 0]; -internalField uniform 100000; +internalField uniform 1e5; boundaryField { - inlet + inlet { type zeroGradient; } - outlet + outlet { - type fixedValue; - value uniform 100000; + type waveTransmissive; + field p; + phi phi; + rho rho; + psi psi; + gamma 1.3; + fieldInf 1e5; + lInf 0.3; + value uniform 1e5; } - upperWall + upperWall { type zeroGradient; } - lowerWall + lowerWall { type zeroGradient; } - frontAndBack + frontAndBack { type cyclic; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties index 95bb1c14f8..faa025c8e2 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -123,6 +123,7 @@ kappa 0.4187; wallFunctionCoeffs { E 9; + Prt 0.85; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties index 8d2c6962d7..f46b08c801 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties @@ -68,16 +68,16 @@ GuldersCoeffs } } -ignite yes; +ignite yes; ignitionSites ( { - location (0 0 0); + location (0.005 -0.02 0.01905); diameter 0.003; start 0; - duration 0.001; - strength 2; + duration 0.1; + strength 200; } ); diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g index d182180d95..7b4411955d 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties index 7c8fd76fe3..dc9f1dae0f 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -15,19 +15,44 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hhuMixtureThermo>>>>; +thermoType + hhuMixtureThermo>>>>; -stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675; +stoichiometricAirFuelMassRatio + stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 15.675; -fuel fuel 1 44.0962 200 5000 1000 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 1.67212e-06 170.672; +// phi = 0.57 +// ft = 0.0352993 +// Tad = 1650.1 -oxidant oxidant 1 28.8504 200 6000 1000 3.10205 0.00123963 -4.17512e-07 6.60292e-11 -3.87448e-15 -985.517 5.35187 3.58378 -0.0007269 1.66985e-06 -1.08452e-10 -4.31951e-13 -1050.53 3.11223 1.67212e-06 170.672; +fuel fuel 1 44.0962 + 100 5000 1000 + 7.53414 0.0188722 -6.27185e-06 9.14756e-10 -4.78381e-14 -16467.5 -17.8923 + 0.933554 0.0264246 6.10597e-06 -2.19775e-08 9.51493e-12 -13958.5 19.2017 + 1.67212e-06 170.672; -reactants reactants 24.8095 29.4649 200 5000 1000 3.28069 0.00195035 -6.53483e-07 1.00239e-10 -5.64653e-15 -1609.55 4.41496 3.47696 0.000367499 1.84866e-06 -9.8993e-10 -3.10214e-14 -1570.81 3.76075 1.67212e-06 170.672; +oxidant oxidant 1 28.8504 + 100 6000 1000 + 3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597 + 3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239 + 1.67212e-06 170.672; -products products 1 28.3233 200 5000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672; +reactants reactants 1 29.2068 + 100 5000 1000 + 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 + 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 + 1.67212e-06 170.672; -burntProducts burntProducts 25.8095 28.3233 200 6000 1000 3.106 0.00179682 -5.94382e-07 9.04998e-11 -5.08033e-15 -11003.7 5.11872 3.49612 0.000650364 -2.08029e-07 1.2291e-09 -7.73697e-13 -11080.3 3.18978 1.67212e-06 170.672; +burntProducts burntProducts 1 28.3233 + 100 6000 1000 + 3.10558 0.00179747 -5.94696e-07 9.05605e-11 -5.08443e-15 -11003.6 5.12104 + 3.49796 0.000638555 -1.83881e-07 1.20989e-09 -7.68691e-13 -11080.5 3.18188 + 1.67212e-06 170.672; +products products 1 28.5396 + 100 5000 1000 + 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 + 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 + 1.67212e-06 170.672; // ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict index cd473319ff..364c823851 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict @@ -17,13 +17,13 @@ FoamFile application XiFoam; -startFrom startTime; +startFrom latestTime; startTime 0; stopAt endTime; -endTime 0.02; +endTime 0.5; deltaT 5e-06; diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes index 2398134a00..d4a2457583 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -17,28 +17,30 @@ FoamFile ddtSchemes { - default Euler; + default backward; } gradSchemes { default Gauss linear; - grad(p) Gauss linear; } divSchemes { default none; - div(phi,U) Gauss limitedLinearV 1; - div(phid,p) Gauss linear; + div(phi,U) Gauss linear; div(phiU,p) Gauss linear; - div(phi,k) Gauss limitedLinear 1; - div(phi,B) Gauss limitedLinear 1; - div(B) Gauss linear; - div(phiXi,Xi) Gauss limitedLinear 1; - div(phiXi,Su) Gauss limitedLinear 1; - div(phiSt,b) Gauss limitedLinear01 1; - div(phi,ft_b_h_hu) Gauss multivariateSelection { fu limitedLinear01 1 ; ft limitedLinear01 1 ; b limitedLinear01 1 ; h limitedLinear 1 ; hu limitedLinear 1 ; }; + div(phi,k) Gauss limitedLinear 0.1; + div(phiXi,Xi) Gauss limitedLinear01 0.1; + div(phiXi,Su) Gauss limitedLinear01 0.1; + div(phiSt,b) Gauss limitedLinear01 0.1; + div(phi,ft_b_h_hu) Gauss multivariateSelection + { + ft limitedLinear01 0.1; + b limitedLinear01 0.1; + h limitedLinear 0.1; + hu limitedLinear 0.1; + }; div(U) Gauss linear; div((Su*grad(b))) Gauss linear; div((U+((Su*Xi)*grad(b)))) Gauss linear; @@ -52,8 +54,8 @@ laplacianSchemes laplacian(DkEff,k) Gauss linear corrected; laplacian(DBEff,B) Gauss linear corrected; laplacian((rho*(1|A(U))),p) Gauss linear corrected; - laplacian(muEff,b) Gauss linear corrected; - laplacian(muEff,ft) Gauss linear corrected; + laplacian(alphaEff,b) Gauss linear corrected; + laplacian(alphaEff,ft) Gauss linear corrected; laplacian(alphaEff,h) Gauss linear corrected; laplacian(alphaEff,hu) Gauss linear corrected; } diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution index d4656531ed..4dda010d66 100644 --- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: dev | +| \\ / O peration | Version: 1.5 | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -124,7 +124,8 @@ solvers PISO { - nCorrectors 2; + nOuterCorrectors 2; + nCorrectors 1; nNonOrthogonalCorrectors 0; } From 8029a15fb46653ac000f0eb187aceb5e271cc8d5 Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 16 Jul 2009 13:15:25 +0100 Subject: [PATCH 050/172] postprocessing section --- ReleaseNotes-1.6 | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/ReleaseNotes-1.6 b/ReleaseNotes-1.6 index 6336192857..b7466be689 100644 --- a/ReleaseNotes-1.6 +++ b/ReleaseNotes-1.6 @@ -57,6 +57,8 @@ + Dictionaries can use words (unquoted) or regular expressions (quoted) for their keywords. When searching, an exact match has priority over a regular expression match. +MJ: If multiple regular expressions they get matched in reverse order. + + The default =#inputMode= is now '=merge=', which corresponds to the most general usage. The =#inputMode warn= corresponds to the previous default behaviour. @@ -278,7 +280,7 @@ + pd to p ------------------------------------------------------------ [HENRY] + gravity ------------------------------------------------------------ [HENRY] -** Solver control improvments +** Solver control improvements Use dictionary entries instead of an =Istream= for the solver controls. + This Allows dictionary substitutions and regular expressions in /system/fvSolution/ @@ -290,9 +292,10 @@ to reflect solver application structure * Post-processing ---------------------------------------------------- [MATTIJS] - + SAMPLING - improved plane, iso-surface handling - + Output to any surface geometry format supported by the =surfMesh= library. - + * sampling on iso-surfaces, interpolated or non-interpolated + * sampling on surface defined by distance to surface (distanceSurface) + * cutting planes on non-convex cells + * Output to any surface geometry format supported by the =surfMesh= library. * *New* Solvers + =buoyantBoussinesqSimpleFoam= Steady state heat transfer solver using a Boussinesq approximation for @@ -332,6 +335,10 @@ temperature to a target value. Useful to equilibrate a case before simulation. + + =chtMultiRegionFoam= + New boundary condition allows independent decomposition of coupled regions + without any constraint on the decomposition. + * Function objects ** Improvements for function objects and time-looping @@ -376,23 +383,30 @@ + =foamToEnsightParts= has *new* =-noMesh= and =-index= options that can be useful when post-processing results incrementally. + + =snappyHexMesh= has lower memory footprint. New distributed triangulated + surface type for meshing surfaces with extremely large triangle count. + ** *New* utilities + =particleTracks= - generate particle tracks for lagrangian calculations + =dsmcInitialise= - preprocessing utility to create initial configurations of DSMC particles in a geometry + + =surfaceRedistributePar= - preprocessing utility to create distributed + triangulated surface. *** *New* foamCalc functions + =interpolate= - performs fvc::interpolate() + =randomise= - randomises a by a given perturbation + =addSubtract= - simple add/subtract field functionality ** Usage - + =timeSelector= can now combine =-time ranges= and =-latestTime= options. + + =timeSelector= can now combine =-time ranges= and =-latestTime= options + (e.g. -time '0.01:0.09', -time '0.01:'). More reliable behaviour for cases missing /constant// or /0// directories. When the =-noZero= option is enabled, =-latestTime= will not select the =0/= directory unless the =-zeroTime= option is given. This helps avoid ill effects caused by accidentally using the /0// directory in certain utilities (eg, =reconstructPar=). + + =-region= option added to more utilities. ** Improvements to Paraview reader module + =PV3FoamReader= added mesh region handling. The region name is parsed From b67065aadf1d4c744d6be925efcf3abbcd4f01e4 Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 16 Jul 2009 14:16:12 +0100 Subject: [PATCH 051/172] option for reading cubit meshes --- .../fluent3DMeshToFoam/fluent3DMeshToFoam.L | 34 +++++++++++++++++-- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L index 8947752081..b66b9512a8 100644 --- a/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L +++ b/applications/utilities/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L @@ -47,6 +47,7 @@ Description #include "cyclicPolyPatch.H" #include "Swap.H" #include "IFstream.H" +#include "readHexLabel.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -92,6 +93,9 @@ DynamicList