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

applications/utilities/preProcessing/PDRsetFields/Allwmake

@@ -5,6 +5,6 @@ cd "${0%/*}" || exit                                # Run from this directory
 #------------------------------------------------------------------------------
 
 wmake $targetType pdrFields
-wmake PDRsetFields
+wmake $targetType PDRsetFields
 
 #------------------------------------------------------------------------------

applications/utilities/preProcessing/setAlphaField/alphaFieldFunctions/implicitFunctions/cylinder/cylinderImplicitFunction.C

@@ -69,13 +69,12 @@ Foam::implicitFunctions::cylinderImplicitFunction::cylinderImplicitFunction
     const dictionary& dict
 )
 :
-    cylinderImplicitFunction
+    // __INTEL_COMPILER bug with inheriting constructors?? (issue #1821)
-    (
+    origin_(dict.get<point>("origin")),
-        dict.get<point>("origin"),
+    radius_(dict.get<scalar>("radius")),
-        dict.get<scalar>("radius"),
+    scale_(dict.getOrDefault<scalar>("scale", 1)),
-        dict.getOrDefault<scalar>("scale", 1),
+    direction_(dict.get<vector>("direction").normalise()),
-        dict.get<vector>("direction")
+    project_(tensor::I - direction_*direction_) // outer product
-    )
 {}
 
 

applications/utilities/preProcessing/setAlphaField/alphaFieldFunctions/implicitFunctions/sin/sinImplicitFunction.C

@@ -72,15 +72,13 @@ Foam::implicitFunctions::sinImplicitFunction::sinImplicitFunction
     const dictionary& dict
 )
 :
-    sinImplicitFunction
+    // __INTEL_COMPILER bug with inheriting constructors?? (issue #1821)
-    (
+    period_(dict.get<scalar>("period")),
-        dict.get<scalar>("period"),
+    phase_(dict.getOrDefault<scalar>("phase", 0)),
-        dict.getOrDefault<scalar>("phase", 0),
+    amplitude_(dict.get<scalar>("amplitude")),
-        dict.get<scalar>("amplitude"),
+    up_(dict.get<vector>("up").normalise()),
-        dict.get<vector>("direction"),
+    direction_(dict.get<vector>("direction").normalise()),
-        dict.get<vector>("up"),
+    origin_(dict.get<vector>("origin"))
-        dict.get<vector>("origin")
-    )
 {}
 
 

src/OpenFOAM/interpolations/interpolationTable/interpolationTable.H

@@ -46,11 +46,10 @@ Description
         readerType          csv;
         file                "<constant>/p0vsTime.csv";
         hasHeaderLine       true;   // skip first line
-        timeColumn      0;      // time is in column 0
+        refColumn           0;      // reference (eg, time) is in column 0
-        valueColumns    (1);    // value starts in column 1
+        componentColumns    (1);    // component values starts in column 1
     \endverbatim
 
-
 Note
     - Accessing an empty list results in an error.
     - Accessing a list with a single element always returns the same value.

src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.C

@@ -37,6 +37,7 @@ template<class Type>
 Foam::labelList Foam::csvTableReader<Type>::getComponentColumns
 (
     const word& name,
+    std::initializer_list<std::pair<const char*,int>> compat,
     const dictionary& dict
 )
 {
@@ -45,7 +46,7 @@ Foam::labelList Foam::csvTableReader<Type>::getComponentColumns
 
     labelList cols;
 
-    ITstream& is = dict.lookup(name);
+    ITstream& is = dict.lookupCompat(name, compat);
     is.format(IOstream::ASCII);
     is >> cols;
     dict.checkITstream(is, name);
@@ -113,8 +114,11 @@ Foam::csvTableReader<Type>::csvTableReader(const dictionary& dict)
 :
     tableReader<Type>(dict),
     headerLine_(dict.get<bool>("hasHeaderLine")),
-    refColumn_(dict.get<label>("timeColumn")),
+    refColumn_(dict.getCompat<label>("refColumn", {{"timeColumn", 1912}})),
-    componentColumns_(getComponentColumns("valueColumns", dict)),
+    componentColumns_
+    (
+        getComponentColumns("componentColumns", {{"valueColumns", 1912}}, dict)
+    ),
     separator_(dict.getOrDefault<string>("separator", ",")[0])
 {}
 
@@ -218,9 +222,9 @@ void Foam::csvTableReader<Type>::write(Ostream& os) const
     tableReader<Type>::write(os);
 
     os.writeEntry("hasHeaderLine", headerLine_);
-    os.writeEntry("timeColumn", refColumn_);
+    os.writeEntry("refColumn", refColumn_);
 
-    // Force writing labelList in ascii
+    // Force writing labelList in ASCII
     const enum IOstream::streamFormat fmt = os.format();
     os.format(IOstream::ASCII);
     os.writeEntry("componentColumns", componentColumns_);

src/OpenFOAM/interpolations/interpolationTable/tableReaders/csv/csvTableReader.H

@@ -76,6 +76,7 @@ class csvTableReader
         static labelList getComponentColumns
         (
             const word& name,
+            std::initializer_list<std::pair<const char*,int>> compat,
             const dictionary& dict
         );
 

src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C

@@ -264,7 +264,7 @@ void Foam::Function1Types::CSV<Type>::writeData(Ostream& os) const
     os.writeEntry("nHeaderLine", nHeaderLine_);
     os.writeEntry("refColumn", refColumn_);
 
-    // Force writing labelList in ascii
+    // Force writing labelList in ASCII
     const enum IOstream::streamFormat fmt = os.format();
     os.format(IOstream::ASCII);
     os.writeEntry("componentColumns", componentColumns_);

src/Pstream/Allwmake-mpi

@@ -1,6 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments -no-recursion
+. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments -no-recursion "$@"
 . ${WM_PROJECT_DIR:?}/wmake/scripts/wmakeFunctions  # Require wmake functions
 
 #------------------------------------------------------------------------------

src/conversion/ccm/Allwmake

@@ -12,7 +12,7 @@ warning="==> skip optional libccm adapter"
 # Link with static libccmio only (fewer issues)
 if have_ccmio
 then
-    wmake libso || echo "$warning (build issues detected)"
+    wmake $targetType || echo "$warning (build issues detected)"
 else
     echo $warning
 fi

src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C

@@ -127,7 +127,7 @@ void Foam::fv::actuationDiskSource::calcFroudeMethod
         Ostream& os = file();
         writeCurrentTime(os);
 
-        os  << Uref << tab << Cp << tab << Ct << tab << a << tab << T << tab
+        os  << Uref << tab << Cp << tab << Ct << tab << a << tab << T
             << endl;
     }
 }
@@ -238,7 +238,7 @@ void Foam::fv::actuationDiskSource::calcVariableScalingMethod
         Ostream& os = file();
         writeCurrentTime(os);
 
-        os  << Uref << tab << Cp << tab << Ct
+        os  << Uref << tab << Cp << tab << Ct << tab
             << Udisk << tab << CpStar << tab << CtStar << tab << T << tab << P
             << endl;
     }

src/parallel/decompose/Allwmake-mpi

@@ -1,6 +1,6 @@
 #!/bin/sh
 cd "${0%/*}" || exit                                # Run from this directory
-. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments -no-recursion
+. ${WM_PROJECT_DIR:?}/wmake/scripts/AllwmakeParseArguments -no-recursion "$@"
 . ${WM_PROJECT_DIR:?}/wmake/scripts/wmakeFunctions  # Require wmake functions
 . ${WM_PROJECT_DIR:?}/wmake/scripts/have_scotch
 

tutorials/incompressible/pimpleFoam/RAS/TJunctionFan/0.orig/p

@@ -27,7 +27,6 @@ boundaryField
         outOfBounds     clamp;
         direction       in;
         readerType      openFoam;
-        hasHeaderLine   true;
         file            "<constant>/FluxVsdP.dat";
         //nonDimensional  true;
         //rpm             300;

wmake/scripts/wmakeFunctions

@@ -173,6 +173,10 @@ findObjectDir()
     # Default (local) build directory
     if [ -z "$objectsDir" ]
     then
+        if [ -d "$absdir/Make" ]
+        then
+            objectsDir="${absdir}/Make/${WM_OPTIONS}"
+        else
             relativeDir="$absdir"
             appDir=.
             [ -d Make ] || appDir=$(findTarget .) || exit 1 # Fatal
@@ -181,6 +185,7 @@ findObjectDir()
             relativeDir="${relativeDir#${absdir}}"
             objectsDir="${appDir}/Make/${WM_OPTIONS}${relativeDir}"
         fi
+    fi
 
     echo "$objectsDir"
 }

wmake/wclean

@@ -313,16 +313,18 @@ fi
 # Clean the 'Make' directory if present
 #------------------------------------------------------------------------------
 
-if [ -d "$MakeDir" ]
+if [ -d "$MakeDir" ] && [ -n "$WM_OPTIONS" ]
 then
-    objectsDir="$MakeDir/$WM_OPTIONS"
+    # Remove in-source directory (if any)
-    case "$PWD" in
+    rm -rf "$MakeDir/$WM_OPTIONS" 2>/dev/null
-    ("$WM_PROJECT_DIR"/*)
+
-        buildPath="$WM_PROJECT_DIR/build/${WM_OPTIONS}"
+    # Remove out-of-source directory (if applicable)
-        objectsDir=$buildPath$(echo $PWD | sed s%$WM_PROJECT_DIR%% )
+    relativeDir="${PWD#${WM_PROJECT_DIR}/}"
-        ;;
+    if [ "$relativeDir" != "$PWD" ]
-    esac
+    then
+        objectsDir="${WM_PROJECT_DIR}/build/${WM_OPTIONS}/${relativeDir}"
         rm -rf "$objectsDir" 2>/dev/null
+    fi
 fi
 
 #------------------------------------------------------------------------------