From d5a973419a2bbbc68a92f986c9ea3c4ff97f4c5a Mon Sep 17 00:00:00 2001 From: Kutalmis Bercin Date: Thu, 11 Aug 2022 14:24:31 +0100 Subject: [PATCH] STYLE: overset: change massCorrection to fluxCorrection COMP: overset: fixes for SPDP, int64 --- .../oversetPolyPatch/oversetFvPatchField.C | 34 ++++++++++++------- .../oversetPolyPatch/oversetFvPatchField.H | 12 +++---- .../0.orig/T | 2 +- .../0.orig/cellDisplacement | 0 .../0.orig/pointDisplacement | 0 .../0.orig/zoneID | 0 .../Allclean | 0 .../Allrun | 0 .../Allrun.pre | 0 .../README.md | 8 ++--- .../constant/dynamicMeshDict | 0 .../constant/transportProperties | 0 .../system/blockMeshDict | 0 .../system/controlDict | 0 .../system/fvSchemes | 0 .../system/fvSolution | 2 +- .../system/setFieldsDict | 0 .../system/topoSetDict | 0 .../overInterDyMFoam/simpleRotor/0.orig/p_rgh | 2 +- 19 files changed, 34 insertions(+), 26 deletions(-) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/0.orig/T (97%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/0.orig/cellDisplacement (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/0.orig/pointDisplacement (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/0.orig/zoneID (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/Allclean (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/Allrun (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/Allrun.pre (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/README.md (50%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/constant/dynamicMeshDict (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/constant/transportProperties (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/system/blockMeshDict (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/system/controlDict (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/system/fvSchemes (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/system/fvSolution (96%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/system/setFieldsDict (100%) rename tutorials/basic/overLaplacianDyMFoam/{heatTransferMassConservation1D => heatTransferFluxConservation1D}/system/topoSetDict (100%) diff --git a/src/overset/oversetPolyPatch/oversetFvPatchField.C b/src/overset/oversetPolyPatch/oversetFvPatchField.C index 7431dc866e..bec48bb7e3 100644 --- a/src/overset/oversetPolyPatch/oversetFvPatchField.C +++ b/src/overset/oversetPolyPatch/oversetFvPatchField.C @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2016-2021 OpenCFD Ltd. + Copyright (C) 2016-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -43,7 +43,7 @@ Foam::oversetFvPatchField::oversetFvPatchField coupledFvPatchField(p, iF), oversetPatch_(refCast(p)), setHoleCellValue_(false), - massCorrection_(false), + fluxCorrection_(false), interpolateHoleCellValue_(false), holeCellValue_(pTraits::min), fringeUpperCoeffs_(), @@ -65,7 +65,7 @@ Foam::oversetFvPatchField::oversetFvPatchField coupledFvPatchField(ptf, p, iF, mapper), oversetPatch_(refCast(p)), setHoleCellValue_(ptf.setHoleCellValue_), - massCorrection_(ptf.massCorrection_), + fluxCorrection_(ptf.fluxCorrection_), interpolateHoleCellValue_(ptf.interpolateHoleCellValue_), holeCellValue_(ptf.holeCellValue_), fringeUpperCoeffs_(ptf.fringeUpperCoeffs_), @@ -86,7 +86,15 @@ Foam::oversetFvPatchField::oversetFvPatchField coupledFvPatchField(p, iF, dict, false), oversetPatch_(refCast(p, dict)), setHoleCellValue_(dict.getOrDefault("setHoleCellValue", false)), - massCorrection_(dict.getOrDefault("massCorrection", false)), + fluxCorrection_ + ( + dict.getOrDefaultCompat + ( + "fluxCorrection", + {{"massCorrection", 2206}}, + false + ) + ), interpolateHoleCellValue_ ( dict.getOrDefault("interpolateHoleCellValue", false) @@ -125,7 +133,7 @@ Foam::oversetFvPatchField::oversetFvPatchField coupledFvPatchField(ptf), oversetPatch_(ptf.oversetPatch_), setHoleCellValue_(ptf.setHoleCellValue_), - massCorrection_(ptf.massCorrection_), + fluxCorrection_(ptf.fluxCorrection_), interpolateHoleCellValue_(ptf.interpolateHoleCellValue_), holeCellValue_(ptf.holeCellValue_), fringeUpperCoeffs_(ptf.fringeUpperCoeffs_), @@ -145,7 +153,7 @@ Foam::oversetFvPatchField::oversetFvPatchField coupledFvPatchField(ptf, iF), oversetPatch_(ptf.oversetPatch_), setHoleCellValue_(ptf.setHoleCellValue_), - massCorrection_(ptf.massCorrection_), + fluxCorrection_(ptf.fluxCorrection_), interpolateHoleCellValue_(ptf.interpolateHoleCellValue_), holeCellValue_(ptf.holeCellValue_), fringeUpperCoeffs_(ptf.fringeUpperCoeffs_), @@ -411,7 +419,7 @@ void Foam::oversetFvPatchField::fringeFlux template void Foam::oversetFvPatchField::adjustPsi ( - Field& psi, + solveScalarField& psi, const lduAddressing& lduAddr, solveScalarField& result ) const @@ -769,7 +777,7 @@ void Foam::oversetFvPatchField::manipulateMatrix if (ovp.master()) { - if (massCorrection_ || (debug & 2)) + if (fluxCorrection_ || (debug & 2)) { storeFringeCoefficients(matrix); } @@ -1030,9 +1038,9 @@ void Foam::oversetFvPatchField::updateInterfaceMatrix const Pstream::commsTypes commsType ) const { - scalarField& psi = const_cast(psiInternal); + auto& psi = const_cast(psiInternal); - if (massCorrection_ && this->oversetPatch_.master()) + if (fluxCorrection_ && this->oversetPatch_.master()) { adjustPsi(psi, lduAddr, result); } @@ -1057,14 +1065,14 @@ void Foam::oversetFvPatchField::write(Ostream& os) const } os.writeEntryIfDifferent ( - "massCorrection", + "fluxCorrection", false, - massCorrection_ + fluxCorrection_ ); os.writeEntryIfDifferent ( "zone", - -1, + label(-1), zoneId_ ); } diff --git a/src/overset/oversetPolyPatch/oversetFvPatchField.H b/src/overset/oversetPolyPatch/oversetFvPatchField.H index 185e3621a8..340132d94a 100644 --- a/src/overset/oversetPolyPatch/oversetFvPatchField.H +++ b/src/overset/oversetPolyPatch/oversetFvPatchField.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2016-2021 OpenCFD Ltd. + Copyright (C) 2016-2022 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -72,13 +72,13 @@ protected: // Hole cell controls - //- Set hole cell value + //- Flag to set hole cell values const bool setHoleCellValue_; - //- Correct mass - const bool massCorrection_; + //- Flag to correct fluxes + const bool fluxCorrection_; - //- Interpolate hole cell value (from nearby non-hole cell) + //- Flag to interpolate hole cell values (from nearby non-hole cell) const bool interpolateHoleCellValue_; //- Hole cell value @@ -172,7 +172,7 @@ public: // to have been called before void adjustPsi ( - Field& psi, + solveScalarField& psi, const lduAddressing& lduAddr, solveScalarField& result ) const; diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/0.orig/T b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/T similarity index 97% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/0.orig/T rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/T index 335e318a57..ea3f31fd65 100644 --- a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/0.orig/T +++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/T @@ -30,7 +30,7 @@ boundaryField free { type overset; - massCorrection true; + fluxCorrection true; value uniform 300; } diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/0.orig/cellDisplacement b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/cellDisplacement similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/0.orig/cellDisplacement rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/cellDisplacement diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/0.orig/pointDisplacement b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/pointDisplacement similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/0.orig/pointDisplacement rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/pointDisplacement diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/0.orig/zoneID b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/zoneID similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/0.orig/zoneID rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/0.orig/zoneID diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/Allclean b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/Allclean similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/Allclean rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/Allclean diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/Allrun b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/Allrun similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/Allrun rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/Allrun diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/Allrun.pre b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/Allrun.pre similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/Allrun.pre rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/Allrun.pre diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/README.md b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/README.md similarity index 50% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/README.md rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/README.md index 18ea487708..3e8f89552a 100644 --- a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/README.md +++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/README.md @@ -1,17 +1,17 @@ -## Implicit mass conservation test +## Implicit flux conservation test -The implicit mass conservation is switched on in the field (here T) overset BC. +The implicit flux conservation is switched on in the field (here T) overset BC. The keyword is used as: free { type overset; - massCorrection true; + fluxCorrection true; value uniform 300; } A special net fringe flux is output in this tutorial. -Switch `massCorrection` to `false` to evaluate the mass correction. +Switch `fluxCorrection` to `false` to evaluate the flux correction. diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/constant/dynamicMeshDict b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/dynamicMeshDict similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/constant/dynamicMeshDict rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/dynamicMeshDict diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/constant/transportProperties b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/transportProperties similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/constant/transportProperties rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/constant/transportProperties diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/blockMeshDict b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/blockMeshDict similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/blockMeshDict rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/blockMeshDict diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/controlDict b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/controlDict similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/controlDict rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/controlDict diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/fvSchemes b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSchemes similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/fvSchemes rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSchemes diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/fvSolution b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSolution similarity index 96% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/fvSolution rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSolution index fb4422347c..9d78c0849d 100644 --- a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/fvSolution +++ b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/fvSolution @@ -24,7 +24,7 @@ solvers solver PBiCGStab; preconditioner DILU; - //// Note: GAMG not supported with massCorrection switched on + //// Note: GAMG not supported with fluxCorrection switched on //solver GAMG; //smoother GaussSeidel; //nCellsInCoarsestLevel 1; diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/setFieldsDict b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/setFieldsDict similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/setFieldsDict rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/setFieldsDict diff --git a/tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/topoSetDict b/tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/topoSetDict similarity index 100% rename from tutorials/basic/overLaplacianDyMFoam/heatTransferMassConservation1D/system/topoSetDict rename to tutorials/basic/overLaplacianDyMFoam/heatTransferFluxConservation1D/system/topoSetDict diff --git a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh index 6f7c3d19c7..2155d755a2 100644 --- a/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh +++ b/tutorials/multiphase/overInterDyMFoam/simpleRotor/0.orig/p_rgh @@ -31,7 +31,7 @@ boundaryField { type overset; value uniform 0; - massCorrection false; + fluxCorrection false; } top