zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: use thisDb reference when referencing/creating finite-area fields

Browse Source 
COMP: remove faMesh::operator()() in favour of mesh() or thisDb() instead

- makes the purpose and usage clearer
This commit is contained in:
Mark Olesen
2023-11-24 20:06:59 +01:00
parent c9e4b0edac
commit 149cd7042f
49 changed files with 261 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
applications/solvers/finiteArea/liquidFilmFoam/createFaFields.H
View File

@ -5,7 +5,7 @@
(
"h",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -20,7 +20,7 @@
(
"Us",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -34,7 +34,7 @@
(
"phis",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
),
@ -48,7 +48,7 @@
(
"phi2s",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
),
@ -67,7 +67,7 @@
(
"Sm",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -82,7 +82,7 @@
(
"Sd",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -96,7 +96,7 @@
(
"Sg",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -112,7 +112,7 @@
(
"ps",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -134,7 +134,7 @@
(
"manningField",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -147,7 +147,7 @@
(
"frictionFactor",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

4
applications/solvers/finiteArea/liquidFilmFoam/createFvFields.H
View File

@ -7,7 +7,7 @@ volVectorField U
(
"U",
runTime.timeName(),
mesh,
mesh.thisDb(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -22,7 +22,7 @@ volScalarField H
(
"H",
runTime.timeName(),
mesh,
mesh.thisDb(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),

6
applications/solvers/finiteArea/sphereSurfactantFoam/createFaFields.H
View File

@ -5,7 +5,7 @@ areaScalarField Cs
(
"Cs",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -26,7 +26,7 @@ areaVectorField Us
(
"Us",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE
),
@ -58,7 +58,7 @@ edgeScalarField phis
(
"phis",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

2
applications/solvers/finiteArea/sphereSurfactantFoam/createFaMesh.H
View File

@ -1,2 +0,0 @@
// Create Finite Area mesh
faMesh aMesh(mesh);

4
applications/solvers/finiteArea/sphereSurfactantFoam/createVolFields.H
View File

@ -7,7 +7,7 @@
(
"Cvf",
runTime.timeName(),
mesh,
mesh.thisDb(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -24,7 +24,7 @@
(
"U",
runTime.timeName(),
mesh,
mesh.thisDb(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),

6
applications/solvers/finiteArea/surfactantFoam/createFaFields.H
View File

@ -5,7 +5,7 @@ areaScalarField Cs
(
"Cs",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
@ -37,7 +37,7 @@ areaVectorField Us
(
"Us",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::MUST_READ,
IOobject::NO_WRITE
),
@ -51,7 +51,7 @@ edgeScalarField phis
(
"phis",
runTime.timeName(),
mesh,
aMesh.thisDb(),
IOobject::NO_READ,
IOobject::NO_WRITE
),

2
applications/solvers/finiteArea/surfactantFoam/createFaMesh.H
View File

@ -1,2 +0,0 @@
// Create Finite Area mesh
faMesh aMesh(mesh);

4
applications/solvers/finiteArea/surfactantFoam/createVolFields.H
View File

@ -7,7 +7,7 @@
(
"Cvf",
runTime.timeName(),
mesh,
mesh.thisDb(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
@ -24,7 +24,7 @@
(
"U",
runTime.timeName(),
mesh,
mesh.thisDb(),
IOobject::NO_READ,
IOobject::AUTO_WRITE
),

10
applications/utilities/parallelProcessing/redistributePar/parFaFieldDistributorCache.C
View File

@ -106,30 +106,30 @@ void Foam::parFaFieldDistributorCache::read
runTime.processorCase(false);
}
IOobjectList objects; //(mesh.mesh(), runTime.timeName());
IOobjectList objects;
if (readHandler)
{
auto oldHandler = fileOperation::fileHandler(readHandler);
const auto oldComm = UPstream::commWorld(fileHandler().comm());
objects = IOobjectList(mesh.mesh(), runTime.timeName());
objects = IOobjectList(mesh.thisDb(), runTime.timeName());
readHandler = fileOperation::fileHandler(oldHandler);
UPstream::commWorld(oldComm);
}
if (Pstream::master() && decompose)
if (UPstream::master() && decompose)
{
runTime.caseName() = proc0CaseName;
runTime.processorCase(oldProcCase);
}
Info<< "From time " << runTime.timeName()
<< " mesh:" << mesh.mesh().objectRegistry::objectRelPath()
<< " mesh:" << mesh.thisDb().objectRelPath()
<< " have objects:" << objects.names() << endl;
if (Pstream::master() && decompose)
if (UPstream::master() && decompose)
{
runTime.caseName() = baseRunTime.caseName();
runTime.processorCase(false);