diff --git a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C index fd9647f430..5dffba7991 100644 --- a/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C +++ b/applications/utilities/mesh/manipulation/refineMesh/refineMesh.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -264,9 +264,9 @@ int main(int argc, char *argv[]) Info<< "3D case; refining all directions" << nl << endl; wordList directions(3); - directions[0] = "tan1"; - directions[1] = "tan2"; - directions[2] = "normal"; + directions[0] = "e1"; + directions[1] = "e2"; + directions[2] = "e3"; refineDict.add("directions", directions); // Use hex cutter @@ -281,20 +281,20 @@ int main(int argc, char *argv[]) if (dirs.x() == -1) { Info<< "2D case; refining in directions y,z\n" << endl; - directions[0] = "tan2"; - directions[1] = "normal"; + directions[0] = "e2"; + directions[1] = "e3"; } else if (dirs.y() == -1) { Info<< "2D case; refining in directions x,z\n" << endl; - directions[0] = "tan1"; - directions[1] = "normal"; + directions[0] = "e1"; + directions[1] = "e3"; } else { Info<< "2D case; refining in directions x,y\n" << endl; - directions[0] = "tan1"; - directions[1] = "tan2"; + directions[0] = "e1"; + directions[1] = "e2"; } refineDict.add("directions", directions); @@ -306,8 +306,8 @@ int main(int argc, char *argv[]) refineDict.add("coordinateSystem", "global"); dictionary coeffsDict; - coeffsDict.add("tan1", vector(1, 0, 0)); - coeffsDict.add("tan2", vector(0, 1, 0)); + coeffsDict.add("e1", vector(1, 0, 0)); + coeffsDict.add("e2", vector(0, 1, 0)); refineDict.add("globalCoeffs", coeffsDict); refineDict.add("geometricCut", "false"); diff --git a/etc/caseDicts/annotated/autoRefineMeshDict b/etc/caseDicts/annotated/autoRefineMeshDict index e83fc43039..9860ad2cfc 100644 --- a/etc/caseDicts/annotated/autoRefineMeshDict +++ b/etc/caseDicts/annotated/autoRefineMeshDict @@ -73,26 +73,26 @@ selectHanging false; coordinateSystem global; //coordinateSystem patchLocal; -// .. and its coefficients. x,y in this case. (normal = tan1^tan2) +// .. and its coefficients. x,y in this case. (normal e3 = e1^e2) globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { - patch outside; // Normal direction is facenormal of zero'th face of patch - tan1 (1 0 0); + patch outside; // Normal direction is normal of zero'th face of patch + e1 (1 0 0); } // List of directions to refine directions ( - tan1 - tan2 - normal + e1 + e2 + e3 ); // refinement level difference between neighbouring cells. Set to large if diff --git a/etc/caseDicts/annotated/refineMeshDict b/etc/caseDicts/annotated/refineMeshDict index 6b58ead019..506da31e5a 100644 --- a/etc/caseDicts/annotated/refineMeshDict +++ b/etc/caseDicts/annotated/refineMeshDict @@ -29,26 +29,26 @@ coordinateSystem global; //coordinateSystem patchLocal; //coordinateSystem fieldBased; -// .. and its coefficients. x,y in this case. (normal direction is calculated -// as tan1^tan2) +// .. and its coefficients. x,y in this case. (normal (e3) direction is +// calculated as e1^e2) globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { - patch outside; // Normal direction is facenormal of zero'th face of patch - tan1 (1 0 0); + patch outside; // Normal direction is facenormal of zero'th face of patch + e1 (1 0 0); } // List of directions to refine, if global or patchLocal directions ( - tan1 - tan2 - normal + e1 + e2 + e3 ); // List of directions to refine, if "fieldBased". Keep in mind that these diff --git a/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict b/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict index bea425cba9..91b8f46078 100644 --- a/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict +++ b/etc/caseDicts/mesh/manipulation/refineRegion/refineMeshDict @@ -20,15 +20,15 @@ coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } directions // comment out as required ( - tan1 - tan2 - normal + e1 + e2 + e3 ); useHexTopology no; diff --git a/src/dynamicMesh/meshCut/directions/directions.C b/src/dynamicMesh/meshCut/directions/directions.C index 7c1e88db4d..058550ab5e 100644 --- a/src/dynamicMesh/meshCut/directions/directions.C +++ b/src/dynamicMesh/meshCut/directions/directions.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,9 +45,9 @@ namespace Foam 3 >::names[] = { - "tan1", - "tan2", - "normal" + "e1", + "e2", + "e3" }; } @@ -286,9 +286,9 @@ Foam::directions::directions const wordList wantedDirs(dict.lookup("directions")); const word coordSystem(dict.lookup("coordinateSystem")); - bool wantNormal = false; - bool wantTan1 = false; - bool wantTan2 = false; + bool wantE3 = false; + bool wantE1 = false; + bool wantE2 = false; label nDirs = 0; if (coordSystem != "fieldBased") @@ -297,17 +297,17 @@ Foam::directions::directions { directionType wantedDir = directionTypeNames_[wantedDirs[i]]; - if (wantedDir == NORMAL) + if (wantedDir == e3) { - wantNormal = true; + wantE3 = true; } - else if (wantedDir == TAN1) + else if (wantedDir == e1) { - wantTan1 = true; + wantE1 = true; } - else if (wantedDir == TAN2) + else if (wantedDir == e2) { - wantTan2 = true; + wantE2 = true; } } } @@ -317,32 +317,32 @@ Foam::directions::directions { const dictionary& globalDict = dict.subDict("globalCoeffs"); - vector tan1(globalDict.lookup("tan1")); - check2D(correct2DPtr, tan1); + vector e1(globalDict.lookup("e1")); + check2D(correct2DPtr, e1); - vector tan2(globalDict.lookup("tan2")); - check2D(correct2DPtr, tan2); + vector e2(globalDict.lookup("e2")); + check2D(correct2DPtr, e2); - vector normal = tan1 ^ tan2; - normal /= mag(normal); + vector e3 = e1 ^ e2; + e3 /= mag(e3); Info<< "Global Coordinate system:" << endl - << " normal : " << normal << endl - << " tan1 : " << tan1 << endl - << " tan2 : " << tan2 + << " e3 : " << e3 << endl + << " e1 : " << e1 << endl + << " e2 : " << e2 << endl << endl; - if (wantNormal) + if (wantE3) { - operator[](nDirs++) = vectorField(1, normal); + operator[](nDirs++) = vectorField(1, e3); } - if (wantTan1) + if (wantE1) { - operator[](nDirs++) = vectorField(1, tan1); + operator[](nDirs++) = vectorField(1, e1); } - if (wantTan2) + if (wantE2) { - operator[](nDirs++) = vectorField(1, tan2); + operator[](nDirs++) = vectorField(1, e2); } } else if (coordSystem == "patchLocal") @@ -364,28 +364,28 @@ Foam::directions::directions // Take zeroth face on patch const polyPatch& pp = mesh.boundaryMesh()[patchi]; - vector tan1(patchDict.lookup("tan1")); + vector e1(patchDict.lookup("e1")); const vector& n0 = pp.faceNormals()[0]; if (correct2DPtr) { - tan1 = correct2DPtr->planeNormal() ^ n0; + e1 = correct2DPtr->planeNormal() ^ n0; WarningInFunction - << "Discarding user specified tan1 since 2D case." << endl - << "Recalculated tan1 from face normal and planeNormal as " - << tan1 << endl << endl; + << "Discarding user specified e1 since 2D case." << endl + << "Recalculated e1 from face normal and planeNormal as " + << e1 << endl << endl; } Switch useTopo(dict.lookup("useHexTopology")); - vectorField normalDirs; - vectorField tan1Dirs; + vectorField e3Dirs; + vectorField e1Dirs; - if (wantNormal || wantTan2) + if (wantE3 || wantE2) { - normalDirs = + e3Dirs = propagateDirection ( mesh, @@ -395,35 +395,35 @@ Foam::directions::directions n0 ); - if (wantNormal) + if (wantE3) { - this->operator[](nDirs++) = normalDirs; + this->operator[](nDirs++) = e3Dirs; } } - if (wantTan1 || wantTan2) + if (wantE1 || wantE2) { - tan1Dirs = + e1Dirs = propagateDirection ( mesh, useTopo, pp, - vectorField(pp.size(), tan1), - tan1 + vectorField(pp.size(), e1), + e1 ); - if (wantTan1) + if (wantE1) { - this->operator[](nDirs++) = tan1Dirs; + this->operator[](nDirs++) = e1Dirs; } } - if (wantTan2) + if (wantE2) { - tmp tan2Dirs = normalDirs ^ tan1Dirs; + tmp e2Dirs = e3Dirs ^ e1Dirs; - this->operator[](nDirs++) = tan2Dirs; + this->operator[](nDirs++) = e2Dirs; } } else if (coordSystem == "fieldBased") diff --git a/src/dynamicMesh/meshCut/directions/directions.H b/src/dynamicMesh/meshCut/directions/directions.H index 10658a4aaf..c159155bb5 100644 --- a/src/dynamicMesh/meshCut/directions/directions.H +++ b/src/dynamicMesh/meshCut/directions/directions.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2011-2020 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -74,9 +74,9 @@ public: //- Enumeration listing the possible coordinate directions. enum directionType { - TAN1, - TAN2, - NORMAL + e1, + e2, + e3 }; @@ -107,8 +107,8 @@ private: const vectorField& dirs ); - //- Check if vec has no component in 2D normal direction. Exits if - // so. + //- Check if vec has no component in 2D normal direction. + // Exits if so. static void check2D ( const twoDPointCorrector* correct2DPtr, diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1 index 7aaf8e7546..02941ef2ef 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range1 @@ -27,17 +27,17 @@ set range1; coordinateSystem fieldBased; // .. and its coefficients. x,y in this case. (normal direction is calculated -// as tan1^tan2) +// as e1 ^e2 ) globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { - patch maxX; // Normal direction is facenormal of zero'th face of patch - tan1 (1 -1 0); + patch maxX; // Normal direction is facenormal of zero'th face of patch + e1 (1 -1 0); } // List of directions to refine diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2 index 7aaf8e7546..b9356cdf62 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range2 @@ -27,17 +27,17 @@ set range1; coordinateSystem fieldBased; // .. and its coefficients. x,y in this case. (normal direction is calculated -// as tan1^tan2) +// as e1 ^e2 ) globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { - patch maxX; // Normal direction is facenormal of zero'th face of patch - tan1 (1 -1 0); + patch maxX; // Normal direction is facenormal of zero'th face of patch + e1 (1 -1 0); } // List of directions to refine diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3 index 7aaf8e7546..02941ef2ef 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.range3 @@ -27,17 +27,17 @@ set range1; coordinateSystem fieldBased; // .. and its coefficients. x,y in this case. (normal direction is calculated -// as tan1^tan2) +// as e1 ^e2 ) globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { - patch maxX; // Normal direction is facenormal of zero'th face of patch - tan1 (1 -1 0); + patch maxX; // Normal direction is facenormal of zero'th face of patch + e1 (1 -1 0); } // List of directions to refine diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1 index 7bf710dd23..6e6963eb43 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier1 @@ -26,23 +26,23 @@ coordinateSystem global; //coordinateSystem patchLocal; // .. and its coefficients. x,y in this case. (normal direction is calculated -// as tan1^tan2) +// as e1 ^e2 ) globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { - patch outside; // Normal direction is facenormal of zero'th face of patch - tan1 (1 0 0); + patch outside; // Normal direction is facenormal of zero'th face of patch + e1 (1 0 0); } // List of directions to refine directions ( - normal + e3 ); // Whether to use hex topology. This will diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2 index 0b4c74a41e..a896dc78b5 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier2 @@ -26,23 +26,23 @@ coordinateSystem global; //coordinateSystem patchLocal; // .. and its coefficients. x,y in this case. (normal direction is calculated -// as tan1^tan2) +// as e1 ^e2 ) globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { - patch outside; // Normal direction is facenormal of zero'th face of patch - tan1 (1 0 0); + patch outside; // Normal direction is facenormal of zero'th face of patch + e1 (1 0 0); } // List of directions to refine directions ( - normal + e3 ); // Whether to use hex topology. This will diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3 index 34291e2a3e..64eba2f3da 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier3 @@ -26,23 +26,23 @@ coordinateSystem global; //coordinateSystem patchLocal; // .. and its coefficients. x,y in this case. (normal direction is calculated -// as tan1^tan2) +// as e1 ^e2 ) globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { - patch outside; // Normal direction is facenormal of zero'th face of patch - tan1 (1 0 0); + patch outside; // Normal direction is facenormal of zero'th face of patch + e1 (1 0 0); } // List of directions to refine directions ( - normal + e3 ); // Whether to use hex topology. This will diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4 index 9771a4e46e..2fb29f9731 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier4 @@ -26,23 +26,23 @@ coordinateSystem global; //coordinateSystem patchLocal; // .. and its coefficients. x,y in this case. (normal direction is calculated -// as tan1^tan2) +// as e1 ^e2 ) globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { - patch outside; // Normal direction is facenormal of zero'th face of patch - tan1 (1 0 0); + patch outside; // Normal direction is facenormal of zero'th face of patch + e1 (1 0 0); } // List of directions to refine directions ( - normal + e3 ); // Whether to use hex topology. This will diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5 index 5b9e4abd9f..f59c6543c2 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier5 @@ -26,23 +26,23 @@ coordinateSystem global; //coordinateSystem patchLocal; // .. and its coefficients. x,y in this case. (normal direction is calculated -// as tan1^tan2) +// as e1 ^e2 ) globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { - patch outside; // Normal direction is facenormal of zero'th face of patch - tan1 (1 0 0); + patch outside; // Normal direction is facenormal of zero'th face of patch + e1 (1 0 0); } // List of directions to refine directions ( - normal + e3 ); // Whether to use hex topology. This will diff --git a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6 b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6 index b3f26c0909..14b1a48e81 100644 --- a/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6 +++ b/tutorials/mesh/refineMesh/refineFieldDirs/system/refineMeshDict.tier6 @@ -26,23 +26,23 @@ coordinateSystem global; //coordinateSystem patchLocal; // .. and its coefficients. x,y in this case. (normal direction is calculated -// as tan1^tan2) +// as e1 ^e2 ) globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { - patch outside; // Normal direction is facenormal of zero'th face of patch - tan1 (1 0 0); + patch outside; // Normal direction is facenormal of zero'th face of patch + e1 (1 0 0); } // List of directions to refine directions ( - normal + e3 ); // Whether to use hex topology. This will diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict index eacfc27942..bf72021113 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle/system/refineMeshDict @@ -21,11 +21,11 @@ coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } -directions ( tan1 tan2 ); +directions (e1 e2); useHexTopology yes; diff --git a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict index a5161e3d56..422491e101 100644 --- a/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/LES/throttle3D/system/refineMeshDict @@ -21,12 +21,12 @@ coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); - tan3 (0 0 1); + e1 (1 0 0); + e2 (0 1 0); + e3 (0 0 1); } -directions ( tan1 tan2 tan3 ); +directions (e1 e2 e3); useHexTopology yes; diff --git a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict index eacfc27942..bf72021113 100644 --- a/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/RAS/throttle/system/refineMeshDict @@ -21,11 +21,11 @@ coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } -directions ( tan1 tan2 ); +directions (e1 e2); useHexTopology yes; diff --git a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict index 5e5e786796..6ddac6a5d6 100644 --- a/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict +++ b/tutorials/multiphase/interFoam/LES/nozzleFlow2D/system/refineMeshDict @@ -21,17 +21,17 @@ coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { patch outside; - tan1 (1 0 0); + e1 (1 0 0); } -directions ( tan1 ); +directions (e1); useHexTopology no; diff --git a/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict.orig b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict.orig index 341d5de2c7..188b2fe19a 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict.orig +++ b/tutorials/multiphase/interFoam/RAS/DTCHull/system/refineMeshDict.orig @@ -21,17 +21,17 @@ coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { patch outside; - tan1 (1 0 0); + e1 (1 0 0); } -directions (tan1 tan2); +directions (e1 e2); useHexTopology no; diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict.orig b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict.orig index d85a027842..188b2fe19a 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict.orig +++ b/tutorials/multiphase/interFoam/RAS/DTCHullMoving/system/refineMeshDict.orig @@ -21,17 +21,17 @@ coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { patch outside; - tan1 (1 0 0); + e1 (1 0 0); } -directions ( tan1 tan2 ); +directions (e1 e2); useHexTopology no; diff --git a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict.orig b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict.orig index d85a027842..188b2fe19a 100644 --- a/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict.orig +++ b/tutorials/multiphase/interFoam/RAS/DTCHullWave/system/refineMeshDict.orig @@ -21,17 +21,17 @@ coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { patch outside; - tan1 (1 0 0); + e1 (1 0 0); } -directions ( tan1 tan2 ); +directions (e1 e2); useHexTopology no; diff --git a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/refineMeshDict b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/refineMeshDict index 4baa32ebbe..c4e74c6c11 100644 --- a/tutorials/multiphase/interFoam/RAS/planingHullW3/system/refineMeshDict +++ b/tutorials/multiphase/interFoam/RAS/planingHullW3/system/refineMeshDict @@ -21,17 +21,17 @@ coordinateSystem global; globalCoeffs { - tan1 ( 1 0 0 ); - tan2 ( 0 1 0 ); + e1 (1 0 0); + e2 (0 1 0); } patchLocalCoeffs { patch outside; - tan1 ( 1 0 0 ); + e1 (1 0 0); } -directions ( tan1 tan2 ); +directions (e1 e2); useHexTopology no; diff --git a/tutorials/multiphase/interFoam/laminar/wave/system/refineMeshDictX b/tutorials/multiphase/interFoam/laminar/wave/system/refineMeshDictX index 23067499cd..702a776474 100644 --- a/tutorials/multiphase/interFoam/laminar/wave/system/refineMeshDictX +++ b/tutorials/multiphase/interFoam/laminar/wave/system/refineMeshDictX @@ -21,13 +21,13 @@ coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } directions ( - tan1 + e1 ); useHexTopology true; diff --git a/tutorials/multiphase/interFoam/laminar/wave/system/refineMeshDictY b/tutorials/multiphase/interFoam/laminar/wave/system/refineMeshDictY index 5652348644..3ba0c0cff4 100644 --- a/tutorials/multiphase/interFoam/laminar/wave/system/refineMeshDictY +++ b/tutorials/multiphase/interFoam/laminar/wave/system/refineMeshDictY @@ -21,13 +21,13 @@ coordinateSystem global; globalCoeffs { - tan1 (1 0 0); - tan2 (0 1 0); + e1 (1 0 0); + e2 (0 1 0); } directions ( - tan2 + e2 ); useHexTopology true;