diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
index 461578e864ed5172d8a4f178a1b8672eefa78e84..126e10b3376db7ed71df101e5bb395241434ada8 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -40,7 +40,7 @@ Description
Valid when:
\f[
- rho_{k} << 1
+ \frac{beta(T - T_{ref})}{rho_{ref}} << 1
\f]
\*---------------------------------------------------------------------------*/
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index a3d5c956fc41fbc60094f21dc452781fe9649b67..4fc37efd28de3cccf916b810009a8fef36ed0be9 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,18 +29,18 @@ Description
Uses the Boussinesq approximation:
\f[
- rho_{eff} = 1 - beta(T - T_{ref})
+ rho_{k} = 1 - beta(T - T_{ref})
\f]
where:
- \f$ rho_{eff} \f$ = the effective (driving) density
+ \f$ rho_{k} \f$ = the effective (driving) density
beta = thermal expansion coefficient [1/K]
T = temperature [K]
\f$ T_{ref} \f$ = reference temperature [K]
Valid when:
\f[
- rho_{eff} << 1
+ \frac{beta(T - T_{ref})}{rho_{ref}} << 1
\f]
\*---------------------------------------------------------------------------*/
diff --git a/bin/paraFoam b/bin/paraFoam
index e6465f0811b2cfb6f6c5d747774acbc8f818edf8..d288e3fb909d8d4d4684bdd6990099989c59fa5c 100755
--- a/bin/paraFoam
+++ b/bin/paraFoam
@@ -3,7 +3,7 @@
# ========= |
# \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
# \\ / O peration |
-# \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+# \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
# \\/ M anipulation |
#-------------------------------------------------------------------------------
# License
@@ -168,8 +168,14 @@ fvControls="system"
if [ -n "$regionName" ]
then
- caseFile="$caseName{$regionName}.$extension"
- fvControls="$fvControls/$regionName"
+ if [ ! -d constant/$regionName ]
+ then
+ echo "FATAL ERROR: Region $regionName does not exist"
+ exit 1
+ else
+ caseFile="$caseName{$regionName}.$extension"
+ fvControls="$fvControls/$regionName"
+ fi
fi
case "${optTouch:-false}" in
diff --git a/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.C b/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.C
index fce4a14921bf43d8abe3f29cc6dfc8574985ec98..d9b8c167d7150ca214a4d99b31f3645688828d53 100644
--- a/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.C
+++ b/src/OpenFOAM/containers/Dictionaries/Dictionary/Dictionary.C
@@ -46,8 +46,9 @@ Foam::Dictionary<T>::Dictionary(const Dictionary& dict)
template<class T>
bool Foam::Dictionary<T>::erase(const word& keyword)
{
- T* tPtr;
- if (tPtr = this->remove(keyword))
+ T* tPtr = this->remove(keyword);
+
+ if (tPtr)
{
delete tPtr;
return true;
@@ -59,6 +60,4 @@ bool Foam::Dictionary<T>::erase(const word& keyword)
}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/OpenFOAM/db/error/messageStream.H b/src/OpenFOAM/db/error/messageStream.H
index fc852ac9c8b9932ccac9b18c7cef3a3a94ade5a2..94c129373df6b886db76cb0d2ef95197594f0fcb 100644
--- a/src/OpenFOAM/db/error/messageStream.H
+++ b/src/OpenFOAM/db/error/messageStream.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -264,6 +264,16 @@ extern messageStream Info;
#define IOInfoIn(fn, ios) \
::Foam::Info((fn), __FILE__, __LINE__, (ios))
+/**
+ * \def Debug(variable)
+ * Report a variable name and value using Foam::Pout in
+ * file __FILE__ at line __LINE__
+*/
+#define Debug(var) \
+ ::Foam::Pout<< "["<< __FILE__ << ":" << __LINE__ << "] " \
+ << #var " = " << var << ::Foam::endl
+
+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
diff --git a/src/OpenFOAM/dimensionSet/dimensionSets.C b/src/OpenFOAM/dimensionSet/dimensionSets.C
index 10b424a57634266f82ff37fb0fbf83579f0db7aa..1e2b254da1df6c85f34357953756867be4963c69 100644
--- a/src/OpenFOAM/dimensionSet/dimensionSets.C
+++ b/src/OpenFOAM/dimensionSet/dimensionSets.C
@@ -38,32 +38,13 @@ namespace Foam
//- Since dimensionSystems() can be reread we actually store a copy of
// the controlDict subDict (v.s. a reference to the subDict for e.g.
// dimensionedConstants)
-autoPtr<dictionary> dimensionSystemsPtr_(NULL);
-
-dictionary& dimensionSystems()
-{
- if (!dimensionSystemsPtr_.valid())
- {
- dictionary* cachedPtr = NULL;
- dimensionSystemsPtr_.reset
- (
- new dictionary
- (
- debug::switchSet
- (
- "DimensionSets",
- cachedPtr
- )
- )
- );
- }
- return dimensionSystemsPtr_();
-}
-
-
-autoPtr<HashTable<dimensionedScalar> > unitSetPtr_;
-autoPtr<dimensionSets> writeUnitSetPtr_;
+dictionary* dimensionSystemsPtr_(NULL);
+HashTable<dimensionedScalar>* unitSetPtr_(NULL);
+dimensionSets* writeUnitSetPtr_(NULL);
+//- Helper class to
+// - register re-reader
+// - deallocate demand-driven data
class addDimensionSetsToDebug
:
public ::Foam::simpleRegIOobject
@@ -74,12 +55,18 @@ public:
::Foam::simpleRegIOobject(Foam::debug::addDimensionSetObject, name)
{}
virtual ~addDimensionSetsToDebug()
- {}
+ {
+ deleteDemandDrivenData(dimensionSystemsPtr_);
+ deleteDemandDrivenData(unitSetPtr_);
+ deleteDemandDrivenData(writeUnitSetPtr_);
+
+ }
virtual void readData(Foam::Istream& is)
{
- unitSetPtr_.clear();
- writeUnitSetPtr_.clear();
- dimensionSystemsPtr_.reset(new dictionary(is));
+ deleteDemandDrivenData(dimensionSystemsPtr_);
+ deleteDemandDrivenData(unitSetPtr_);
+ deleteDemandDrivenData(writeUnitSetPtr_);
+ dimensionSystemsPtr_ = new dictionary(is);
}
virtual void writeData(Foam::Ostream& os) const
{
@@ -89,10 +76,27 @@ public:
addDimensionSetsToDebug addDimensionSetsToDebug_("DimensionSets");
+dictionary& dimensionSystems()
+{
+ if (!dimensionSystemsPtr_)
+ {
+ dictionary* cachedPtr = NULL;
+ dimensionSystemsPtr_ = new dictionary
+ (
+ debug::switchSet
+ (
+ "DimensionSets",
+ cachedPtr
+ )
+ );
+ }
+ return *dimensionSystemsPtr_;
+}
+
const HashTable<dimensionedScalar>& unitSet()
{
- if (!unitSetPtr_.valid())
+ if (!unitSetPtr_)
{
const dictionary& dict = dimensionSystems();
@@ -114,10 +118,7 @@ const HashTable<dimensionedScalar>& unitSet()
const dictionary& unitDict = dict.subDict(unitSetCoeffs);
- unitSetPtr_.reset
- (
- new HashTable<dimensionedScalar>(unitDict.size())
- );
+ unitSetPtr_ = new HashTable<dimensionedScalar>(unitDict.size());
forAllConstIter(dictionary, unitDict, iter)
{
@@ -145,14 +146,7 @@ const HashTable<dimensionedScalar>& unitSet()
)
);
- writeUnitSetPtr_.reset
- (
- new dimensionSets
- (
- unitSetPtr_(),
- writeUnitNames
- )
- );
+ writeUnitSetPtr_ = new dimensionSets(*unitSetPtr_, writeUnitNames);
if (writeUnitNames.size() != 0 && writeUnitNames.size() != 7)
{
@@ -162,17 +156,17 @@ const HashTable<dimensionedScalar>& unitSet()
<< exit(FatalIOError);
}
}
- return unitSetPtr_();
+ return *unitSetPtr_;
}
const dimensionSets& writeUnitSet()
{
- if (!writeUnitSetPtr_.valid())
+ if (!writeUnitSetPtr_)
{
(void)unitSet();
}
- return writeUnitSetPtr_();
+ return *writeUnitSetPtr_;
}
diff --git a/src/fieldSources/basicSource/basicSource.C b/src/fieldSources/basicSource/basicSource.C
index 64be60fa84e8adf9b81f2e67b630992c587fa9f9..7732f89f9a973c705e8d351c29de8e8187fe6baa 100644
--- a/src/fieldSources/basicSource/basicSource.C
+++ b/src/fieldSources/basicSource/basicSource.C
@@ -108,7 +108,6 @@ void Foam::basicSource::setSelection(const dictionary& dict)
void Foam::basicSource::setCellSet()
{
- Info<< incrIndent << indent << "Source: " << name_ << endl;
switch (selectionMode_)
{
case smPoints:
@@ -237,7 +236,7 @@ void Foam::basicSource::setCellSet()
Info<< indent << "- selected "
<< returnReduce(cells_.size(), sumOp<label>())
- << " cell(s) with volume " << V_ << nl << decrIndent << endl;
+ << " cell(s) with volume " << V_ << nl << endl;
}
}
@@ -257,8 +256,8 @@ Foam::basicSource::basicSource
dict_(dict),
coeffs_(dict.subDict(modelType + "Coeffs")),
active_(readBool(dict_.lookup("active"))),
- timeStart_(readScalar(dict_.lookup("timeStart"))),
- duration_(readScalar(dict_.lookup("duration"))),
+ timeStart_(-1.0),
+ duration_(0.0),
selectionMode_
(
selectionModeTypeNames_.read(dict_.lookup("selectionMode"))
@@ -273,9 +272,24 @@ Foam::basicSource::basicSource
fieldNames_(),
applied_()
{
+ Info<< incrIndent << indent << "Source: " << name_ << endl;
+
+ if (dict_.readIfPresent("timeStart", timeStart_))
+ {
+ dict_.lookup("duration") >> duration_;
+ Info<< indent << "- applying source at time " << timeStart_
+ << " for duration " << duration_ << endl;
+ }
+ else
+ {
+ Info<< indent<< "-applying source for all time" << endl;
+ }
+
setSelection(dict_);
setCellSet();
+
+ Info<< decrIndent;
}
@@ -325,12 +339,7 @@ Foam::basicSource::~basicSource()
bool Foam::basicSource::isActive()
{
- if
- (
- active_
- && (mesh_.time().value() >= timeStart_)
- && (mesh_.time().value() <= timeEnd())
- )
+ if (active_ && inTimeLimits(mesh_.time().value()))
{
// Update the cell set if the mesh is changing
if (mesh_.changing())
diff --git a/src/fieldSources/basicSource/basicSource.H b/src/fieldSources/basicSource/basicSource.H
index 3e4740cead022cd494f98923cb7afc88b7af399e..8c5543c48ab5e3f1d48786573372b81b5e39146f 100644
--- a/src/fieldSources/basicSource/basicSource.H
+++ b/src/fieldSources/basicSource/basicSource.H
@@ -277,8 +277,8 @@ public:
//- Return const access to the duration
inline scalar duration() const;
- //- Return const access to the time end
- inline scalar timeEnd() const;
+ //- Return true if within time limits
+ inline bool inTimeLimits(const scalar time) const;
//- Return const access to the cell selection mode
inline const selectionModeType& selectionMode() const;
diff --git a/src/fieldSources/basicSource/basicSourceI.H b/src/fieldSources/basicSource/basicSourceI.H
index 6ffc096defc8473514f2f5f9cf3a48a237ebdb37..e77d808e3dec7b900f48c17f9849e05fe7a1e298 100644
--- a/src/fieldSources/basicSource/basicSourceI.H
+++ b/src/fieldSources/basicSource/basicSourceI.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -63,9 +63,17 @@ inline Foam::scalar Foam::basicSource::duration() const
}
-inline Foam::scalar Foam::basicSource::timeEnd() const
+inline bool Foam::basicSource::inTimeLimits(const scalar time) const
{
- return timeStart_ + duration_;
+ return
+ (
+ (timeStart_ < 0)
+ ||
+ (
+ (mesh_.time().value() >= timeStart_)
+ && (mesh_.time().value() <= (timeStart_ + duration_))
+ )
+ );
}
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist.C
index 1cfd67f1898030da0c4792deb85ade8a7eb86e72..405fba9c82afdb8180e1e43cebf4e306c261a0e7 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -62,8 +62,6 @@ Foam::wallDist::~wallDist()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-// Correct for mesh geom/topo changes. Might be more intelligent in the
-// future (if only small topology change)
void Foam::wallDist::correct()
{
// Get patchids of walls
diff --git a/src/meshTools/cellDist/patchWave/patchDataWave.H b/src/meshTools/cellDist/patchWave/patchDataWave.H
index e2369f81a928ba9b9c2fa992f5035317b9713dff..a08740222b353b10ab14baa39f7e68dc5dad23e6 100644
--- a/src/meshTools/cellDist/patchWave/patchDataWave.H
+++ b/src/meshTools/cellDist/patchWave/patchDataWave.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -55,10 +55,9 @@ namespace Foam
// Forward declaration of classes
class polyMesh;
class wallPoint;
-//template<class Type, class TrackingData> class MeshWave;
/*---------------------------------------------------------------------------*\
- Class patchDataWave Declaration
+ Class patchDataWave Declaration
\*---------------------------------------------------------------------------*/
template<class TransferType>
diff --git a/src/meshTools/cellDist/patchWave/patchWave.C b/src/meshTools/cellDist/patchWave/patchWave.C
index 92d0b5c96c78236d3141a83c416642ef696eeccf..fd05d0e728493bb19d44eddc8e9f871255bef945 100644
--- a/src/meshTools/cellDist/patchWave/patchWave.C
+++ b/src/meshTools/cellDist/patchWave/patchWave.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -27,7 +27,6 @@ License
#include "polyMesh.H"
#include "wallPoint.H"
#include "globalMeshData.H"
-#include "SubField.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@@ -132,7 +131,6 @@ Foam::label Foam::patchWave::getValues(const MeshWave<wallPoint>& waveInfo)
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
-// Construct from components
Foam::patchWave::patchWave
(
const polyMesh& mesh,
@@ -159,28 +157,19 @@ Foam::patchWave::~patchWave()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-// Correct for mesh geom/topo changes. Might be more intelligent in the
-// future (if only small topology change)
void Foam::patchWave::correct()
{
- //
// Set initial changed faces: set wallPoint for wall faces to wall centre
- //
- // Count walls
- label nWalls = sumPatchSize(patchIDs_);
+ label nPatch = sumPatchSize(patchIDs_);
- List<wallPoint> faceDist(nWalls);
- labelList changedFaces(nWalls);
+ List<wallPoint> faceDist(nPatch);
+ labelList changedFaces(nPatch);
// Set to faceDist information to facecentre on walls.
setChangedFaces(patchIDs_, changedFaces, faceDist);
-
- //
// Do calculate wall distance by 'growing' from faces.
- //
-
MeshWave<wallPoint> waveInfo
(
mesh(),
@@ -189,20 +178,13 @@ void Foam::patchWave::correct()
mesh().globalData().nTotalCells()+1 // max iterations
);
-
- //
// Copy distance into return field
- //
-
nUnset_ = getValues(waveInfo);
- //
// Correct wall cells for true distance
- //
-
if (correctWalls_)
{
- Map<label> nearestFace(2 * nWalls);
+ Map<label> nearestFace(2*nPatch);
correctBoundaryFaceCells
(
diff --git a/src/meshTools/cellDist/patchWave/patchWave.H b/src/meshTools/cellDist/patchWave/patchWave.H
index 16de93356a29dfcea10abf76414e17f32c99c638..72a683625bba67b369aac0d7ab2f7ff70f7f2724 100644
--- a/src/meshTools/cellDist/patchWave/patchWave.H
+++ b/src/meshTools/cellDist/patchWave/patchWave.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -51,7 +51,7 @@ class polyMesh;
class wallPoint;
/*---------------------------------------------------------------------------*\
- Class patchWave Declaration
+ Class patchWave Declaration
\*---------------------------------------------------------------------------*/
class patchWave
@@ -128,7 +128,7 @@ public:
return distance_;
}
- //- Non const access so we can 'transfer' contents for efficiency.
+ //- Non const access so we can 'transfer' contents for efficiency
scalarField& distance()
{
return distance_;
@@ -143,7 +143,6 @@ public:
{
return patchDistance_;
}
-
};
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
index 1ffe2ae82f034af094ffa5ea933b9eb9dad4b8f0..926773ba6c5516f68e17768b0e7c28ee1a2df73c 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
@@ -118,17 +118,10 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::updateCoeffs()
UPstream::msgType() = oldTag+1;
bool filmOk =
- db().objectRegistry::foundObject<filmModelType>
- (
- "surfaceFilmProperties"
- );
+ db().time().foundObject<filmModelType>("surfaceFilmProperties");
- bool pyrOk =
- db().objectRegistry::foundObject<pyrModelType>
- (
- "pyrolysisProperties"
- );
+ bool pyrOk = db().time().foundObject<pyrModelType>("pyrolysisProperties");
if (!filmOk || !pyrOk)
{
@@ -142,7 +135,7 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::updateCoeffs()
// Retrieve film model
const filmModelType& filmModel =
- db().lookupObject<filmModelType>("surfaceFilmProperties");
+ db().time().lookupObject<filmModelType>("surfaceFilmProperties");
const label filmPatchI = filmModel.regionPatchID(patchI);
@@ -154,7 +147,7 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::updateCoeffs()
// Retrieve pyrolysis model
const pyrModelType& pyrModel =
- db().lookupObject<pyrModelType>("pyrolysisProperties");
+ db().time().lookupObject<pyrModelType>("pyrolysisProperties");
const label pyrPatchI = pyrModel.regionPatchID(patchI);
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index 9210d30e576f1b7ba86518265760cf5764a60045..f5bdabd7dd69a90a8ea9fc9661deb4a0ea00cb72 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
@@ -117,20 +117,13 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
int oldTag = UPstream::msgType();
UPstream::msgType() = oldTag+1;
- bool filmOk =
- db().objectRegistry::foundObject<filmModelType>
- (
- "surfaceFilmProperties"
- );
-
+ bool foundFilm =
+ db().time().foundObject<filmModelType>("surfaceFilmProperties");
- bool pyrOk =
- db().objectRegistry::foundObject<pyrModelType>
- (
- "pyrolysisProperties"
- );
+ bool foundPyrolysis =
+ db().time().foundObject<pyrModelType>("pyrolysisProperties");
- if (!filmOk || !pyrOk)
+ if (!foundFilm || !foundPyrolysis)
{
// do nothing on construction - film model doesn't exist yet
return;
@@ -142,10 +135,7 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
// Retrieve film model
const filmModelType& filmModel =
- db().objectRegistry::lookupObject<filmModelType>
- (
- "surfaceFilmProperties"
- );
+ db().time().lookupObject<filmModelType>("surfaceFilmProperties");
const label filmPatchI = filmModel.regionPatchID(patchI);
@@ -157,10 +147,7 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
// Retrieve pyrolysis model
const pyrModelType& pyrModel =
- db().objectRegistry::lookupObject<pyrModelType>
- (
- "pyrolysisProperties"
- );
+ db().time().lookupObject<pyrModelType>("pyrolysisProperties");
const label pyrPatchI = pyrModel.regionPatchID(patchI);
diff --git a/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.C b/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.C
index 01828d085ae94e72ae9632f7b2c404b3efb9731f..74a4416e2d35bbf7bd7e59871e93b704bfc01731 100644
--- a/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.C
+++ b/src/regionModels/regionModel/derivedFvPatches/mappedVariableThicknessWall/mappedVariableThicknessWallFvPatch.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -49,14 +49,10 @@ makeDeltaCoeffs(scalarField& dc) const
const mappedVariableThicknessWallPolyPatch& pp =
refCast<const mappedVariableThicknessWallPolyPatch>(patch());
- const mappedPatchBase& mpp = refCast<const mappedPatchBase>(patch());
-
- const polyMesh& nbrMesh = mpp.sampleMesh();
-
typedef regionModels::regionModel1D modelType;
const modelType& region1D =
- nbrMesh.objectRegistry::lookupObject<modelType>
+ patch().boundaryMesh().mesh().time().lookupObject<modelType>
(
"thermoBaffleProperties"
);
diff --git a/src/regionModels/regionModel/regionModel/regionModel.C b/src/regionModels/regionModel/regionModel/regionModel.C
index 55ced3fe534eddd5e8ef6029907c76d6c6d3461a..0590e4e418ce0b2fe9784e0b867ff8088b127236 100644
--- a/src/regionModels/regionModel/regionModel/regionModel.C
+++ b/src/regionModels/regionModel/regionModel/regionModel.C
@@ -341,7 +341,7 @@ Foam::regionModels::regionModel::regionModel(const fvMesh& mesh)
(
"regionModelProperties",
mesh.time().constant(),
- mesh,
+ mesh.time(),
IOobject::NO_READ,
IOobject::NO_WRITE
)
@@ -376,7 +376,7 @@ Foam::regionModels::regionModel::regionModel
(
regionType + "Properties",
mesh.time().constant(),
- mesh,
+ mesh.time(),
IOobject::MUST_READ,
IOobject::NO_WRITE
)
@@ -421,7 +421,7 @@ Foam::regionModels::regionModel::regionModel
(
regionType + "Properties",
mesh.time().constant(),
- mesh,
+ mesh.time(),
IOobject::NO_READ,
IOobject::NO_WRITE,
true
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
index 617af63382203e67fbca60057c5ff2816f7e22fa..bc6af600b564a9fafd96ce04743b0dd539fb5591 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
@@ -115,12 +115,13 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs()
const label patchI = patch().index();
- const scalar t = db().time().timeOutputValue();
-
// retrieve the film region from the database
const regionModels::regionModel& region =
- db().lookupObject<regionModels::regionModel>("surfaceFilmProperties");
+ db().time().lookupObject<regionModels::regionModel>
+ (
+ "surfaceFilmProperties"
+ );
const regionModels::surfaceFilmModels::kinematicSingleLayer& film =
dynamic_cast
@@ -130,7 +131,24 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs()
// calculate the vector tangential to the patch
- const vectorField n(patch().nf());
+ // note: normal pointing into the domain
+ const vectorField n(-patch().nf());
+
+ // TODO: currently re-evaluating the entire gTan field to return this patch
+ const scalarField gTan(film.gTan()().boundaryField()[patchI] & n);
+
+ if (max(mag(gTan)) < SMALL)
+ {
+ WarningIn
+ (
+ "void Foam::inclinedFilmNusseltHeightFvPatchScalarField::"
+ "updateCoeffs()"
+ )
+ << "Tangential gravity component is zero. This boundary condition "
+ << "is designed to operate on patches inclined with respect to "
+ << "gravity"
+ << endl;
+ }
const volVectorField& nHat = film.nHat();
@@ -146,6 +164,8 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs()
// calculate the wavy film height
+ const scalar t = db().time().timeOutputValue();
+
const scalar GMean = GammaMean_->value(t);
const scalar a = a_->value(t);
const scalar omega = omega_->value(t);
@@ -160,22 +180,6 @@ void Foam::inclinedFilmNusseltHeightFvPatchScalarField::updateCoeffs()
const scalarField Re(max(G, scalar(0.0))/mup);
- // TODO: currently re-evaluating the entire gTan field to return this patch
- const scalarField gTan(film.gTan()().boundaryField()[patchI] & n);
-
- if (max(mag(gTan)) < SMALL)
- {
- WarningIn
- (
- "void Foam::inclinedFilmNusseltHeightFvPatchScalarField::"
- "updateCoeffs()"
- )
- << "Tangential gravity component is zero. This boundary condition "
- << "is designed to operate on patches inclined with respect to "
- << "gravity"
- << endl;
- }
-
operator==
(
pow(3.0*sqr(mup/rhop)/(gTan + ROOTVSMALL), 0.333)*pow(Re, 0.333)
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
index 923a559dfaf077b2bf3531c4990ff390f2d44da7..72a7e9fdc37e28115b11bad6c19da93e86f75316 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
@@ -115,12 +115,13 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::updateCoeffs()
const label patchI = patch().index();
- const scalar t = db().time().timeOutputValue();
-
// retrieve the film region from the database
const regionModels::regionModel& region =
- db().lookupObject<regionModels::regionModel>("surfaceFilmProperties");
+ db().time().lookupObject<regionModels::regionModel>
+ (
+ "surfaceFilmProperties"
+ );
const regionModels::surfaceFilmModels::kinematicSingleLayer& film =
dynamic_cast
@@ -129,8 +130,24 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::updateCoeffs()
>(region);
// calculate the vector tangential to the patch
+ // note: normal pointing into the domain
+ const vectorField n(-patch().nf());
- const vectorField n(patch().nf());
+ // TODO: currently re-evaluating the entire gTan field to return this patch
+ const scalarField gTan(film.gTan()().boundaryField()[patchI] & n);
+
+ if (max(mag(gTan)) < SMALL)
+ {
+ WarningIn
+ (
+ "void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::"
+ "updateCoeffs()"
+ )
+ << "Tangential gravity component is zero. This boundary condition "
+ << "is designed to operate on patches inclined with respect to "
+ << "gravity"
+ << endl;
+ }
const volVectorField& nHat = film.nHat();
@@ -146,6 +163,8 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::updateCoeffs()
// calculate the wavy film height
+ const scalar t = db().time().timeOutputValue();
+
const scalar GMean = GammaMean_->value(t);
const scalar a = a_->value(t);
const scalar omega = omega_->value(t);
@@ -160,22 +179,6 @@ void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::updateCoeffs()
const scalarField Re(max(G, scalar(0.0))/mup);
- // TODO: currently re-evaluating the entire gTan field to return this patch
- const scalarField gTan(film.gTan()().boundaryField()[patchI] & n);
-
- if (max(mag(gTan)) < SMALL)
- {
- WarningIn
- (
- "void Foam::inclinedFilmNusseltInletVelocityFvPatchVectorField::"
- "updateCoeffs()"
- )
- << "Tangential gravity component is zero. This boundary condition "
- << "is designed to operate on patches inclined with respect to "
- << "gravity"
- << endl;
- }
-
operator==(n*pow(gTan*mup/(3.0*rhop), 0.333)*pow(Re, 0.666));
fixedValueFvPatchVectorField::updateCoeffs();
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
index fd3be5ac38564d18c5fb6e02478b04c3d0d65822..fb2d123496b45f83f66ebd6b101fe04a1dc4d541 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -141,10 +141,10 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs()
int oldTag = UPstream::msgType();
UPstream::msgType() = oldTag+1;
- bool ok =
- db().objectRegistry::foundObject<modelType>("surfaceFilmProperties");
+ bool foundFilm =
+ db().time().foundObject<modelType>("surfaceFilmProperties");
- if (!ok)
+ if (!foundFilm)
{
// do nothing on construction - film model doesn't exist yet
return;
@@ -154,7 +154,7 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs()
// Retrieve phase change mass from surface film model
const modelType& filmModel =
- db().objectRegistry::lookupObject<modelType>("surfaceFilmProperties");
+ db().time().lookupObject<modelType>("surfaceFilmProperties");
const label filmPatchI = filmModel.regionPatchID(patchI);
@@ -216,7 +216,6 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs()
}
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void alphatFilmWallFunctionFvPatchScalarField::write(Ostream& os) const
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C
index 7374f80e034b2191b6dceeb2500308642c87d1a8..ee912e61830daad2b5dee8d384d4d5681023a4d4 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/mutkFilmWallFunction/mutkFilmWallFunctionFvPatchScalarField.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -53,10 +53,10 @@ tmp<scalarField> mutkFilmWallFunctionFvPatchScalarField::calcUTau
typedef regionModels::surfaceFilmModels::surfaceFilmModel modelType;
- bool ok =
- db().objectRegistry::foundObject<modelType>("surfaceFilmProperties");
+ bool foundFilm =
+ db().time().foundObject<modelType>("surfaceFilmProperties");
- if (!ok)
+ if (!foundFilm)
{
// do nothing on construction - film model doesn't exist yet
return tuTau;
@@ -66,7 +66,7 @@ tmp<scalarField> mutkFilmWallFunctionFvPatchScalarField::calcUTau
// Retrieve phase change mass from surface film model
const modelType& filmModel =
- db().objectRegistry::lookupObject<modelType>("surfaceFilmProperties");
+ db().time().lookupObject<modelType>("surfaceFilmProperties");
const label filmPatchI = filmModel.regionPatchID(patchI);
diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
index e6cee26e0342b63b720caae1dcf6637eeedda28b..5bf0534819f0404869ee2193d28c5c4725c2d9fd 100644
--- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
+++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C
@@ -245,6 +245,8 @@ void thermoSingleLayer::correctAlpha()
alpha_[i] = 0.0;
}
}
+
+ alpha_.correctBoundaryConditions();
}
else
{
diff --git a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
index 799bac6dfc9ffc1b4340914ea132c597bca2ba59..471295924eb18851af009eac6e06e15685a64b9f 100644
--- a/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
+++ b/src/regionModels/thermoBaffleModels/derivedFvPatchFields/thermoBaffle/thermoBaffleFvPatchScalarField.C
@@ -33,7 +33,6 @@ namespace Foam
namespace compressible
{
-
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
thermoBaffleFvPatchScalarField::
@@ -173,11 +172,7 @@ void thermoBaffleFvPatchScalarField::updateCoeffs()
const fvMesh& thisMesh = patch().boundaryMesh().mesh();
- if
- (
- thisMesh.name() == polyMesh::defaultRegion
- && owner_
- )
+ if (owner_ && thisMesh.name() == polyMesh::defaultRegion)
{
baffle_->evolve();
}
@@ -241,7 +236,5 @@ makePatchTypeField
} // End namespace compressible
} // End namespace Foam
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index 5271b5da6955d79bea817d2a6fc357e1aaa1e85e..862d4ee6be33dbe206ec2144eb3895c861095a93 100644
--- a/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -148,16 +148,12 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
UPstream::msgType() = oldTag+1;
// Get the coupling information from the mappedPatchBase
- const mappedPatchBase& mpp = refCast<const mappedPatchBase>
- (
- patch().patch()
- );
+ const mappedPatchBase& mpp =
+ refCast<const mappedPatchBase>(patch().patch());
const polyMesh& nbrMesh = mpp.sampleMesh();
- const fvPatch& nbrPatch = refCast<const fvMesh>
- (
- nbrMesh
- ).boundary()[mpp.samplePolyPatch().index()];
-
+ const label samplePatchI = mpp.samplePolyPatch().index();
+ const fvPatch& nbrPatch =
+ refCast<const fvMesh>(nbrMesh).boundary()[samplePatchI];
tmp<scalarField> intFld = patchInternalField();
@@ -208,7 +204,7 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
this->refGrad() = 0.0;
- this->valueFraction() = nbrKDelta / (nbrKDelta + myKDelta());
+ this->valueFraction() = nbrKDelta/(nbrKDelta + myKDelta());
mixedFvPatchScalarField::updateCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
index 4a8d812ad5aedf8d2791392aa1dc67b41dc7dca1..5f5e495fdd1c8bfff267439079c930704401fc4d 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -177,7 +177,7 @@ public:
// Acces functions
// Return Ks
- scalarField& Ks()
+ scalarField& Ks()
{
return Ks_;
}
diff --git a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/sourcesProperties b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/sourcesProperties
index 6137d5900e33a0f991e238e97b99a0ec3d1b0968..523f5ad8b922c6d799507827b43ed147a8198620 100644
--- a/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/sourcesProperties
+++ b/tutorials/compressible/rhoLTSPimpleFoam/angledDuct/constant/sourcesProperties
@@ -19,8 +19,6 @@ porosity1
{
type explicitPorositySource;
active true;
- timeStart 0;
- duration 1000000;
selectionMode cellZone;
cellZone porosity;
diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/sourcesProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/sourcesProperties
index 1a3adf4c90dbcad913511bc34ec92168dc1207b1..c49da928e3945ef57d48f7a1fa01228ebbc6cfe3 100644
--- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/sourcesProperties
+++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/sourcesProperties
@@ -19,8 +19,6 @@ source1
{
type fixedTemperatureConstraint;
active true;
- timeStart 0;
- duration 1000000;
selectionMode cellZone;
cellZone porosity;
diff --git a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties
index a73a9bd2b7ce0c63bf7e09a803ccdfa1241ec2b8..10d4404812e1444829d5b5b26dce2b83e886aa04 100644
--- a/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties
+++ b/tutorials/compressible/rhoSimpleFoam/angledDuctExplicitFixedCoeff/constant/sourcesProperties
@@ -19,8 +19,6 @@ fixedTemperaure1
{
type fixedTemperatureConstraint;
active true;
- timeStart 0;
- duration 1000000;
selectionMode cellZone;
cellZone porosity;
@@ -36,8 +34,6 @@ porosity1
{
type explicitPorositySource;
active true;
- timeStart 0;
- duration 1000000;
selectionMode cellZone;
cellZone porosity;
diff --git a/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties b/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties
index 501ab02cb1a37b40aee82205730e0555e0dabb28..e0d33be9147ff332ffa35ef9b745074a11884d97 100644
--- a/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties
+++ b/tutorials/incompressible/pimpleFoam/channel395/constant/sourcesProperties
@@ -19,8 +19,6 @@ momentumSource
{
type pressureGradientExplicitSource;
active on; //on/off switch
- timeStart 0.0; //start time
- duration 1000000.0; //duration
selectionMode all; //cellSet // points //cellZone
pressureGradientExplicitSourceCoeffs
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/sourcesProperties b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/sourcesProperties
index 8b7fb7bcf238ea417a80bcea72015643d29f94c1..e430834314b0c311ff7cad4388222100db6f5854 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/sourcesProperties
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/constant/sourcesProperties
@@ -19,8 +19,6 @@ MRF1
{
type MRFSource;
active true;
- timeStart 0;
- duration 1e100;
selectionMode cellZone;
cellZone rotor;
diff --git a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict
index 3ccea1fbf38d7489afff980ae57dcfe1cd4aeafe..34336b01fa0e622adfee9be505394f49ea253678 100644
--- a/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/mixerVessel2D/system/controlDict
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-application MRFSimpleFoam;
+application simpleFoam;
startFrom startTime;
diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/constant/sourcesProperties b/tutorials/incompressible/simpleFoam/turbineSiting/constant/sourcesProperties
index 47ea4f097841f82e12de1f1ad869e49f15ec261e..335141fe69c7f250b58e190fff7fb68e0a1fba8a 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/constant/sourcesProperties
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/constant/sourcesProperties
@@ -19,8 +19,6 @@ disk1
{
type actuationDiskSource;
active on; //on/off switch
- timeStart 0.0; //start time
- duration 1000.0; //duration
selectionMode cellSet; //cellSet // points //cellZone
cellSet actuationDisk1;//cellSet name when selectionMode = cellSet
@@ -39,8 +37,6 @@ disk2
{
type actuationDiskSource;
active on;
- timeStart 0.0;
- duration 1000.0;
selectionMode cellSet;
cellSet actuationDisk2;