Merge branch 'master' of code.it4i.cz:vys0053/OpenFOAM-MERIC

FOAMMODULES-GCC-Salomon.sh

+#!/bin/sh
+
+#CHANGELOG
+	# scotch/src/Makefile.inc icc misto gcc
+#TOTRY
+	# openmpi
+	# FOAM_MPI=5.1.2.150-iccifort-2016.1.150-GCC-4.9.3-2.25
+
+# SELECT MACHINE ####################################################
+MERIC_LIBS_COMMON="-L$HOME/OpenFOAM/meric/lib/ -lmericmpi "
+MERIC_LIBS_TAURUS="-lhdeem -lfreeipmi -lcpufreq -lx86_adapt -DWITHREADEX -DUSE_MERIC "
+MERIC_LIBS_SALOMON="-L$HOME/readex/MERIC/x86adaptGCC/x86_adapt/build/ -lx86_adapt -DWITHREADEX -DUSE_MERIC "
+
+export READEX_LIBS=$MERIC_LIBS_COMMON$MERIC_LIBS_SALOMON
+
+#####################################################################
+version=3
+if [ $version -eq 1 ] #has problem with depricated compiler parameter --add-needed
+then
+	module load GCC
+	module load OpenMPI
+	module load CMake
+	module load zlib
+	module load flex
+	module load Automake
+elif [ $version -eq 2 ]	#working
+then
+	module load OpenMPI/1.10.2-GCC-5.3.0-2.26
+	module load CMake
+	module load zlib
+	module load flex
+	module load Automake
+elif [ $version -eq 3 ]	#working
+then
+	module load OpenMPI/1.10.1-GCC-4.9.3-2.25
+	module load CMake
+	module load zlib
+	module load flex
+	module load Automake
+fi
+
+#export MPI_ROOT=$I_MPI_ROOT
+export WM_NCOMPPROCS=22
+
+#export LD_LIBRARY_PATH+=:$HOME/readex/MERIC/mericGCC
+export LD_LIBRARY_PATH+=:$HOME/OpenFOAM/meric/lib
+export LD_LIBRARY_PATH+=:$HOME/readex/MERIC/x86adaptGCC/x86_adapt/build/
+
+
+. ~/OpenFOAM/OpenFOAM-v1612+/etc/bashrc 
+
+export MERIC_MODE=3 #no energy measurement
+export MERIC_NUM_THREADS=0
+export MERIC_FREQUENCY=0
+export MERIC_UNCORE_FREQUENCY=0
+
+return 0
+################################################################################
+
+
+   GCC/4.4.7-system                                             icc/2015.3.187-GNU-4.9.3-2.25
+   GCC/4.7.4                                                    icc/2015.3.187-GNU-5.1.0-2.25
+   GCC/4.8.3                                                    icc/2015.3.187
+   GCC/4.9.3-binutils-2.25                                      icc/2016.0.109-GCC-4.9.3
+   GCC/4.9.3-tf                                                 icc/2016.1.150-GCC-4.9.3
+   GCC/4.9.3                                                    icc/2016.1.150-GCC-4.9.3-2.25
+   GCC/4.9.3-2.25                                               icc/2016.1.150
+   GCC/5.1.0-binutils-2.25                                      icc/2016.3.210-GCC-5.3.0-2.26
+   GCC/5.2.0                                                    icc/2017.0.098-GCC-5.4.0-2.26
+   GCC/5.3.0-2.25                                               icc/2017.1.132-GCC-5.4.0-2.26
+   GCC/5.3.0-2.26                                               icc/2017.1.132-GCC-6.3.0-2.27
+   GCC/5.3.1-snapshot-20160419-2.25                             icc/2017.2.174-GCC-6.3.0-2.27
+   GCC/5.4.0-2.26                                               icc/2017.4.196-GCC-7.1.0-2.28   (D)
+   GCC/6.2.0-2.27                                               ifort/2013.5.192-GCC-4.8.3
+   GCC/6.3.0-2.27                                               ifort/2013.5.192
+   GCC/7.1.0-2.28                                      (L,D)    ifort/2015.3.187-GNU-4.9.3-2.25
+   GCCcore/4.9.3                                                ifort/2015.3.187-GNU-5.1.0-2.25
+   GCCcore/5.3.0                                                ifort/2015.3.187
+   GCCcore/5.3.1-snapshot-20160419                              ifort/2016.0.109-GCC-4.9.3
+   GCCcore/5.4.0                                                ifort/2016.1.150-GCC-4.9.3
+   GCCcore/6.2.0                                                ifort/2016.1.150-GCC-4.9.3-2.25
+   GCCcore/6.3.0                                                ifort/2016.1.150
+   GCCcore/7.1.0                                       (L,D) 
+   
+      OpenMPI/1.8.6-GCC-4.4.7-system
+   OpenMPI/1.8.6-GNU-5.1.0-2.25
+   OpenMPI/1.8.6-iccifort-2015.3.187-GNU-5.1.0-2.25
+   OpenMPI/1.8.8-GNU-4.9.3-2.25
+   OpenMPI/1.8.8-GNU-5.1.0-2.25
+   OpenMPI/1.8.8-iccifort-2015.3.187-GNU-4.9.3-2.25
+   OpenMPI/1.10.1-GCC-4.9.3-2.25
+   OpenMPI/1.10.1-GNU-4.9.3-2.25
+   OpenMPI/1.10.2-GCC-4.9.3-2.25
+   OpenMPI/1.10.2-GCC-5.3.0-2.26
+   OpenMPI/1.10.7-GCC-6.3.0-2.27
+   OpenMPI/1.10.7-GCC-7.1.0-2.28                      (L,D)
+   OpenMPI/2.0.1-iccifort-2017.1.132-GCC-5.4.0-2.26   (E)
+   OpenMPI/2.0.2-GCC-6.3.0-2.27                       (E)
+   OpenMPI/2.1.0-GCC-4.9.3-2.25                       (E)
+   OpenMPI/2.1.0-GCC-6.3.0-2.27                       (E)
+
+
+
+
+

