From 49ba6a8e946ca161157479bb88b1d7dc927fc899 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Wed, 3 Apr 2019 12:55:33 -0700
Subject: [PATCH] ENH: Updating overRhoSimpleFoam and overSimpleFoam to use
oversetInterpolationSuppressed dict.
---
.../overRhoSimpleFoam/createFields.H | 27 ++++++++-----------
.../overSimpleFoam/createOversetFields.H | 24 +++++++----------
.../twoSimpleRotors/system/controlDict | 4 +--
.../twoSimpleRotors/system/fvSchemes | 4 ---
.../cylinderAndBackground/system/fvSchemes | 5 +---
.../background_overset/system/fvSchemes | 6 ++---
6 files changed, 26 insertions(+), 44 deletions(-)
diff --git a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createFields.H
index 2544f3e5598..4114962be72 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/overRhoSimpleFoam/createFields.H
@@ -62,22 +62,17 @@ dimensionedScalar initialMass = fvc::domainIntegrate(rho);
// Add solver-specific interpolations
{
- dictionary oversetDict;
- oversetDict.add("U", true);
- oversetDict.add("p", true);
- oversetDict.add("HbyA", true);
- oversetDict.add("grad(p)", true);
- oversetDict.add("rho", true);
-
- const_cast<dictionary&>
- (
- mesh.schemesDict()
- ).add
- (
- "oversetInterpolationRequired",
- oversetDict,
- true
- );
+ wordHashSet& nonInt =
+ const_cast<wordHashSet&>(Stencil::New(mesh).nonInterpolatedFields());
+
+ nonInt.insert("HbyA");
+ nonInt.insert("grad(p)");
+ nonInt.insert("surfaceIntegrate(phi)");
+ nonInt.insert("surfaceIntegrate(phiHbyA)");
+ nonInt.insert("cellMask");
+ nonInt.insert("cellDisplacement");
+ nonInt.insert("interpolatedCells");
+ nonInt.insert("cellInterpolationWeight");
}
// Mask field for zeroing out contributions on hole cells
diff --git a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createOversetFields.H b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createOversetFields.H
index 7eda905f506..77454095d1f 100644
--- a/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createOversetFields.H
+++ b/applications/solvers/incompressible/simpleFoam/overSimpleFoam/createOversetFields.H
@@ -2,21 +2,17 @@
// Add solver-specific interpolations
{
- dictionary oversetDict;
- oversetDict.add("U", true);
- oversetDict.add("p", true);
- oversetDict.add("HbyA", true);
- oversetDict.add("grad(p)", true);
+ wordHashSet& nonInt =
+ const_cast<wordHashSet&>(Stencil::New(mesh).nonInterpolatedFields());
- const_cast<dictionary&>
- (
- mesh.schemesDict()
- ).add
- (
- "oversetInterpolationRequired",
- oversetDict,
- true
- );
+ nonInt.insert("HbyA");
+ nonInt.insert("grad(p)");
+ nonInt.insert("surfaceIntegrate(phi)");
+ nonInt.insert("surfaceIntegrate(phiHbyA)");
+ nonInt.insert("cellMask");
+ nonInt.insert("cellDisplacement");
+ nonInt.insert("interpolatedCells");
+ nonInt.insert("cellInterpolationWeight");
}
// Mask field for zeroing out contributions on hole cells
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict
index bd60324b263..e620aa08827 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/controlDict
@@ -31,7 +31,7 @@ startTime 0;
stopAt endTime;
-endTime 1.0;
+endTime 0.5;
deltaT 2e-5;
@@ -55,7 +55,7 @@ runTimeModifiable true;
adjustTimeStep true;
-maxCo 0.2;
+maxCo 1.2;
functions
{
diff --git a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSchemes b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSchemes
index 0098c4f3f9f..c25201c34d8 100644
--- a/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSchemes
+++ b/tutorials/compressible/overRhoPimpleDyMFoam/twoSimpleRotors/system/fvSchemes
@@ -68,10 +68,6 @@ fluxRequired
oversetInterpolationSuppressed
{
- grad(p);
- surfaceIntegrate(phiHbyA);
- //grad(pcorr);
- //surfaceIntegrate(((rAUf*magSf)*snGradCorr(pcorr)));
}
// ************************************************************************* //
diff --git a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSchemes b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSchemes
index ec3b5cb4d4d..f0ca15bfda5 100644
--- a/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSchemes
+++ b/tutorials/compressible/overRhoSimpleFoam/hotCylinder/cylinderAndBackground/system/fvSchemes
@@ -61,11 +61,8 @@ oversetInterpolation
method inverseDistance;
}
-oversetInterpolationRequired
+oversetInterpolationSuppressed
{
- epsilon;
- k;
- nut;
}
// ************************************************************************* //
diff --git a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSchemes b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSchemes
index fdfe45fa964..34cb2efc701 100644
--- a/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSchemes
+++ b/tutorials/incompressible/overSimpleFoam/aeroFoil/background_overset/system/fvSchemes
@@ -80,13 +80,11 @@ oversetInterpolation
searchBoxDivisions (100 100 1);
}
-oversetInterpolationRequired
+oversetInterpolationSuppressed
{
- omega;
- k;
- nut;
}
+
wallDist
{
method Poisson;
--
GitLab