From 5ab1021211848adab0fbd4b13a753bbe1566b6a4 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 28 Mar 2019 15:17:13 +0000
Subject: [PATCH] ENH: overset: move to oversetInterpolationSuppressed. Part of
#1041.
---
.../overLaplacianDyMFoam/createFields.H | 17 -----------------
.../overPotentialFoam/createFields.H | 19 ++++++-------------
.../heatTransfer/system/fvSchemes | 8 ++++++--
.../cylinderAndBackground/system/fvSchemes | 1 -
4 files changed, 12 insertions(+), 33 deletions(-)
diff --git a/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/createFields.H b/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/createFields.H
index fc66a21b162..62036fcc76a 100644
--- a/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/createFields.H
+++ b/applications/solvers/basic/laplacianFoam/overLaplacianDyMFoam/createFields.H
@@ -13,23 +13,6 @@
mesh
);
- // Add overset specific interpolations
- {
- dictionary oversetDict;
- oversetDict.add("T", true);
-
- const_cast<dictionary&>
- (
- mesh.schemesDict()
- ).add
- (
- "oversetInterpolationRequired",
- oversetDict,
- true
- );
- }
-
-
Info<< "Reading transportProperties\n" << endl;
IOdictionary transportProperties
diff --git a/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
index 80f04a8a68d..d39f3044b71 100644
--- a/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
+++ b/applications/solvers/basic/potentialFoam/overPotentialFoam/createFields.H
@@ -121,21 +121,14 @@ mesh.setFluxRequired(Phi.name());
#include "createMRF.H"
-// Add overset specific interpolations
+// Add solver-specific interpolations
{
- dictionary oversetDict;
- oversetDict.add("Phi", true);
- oversetDict.add("U", true);
+ wordHashSet& nonInt =
+ const_cast<wordHashSet&>(Stencil::New(mesh).nonInterpolatedFields());
+
+ nonInt.insert("cellMask");
+ nonInt.insert("interpolatedCells");
- const_cast<dictionary&>
- (
- mesh.schemesDict()
- ).add
- (
- "oversetInterpolationRequired",
- oversetDict,
- true
- );
}
// Mask field for zeroing out contributions on hole cells
diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes
index aaf2392bd19..ac3a013d5e0 100644
--- a/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes
+++ b/tutorials/basic/overLaplacianDyMFoam/heatTransfer/system/fvSchemes
@@ -74,9 +74,13 @@ oversetInterpolation
//searchBoxDivisions (100 100 1);
}
-oversetInterpolationRequired
+
+// Any additional fields that should not be interpolated
+oversetInterpolationSuppresed
{
- // Any additional fields that require overset interpolation
+ // For backwards compatibility; should not really be suppressed
+ grad(T);
}
+
// ************************************************************************* //
diff --git a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes
index e25ea6f5fcd..7a4160973b6 100644
--- a/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes
+++ b/tutorials/basic/overPotentialFoam/cylinder/cylinderAndBackground/system/fvSchemes
@@ -53,5 +53,4 @@ oversetInterpolation
}
-
// ************************************************************************* //
--
GitLab