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

mall update to solutionControl's interface. Vuko Vukcevic

Browse source
This commit is contained in:
Hrvoje Jasak 2019-04-09 12:01:28 +01:00
commit aefefb78d9
2 changed files with 27 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -662,8 +662,7 @@ void Foam::solutionControl::calcSteadyConsistentFlux
"void solutionControl::calcSteadyConsistentFlux" "void solutionControl::calcSteadyConsistentFlux"
"\n(" "\n("
"\n surfaceScalarField& phi," "\n surfaceScalarField& phi,"
"\n const volVectorField& U," "\n const volVectorField& U"
"\n const volScalarField& rAU"
"\n)" "\n)"
) << "Either aCoeff or faceU is allocated for field " << UName ) << "Either aCoeff or faceU is allocated for field " << UName
<< " while the other is not." << " while the other is not."
@ -684,8 +683,7 @@ void Foam::solutionControl::calcSteadyConsistentFlux
"void solutionControl::calcSteadyConsistentFlux" "void solutionControl::calcSteadyConsistentFlux"
"\n(" "\n("
"\n surfaceScalarField& phi," "\n surfaceScalarField& phi,"
"\n const volVectorField& U," "\n const volVectorField& U"
"\n const volScalarField& rAU"
"\n)" "\n)"
) << "Index is set, but the aCoeff field is not allocated for " ) << "Index is set, but the aCoeff field is not allocated for "
<< UName << "." << nl << UName << "." << nl
@ -701,8 +699,7 @@ void Foam::solutionControl::calcSteadyConsistentFlux
"void solutionControl::calcSteadyConsistentFlux" "void solutionControl::calcSteadyConsistentFlux"
"\n(" "\n("
"\n surfaceScalarField& phi," "\n surfaceScalarField& phi,"
"\n const volVectorField& U," "\n const volVectorField& U"
"\n const volScalarField& rAU"
"\n)" "\n)"
) << "Index is set, but the faceU field is allocated for " ) << "Index is set, but the faceU field is allocated for "
<< UName << "." << nl << UName << "." << nl
@ -794,8 +791,7 @@ void Foam::solutionControl::calcSteadyConsistentFlux
"void solutionControl::calcSteadyConsistentFlux" "void solutionControl::calcSteadyConsistentFlux"
"\n(" "\n("
"\n surfaceScalarField& phi," "\n surfaceScalarField& phi,"
"\n const volVectorField& U," "\n const volVectorField& U"
"\n const volScalarField& rAU"
"\n)" "\n)"
) << "Either aCoeff or faceU is allocated for field " << UName ) << "Either aCoeff or faceU is allocated for field " << UName
<< " while the other is not." << " while the other is not."
@ -816,8 +812,7 @@ void Foam::solutionControl::calcSteadyConsistentFlux
"void solutionControl::calcSteadyConsistentFlux" "void solutionControl::calcSteadyConsistentFlux"
"\n(" "\n("
"\n surfaceScalarField& phi," "\n surfaceScalarField& phi,"
"\n const volVectorField& U," "\n const volVectorField& U"
"\n const volScalarField& rAU"
"\n)" "\n)"
) << "Index is set, but the aCoeff field is not allocated for " ) << "Index is set, but the aCoeff field is not allocated for "
<< UName << "." << nl << UName << "." << nl
@ -833,8 +828,7 @@ void Foam::solutionControl::calcSteadyConsistentFlux
"void solutionControl::calcSteadyConsistentFlux" "void solutionControl::calcSteadyConsistentFlux"
"\n(" "\n("
"\n surfaceScalarField& phi," "\n surfaceScalarField& phi,"
"\n const volVectorField& U," "\n const volVectorField& U"
"\n const volScalarField& rAU"
"\n)" "\n)"
) << "Index is set, but the faceU field is allocated for " ) << "Index is set, but the faceU field is allocated for "
<< UName << "." << nl << UName << "." << nl
@ -928,11 +922,11 @@ void Foam::solutionControl::calcSteadyMRFConsistentFlux
{ {
FatalErrorIn FatalErrorIn
( (
"void solutionControl::calcSteadyConsistentFlux" "void solutionControl::calcSteadyMRFConsistentFlux"
"\n(" "\n("
"\n surfaceScalarField& phi," "\n surfaceScalarField& phi,"
"\n const volVectorField& U," "\n const volVectorField& U,"
"\n const volScalarField& rAU" "\n const MRFZones& mrfZones"
"\n)" "\n)"
) << "Either aCoeff or faceU is allocated for field " << UName ) << "Either aCoeff or faceU is allocated for field " << UName
<< " while the other is not." << " while the other is not."
@ -954,7 +948,7 @@ void Foam::solutionControl::calcSteadyMRFConsistentFlux
"\n(" "\n("
"\n surfaceScalarField& phi," "\n surfaceScalarField& phi,"
"\n const volVectorField& U," "\n const volVectorField& U,"
"\n const volScalarField& rAU" "\n const MRFZones& mrfZones"
"\n)" "\n)"
) << "Index is set, but the aCoeff field is not allocated for " ) << "Index is set, but the aCoeff field is not allocated for "
<< UName << "." << nl << UName << "." << nl
@ -971,7 +965,7 @@ void Foam::solutionControl::calcSteadyMRFConsistentFlux
"\n(" "\n("
"\n surfaceScalarField& phi," "\n surfaceScalarField& phi,"
"\n const volVectorField& U," "\n const volVectorField& U,"
"\n const volScalarField& rAU" "\n const MRFZones& mrfZones"
"\n)" "\n)"
) << "Index is set, but the faceU field is allocated for " ) << "Index is set, but the faceU field is allocated for "
<< UName << "." << nl << UName << "." << nl
@ -1044,10 +1038,10 @@ void Foam::solutionControl::reconstructTransientVelocity
"void solutionControl::reconstructTransientVelocity" "void solutionControl::reconstructTransientVelocity"
"\n(" "\n("
"\n volVectorField& U," "\n volVectorField& U,"
"\n const surfaceScalarField& phi,"
"\n const volVectorField& ddtUEqn," "\n const volVectorField& ddtUEqn,"
"\n const volScalarField& rAU," "\n const volScalarField& rAU,"
"\n const volScalarField& p" "\n const volScalarField& p"
"\n const surfaceScalarField& phi"
"\n) const" "\n) const"
) << "faceU not calculated for field " << UName ) << "faceU not calculated for field " << UName
<< ". Make sure you have called" << ". Make sure you have called"
@ -1110,7 +1104,8 @@ const Foam::surfaceScalarField& Foam::solutionControl::aCoeff
{ {
FatalErrorIn FatalErrorIn
( (
"const surfaceScalarField& solutionControl::aCoeff() const" "const surfaceScalarField& solutionControl::aCoeff"
"(const word& UName) const"
) << "aCoeff not calculated for field " << UName ) << "aCoeff not calculated for field " << UName
<< ". Make sure you have called" << ". Make sure you have called"
<< " calcTransientConsistentFlux(...) or " << " calcTransientConsistentFlux(...) or "

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

@ -104,6 +104,20 @@ protected:
label corrNonOrtho_; label corrNonOrtho_;
// Fields necessary for time and under-relaxation consistency
//- A coeff (A^~) arising from consistency formulation. Note: we can
// have multiple pressure/velocity systems, hence the PtrList
mutable PtrList<surfaceScalarField> aCoeffPtrs_;
//- Face velocity needed for consistent formulation. Note: we can
// have multiple pressure/velocity systems, hence the PtrList
mutable PtrList<surfaceVectorField> faceUPtrs_;
//- Hash Table containing indices of PtrLists for given names
mutable HashTable<label> indices_;
// Protected Member Functions // Protected Member Functions
//- Read controls from fvSolution dictionary //- Read controls from fvSolution dictionary
@ -194,22 +208,6 @@ protected:
private: private:
// Private data
// Fields necessary for time and under-relaxation consistency
//- A coeff (A^~) arising from consistency formulation. Note: we can
// have multiple pressure/velocity systems, hence the PtrList
mutable PtrList<surfaceScalarField> aCoeffPtrs_;
//- Face velocity needed for consistent formulation. Note: we can
// have multiple pressure/velocity systems, hence the PtrList
mutable PtrList<surfaceVectorField> faceUPtrs_;
//- Hash Table containing indices of PtrLists for given names
mutable HashTable<label> indices_;
// Private member functions // Private member functions
//- Disallow default bitwise copy construct //- Disallow default bitwise copy construct