Commit 29397f5f authored by HOURDIN Christophe's avatar HOURDIN Christophe
Browse files

choice of the type of MAKE in the jobcomp set in namelist_exp.sh

parent 762c48a5
...@@ -74,7 +74,7 @@ XIOS_ROOT_DIR="<xios_dir>" ...@@ -74,7 +74,7 @@ XIOS_ROOT_DIR="<xios_dir>"
# #
# Use GNU Make command, else make # Use GNU Make command, else make
# #
MAKE=make MAKE="<make>"
which $MAKE > /dev/null 2>&1 || MAKE=make which $MAKE > /dev/null 2>&1 || MAKE=make
# #
......
...@@ -11,6 +11,7 @@ export STOREDIR=${CCCSTOREDIR} ...@@ -11,6 +11,7 @@ export STOREDIR=${CCCSTOREDIR}
# croco # croco
export CROCO_SOURCE="/ccc/work/cont005/gen1140/hourdinc/croco_v2.00_orig/OCEAN" export CROCO_SOURCE="/ccc/work/cont005/gen1140/hourdinc/croco_v2.00_orig/OCEAN"
export CROCO_SCRATCH="${SCRATCHDIR}/croco_scratch_${COMPUTER}" export CROCO_SCRATCH="${SCRATCHDIR}/croco_scratch_${COMPUTER}"
export MAKE="make"
export MPIF90="mpif90" export MPIF90="mpif90"
export FC="ifort" export FC="ifort"
export IFORT_FFLAGS1="-O3 -fno-alias -i4 -r8 -fp-model precise" # production export IFORT_FFLAGS1="-O3 -fno-alias -i4 -r8 -fp-model precise" # production
......
...@@ -11,6 +11,7 @@ export STOREDIR=${CCCSTOREDIR} ...@@ -11,6 +11,7 @@ export STOREDIR=${CCCSTOREDIR}
# croco # croco
export CROCO_SOURCE="/ccc/work/cont005/gen1140/hourdinc/croco_v2.00_orig/OCEAN" export CROCO_SOURCE="/ccc/work/cont005/gen1140/hourdinc/croco_v2.00_orig/OCEAN"
export CROCO_SCRATCH="${SCRATCHDIR}/croco_scratch_${COMPUTER}" export CROCO_SCRATCH="${SCRATCHDIR}/croco_scratch_${COMPUTER}"
export MAKE="make"
export MPIF90="mpif90" export MPIF90="mpif90"
export FC="ifort" export FC="ifort"
export IFORT_FFLAGS1="-O3 -fno-alias -i4 -r8 -fp-model precise" # production export IFORT_FFLAGS1="-O3 -fno-alias -i4 -r8 -fp-model precise" # production
......
...@@ -11,6 +11,7 @@ export STOREDIR=${STORE} ...@@ -11,6 +11,7 @@ export STOREDIR=${STORE}
# croco # croco
export CROCO_SOURCE="/gpfswork/rech/eee/reee084/croco_v2.00_orig/OCEAN" export CROCO_SOURCE="/gpfswork/rech/eee/reee084/croco_v2.00_orig/OCEAN"
export CROCO_SCRATCH="${SCRATCHDIR}/croco_scratch_${COMPUTER}" export CROCO_SCRATCH="${SCRATCHDIR}/croco_scratch_${COMPUTER}"
export MAKE="make"
export MPIF90="mpiifort" export MPIF90="mpiifort"
export FC="ifort" export FC="ifort"
export IFORT_FFLAGS1="-O3 -fno-alias -i4 -r8 -fp-model precise" # production export IFORT_FFLAGS1="-O3 -fno-alias -i4 -r8 -fp-model precise" # production
......
...@@ -33,6 +33,7 @@ fi ...@@ -33,6 +33,7 @@ fi
sed -e "s|<croco_source>|${CROCO_SOURCE}|" \ sed -e "s|<croco_source>|${CROCO_SOURCE}|" \
-e "s|<croco_scratch>|${CROCO_SCRATCH}|" \ -e "s|<croco_scratch>|${CROCO_SCRATCH}|" \
-e "s|<make>|${MAKE}|" \
-e "s|<mpif90>|${MPIF90}|" \ -e "s|<mpif90>|${MPIF90}|" \
-e "s|<fc>|${FC}|" \ -e "s|<fc>|${FC}|" \
-e "s|<netcdflib>|${NETCDFLIB}|" \ -e "s|<netcdflib>|${NETCDFLIB}|" \
...@@ -171,7 +172,7 @@ if ( ! [ -d ${CROCO_LAST} ] ) || ( [ -d ${CROCO_LAST} ] && [ "${test_diff}" != " ...@@ -171,7 +172,7 @@ if ( ! [ -d ${CROCO_LAST} ] ) || ( [ -d ${CROCO_LAST} ] && [ "${test_diff}" != "
echo " compile directory: `pwd`" echo " compile directory: `pwd`"
echo "" echo ""
time ./jobcomp time -p ./jobcomp
if [ -f croco ] ; then if [ -f croco ] ; then
# en cours... TEST sur changement dans le source croco # en cours... TEST sur changement dans le source croco
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment