Update for supermuc system (#340)

davidsblom · Sep 1, 2016 · 911c08f · 911c08f
1 parent 55d0bf1
commit 911c08f
Show file tree

Hide file tree

Showing 29 changed files with 389 additions and 62 deletions.
diff --git a/applications/solvers/fsi/fluidFoam/Make/options b/applications/solvers/fsi/fluidFoam/Make/options
@@ -1,5 +1,9 @@
 c++WARN     = -Wall -Wextra -Werror
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 \
     -I../../../../src/fsi \
     -I../../../../src/fsi/lnInclude \
@@ -27,7 +31,7 @@ EXE_INC = -std=c++11 \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \
@@ -52,7 +56,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \

diff --git a/applications/solvers/fsi/fsiFluidFoam/Make/options b/applications/solvers/fsi/fsiFluidFoam/Make/options
@@ -4,6 +4,10 @@ ifndef PRECICE_ROOT
     PRECICE_ROOT=../../../../src/thirdParty/precice
 endif
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 -fext-numeric-literals \
     -isystem ../../../../src/thirdParty/elemental/install/include \
     -I../../../../src/fsi/lnInclude \
@@ -30,7 +34,7 @@ EXE_INC = -std=c++11 -fext-numeric-literals \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \
@@ -56,7 +60,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \

diff --git a/applications/solvers/fsi/fsiFoam/Make/options b/applications/solvers/fsi/fsiFoam/Make/options
@@ -1,5 +1,9 @@
 c++WARN     = -Wall -Wextra -Werror -Wno-literal-suffix
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 -fext-numeric-literals \
     -isystem ../../../../src/fsi/lnInclude \
     -I ../../../../src/fsi \
@@ -34,7 +38,7 @@ EXE_INC = -std=c++11 -fext-numeric-literals \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \
@@ -59,7 +63,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \

diff --git a/applications/solvers/fsi/fsiSolidFoam/Make/options b/applications/solvers/fsi/fsiSolidFoam/Make/options
@@ -4,6 +4,10 @@ ifndef PRECICE_ROOT
     PRECICE_ROOT=../../../../src/thirdParty/precice
 endif
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 \
     -I../../../../src/fsi/lnInclude \
     -isystem ../../../../src/thirdParty/eigen \
@@ -27,7 +31,7 @@ EXE_INC = -std=c++11 \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \
@@ -53,7 +57,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \

diff --git a/applications/solvers/fsi/solidFoam/Make/options b/applications/solvers/fsi/solidFoam/Make/options
@@ -1,5 +1,9 @@
 c++WARN     = -Wall -Wextra -Werror
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 \
     -I../../../../src/fsi \
     -I../../../../src/fsi/lnInclude \
@@ -15,7 +19,7 @@ EXE_INC = -std=c++11 \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \
@@ -40,7 +44,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \

diff --git a/applications/solvers/unsteadyPUCoupledFoam/Make/options b/applications/solvers/unsteadyPUCoupledFoam/Make/options
@@ -1,5 +1,9 @@
 c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wnon-virtual-dtor -Wunused-local-typedefs
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 \
     -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/turbulenceModels/incompressible/RAS/RASModel \
@@ -13,7 +17,7 @@ EXE_INC = -std=c++11 \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \
@@ -42,7 +46,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
     -ldynamicMesh \

diff --git a/src/RBFMeshMotionSolver/RBFMeshMotionSolver.C b/src/RBFMeshMotionSolver/RBFMeshMotionSolver.C
@@ -4,6 +4,8 @@
  *   David Blom, TU Delft. All rights reserved.
  */
 
+#include "dynamicLabelList.H"
+#include "PstreamReduceOps.H"
 #include "RBFMeshMotionSolver.H"
 #include <unordered_map>
 #include <vector>

diff --git a/src/RBFMeshMotionSolver/UnitCoarsening.C b/src/RBFMeshMotionSolver/UnitCoarsening.C
@@ -105,6 +105,7 @@ namespace rbf
 
             // Get location of max error
             El::Entry<double> locMax = El::MaxAbsLoc( errors );
+            largestError = locMax.value;
 
             // Break if maximum points are reached
             if ( int( selectedPositions.size() ) >= maxPoints )

diff --git a/src/RBFMeshMotionSolver/twoDPointCorrectorRBF.C b/src/RBFMeshMotionSolver/twoDPointCorrectorRBF.C
@@ -1,4 +1,10 @@
 
+/*
+ * Author
+ *   David Blom, TU Delft. All rights reserved.
+ */
+
+#include "dynamicLabelList.H"
 #include "twoDPointCorrectorRBF.H"
 #include "polyMesh.H"
 

diff --git a/src/tests/testsuite-dealii/Make/options b/src/tests/testsuite-dealii/Make/options
@@ -1,5 +1,9 @@
 c++WARN     = -Wall -Wextra -Werror -Wno-literal-suffix
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 \
     -I ../../fsi \
     -I ../../fsi/lnInclude \
@@ -32,7 +36,7 @@ EXE_INC = -std=c++11 \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
@@ -58,7 +62,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \

diff --git a/src/tests/testsuite-fsi/Make/options b/src/tests/testsuite-fsi/Make/options
@@ -1,5 +1,9 @@
 c++WARN     = -Wall -Wextra -Werror -Wno-literal-suffix
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 \
     -I ../../fsi \
     -I ../../fsi/lnInclude \
@@ -32,7 +36,7 @@ EXE_INC = -std=c++11 \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
@@ -58,7 +62,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \

diff --git a/src/tests/testsuite-rbf/Make/options b/src/tests/testsuite-rbf/Make/options
@@ -1,5 +1,9 @@
 c++WARN     = -Wall -Wextra -Werror -Wno-literal-suffix
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 -fext-numeric-literals\
     -isystem ../../thirdParty/elemental/install/include \
     -I ../../fsi \
@@ -33,7 +37,7 @@ EXE_INC = -std=c++11 -fext-numeric-literals\
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
@@ -59,7 +63,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \

diff --git a/src/tests/testsuite-sdc-fsi/Make/options b/src/tests/testsuite-sdc-fsi/Make/options
@@ -1,5 +1,9 @@
 c++WARN     = -Wall -Wextra -Werror
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 \
     -I ../../fsi \
     -I ../../fsi/lnInclude \
@@ -12,7 +16,7 @@ EXE_INC = -std=c++11 \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
@@ -38,7 +42,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \

diff --git a/src/tests/testsuite-sdc/Make/options b/src/tests/testsuite-sdc/Make/options
@@ -1,5 +1,9 @@
 c++WARN     = -Wall -Wextra -Werror -Wno-literal-suffix
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 \
     -I ../../fsi \
     -I ../../fsi/lnInclude \
@@ -32,7 +36,7 @@ EXE_INC = -std=c++11 \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
@@ -58,7 +62,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \

diff --git a/src/tests/testsuite-spacemapping/Make/options b/src/tests/testsuite-spacemapping/Make/options
@@ -1,5 +1,9 @@
 c++WARN     = -Wall -Wextra -Werror -Wno-literal-suffix
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 \
     -I ../../fsi \
     -I ../../fsi/lnInclude \
@@ -32,7 +36,7 @@ EXE_INC = -std=c++11 \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \
@@ -58,7 +62,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -lgtest \
     -ldynamicFvMesh \
     -ltopoChangerFvMesh \

diff --git a/src/tests/tubeflow-sdc-bdf-solid/Make/options b/src/tests/tubeflow-sdc-bdf-solid/Make/options
@@ -1,5 +1,9 @@
 c++WARN     = -Wall -Wextra -Werror
 
+ifndef MKL_LIB
+    MKL_LIB=-lopenblas
+endif
+
 EXE_INC = -std=c++11 -fopenmp \
     -I ../../fsi \
     -I ../../fsi/lnInclude \
@@ -11,7 +15,7 @@ EXE_INC = -std=c++11 -fopenmp \
 ifeq ($(WM_COMPILE_OPTION), Opt)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -L../../thirdParty/gtest \
     -lgtest \
     -ldynamicFvMesh \
@@ -38,7 +42,7 @@ endif
 ifeq ($(WM_COMPILE_OPTION), Debug)
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
-    -lopenblas -llapack -lscalapack -lpmrrr -lmetis -lparmetis -lEl -lElSuiteSparse \
+    $(MKL_LIB) -lpmrrr -lEl -lElSuiteSparse \
     -L../../thirdParty/gtest \
     -lgtest \
     -ldynamicFvMesh \