Merge remote-tracking branch 'origin/master' into develop

2020-07-28 08:42:12 +02:00 · 2020-07-28 08:42:12 +02:00 · 74a062d1d5
commit 74a062d1d5
parent 65d640e58e 6461eec886
15 changed files with 31 additions and 23 deletions
--- a/12
+++ b/12
@ -80,18 +80,6 @@ then
    echo
 elif [ -d "$WM_PROJECT_DIR/modules" ]
 then
-    echo "========================================"
-    echo "Compile OpenFOAM modules"
-    echo "    ignoring possible compilation errors"
-    echo "    make certain to check the output file"
-    echo
-    set +e
-    export WM_CONTINUE_ON_ERROR=true
-
-    # Default build into OpenFOAM project locations
-    : "${FOAM_MODULE_PREFIX:=${FOAM_LIBBIN%/*}}"
-    export FOAM_MODULE_PREFIX
-
    (cd "$WM_PROJECT_DIR/modules" 2>/dev/null && wmake -all)
 fi

--- a/META-INFO/api-info
+++ b/META-INFO/api-info
@ -1,2 +1,2 @@
 api=2006
-patch=0
+patch=200727
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
@ -26,6 +26,8 @@ EXE_INC = \
 EXE_LIBS = \
    ${CGAL_LIBS} \
    -lconformalVoronoiMesh \
+    -lfileFormats \
+    -lsurfMesh \
    -lmeshTools \
    -ldecompositionMethods \
    -ldecompose \
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/mergeOrSplitBaffles.C
@ -286,7 +286,7 @@ int main(int argc, char *argv[])

    #include "addOverwriteOption.H"
    #include "addRegionOption.H"
-    argList::addBoolOption
+    argList::addOption
    (
        "dict",
        "file",
--- a/applications/utilities/postProcessing/lumped/lumpedPointForces/Make/options
+++ b/applications/utilities/postProcessing/lumped/lumpedPointForces/Make/options
@ -6,5 +6,6 @@ EXE_INC = \

 EXE_LIBS = \
    -lfiniteVolume \
+    -lfileFormats \
    -lmeshTools \
    -llumpedPointMotion
--- a/applications/utilities/postProcessing/lumped/lumpedPointMovement/Make/options
+++ b/applications/utilities/postProcessing/lumped/lumpedPointMovement/Make/options
@ -6,5 +6,6 @@ EXE_INC = \

 EXE_LIBS = \
    -lfiniteVolume \
+    -lfileFormats \
    -lmeshTools \
    -llumpedPointMotion
--- a/modules/Allwmake
+++ b/modules/Allwmake
@ -7,9 +7,22 @@ targetType=libso
 # Default build into OpenFOAM project locations unless specified with
 # -prefix or FOAM_MODULE_PREFIX env varable

-: "${FOAM_MODULE_PREFIX:=${FOAM_LIBBIN%/*}}"
+# Long form to avoid dash 0.5.8 error (issue #1757)
+[ -n "$FOAM_MODULE_PREFIX" ] || FOAM_MODULE_PREFIX="${FOAM_LIBBIN%/*}"
 export FOAM_MODULE_PREFIX

+echo "========================================"
+echo "Compile OpenFOAM modules"
+echo "prefix = $FOAM_MODULE_PREFIX"
+echo
+echo "    ignoring possible compilation errors"
+echo "    make certain to check the output file"
+echo
+set +e
+export WM_CONTINUE_ON_ERROR=true
+
+#------------------------------------------------------------------------------
+
 for moduleName in $(./list-modules)
 do
    if [ -d "$moduleName" ]
--- a/modules/adios
+++ b/modules/adios
@ -1 +1 @@
-Subproject commit da201350928db0bdd7b6e3777b36f927f617de53
+Subproject commit f635fe3375bc035409a3375d4876f943e99746b3
--- a/modules/external-solver
+++ b/modules/external-solver
@ -1 +1 @@
-Subproject commit 8ebbdb63196b9556e90a0c25f30878fb743bc9c9
+Subproject commit 302f2518284be5a3c796091357a67fb1ae0250cd
--- a/modules/visualization
+++ b/modules/visualization
@ -1 +1 @@
-Subproject commit 07cd1156faf9510fb07dc622674c5928d26a68a8
+Subproject commit 766c82b8d98576aa315416d422645ef0ffc90272
--- a/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.H
+++ b/src/dynamicFaMesh/interfaceTrackingFvMesh/fvPatchFields/freeSurfacePressure/freeSurfacePressureFvPatchScalarField.H
@ -34,7 +34,7 @@ Description
    calculated as:

        \f[
-            p = pa - \vec{g} & \vec{r}
+            p = pa - \vec{g} \cdot \vec{r}
        \f]

    where
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.H
@ -30,7 +30,7 @@ Group
    grpInletBoundaryConditions grpOutletBoundaryConditions

 Description
-    This velocity inlet/outlet boundary condition is applied to pressure
+    This velocity inlet/outlet boundary condition is applied to velocity
    boundaries where the pressure is specified.  A zero-gradient condition is
    applied for outflow (as defined by the flux); for inflow, the velocity
    is obtained from the flux with the specified inlet direction.
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H
@ -30,7 +30,7 @@ Group
    grpInletBoundaryConditions grpOutletBoundaryConditions

 Description
-    This velocity inlet/outlet boundary condition is applied to pressure
+    This velocity inlet/outlet boundary condition is applied to velocity
    boundaries where the pressure is specified.  A zero-gradient condition is
    applied for outflow (as defined by the flux); for inflow, the velocity is
    obtained from the patch-face normal component of the internal-cell value.
--- a/src/lumpedPointMotion/state/lumpedPointState.C
+++ b/src/lumpedPointMotion/state/lumpedPointState.C
@ -152,7 +152,7 @@ Foam::lumpedPointState::lumpedPointState
        FatalErrorInFunction
            << "Have " << points_.size() << " points but "
            << angles_.size() << " angles" << nl
-            exit(FatalError);
+            << exit(FatalError);
        #else
        WarningInFunction
            << "Have " << points_.size() << " points but "
--- a/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun
+++ b/tutorials/heatTransfer/chtMultiRegionSimpleFoam/jouleHeatingSolid/Allrun
@ -7,6 +7,9 @@ cd "${0%/*}" || exit                                # Run from this directory

 runApplication $(getApplication)

-./createGraphs
+if notTest "$@"
+then
+    ./createGraphs
+fi

 #------------------------------------------------------------------------------