diff --git a/src/configure b/src/configure index 571f98e047de92e8f94c5820e1c8109a5f3e3af4..6cc84dbb9da9541854d100d41a49820d64a742a4 100755 --- a/src/configure +++ b/src/configure @@ -81,6 +81,20 @@ module rm intelmpi ; module load intelmpi/4.1.1.036 ; module rm netcdf ; module load netcdf/4.3.0 ; module rm grib_api ; module load grib_api/1.13.0_netcdf ; export GRIBAPI_PATH=/opt/softs/libraries/ICC13.1.4.183/grib_api-1.13.0_netcdf +"} + ;; +'Linux prolix'*) + export ARCH=${ARCH:-LXifort} + export VER_MPI=${VER_MPI:-MPIINTEL} + export OPTLEVEL=${OPTLEVEL:-O3} + export MVWORK=${MVWORK:-NO} + export VER_CDF=${VER_CDF:-CDFBFIX} + export MNHENV=${MNHENV:-" +module rm intel ; module load intel/13.1.4.183 ; +module rm intelmpi ; module load intelmpi/5.1.2.150 ; +module rm netcdf ; module load netcdf/4.3.0 ; +module rm grib_api ; module load grib_api/1.13.0_netcdf ; +export GRIBAPI_PATH=/opt/softs/libraries/ICC13.1.4.183/grib_api-1.13.0_netcdf "} ;; 'Linux login0'*|'Linux compute'*) diff --git a/src/job_make_examples_BG b/src/job_make_examples_BG index 3fd603f0ecd36848889521ad0c9511cfb1ce0c29..9ac36da0667c3a5b25aef97d6d209384faae9650 100755 --- a/src/job_make_examples_BG +++ b/src/job_make_examples_BG @@ -18,7 +18,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BGI4-MNH-V5-2-0-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-2-1-MPIAUTO-O2 #001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier diff --git a/src/job_make_examples_BGQ b/src/job_make_examples_BGQ index 860a30b77ee1a54babd40030c1782f80947a5232..685ebfdf7102fd6ce21edeaf71fc71a15842e03b 100755 --- a/src/job_make_examples_BGQ +++ b/src/job_make_examples_BGQ @@ -18,7 +18,7 @@ cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BGQI4-MNH-V5-2-0-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-2-1-MPIAUTO-O2NAN set -x diff --git a/src/job_make_examples_BullX b/src/job_make_examples_BullX index d2bdb0f46b7da557c20ea7f0d33dc9a571c28cc8..ea6a5341dd500d44590bd605edc593633d7a555a 100755 --- a/src/job_make_examples_BullX +++ b/src/job_make_examples_BullX @@ -19,7 +19,7 @@ set -e # Nom de la machine hostname -. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O3 export MONORUN="mpirun -np 1 " export MPIRUN="mpirun -np 2 " export POSTRUN="time " diff --git a/src/job_make_examples_BullX_eos b/src/job_make_examples_BullX_eos index 17cb1a86d95ab75086b428a832b6b18b359882a4..dd2ac760b6827a49fe8e43b6601e377d42eda15d 100755 --- a/src/job_make_examples_BullX_eos +++ b/src/job_make_examples_BullX_eos @@ -17,7 +17,7 @@ set -x # Nom de la machine hostname -. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O2 export MONORUN="mpirun -genv I_MPI_PIN_PROCESSOR_LIST=all:map=spread -prepend-rank -np 1 " export MPIRUN="mpirun -genv I_MPI_PIN_PROCESSOR_LIST=all:map=spread -prepend-rank -np 4 " export POSTRUN="time " diff --git a/src/job_make_examples_CRAY_cca b/src/job_make_examples_CRAY_cca index 08fe6a6e9f4405236ebc6b64c02edfa3c1ea3ecd..7f1842d1853261ac14bd3461fc6a3c587cd5b0b8 100755 --- a/src/job_make_examples_CRAY_cca +++ b/src/job_make_examples_CRAY_cca @@ -27,7 +27,7 @@ cd ${PBS_O_WORKDIR} #ARCH=LXifort ARCH=LXcray -. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-0-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-1-MPICRAY-O2 export MONORUN="aprun -n 1 " diff --git a/src/job_make_examples_IBM_ada b/src/job_make_examples_IBM_ada index 8fe79d890c24d81d502a33b90938186bed4e37fa..67746ffdc6428bc24fc97642fa4b569800ed18c9 100755 --- a/src/job_make_examples_IBM_ada +++ b/src/job_make_examples_IBM_ada @@ -19,7 +19,7 @@ cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O2 # Pour avoir l'echo des commandes set -x diff --git a/src/job_make_examples_IBM_sp6_vargas b/src/job_make_examples_IBM_sp6_vargas index faf30008928ced1a63529af454c587143f057723..59c7b3bee1bc64fa027f32c12fc2b8b055fefa15 100755 --- a/src/job_make_examples_IBM_sp6_vargas +++ b/src/job_make_examples_IBM_sp6_vargas @@ -24,7 +24,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-AIX64-MNH-V5-2-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64-MNH-V5-2-1-MPIAUTO-O2 #001_2Drelief 002_3Drelief 003_KW78 004_Reunion 007_16janvier diff --git a/src/job_make_examples_NEC_SX8 b/src/job_make_examples_NEC_SX8 index d70df4f6d55936858cdcc8a89e6c61eba99a0826..eba96f246aa278f1a753e195a7728d0c9b8dbd3b 100755 --- a/src/job_make_examples_NEC_SX8 +++ b/src/job_make_examples_NEC_SX8 @@ -18,7 +18,7 @@ hostname [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR # -. ../conf/profile_mesonh-SX8I4-MNH-V5-2-0-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O4 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " diff --git a/src/job_make_examples_SX8 b/src/job_make_examples_SX8 index 20a2ef89e5d3f4bc502694f4804ff564f4dc27d1..2b4a069b5e679216d4f324c7a55d2d812a088cf2 100755 --- a/src/job_make_examples_SX8 +++ b/src/job_make_examples_SX8 @@ -19,7 +19,7 @@ hostname [ -d $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR # -. ../conf/profile_mesonh-SX8I4-MNH-V5-2-0-MPIAUTO-O2 +. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O2 export MONORUN="Mpirun -np 1 " export MPIRUN="Mpirun -np 2 " diff --git a/src/job_make_examples_cxa b/src/job_make_examples_cxa index a27eedd34babbba09bc1de7341f359ed9eb1badd..706d988e5612b3c9d89fad9f5eb6c05269f1fde3 100755 --- a/src/job_make_examples_cxa +++ b/src/job_make_examples_cxa @@ -34,7 +34,7 @@ echo SHELL=$SHELL cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-MPIAUTO-O2 ulimit -c 0 # pas de core diff --git a/src/job_make_mesonh_BG b/src/job_make_mesonh_BG index aaf2a7a17830b7c04cdd2710cf7bf92d6f978cff..864461709093ce90dcbf851ab63c0da3c3ba5e59 100755 --- a/src/job_make_mesonh_BG +++ b/src/job_make_mesonh_BG @@ -18,7 +18,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BGI4-MNH-V5-2-0-MPIAUTO-O2 +. ../conf/profile_mesonh-BGI4-MNH-V5-2-1-MPIAUTO-O2 #time gmake time gmake -r -j8 diff --git a/src/job_make_mesonh_BGQ b/src/job_make_mesonh_BGQ index f59cec7c163005f88236f186f884e2bde2b2afae..e213ca13109a677750f81abe0b507667a5a3d71b 100755 --- a/src/job_make_mesonh_BGQ +++ b/src/job_make_mesonh_BGQ @@ -34,7 +34,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-BGQI4-MNH-V5-2-0-MPIAUTO-O2NAN +. ../conf/profile_mesonh-BGQI4-MNH-V5-2-1-MPIAUTO-O2NAN case $LOADL_STEP_NAME in diff --git a/src/job_make_mesonh_BullX b/src/job_make_mesonh_BullX index 2abf063a19edc07b3c0b4b6cd9fc794cbf6fe85a..fd375e56b060eab908b90b7c155481c700886469 100755 --- a/src/job_make_mesonh_BullX +++ b/src/job_make_mesonh_BullX @@ -19,7 +19,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job pwd -. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O3 time gmake -j 4 time gmake -j 1 installmaster diff --git a/src/job_make_mesonh_CRAY_cca b/src/job_make_mesonh_CRAY_cca index b43b9b691fa048f47aa39c9c048a7809ad95e754..77af67e2e6eafe0ce689124a0243e6e9cdb5f6e6 100755 --- a/src/job_make_mesonh_CRAY_cca +++ b/src/job_make_mesonh_CRAY_cca @@ -21,7 +21,7 @@ pwd #ARCH=LXifort ARCH=LXcray -. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-0-MPICRAY-O2 +. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-1-MPICRAY-O2 time gmake -j 4 2>&1 | tee sortie_compile_cray.$$ diff --git a/src/job_make_mesonh_IBM_ada b/src/job_make_mesonh_IBM_ada index 1dd844dd4bd32417ed61128ec4a21cdc5d335f0d..118d7dfda148512b570490c8b5f74dd711eecee7 100755 --- a/src/job_make_mesonh_IBM_ada +++ b/src/job_make_mesonh_IBM_ada @@ -16,7 +16,7 @@ cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-MPIINTEL-O2 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-MPIINTEL-O2 # Pour avoir l'echo des commandes set -x diff --git a/src/job_make_mesonh_IBM_sp6_vargas b/src/job_make_mesonh_IBM_sp6_vargas index 1e6d794402dfc4535c7d5ae3cde481da413bf6de..8c77dbacce57126dbd91a08117d65a6896341f7b 100755 --- a/src/job_make_mesonh_IBM_sp6_vargas +++ b/src/job_make_mesonh_IBM_sp6_vargas @@ -24,7 +24,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-MPIAUTO-O2 time gmake -j1 gribapi time gmake -r -j8 diff --git a/src/job_make_mesonh_MFSX8 b/src/job_make_mesonh_MFSX8 index fbddf35d6645f07e855c0949495fba1d672eb8f4..f939d6fba4b3dc28f9ce831c382325600884dba4 100644 --- a/src/job_make_mesonh_MFSX8 +++ b/src/job_make_mesonh_MFSX8 @@ -12,7 +12,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job [ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR} -. ../conf/profile_mesonh-SX8I4-MNH-V5-2-0-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O4 time gmake -j 4 ########## compile on four processors to speedup the compilation time gmake -j 1 installmaster diff --git a/src/job_make_mesonh_NEC_SX8 b/src/job_make_mesonh_NEC_SX8 index be68eaa2da16f08aaab2ccb4cfb990123c2d889f..e70939fda1275ac37a507e101a47a09242e9e475 100755 --- a/src/job_make_mesonh_NEC_SX8 +++ b/src/job_make_mesonh_NEC_SX8 @@ -11,7 +11,7 @@ set -x # On va lancer la compilation dans le répertoire de lancement du job [ $PBS_O_WORKDIR ] && cd $PBS_O_WORKDIR -. ../conf/profile_mesonh-SX8I4-MNH-V5-2-0-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-MPIAUTO-O4 time gmake -j 4 time gmake -j 4 # some time problem with first pass in parallel compilation diff --git a/src/job_make_mesonh_cxa b/src/job_make_mesonh_cxa index 15cd6c2cf22e330a305d145899379bb50fd467c9..1fbebd06a39c004f54db0d5795dc4a4ea31485a1 100755 --- a/src/job_make_mesonh_cxa +++ b/src/job_make_mesonh_cxa @@ -27,7 +27,7 @@ set -x cd $LOADL_STEP_INITDIR -. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-0-MPIAUTO-O2 +. ../conf/profile_mesonh-AIX64I4-MNH-V5-2-1-MPIAUTO-O2 time gmake -r -j1 time gmake installmaster diff --git a/src/job_make_mesonh_user_BullX b/src/job_make_mesonh_user_BullX index 4cbf6690dd547b6e15209e7e97a8cd54da5127dc..4ae34bfe45d335110efcac9b7f154d7da76ecdaf 100755 --- a/src/job_make_mesonh_user_BullX +++ b/src/job_make_mesonh_user_BullX @@ -19,7 +19,7 @@ export VER_USER= ########## Your own USER Directory set -x # On va lancer la compilation dans le répertoire de lancement du job -. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-${VER_USER}-MPIINTEL-O3 +. ../conf/profile_mesonh-LXifortI4-MNH-V5-2-1-${VER_USER}-MPIINTEL-O3 time gmake user time gmake -j 1 installuser diff --git a/src/job_make_mesonh_user_MFSX8 b/src/job_make_mesonh_user_MFSX8 index 9c6c5d3b394b8d236c4af481bf2f4b2bb186fedd..bf7c6f37bab64464bf64d6e74b4580cdcd49f374 100644 --- a/src/job_make_mesonh_user_MFSX8 +++ b/src/job_make_mesonh_user_MFSX8 @@ -14,7 +14,7 @@ set -x [ ${PBS_O_WORKDIR} ] && cd ${PBS_O_WORKDIR} -. ../conf/profile_mesonh-SX8I4-MNH-V5-2-0-${VER_USER}-MPIAUTO-O4 +. ../conf/profile_mesonh-SX8I4-MNH-V5-2-1-${VER_USER}-MPIAUTO-O4 time gmake user time gmake -j 1 installuser