diff --git a/src/postProcessing/minMaxFields/IOminMaxFields.H b/src/postProcessing/minMaxFields/IOminMaxFields.H new file mode 100644 index 0000000000..2c552e3742 --- /dev/null +++ b/src/postProcessing/minMaxFields/IOminMaxFields.H @@ -0,0 +1,50 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 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 + +Typedef + Foam::IOminMaxFields + +Description + Instance of the generic IOOutputFilter for minMaxFields. + +\*---------------------------------------------------------------------------*/ + +#ifndef IOminMaxFields_H +#define IOminMaxFields_H + +#include "minMaxFields.H" +#include "IOOutputFilter.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef IOOutputFilter IOminMaxFields; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/postProcessing/minMaxFields/Make/files b/src/postProcessing/minMaxFields/Make/files new file mode 100644 index 0000000000..196026e838 --- /dev/null +++ b/src/postProcessing/minMaxFields/Make/files @@ -0,0 +1,4 @@ +minMaxFields.C +minMaxFieldsFunctionObject.C + +LIB = $(FOAM_LIBBIN)/libminMaxFields diff --git a/src/postProcessing/minMaxFields/Make/options b/src/postProcessing/minMaxFields/Make/options new file mode 100644 index 0000000000..0954a90689 --- /dev/null +++ b/src/postProcessing/minMaxFields/Make/options @@ -0,0 +1,8 @@ +EXE_INC = \ + -I$(LIB_SRC)/finiteVolume/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude \ + -I$(LIB_SRC)/sampling/lnInclude + +LIB_LIBS = \ + -lfiniteVolume \ + -lmeshTools diff --git a/src/postProcessing/minMaxFields/minMaxFields.C b/src/postProcessing/minMaxFields/minMaxFields.C new file mode 100644 index 0000000000..0c9c5df645 --- /dev/null +++ b/src/postProcessing/minMaxFields/minMaxFields.C @@ -0,0 +1,203 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 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 "minMaxFields.H" +#include "volFields.H" +#include "dictionary.H" +#include "Time.H" + + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + defineTypeNameAndDebug(minMaxFields, 0); +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::minMaxFields::minMaxFields +( + const word& name, + const objectRegistry& obr, + const dictionary& dict, + const bool loadFromFiles +) +: + name_(name), + obr_(obr), + active_(true), + log_(false), + fieldSet_(), + minMaxFieldsFilePtr_(NULL) +{ + // Check if the available mesh is an fvMesh otherise deactivate + if (!isA(obr_)) + { + active_ = false; + WarningIn + ( + "minMaxFields::minMaxFields" + "(const objectRegistry& obr, const dictionary& dict)" + ) << "No fvMesh available, deactivating." + << endl; + } + + read(dict); +} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::minMaxFields::~minMaxFields() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +void Foam::minMaxFields::read(const dictionary& dict) +{ + if (active_) + { + log_ = dict.lookupOrDefault("log", false); + + dict.lookup("fields") >> fieldSet_; + } +} + + +void Foam::minMaxFields::makeFile() +{ + // Create the minMaxFields file if not already created + if (!minMaxFieldsFilePtr_.valid()) + { + if (debug) + { + Info<< "Creating minMaxFields file." << endl; + } + + // File update + if (Pstream::master()) + { + fileName minMaxFieldsDir; + if (Pstream::parRun()) + { + // Put in undecomposed case (Note: gives problems for + // distributed data running) + minMaxFieldsDir = + obr_.time().path()/".."/name_/obr_.time().timeName(); + } + else + { + minMaxFieldsDir = + obr_.time().path()/name_/obr_.time().timeName(); + } + + // Create directory if does not exist. + mkDir(minMaxFieldsDir); + + // Open new file at start up + minMaxFieldsFilePtr_.reset + ( + new OFstream(minMaxFieldsDir/(type() + ".dat")) + ); + + // Add headers to output data + writeFileHeader(); + } + } +} + + +void Foam::minMaxFields::writeFileHeader() +{ + if (minMaxFieldsFilePtr_.valid()) + { + minMaxFieldsFilePtr_() + << "# Time" << tab << "field" << tab << "min" << tab << "max" + << endl; + } +} + + +void Foam::minMaxFields::execute() +{ + // Do nothing - only valid on write +} + +void Foam::minMaxFields::write() +{ + if (active_) + { + // Create the minMaxFields file if not already created + makeFile(); + + forAll(fieldSet_, fieldI) + { + calcMinMaxFields(fieldSet_[fieldI]); + calcMinMaxFields(fieldSet_[fieldI]); + calcMinMaxFields(fieldSet_[fieldI]); + calcMinMaxFields(fieldSet_[fieldI]); + calcMinMaxFields(fieldSet_[fieldI]); + } + } +} + + +template<> +void Foam::minMaxFields::calcMinMaxFields +( + const word& fieldName +) +{ + if (obr_.foundObject(fieldName)) + { + const scalarField& field = obr_.lookupObject(fieldName); + scalar minValue = min(field); + scalar maxValue = max(field); + + reduce(minValue, minOp()); + reduce(maxValue, maxOp()); + + if (Pstream::master()) + { + minMaxFieldsFilePtr_() << obr_.time().value() << tab + << fieldName << tab << minValue << tab << maxValue << endl; + + if (log_) + { + Info<< "minMaxFields output:" << nl + << " min(" << fieldName << ") = " << minValue << nl + << " max(" << fieldName << ") = " << maxValue << nl + << endl; + } + } + } +} + + +// ************************************************************************* // diff --git a/src/postProcessing/minMaxFields/minMaxFields.H b/src/postProcessing/minMaxFields/minMaxFields.H new file mode 100644 index 0000000000..8a05ae3035 --- /dev/null +++ b/src/postProcessing/minMaxFields/minMaxFields.H @@ -0,0 +1,182 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 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::minMaxFields + +Description + Calculates scalar minimim and maximum field values. + + For variables with rank > 0, computes the magnitude of the min/max + values. + + Data written to the file \/minMaxFields.dat + + +SourceFiles + minMaxFields.C + IOminMaxFields.H + +\*---------------------------------------------------------------------------*/ + +#ifndef minMaxFields_H +#define minMaxFields_H + +#include "primitiveFieldsFwd.H" +#include "volFieldsFwd.H" +#include "labelHashSet.H" +#include "OFstream.H" +#include "Switch.H" +#include "pointFieldFwd.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +// Forward declaration of classes +class objectRegistry; +class dictionary; +class mapPolyMesh; + +/*---------------------------------------------------------------------------*\ + Class minMaxFields Declaration +\*---------------------------------------------------------------------------*/ + +class minMaxFields +{ +protected: + + // Private data + + //- Name of this set of forces, + // Also used as the name of the probes directory. + word name_; + + const objectRegistry& obr_; + + //- on/off switch + bool active_; + + //- Switch to send output to Info as well as to file + Switch log_; + + //- Patches to integrate forces over + wordList fieldSet_; + + + //- Forces/moment file ptr + autoPtr minMaxFieldsFilePtr_; + + + // Private Member Functions + + //- If the forces file has not been created create it + void makeFile(); + + //- Disallow default bitwise copy construct + minMaxFields(const minMaxFields&); + + //- Disallow default bitwise assignment + void operator=(const minMaxFields&); + + //- Output file header information + virtual void writeFileHeader(); + + +public: + + //- Runtime type information + TypeName("minMaxFields"); + + + // Constructors + + //- Construct for given objectRegistry and dictionary. + // Allow the possibility to load fields from files + minMaxFields + ( + const word& name, + const objectRegistry&, + const dictionary&, + const bool loadFromFiles = false + ); + + + // Destructor + + virtual ~minMaxFields(); + + + // Member Functions + + //- Return name of the set of forces + virtual const word& name() const + { + return name_; + } + + //- Read the forces data + virtual void read(const dictionary&); + + //- Execute + virtual void execute(); + + //- Calculate the field min/max + template + void calcMinMaxFields(const word& fieldName); + + //- Write the minMaxFields + virtual void write(); + + //- Update for changes of mesh + virtual void updateMesh(const mapPolyMesh&) + {} + + //- Update for changes of mesh + virtual void movePoints(const pointField&) + {} +}; + + +// Template specialisation for scalar fields +template<> +void minMaxFields::calcMinMaxFields(const word& fieldName); + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#ifdef NoRepository +# include "minMaxFieldsTemplates.C" +#endif + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.C b/src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.C new file mode 100644 index 0000000000..454bb450c3 --- /dev/null +++ b/src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.C @@ -0,0 +1,43 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 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 "minMaxFieldsFunctionObject.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +namespace Foam +{ + defineNamedTemplateTypeNameAndDebug(minMaxFieldsFunctionObject, 0); + + addToRunTimeSelectionTable + ( + functionObject, + minMaxFieldsFunctionObject, + dictionary + ); +} + +// ************************************************************************* // diff --git a/src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.H b/src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.H new file mode 100644 index 0000000000..b414a0ff94 --- /dev/null +++ b/src/postProcessing/minMaxFields/minMaxFieldsFunctionObject.H @@ -0,0 +1,55 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 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 + +Typedef + Foam::minMaxFieldsFunctionObject + +Description + FunctionObject wrapper around minMaxFields to allow them to be created via + the functions list within controlDict. + +SourceFiles + minMaxFieldsFunctionObject.C + +\*---------------------------------------------------------------------------*/ + +#ifndef minMaxFieldsFunctionObject_H +#define minMaxFieldsFunctionObject_H + +#include "minMaxFields.H" +#include "OutputFilterFunctionObject.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + typedef OutputFilterFunctionObject + minMaxFieldsFunctionObject; +} + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/postProcessing/minMaxFields/minMaxFieldsTemplates.C b/src/postProcessing/minMaxFields/minMaxFieldsTemplates.C new file mode 100644 index 0000000000..ea5947c1e2 --- /dev/null +++ b/src/postProcessing/minMaxFields/minMaxFieldsTemplates.C @@ -0,0 +1,65 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 1991-2008 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 "minMaxFields.H" +#include "volFields.H" +#include "dictionary.H" +#include "Time.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +template +void Foam::minMaxFields::calcMinMaxFields(const word& fieldName) +{ + typedef GeometricField fieldType; + + if (obr_.foundObject(fieldName)) + { + const fieldType& field = obr_.lookupObject(fieldName); + scalar minValue = min(mag(field)).value(); + scalar maxValue = max(mag(field)).value(); + + reduce(minValue, minOp()); + reduce(maxValue, maxOp()); + + if (Pstream::master()) + { + minMaxFieldsFilePtr_() << obr_.time().value() << tab + << fieldName << tab << minValue << tab << maxValue << endl; + + if (log_) + { + Info<< "minMaxFields output:" << nl + << " min(mag(" << fieldName << ")) = " << minValue << nl + << " max(mag(" << fieldName << ")) = " << maxValue << nl + << endl; + } + } + } +} + + +// ************************************************************************* // diff --git a/src/turbulenceModels/RAS/compressible/LRR/LRR.C b/src/turbulenceModels/RAS/compressible/LRR/LRR.C index 90c7f3ca17..176e2a63c8 100644 --- a/src/turbulenceModels/RAS/compressible/LRR/LRR.C +++ b/src/turbulenceModels/RAS/compressible/LRR/LRR.C @@ -157,10 +157,54 @@ LRR::LRR ) ), - R_(autoCreateR("R", mesh_)), - k_(autoCreateK("k", mesh_)), - epsilon_(autoCreateEpsilon("epsilon", mesh_)), - mut_(autoCreateMut("mut", mesh_)) + R_ + ( + IOobject + ( + "R", + runTime_.timeName(), + mesh_, + IOobject::MUST_READ, + IOobject::AUTO_WRITE + ), + autoCreateR("R", mesh_) + ), + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + epsilon_ + ( + IOobject + ( + "epsilon", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateEpsilon("epsilon", mesh_) + ), + mut_ + ( + IOobject + ( + "mut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateMut("mut", mesh_) + ) { mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_); mut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C index 89b5ab1f09..0736481d09 100644 --- a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C +++ b/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C @@ -189,12 +189,44 @@ LaunderGibsonRSTM::LaunderGibsonRSTM IOobject::MUST_READ, IOobject::AUTO_WRITE ), - mesh_ + autoCreateR("R", mesh_) ), - - k_(autoCreateK("k", mesh_)), - epsilon_(autoCreateEpsilon("epsilon", mesh_)), - mut_(autoCreateMut("mut", mesh_)) + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + epsilon_ + ( + IOobject + ( + "epsilon", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateEpsilon("epsilon", mesh_) + ), + mut_ + ( + IOobject + ( + "mut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateMut("mut", mesh_) + ) { mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_); mut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C index 2930fb284f..6d54e97f70 100644 --- a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C +++ b/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C @@ -139,9 +139,42 @@ RNGkEpsilon::RNGkEpsilon ) ), - k_(autoCreateK("k", mesh_)), - epsilon_(autoCreateEpsilon("epsilon", mesh_)), - mut_(autoCreateMut("mut", mesh_)) + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + epsilon_ + ( + IOobject + ( + "epsilon", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateEpsilon("epsilon", mesh_) + ), + mut_ + ( + IOobject + ( + "mut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateMut("mut", mesh_) + ) { mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_); mut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/RAS/compressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/RAS/compressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C index fdf205b930..12cec378a2 100644 --- a/src/turbulenceModels/RAS/compressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C +++ b/src/turbulenceModels/RAS/compressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C @@ -80,7 +80,8 @@ tmp autoCreateMut mesh.time().timeName(), mesh, IOobject::MUST_READ, - IOobject::AUTO_WRITE + IOobject::NO_WRITE, + false ); if (mutHeader.headerOk()) @@ -117,7 +118,8 @@ tmp autoCreateMut mesh.time().timeName(), mesh, IOobject::NO_READ, - IOobject::NO_WRITE + IOobject::NO_WRITE, + false ), mesh, dimensionedScalar("zero", dimDensity*dimArea/dimTime, 0.0), diff --git a/src/turbulenceModels/RAS/compressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C b/src/turbulenceModels/RAS/compressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C index fd7c9d59bf..0f93c40155 100644 --- a/src/turbulenceModels/RAS/compressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C +++ b/src/turbulenceModels/RAS/compressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C @@ -50,8 +50,7 @@ autoCreateWallFunctionField "mut", mesh.time().timeName(), mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE + IOobject::MUST_READ ); typedef GeometricField fieldType; @@ -68,7 +67,8 @@ autoCreateWallFunctionField mesh.time().timeName(), mesh, IOobject::MUST_READ, - IOobject::AUTO_WRITE + IOobject::NO_WRITE, + false ), mesh ) @@ -118,7 +118,8 @@ autoCreateWallFunctionField mesh.time().timeName(), mesh, IOobject::NO_READ, - IOobject::AUTO_WRITE + IOobject::NO_WRITE, + false ), mesh, dimensioned diff --git a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C index 414690f6fd..80a79ab88f 100644 --- a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C +++ b/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C @@ -119,9 +119,43 @@ kEpsilon::kEpsilon 1.0 ) ), - k_(autoCreateK("k", mesh_)), - epsilon_(autoCreateEpsilon("epsilon", mesh_)), - mut_(autoCreateMut("mut", mesh_)) + + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + epsilon_ + ( + IOobject + ( + "epsilon", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateEpsilon("epsilon", mesh_) + ), + mut_ + ( + IOobject + ( + "mut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateMut("mut", mesh_) + ) { mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_); mut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C index 32bb44bcbb..854dcb1bbf 100644 --- a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C +++ b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C @@ -223,9 +223,42 @@ kOmegaSST::kOmegaSST y_(mesh_), - k_(autoCreateK("k", mesh_)), - omega_(autoCreateOmega("omega", mesh_)), - mut_(autoCreateMut("mut", mesh_)) + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + omega_ + ( + IOobject + ( + "omega", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateOmega("omega", mesh_) + ), + mut_ + ( + IOobject + ( + "mut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateMut("mut", mesh_) + ) { mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_))))); mut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C index 141a7376c9..fae47c1d40 100644 --- a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C +++ b/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C @@ -152,9 +152,42 @@ realizableKE::realizableKE ) ), - k_(autoCreateK("k", mesh_)), - epsilon_(autoCreateEpsilon("epsilon", mesh_)), - mut_(autoCreateMut("mut", mesh_)) + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + epsilon_ + ( + IOobject + ( + "epsilon", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateEpsilon("epsilon", mesh_) + ), + mut_ + ( + IOobject + ( + "mut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateMut("mut", mesh_) + ) { bound(k_, k0_); bound(epsilon_, epsilon0_); diff --git a/src/turbulenceModels/RAS/incompressible/LRR/LRR.C b/src/turbulenceModels/RAS/incompressible/LRR/LRR.C index a7304b7c6c..7eebd91b5a 100644 --- a/src/turbulenceModels/RAS/incompressible/LRR/LRR.C +++ b/src/turbulenceModels/RAS/incompressible/LRR/LRR.C @@ -138,10 +138,54 @@ LRR::LRR ) ), - R_(autoCreateR("R", mesh_)), - k_(autoCreateK("k", mesh_)), - epsilon_(autoCreateEpsilon("epsilon", mesh_)), - nut_(autoCreateNut("nut", mesh_)) + R_ + ( + IOobject + ( + "R", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateR("R", mesh_) + ), + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + epsilon_ + ( + IOobject + ( + "epsilon", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateEpsilon("epsilon", mesh_) + ), + nut_ + ( + IOobject + ( + "nut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateNut("nut", mesh_) + ) { nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_); nut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C index ac7a036e49..4e33412681 100644 --- a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C +++ b/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C @@ -167,10 +167,54 @@ LaunderGibsonRSTM::LaunderGibsonRSTM yr_(mesh_), - R_(autoCreateR("R", mesh_)), - k_(autoCreateK("k", mesh_)), - epsilon_(autoCreateEpsilon("epsilon", mesh_)), - nut_(autoCreateNut("nut", mesh_)) + R_ + ( + IOobject + ( + "R", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateR("R", mesh_) + ), + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + epsilon_ + ( + IOobject + ( + "epsilon", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateEpsilon("epsilon", mesh_) + ), + nut_ + ( + IOobject + ( + "nut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateNut("nut", mesh_) + ) { nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_); nut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C index 6e877d6a42..5000d6a135 100644 --- a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C +++ b/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C @@ -147,8 +147,30 @@ LienCubicKE::LienCubicKE ) ), - k_(autoCreateK("k", mesh_)), - epsilon_(autoCreateEpsilon("epsilon", mesh_)), + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + epsilon_ + ( + IOobject + ( + "epsilon", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateEpsilon("epsilon", mesh_) + ), gradU_(fvc::grad(U)), eta_(k_/epsilon_*sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T())))), @@ -165,7 +187,18 @@ LienCubicKE::LienCubicKE ) ), - nut_(autoCreateNut("nut", mesh_)), + nut_ + ( + IOobject + ( + "nut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateNut("nut", mesh_) + ), nonlinearStress_ ( diff --git a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C index 2029df47c9..eebcbbdb5e 100644 --- a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C +++ b/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C @@ -119,9 +119,42 @@ RNGkEpsilon::RNGkEpsilon ) ), - k_(autoCreateK("k", mesh_)), - epsilon_(autoCreateEpsilon("epsilon", mesh_)), - nut_(autoCreateNut("nut", mesh_)) + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + epsilon_ + ( + IOobject + ( + "epsilon", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateEpsilon("epsilon", mesh_) + ), + nut_ + ( + IOobject + ( + "nut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateNut("nut", mesh_) + ) { nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_); nut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/RAS/incompressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/RAS/incompressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C index 7a2fef5e6c..fe4fa56179 100644 --- a/src/turbulenceModels/RAS/incompressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C +++ b/src/turbulenceModels/RAS/incompressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctions.C @@ -80,7 +80,8 @@ tmp autoCreateNut mesh.time().timeName(), mesh, IOobject::MUST_READ, - IOobject::AUTO_WRITE + IOobject::NO_WRITE, + false ); if (nutHeader.headerOk()) @@ -117,7 +118,8 @@ tmp autoCreateNut mesh.time().timeName(), mesh, IOobject::NO_READ, - IOobject::NO_WRITE + IOobject::NO_WRITE, + false ), mesh, dimensionedScalar("zero", dimArea/dimTime, 0.0), diff --git a/src/turbulenceModels/RAS/incompressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C b/src/turbulenceModels/RAS/incompressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C index 64da24799d..8f3b2889c8 100644 --- a/src/turbulenceModels/RAS/incompressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C +++ b/src/turbulenceModels/RAS/incompressible/backwardsCompatibilityWallFunctions/backwardsCompatibilityWallFunctionsTemplates.C @@ -50,8 +50,7 @@ autoCreateWallFunctionField "nut", mesh.time().timeName(), mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE + IOobject::MUST_READ ); typedef GeometricField fieldType; @@ -68,7 +67,8 @@ autoCreateWallFunctionField mesh.time().timeName(), mesh, IOobject::MUST_READ, - IOobject::AUTO_WRITE + IOobject::NO_WRITE, + false ), mesh ) @@ -118,7 +118,8 @@ autoCreateWallFunctionField mesh.time().timeName(), mesh, IOobject::NO_READ, - IOobject::AUTO_WRITE + IOobject::NO_WRITE, + false ), mesh, dimensioned diff --git a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C index 43f3fa2d2d..7e9f971122 100644 --- a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C +++ b/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C @@ -93,9 +93,42 @@ kEpsilon::kEpsilon ) ), - k_(autoCreateK("k", mesh_)), - epsilon_(autoCreateEpsilon("epsilon", mesh_)), - nut_(autoCreateNut("nut", mesh_)) + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + epsilon_ + ( + IOobject + ( + "epsilon", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateEpsilon("epsilon", mesh_) + ), + nut_ + ( + IOobject + ( + "nut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateNut("nut", mesh_) + ) { nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_); nut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/RAS/incompressible/kOmega/kOmega.C b/src/turbulenceModels/RAS/incompressible/kOmega/kOmega.C index fb8326b5b8..47a68d2e18 100644 --- a/src/turbulenceModels/RAS/incompressible/kOmega/kOmega.C +++ b/src/turbulenceModels/RAS/incompressible/kOmega/kOmega.C @@ -104,9 +104,42 @@ kOmega::kOmega omega0_("omega0", dimless/dimTime, SMALL), omegaSmall_("omegaSmall", dimless/dimTime, SMALL), - k_(autoCreateK("k", mesh_)), - omega_(autoCreateOmega("omega", mesh_)), - nut_(autoCreateNut("nut", mesh_)) + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + omega_ + ( + IOobject + ( + "omega", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateOmega("omega", mesh_) + ), + nut_ + ( + IOobject + ( + "nut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateNut("nut", mesh_) + ) { nut_ = k_/(omega_ + omegaSmall_); nut_.correctBoundaryConditions(); diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C index ba8dc16525..2c66a36f30 100644 --- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C +++ b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C @@ -213,9 +213,42 @@ kOmegaSST::kOmegaSST y_(mesh_), - k_(autoCreateK("k", mesh_)), - omega_(autoCreateOmega("omega", mesh_)), - nut_(autoCreateNut("nut", mesh_)) + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + omega_ + ( + IOobject + ( + "omega", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateOmega("omega", mesh_) + ), + nut_ + ( + IOobject + ( + "nut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateNut("nut", mesh_) + ) { nut_ = a1_*k_ diff --git a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C index c8f488f5a1..294bf9c915 100644 --- a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C +++ b/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C @@ -142,9 +142,42 @@ realizableKE::realizableKE ) ), - k_(autoCreateK("k", mesh_)), - epsilon_(autoCreateEpsilon("epsilon", mesh_)), - nut_(autoCreateNut("nut", mesh_)) + k_ + ( + IOobject + ( + "k", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateK("k", mesh_) + ), + epsilon_ + ( + IOobject + ( + "epsilon", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateEpsilon("epsilon", mesh_) + ), + nut_ + ( + IOobject + ( + "nut", + runTime_.timeName(), + mesh_, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + autoCreateNut("nut", mesh_) + ) { bound(k_, k0_); bound(epsilon_, epsilon0_);