diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/UEqn.H b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/UEqn.H index 430e60c848..eaaa3e60c9 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/UEqn.H +++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/UEqn.H @@ -5,7 +5,7 @@ tmp UEqn fvm::ddt(U) + fvm::div(phi, U) + turbulence->divDevReff(U) - == + == fvOptions(U) ); @@ -17,7 +17,7 @@ rAU = 1.0/UEqn().A(); if (pimple.momentumPredictor()) { - solve(UEqn() == -fvc::grad(p) + fvOptions(U)); + solve(UEqn() == -fvc::grad(p)); fvOptions.correct(U); } diff --git a/applications/utilities/postProcessing/graphics/PV398Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV398Readers/Allwmake index 33d6bd18dd..1469999cb6 100755 --- a/applications/utilities/postProcessing/graphics/PV398Readers/Allwmake +++ b/applications/utilities/postProcessing/graphics/PV398Readers/Allwmake @@ -2,21 +2,26 @@ cd ${0%/*} || exit 1 # run from this directory #set -x -if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] -then - [ -n "$PV_PLUGIN_PATH" ] || { - echo "$0 : PV_PLUGIN_PATH not valid - it is unset" - exit 1 - } +if [ "$ParaView_VERSION" == "3.98.1" ] + then + if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] + then + [ -n "$PV_PLUGIN_PATH" ] || { + echo "$0 : PV_PLUGIN_PATH not valid - it is unset" + exit 1 + } - # ensure CMake gets the correct C++ compiler - [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + # ensure CMake gets the correct C++ compiler + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" - wmake libso vtkPV398Readers - PV398blockMeshReader/Allwmake - PV398FoamReader/Allwmake + wmake libso vtkPV398Readers + PV398blockMeshReader/Allwmake + PV398FoamReader/Allwmake + else + echo "ERROR: ParaView not found in $ParaView_DIR" + fi else - echo "ERROR: ParaView not found in $ParaView_DIR" + echo "WARN: PV398 readers not building: ParaView_VERSION=$ParaView_VERSION" fi # ----------------------------------------------------------------- end-of-file diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake index 1568f8afb8..03b352116e 100755 --- a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake +++ b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake @@ -2,21 +2,26 @@ cd ${0%/*} || exit 1 # run from this directory #set -x -if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] -then - [ -n "$PV_PLUGIN_PATH" ] || { - echo "$0 : PV_PLUGIN_PATH not valid - it is unset" - exit 1 - } +if [ "$ParaView_VERSION" != "3.98.1" ] + then + if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ] + then + [ -n "$PV_PLUGIN_PATH" ] || { + echo "$0 : PV_PLUGIN_PATH not valid - it is unset" + exit 1 + } - # ensure CMake gets the correct C++ compiler - [ -n "$WM_CXX" ] && export CXX="$WM_CXX" + # ensure CMake gets the correct C++ compiler + [ -n "$WM_CXX" ] && export CXX="$WM_CXX" - wmake libso vtkPV3Readers - PV3blockMeshReader/Allwmake - PV3FoamReader/Allwmake + wmake libso vtkPV3Readers + PV3blockMeshReader/Allwmake + PV3FoamReader/Allwmake + else + echo "ERROR: ParaView not found in $ParaView_DIR" + fi else - echo "ERROR: ParaView not found in $ParaView_DIR" + echo "WARN: PV3 readers not building: ParaView_VERSION=$ParaView_VERSION" fi # ----------------------------------------------------------------- end-of-file diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H index 0b9d4f70d9..76a833ba61 100644 --- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H +++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/processorCyclic/processorCyclicPolyPatch.H @@ -45,7 +45,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class processorCyclicPolyPatch Declaration + Class processorCyclicPolyPatch Declaration \*---------------------------------------------------------------------------*/ class processorCyclicPolyPatch @@ -63,8 +63,6 @@ class processorCyclicPolyPatch //- Index of originating patch mutable label referPatchID_; - // Private member functions - protected: @@ -223,8 +221,7 @@ public: // Destructor - - virtual ~processorCyclicPolyPatch(); + virtual ~processorCyclicPolyPatch(); // Member functions diff --git a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C index 63cef912b1..e5deecdf11 100644 --- a/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C +++ b/src/edgeMesh/extendedFeatureEdgeMesh/extendedFeatureEdgeMeshTemplates.C @@ -65,8 +65,7 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges labelListList featurePointFeatureEdges(nFeatPts); forAll(featurePointFeatureEdges, pI) { - featurePointFeatureEdges[pI] = - labelList(pointEdges[featurePoints[pI]].size(), -1); + featurePointFeatureEdges[pI] = pointEdges[featurePoints[pI]]; } // Mapping between old and new indices, there is entry in the map for each @@ -74,6 +73,10 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges // >= 0 corresponds to the index labelList pointMap(sFeatLocalPts.size(), -1); + // Mapping between surface edge index and its feature edge index. -1 if it + // is not a feature edge + labelList edgeMap(sFeatEds.size(), -1); + // Noting when the normal of a face has been used so not to duplicate labelList faceMap(surf.size(), -1); @@ -98,6 +101,8 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges { label sFEI = featureEdges[i]; + edgeMap[sFEI] = i; + const edge& fE(sFeatEds[sFEI]); // Check to see if the points have been already used @@ -156,43 +161,31 @@ void Foam::extendedFeatureEdgeMesh::sortPointsAndEdges { regionEdges.append(i); } - - forAll(featurePointFeatureEdges, pI) - { - const labelList& fpfEdges = pointEdges[featurePoints[pI]]; - - labelList& fpfe = featurePointFeatureEdges[pI]; - - forAll(fpfEdges, eI) - { - if (sFEI == fpfEdges[eI]) - { - fpfe[eI] = i; - } - } - } } + // Populate feature point feature edges + DynamicList