Skip to content
Snippets Groups Projects
Commit 9478f069 authored by Gaelle Tanguy's avatar Gaelle Tanguy Committed by WAUTELET Philippe
Browse files

G.Delautier 20/11/2014 : passage version 5-1-3

parent 6a29c627
No related branches found
No related tags found
No related merge requests found
Showing
with 20 additions and 20 deletions
...@@ -43,7 +43,7 @@ USE MODD_CONF, ONLY : NMASDEV,NBUGFIX,CBIBUSER ...@@ -43,7 +43,7 @@ USE MODD_CONF, ONLY : NMASDEV,NBUGFIX,CBIBUSER
IMPLICIT NONE IMPLICIT NONE
! !
NMASDEV=51 NMASDEV=51
NBUGFIX=2 NBUGFIX=3
CBIBUSER='' CBIBUSER=''
! !
END SUBROUTINE VERSION END SUBROUTINE VERSION
...@@ -11,7 +11,7 @@ then ...@@ -11,7 +11,7 @@ then
export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-1} export VERSION_MASTER=${VERSION_MASTER:-MNH-V5-1}
export VERSION_BUG=${VERSION_BUG:-3} export VERSION_BUG=${VERSION_BUG:-3}
export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}} export VERSION_XYZ=${VERSION_XYZ:-${VERSION_MASTER}-${VERSION_BUG}}
export VERSION_DATE=${VERSION_DATE:-"22/05/2014"} export VERSION_DATE=${VERSION_DATE:-"20/11/2014"}
export VERSION_CDF=${VERSION_CDF-"3.6.3"} export VERSION_CDF=${VERSION_CDF-"3.6.3"}
export VERSION_GRIBAPI=${VERSION_GRIBAPI-"1.9.9"} export VERSION_GRIBAPI=${VERSION_GRIBAPI-"1.9.9"}
export MNH_INT=${MNH_INT-"I4"} export MNH_INT=${MNH_INT-"I4"}
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
set -x set -x
cd $LOADL_STEP_INITDIR cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-BGI4-MNH-V5-1-2-MPIAUTO-O2 . ../conf/profile_mesonh-BGI4-MNH-V5-1-3-MPIAUTO-O2
#001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier #001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
cd $LOADL_STEP_INITDIR cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-BGQI4-MNH-V5-1-2-MPIAUTO-O2NAN . ../conf/profile_mesonh-BGQI4-MNH-V5-1-3-MPIAUTO-O2NAN
#. ../conf/profile_mesonh-BGQI4-MNH-V4-10-1-MPIAUTO-O2 #. ../conf/profile_mesonh-BGQI4-MNH-V4-10-1-MPIAUTO-O2
set -x set -x
......
...@@ -19,7 +19,7 @@ set -e ...@@ -19,7 +19,7 @@ set -e
# Nom de la machine # Nom de la machine
hostname hostname
. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-2-MPIINTEL-O3 . ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-MPIINTEL-O3
export MONORUN="mpirun -np 1 " export MONORUN="mpirun -np 1 "
export MPIRUN="mpirun -np 2 " export MPIRUN="mpirun -np 2 "
export POSTRUN="time " export POSTRUN="time "
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
cd $LOADL_STEP_INITDIR cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-2-MPIINTEL-O2 . ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-MPIINTEL-O2
# Pour avoir l'echo des commandes # Pour avoir l'echo des commandes
set -x set -x
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
set -x set -x
cd $LOADL_STEP_INITDIR cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-AIX64-MNH-V5-1-2-MPIAUTO-O2 . ../conf/profile_mesonh-AIX64-MNH-V5-1-3-MPIAUTO-O2
#001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier #001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier
......
...@@ -18,7 +18,7 @@ hostname ...@@ -18,7 +18,7 @@ hostname
[ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR
# #
. ../conf/profile_mesonh-SX8I4-MNH-V5-1-2-MPIAUTO-O4 . ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-MPIAUTO-O4
export MONORUN="Mpirun -np 1 " export MONORUN="Mpirun -np 1 "
export MPIRUN="Mpirun -np 2 " export MPIRUN="Mpirun -np 2 "
......
...@@ -19,7 +19,7 @@ hostname ...@@ -19,7 +19,7 @@ hostname
[ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR
# #
. ../conf/profile_mesonh-SX8I4-MNH-V5-1-2-MPIAUTO-O2 . ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-MPIAUTO-O2
export MONORUN="Mpirun -np 1 " export MONORUN="Mpirun -np 1 "
export MPIRUN="Mpirun -np 2 " export MPIRUN="Mpirun -np 2 "
......
...@@ -34,7 +34,7 @@ echo SHELL=$SHELL ...@@ -34,7 +34,7 @@ echo SHELL=$SHELL
cd $LOADL_STEP_INITDIR cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-2-MPIAUTO-O2 . ../conf/profile_mesonh-AIX64I4-MNH-V5-1-3-MPIAUTO-O2
ulimit -c 0 # pas de core ulimit -c 0 # pas de core
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
set -x set -x
cd $LOADL_STEP_INITDIR cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-BGI4-MNH-V5-1-2-MPIAUTO-O2 . ../conf/profile_mesonh-BGI4-MNH-V5-1-3-MPIAUTO-O2
#time gmake #time gmake
time gmake -r -j8 time gmake -r -j8
......
...@@ -34,7 +34,7 @@ set -x ...@@ -34,7 +34,7 @@ set -x
cd $LOADL_STEP_INITDIR cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-BGQI4-MNH-V5-1-2-MPIAUTO-O2NAN . ../conf/profile_mesonh-BGQI4-MNH-V5-1-3-MPIAUTO-O2NAN
case $LOADL_STEP_NAME in case $LOADL_STEP_NAME in
......
...@@ -19,7 +19,7 @@ set -x ...@@ -19,7 +19,7 @@ set -x
# On va lancer la compilation dans le répertoire de lancement du job # On va lancer la compilation dans le répertoire de lancement du job
pwd pwd
. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-2-MPIINTEL-O3 . ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-MPIINTEL-O3
time gmake -j 4 time gmake -j 4
time gmake -j 1 installmaster time gmake -j 1 installmaster
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
cd $LOADL_STEP_INITDIR cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-2-MPIINTEL-O2 . ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-MPIINTEL-O2
# Pour avoir l'echo des commandes # Pour avoir l'echo des commandes
set -x set -x
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
set -x set -x
cd $LOADL_STEP_INITDIR cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-2-MPIAUTO-O2 . ../conf/profile_mesonh-AIX64I4-MNH-V5-1-3-MPIAUTO-O2
time gmake -j1 gribapi time gmake -j1 gribapi
time gmake -r -j8 time gmake -r -j8
......
...@@ -12,7 +12,7 @@ set -x ...@@ -12,7 +12,7 @@ set -x
# On va lancer la compilation dans le répertoire de lancement du job # On va lancer la compilation dans le répertoire de lancement du job
[ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR} [ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR}
. ../conf/profile_mesonh-SX8I4-MNH-V5-1-2-MPIAUTO-O4 . ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-MPIAUTO-O4
time gmake -j 4 ########## compile on four processors to speedup the compilation time gmake -j 4 ########## compile on four processors to speedup the compilation
time gmake -j 1 installmaster time gmake -j 1 installmaster
......
...@@ -11,7 +11,7 @@ set -x ...@@ -11,7 +11,7 @@ set -x
# On va lancer la compilation dans le répertoire de lancement du job # On va lancer la compilation dans le répertoire de lancement du job
[ $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR [ $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR
. ../conf/profile_mesonh-SX8I4-MNH-V5-1-2-MPIAUTO-O4 . ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-MPIAUTO-O4
time gmake -j 4 time gmake -j 4
time gmake -j 4 # some time problem with first pass in parallel compilation time gmake -j 4 # some time problem with first pass in parallel compilation
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
set -x set -x
cd $LOADL_STEP_INITDIR cd $LOADL_STEP_INITDIR
. ../conf/profile_mesonh-AIX64I4-MNH-V5-1-2-MPIAUTO-O2 . ../conf/profile_mesonh-AIX64I4-MNH-V5-1-3-MPIAUTO-O2
time gmake -r -j1 time gmake -r -j1
time gmake installmaster time gmake installmaster
......
...@@ -19,7 +19,7 @@ export VER_USER= ########## Your own USER Directory ...@@ -19,7 +19,7 @@ export VER_USER= ########## Your own USER Directory
set -x set -x
# On va lancer la compilation dans le répertoire de lancement du job # On va lancer la compilation dans le répertoire de lancement du job
. ../conf/profile_mesonh-LXifortI4-MNH-V5-1-2-${VER_USER}-MPIINTEL-O3 . ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-${VER_USER}-MPIINTEL-O3
time gmake user time gmake user
time gmake -j 1 installuser time gmake -j 1 installuser
...@@ -14,7 +14,7 @@ set -x ...@@ -14,7 +14,7 @@ set -x
[ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR} [ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR}
. ../conf/profile_mesonh-SX8I4-MNH-V5-1-2-${VER_USER}-MPIAUTO-O4 . ../conf/profile_mesonh-SX8I4-MNH-V5-1-3-${VER_USER}-MPIAUTO-O4
time gmake user time gmake user
time gmake -j 1 installuser time gmake -j 1 installuser
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment