fixed compilation scripts

compile_for_meric.sh

@@ -11,18 +11,17 @@
 
 ################################################################################
 # SET PATH TO MODULES 
-
 ENV_SET_FILE=$(pwd)/FOAMMODULES-GCC-meric-Taurus.sh
 
 # GCC compiler
-cp $FM_DIR/OpenFOAM-v1612+/etc/bashrc-GCC6 $FM_DIR/OpenFOAM-v1612+/etc/bashrc
+cp OpenFOAM-v1612+/etc/bashrc-GCC6 OpenFOAM-v1612+/etc/bashrc
 
 # compiler flags
-cp $FM_DIR/OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++ORIGIN $FM_DIR/OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++
+cp OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++ORIGIN OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++
 
 ################################################################################
-echo "source $ENV_SET_FILE" > foammodules.sh
 source $ENV_SET_FILE
+echo "source $ENV_SET_FILE" > foammodules.sh
 
 #foam
 cd $(pwd)/OpenFOAM-v1612+

compile_for_plain.sh

@@ -14,14 +14,14 @@
 ENV_SET_FILE=$(pwd)/FOAMMODULES-GCC-Taurus.sh
 
 # GCC compiler
-cp $FM_DIR/OpenFOAM-v1612+/etc/bashrc-GCC6 $FM_DIR/OpenFOAM-v1612+/etc/bashrc
+cp OpenFOAM-v1612+/etc/bashrc-GCC6 OpenFOAM-v1612+/etc/bashrc
 
 # NO SCOREP flags
-cp $FM_DIR/OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++ORIGIN $FM_DIR/OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++
+cp OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++ORIGIN OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++
 
 ################################################################################
-echo "source $ENV_SET_FILE" > foammodules.sh
 source $ENV_SET_FILE
+echo "source $ENV_SET_FILE" > foammodules.sh
 
 #foam
 cd $(pwd)/OpenFOAM-v1612+

compile_for_rdd.sh

@@ -15,14 +15,14 @@
 ENV_SET_FILE=$(pwd)/FOAMMODULES-ScorepGCC-manual-Taurus.sh
 
 # GCC compiler
-cp $FM_DIR/OpenFOAM-v1612+/etc/bashrc-GCC6 $FM_DIR/OpenFOAM-v1612+/etc/bashrc
+cp OpenFOAM-v1612+/etc/bashrc-GCC6 OpenFOAM-v1612+/etc/bashrc
 
 # SCOREP flags	# scorep --online-access --user --thread=none --mpp=mpi --nocompiler
-cp $FM_DIR/OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++SCOREPmanual $FM_DIR/OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++
+cp OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++SCOREPmanual OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++
 
 ################################################################################
-echo "source $ENV_SET_FILE" > foammodules.sh
 source $ENV_SET_FILE
+echo "source $ENV_SET_FILE" > foammodules.sh
 
 # cd
 #foam

compile_for_saf.sh

@@ -14,14 +14,14 @@
 ENV_SET_FILE=$(pwd)/FOAMMODULES-ScorepGCC-basic-Taurus.sh
 
 # GCC compiler
-cp $FM_DIR/OpenFOAM-v1612+/etc/bashrc-GCC6 $FM_DIR/OpenFOAM-v1612+/etc/bashrc
+cp OpenFOAM-v1612+/etc/bashrc-GCC6 OpenFOAM-v1612+/etc/bashrc
 
 # SCOREP flags - autofilter # --mpp=mpi
-cp $FM_DIR/OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++SCOREP $FM_DIR/OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++
+cp OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++SCOREP OpenFOAM-v1612+/wmake/rules/linux64Gcc/c++
 
 ################################################################################
-echo "source $ENV_SET_FILE" > foammodules.sh
 source $ENV_SET_FILE
+echo "source $ENV_SET_FILE" > foammodules.sh
 
 #foam
 cd $(pwd)/OpenFOAM-v1612+