FOAMMODULES-Intel-Salomon.sh

+#!/bin/sh
+
+#CHANGELOG
+	# scotch/src/Makefile.inc icc misto gcc
+#TOTRY
+	# openmpi
+	# FOAM_MPI=5.1.2.150-iccifort-2016.1.150-GCC-4.9.3-2.25
+
+
+
+version=2016
+
+if   [ $version -eq 2015 ]	#doesn't support C++14
+then
+	module load intel/2015b-intel-2015b
+	module load zlib/1.2.8-intel-2015b 
+	module load flex/2.5.39-intel-2015b 
+	module load CMake/3.0.0-intel-2015b 
+	module load Boost/1.58.0-intel-2015b-Python-2.7.9
+elif [ $version -eq 2016 ]
+then
+	module load intel/2016a
+	module load zlib/1.2.8-foss-2016a
+	module load flex/2.5.39-foss-2016a
+	module load CMake/3.5.1-intel-2016a
+	module load Boost/1.61.0-foss-2016a
+#	export BOOST_ARCH_PATH=$EBROOTBOOST
+elif [ $version -eq 2017 ]
+then
+	module load intel/2017a
+	module load zlib/1.2.11
+	module load flex/2.6.0-intel-2017a
+	module load CMake/3.7.2-intel-2017a
+	module load Boost/1.63.0-intel-2017a
+fi
+
+export MPI_ROOT=$I_MPI_ROOT
+export WM_NCOMPPROCS=22
+
+export LD_LIBRARY_PATH+=:$HOME/OpenFOAM/meric/lib
+
+. ~/OpenFOAM/OpenFOAM-v1612+/etc/bashrc