exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

solutionControl classes are now compiling

Browse source
This commit is contained in:
Vanja Skuric 2016-04-12 09:05:00 +02:00
parent c2886e89e5
commit 11d0c32d20
7 changed files with 31 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.C
View file

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/
#include "simpleControl.H"
#include "Time.H"
#include "foamTime.H"
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //

14
src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.C
View file

@ -81,8 +81,11 @@ void Foam::solutionControl::read(const bool absTolOnly)
}
else
{
FatalErrorInFunction
<< "Residual data for " << iter().keyword()
FatalErrorIn
(
"void Foam::solutionControl::read"
"(const bool absTolOnly)"
) << "Residual data for " << iter().keyword()
<< " must be specified as a dictionary"
<< exit(FatalError);
}
@ -107,8 +110,11 @@ void Foam::solutionControl::read(const bool absTolOnly)
}
else
{
FatalErrorInFunction
<< "Residual data for " << iter().keyword()
FatalErrorIn
(
"void Foam::solutionControl::read"
"(const bool absTolOnly)"
) << "Residual data for " << iter().keyword()
<< " must be specified as a dictionary"
<< exit(FatalError);
}

12
src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControl.H
View file

@ -33,6 +33,10 @@ Description
#define solutionControl_H
#include "fvMesh.H"
#include "surfaceMesh.H"
#include "fvsPatchField.H"
#include "fvMatrices.H"
#include "wordRe.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -216,16 +220,16 @@ public:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "solutionControlI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifdef NoRepository
#include "solutionControlTemplates.C"
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "solutionControlI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#endif
// ************************************************************************* //

8
src/finiteVolume/cfdTools/general/solutionControl/solutionControl/solutionControlTemplates.C
View file

@ -34,18 +34,18 @@ void Foam::solutionControl::storePrevIter() const
{
typedef GeometricField<Type, fvPatchField, volMesh> GeoField;
HashTable<GeoField*>
HashTable<const GeoField*>
flds(mesh_.objectRegistry::lookupClass<GeoField>());
forAllIter(typename HashTable<GeoField*>, flds, iter)
forAllIter(typename HashTable<const GeoField*>, flds, iter)
{
GeoField& fld = *iter();
const GeoField& fld = *iter();
const word& fName = fld.name();
size_t prevIterField = fName.find("PrevIter");
if ((prevIterField == word::npos) && mesh_.relaxField(fName))
if ((prevIterField == word::npos) && mesh_.solutionDict().relax(fName))
{
if (debug)
{

4
src/finiteVolume/fvMesh/fvMesh.C
View file

@ -103,6 +103,7 @@ Foam::fvMesh::fvMesh(const IOobject& io)
:
polyMesh(io),
surfaceInterpolation(*this),
data(static_cast<const objectRegistry&>(*this)),
boundary_(*this, boundaryMesh()),
lduPtr_(NULL),
curTimeIndex_(time().timeIndex()),
@ -205,6 +206,7 @@ Foam::fvMesh::fvMesh
:
polyMesh(io, points, faces, allOwner, allNeighbour, syncPar),
surfaceInterpolation(*this),
data(static_cast<const objectRegistry&>(*this)),
boundary_(*this),
lduPtr_(NULL),
curTimeIndex_(time().timeIndex()),
@ -235,6 +237,7 @@ Foam::fvMesh::fvMesh
:
polyMesh(io, points, faces, cells, syncPar),
surfaceInterpolation(*this),
data(static_cast<const objectRegistry&>(*this)),
boundary_(*this),
lduPtr_(NULL),
curTimeIndex_(time().timeIndex()),
@ -282,6 +285,7 @@ Foam::fvMesh::fvMesh
syncPar
),
surfaceInterpolation(*this),
data(static_cast<const objectRegistry&>(*this)),
boundary_(*this),
lduPtr_(NULL),
curTimeIndex_(time().timeIndex()),

4
src/finiteVolume/fvMesh/fvMesh.H
View file

@ -52,6 +52,7 @@ SourceFiles
#include "primitiveMesh.H"
#include "fvBoundaryMesh.H"
#include "surfaceInterpolation.H"
#include "data.H"
#include "DimensionedField.H"
#include "volFieldsFwd.H"
#include "surfaceFieldsFwd.H"
@ -76,7 +77,8 @@ class fvMesh
:
public polyMesh,
public lduMesh,
public surfaceInterpolation
public surfaceInterpolation,
public data
{
// Private data

1
src/foam/fields/GeometricFields/GeometricField/GeometricField.C
View file

@ -27,6 +27,7 @@ License
#include "foamTime.H"
#include "demandDrivenData.H"
#include "dictionary.H"
#include "data.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //