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

.gitlab/issue_templates/bug.md

+<!---
+Please read this!
+
+Before opening a new issue, make sure to search for keywords in the issues
+filtered by the "bug" label and check to see if it has already been reported
+--->
+
+### Summary
+
+(Summarize the bug encountered concisely)
+
+
+### Steps to reproduce
+
+(How one can reproduce the issue - this is very important)
+
+
+### Example case
+
+(If possible, please create a SMALL example case and attach it to your bug report)
+
+(If you are using an older version of OpenFOAM this will also determine whether the bug has been fixed in a more recent version)
+
+
+### What is the current *bug* behaviour?
+
+(What actually happens)
+
+
+### What is the expected *correct* behavior?
+
+(What you should see instead)
+
+
+### Relevant logs and/or images
+
+(Paste any relevant logs - please use code blocks (```) to format console output,
+logs, and code as it's very hard to read otherwise.)
+
+
+### Environment information
+
+(OpenFOAM version : XXX)
+(Operating system : XXX)
+(Hardware info    : XXX)
+
+
+### Possible fixes
+
+(If you can, link to the line of code that might be responsible for the problem)
+
+/label ~bug

.gitlab/issue_templates/feature-request.md

+### Functionality to add/problem to solve
+
+(Brief scope)
+
+
+### Target audience
+
+(Who will benefit from the changes?)
+(What type of cases?)
+
+
+### Proposal
+
+(How are we going to solve the problem?)
+
+
+### What does success look like, and how can we measure that?
+
+(What are the success factors and acceptance criteria? e.g. test cases, error margins)
+
+
+### Links / references
+
+(Links to literature, supporting information)
+
+
+### Funding
+
+(Does the functionality already exist/is sponsorship available?)
+
+/label ~feature

.gitlab/merge_request_templates/new-features.md

+### Summary
+
+(Summarize the changes concisely)
+
+
+### Resolved bugs (If applicable)
+
+(Links to issues)
+
+
+### Details of new models (If applicable)
+
+(New options, user inputs etc)
+(Images are nice :))
+
+
+### Risks
+
+(Possible regressions?)
+(Changes to user inputs?)

META-INFO/api-info

 api=1812
-patch=190123
+patch=190129

applications/utilities/postProcessing/dataConversion/foamToEnsightParts/getTimeIndex.H

 // Read time index from */uniform/time, but treat 0 and constant specially
 // or simply increment from the '-index' option if it was supplied
 
-    label timeIndex = 0;
-
+label timeIndex = 0;
+{
     if (optIndex)
     {
         timeIndex = indexingNumber++;
@@ -37,7 +37,4 @@
             continue;
         }
     }
-
-    Info<< nl << "Time [" << timeIndex << "] = " << runTime.timeName() << nl;
-
-// end-of-file
+}

etc/bashrc

@@ -95,6 +95,7 @@ export WM_COMPILE_OPTION=Opt
 # [WM_MPLIB] - MPI implementation:
 # = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPI | MPICH | MPICH-GM |
 #   HPMPI | CRAY-MPICH | FJMPI | QSMPI | SGIMPI | INTELMPI | USERMPI
+# Also possible to use INTELMPI-xyz etc and define your own wmake rule
 export WM_MPLIB=SYSTEMOPENMPI
 
 

etc/config.csh/mpi

@@ -33,7 +33,7 @@ unsetenv MPI_ARCH_PATH MPI_HOME
 setenv FOAM_MPI dummy  # Fallback value
 
 switch ("$WM_MPLIB")
-case SYSTEMOPENMPI:
+case SYSTEMOPENMPI*:
     # The system installed openmpi, locations discovery via mpicc.
     setenv FOAM_MPI openmpi-system
     _foamEtc -config openmpi-system             # <- Adjustments (optional)
@@ -243,7 +243,7 @@ case SGIMPI:
     _foamAddLib     $MPI_ARCH_PATH/lib
     breaksw
 
-case INTELMPI:
+case INTELMPI*:
     if ( $?I_MPI_ROOT ) then
         # I_MPI_ROOT: The Intel MPI Library installation directory
 
@@ -300,14 +300,8 @@ case INTELMPI:
         echo "    Currently using '$MPI_ARCH_PATH'"
     endif
 
-    # Newer versions (5.0.3 or earlier?) with intel64/bin ...
-    if ( -d "$MPI_ARCH_PATH/intel64/bin" ) then
-        _foamAddPath    "$MPI_ARCH_PATH/intel64/bin"
-        _foamAddLib     "$MPI_ARCH_PATH/intel64/lib"
-    else
-        _foamAddPath    "$MPI_ARCH_PATH/bin64"
-        _foamAddLib     "$MPI_ARCH_PATH/lib64"
-    endif
+    _foamAddPath    "$MPI_ARCH_PATH/intel64/bin"
+    _foamAddLib     "$MPI_ARCH_PATH/intel64/lib"
     breaksw
 endsw
 

etc/config.sh/mpi

@@ -33,7 +33,7 @@ unset MPI_ARCH_PATH MPI_HOME
 export FOAM_MPI=dummy  # Fallback value
 
 case "$WM_MPLIB" in
-SYSTEMOPENMPI)
+SYSTEMOPENMPI*)
     # The system installed openmpi, locations discovery via mpicc.
     export FOAM_MPI=openmpi-system
 
@@ -261,7 +261,7 @@ SGIMPI)
     _foamAddLib     $MPI_ARCH_PATH/lib
     ;;
 
-INTELMPI)
+INTELMPI*)
     if [ -n "$I_MPI_ROOT" ]
     then
         # I_MPI_ROOT: The Intel MPI Library installation directory
@@ -303,15 +303,8 @@ INTELMPI)
 
     export FOAM_MPI MPI_ARCH_PATH
 
-    # Newer versions (5.0.3 or earlier?) with intel64/bin ...
-    if [ -d "$MPI_ARCH_PATH/intel64/bin" ]
-    then
-        _foamAddPath    "$MPI_ARCH_PATH/intel64/bin"
-        _foamAddLib     "$MPI_ARCH_PATH/intel64/lib"
-    else
-        _foamAddPath    "$MPI_ARCH_PATH/bin64"
-        _foamAddLib     "$MPI_ARCH_PATH/lib64"
-    fi
+    _foamAddPath    "$MPI_ARCH_PATH/intel64/bin"
+    _foamAddLib     "$MPI_ARCH_PATH/intel64/lib"
     ;;
 esac
 

etc/cshrc

@@ -97,6 +97,7 @@ setenv WM_COMPILE_OPTION Opt
 # [WM_MPLIB] - MPI implementation:
 # = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPI | MPICH | MPICH-GM |
 #   HPMPI | CRAY-MPICH | FJMPI | QSMPI | SGIMPI | INTELMPI | USERMPI
+# Also possible to use INTELMPI-xyz etc and define your own wmake rule
 setenv WM_MPLIB SYSTEMOPENMPI
 
 

src/regionModels/thermalBaffleModels/thermalBaffleModel/thermalBaffleModelNew.C

@@ -38,9 +38,8 @@ namespace thermalBaffleModels
 
 autoPtr<thermalBaffleModel> thermalBaffleModel::New(const fvMesh& mesh)
 {
-    word modelType;
-    {
-        IOdictionary thermalBafflePropertiesDict
+    const word modelType =
+        IOdictionary
         (
             IOobject
             (
@@ -51,15 +50,7 @@ autoPtr<thermalBaffleModel> thermalBaffleModel::New(const fvMesh& mesh)
                 IOobject::NO_WRITE,
                 false
             )
-        );
-
-        word modelType =
-            thermalBafflePropertiesDict.lookupOrDefault<word>
-            (
-                "thermalBaffleModel",
-                "thermalBaffle"
-            );
-    }
+        ).lookupOrDefault<word>("thermalBaffleModel", "thermalBaffle");
 
     auto cstrIter = meshConstructorTablePtr_->cfind(modelType);
 
@@ -84,7 +75,7 @@ autoPtr<thermalBaffleModel> thermalBaffleModel::New
     const dictionary& dict
 )
 {
-    word modelType =
+    const word modelType =
         dict.lookupOrDefault<word>("thermalBaffleModel", "thermalBaffle");
 
     auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);

wmake/rules/linux64Clang/mplibINTELMPI

 PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/include64
-PLIBS      = -L$(MPI_ARCH_PATH)/lib64 -lmpi
+PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
+PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

wmake/rules/linux64Cray/mplibINTELMPI

 PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/include64
-PLIBS      = -L$(MPI_ARCH_PATH)/lib64 -lmpi
+PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
+PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

wmake/rules/linux64Gcc/mplibINTELMPI

 PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/include64
-PLIBS      = -L$(MPI_ARCH_PATH)/lib64 -lmpi
+PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
+PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

wmake/rules/linux64Icc/mplibINTELMPI

 PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/include64
-PLIBS      = -L$(MPI_ARCH_PATH)/lib64 -lmpi
+PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
+PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi

wmake/rules/linuxIA64Icc/mplibINTELMPI

 PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -isystem $(MPI_ARCH_PATH)/include64
-PLIBS      = -L$(MPI_ARCH_PATH)/lib64 -lmpi
+PINC       = -isystem $(MPI_ARCH_PATH)/intel64/include
+PLIBS      = -L$(MPI_ARCH_PATH)/intel64/lib -lmpi