From ca1e3e86c9f05265ea80e08c3c2f8ef8c1b794d9 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 30 Apr 2020 15:28:19 +0100
Subject: [PATCH] BUG: fvMesh: read dictionaries if present. Fixes #3.
---
.../utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C | 2 +-
.../mesh/manipulation/splitMeshRegions/splitMeshRegions.C | 2 +-
src/dynamicMesh/fvMeshSubset/fvMeshSubset.C | 2 +-
src/dynamicMesh/polyMeshFilter/polyMeshFilter.C | 2 +-
.../highAspectRatio/highAspectRatioFvGeometryScheme.C | 2 +-
src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
index 7d0909ba5b5..8f9c0b9d7bb 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
+++ b/applications/utilities/mesh/generation/extrude/extrudeMesh/extrudeMesh.C
@@ -704,7 +704,7 @@ int main(int argc, char *argv[])
regionName,
runTimeExtruded.constant(),
runTimeExtruded,
- IOobject::NO_READ,
+ IOobject::READ_IF_PRESENT, // Read fv* if present
IOobject::AUTO_WRITE,
false
),
diff --git a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
index 22060652a6d..aa84e3c65a8 100644
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/splitMeshRegions.C
@@ -680,7 +680,7 @@ autoPtr<mapPolyMesh> createRegionMesh
regionName,
mesh.time().timeName(),
mesh.time(),
- IOobject::NO_READ,
+ IOobject::READ_IF_PRESENT, // read fv* if present
IOobject::AUTO_WRITE
),
mesh
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
index 98a5fac0608..ccd4ec5ddaf 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
@@ -268,7 +268,7 @@ void Foam::fvMeshSubset::removeCellsImpl
baseMesh().name(),
baseMesh().time().timeName(),
baseMesh().time(),
- IOobject::NO_READ,
+ IOobject::READ_IF_PRESENT, // read fv* if present
IOobject::NO_WRITE
),
baseMesh(),
diff --git a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
index d563d0e5e97..3f2e76dc4f6 100644
--- a/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
+++ b/src/dynamicMesh/polyMeshFilter/polyMeshFilter.C
@@ -79,7 +79,7 @@ Foam::autoPtr<Foam::fvMesh> Foam::polyMeshFilter::copyMesh(const fvMesh& mesh)
mesh.name(),
mesh.polyMesh::instance(),
mesh.time(),
- IOobject::NO_READ,
+ IOobject::READ_IF_PRESENT, // read fv* if present
IOobject::NO_WRITE,
false
),
diff --git a/src/finiteVolume/fvMesh/fvGeometryScheme/highAspectRatio/highAspectRatioFvGeometryScheme.C b/src/finiteVolume/fvMesh/fvGeometryScheme/highAspectRatio/highAspectRatioFvGeometryScheme.C
index b9172efda2a..be94d91b8fd 100644
--- a/src/finiteVolume/fvMesh/fvGeometryScheme/highAspectRatio/highAspectRatioFvGeometryScheme.C
+++ b/src/finiteVolume/fvMesh/fvGeometryScheme/highAspectRatio/highAspectRatioFvGeometryScheme.C
@@ -281,7 +281,7 @@ void Foam::highAspectRatioFvGeometryScheme::makeAverageCentres
sumA += a;
}
// This is to deal with zero-area faces. Mark very small faces
- // to be detected in e.g., processorPolyPatch.
+ // to be detected in e.g. processorPolyPatch.
if (sumA >= ROOTVSMALL)
{
faceCentres[facei] = sumAc/sumA;
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 9d573c4783b..27ecd44f029 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -4180,7 +4180,7 @@ void Foam::snappyLayerDriver::addLayers
mesh.name(),
static_cast<polyMesh&>(mesh).instance(),
mesh.time(), // register with runTime
- IOobject::NO_READ,
+ IOobject::READ_IF_PRESENT, // read fv* if present
static_cast<polyMesh&>(mesh).writeOpt()
), // io params from original mesh but new name
mesh, // original mesh
--
GitLab