snappyHexMesh: the addLayersControls sub-dictionary in snappyHexMeshDict is now optional

If

addLayers       off;

then

addLayersControls
{
.
.
.
}

need not be present in the snappyHexMeshDict.
This commit is contained in:
Henry Weller
2022-02-25 09:42:34 +00:00
parent 93be3fc011
commit d87a939ea6

View File

@ -733,9 +733,6 @@ int main(int argc, char *argv[])
// snap-to-surface parameters
const dictionary& snapDict = meshDict.subDict("snapControls");
// layer addition parameters
const dictionary& layerDict = meshDict.subDict("addLayersControls");
// absolute merge distance
const scalar mergeDist = getMergeDistance
(
@ -1223,10 +1220,6 @@ int main(int argc, char *argv[])
// Snap parameters
const snapParameters snapParams(snapDict);
// Layer addition parameters
const layerParameters layerParams(layerDict, mesh.boundaryMesh());
if (wantRefine)
{
cpuTime timer;
@ -1240,13 +1233,11 @@ int main(int argc, char *argv[])
globalToSlavePatch
);
if (!overwrite && !debugLevel)
{
const_cast<Time&>(mesh.time())++;
}
refineDriver.doRefine
(
refineDict,
@ -1256,7 +1247,6 @@ int main(int argc, char *argv[])
motionDict
);
if (!keepPatches && !wantSnap && !wantLayers)
{
removeZeroSizedPatches(mesh);
@ -1324,6 +1314,12 @@ int main(int argc, char *argv[])
{
cpuTime timer;
// Layer addition parameters dictionary
const dictionary& layersDict = meshDict.subDict("addLayersControls");
// Layer addition parameters
const layerParameters layerParams(layersDict, mesh.boundaryMesh());
snappyLayerDriver layerDriver
(
meshRefiner,
@ -1346,7 +1342,7 @@ int main(int argc, char *argv[])
layerDriver.doLayers
(
layerDict,
layersDict,
motionDict,
layerParams,
preBalance,