Changeset 2725

Timestamp:

2011-04-06T14:07:42+02:00 (13 years ago)

Author:

rblod

Message:

Correct mistakes in sette.sh introduced during the merge

File:

• trunk/NEMOGCM/SETTE/sette.sh (modified) (9 diffs)

trunk/NEMOGCM/SETTE/sette.sh

@@ -112 +112 @@
 #-
 # Compiler among those in NEMOGCM/ARCH
-CMP_NAM=$1
+COMPILER=gfortran_linux
 
 # Directory to run the tests
@@ -120 +120 @@
 TOOLS_DIR=${MAIN_DIR}/TOOLS
 COMPIL_DIR=${TOOLS_DIR}/COMPILE
-# Check if a compiler has already been defined
-. ${COMPIL_DIR}/Fcheck_archfile.sh arch_nemo.fcm ${CMP_NAM} || exit
-
+
+CMP_NAM=${1:-$COMPILER}
 ## NBTEST=6
 ## echo "TOTAL NUMBER OF TEST" ${NBTEST}
@@ -185 +184 @@
     . ./fcm_job.sh input_ORCA2_LIM_PISCES.cfg 1 LONG
     
-    cd ${SETTE_DIR}
-    . ../CONFIG/makenemo -n ORCA2LIMPIS_SHORT -r ORCA2_LIM_PISCES del_key "key_dtatrc key_diatrc"
+#    cd ${SETTE_DIR}
+#    . ../CONFIG/makenemo -n ORCA2LIMPIS_SHORT -r ORCA2_LIM_PISCES del_key "key_dtatrc key_diatrc"
     cd ${SETTE_DIR}
     . param.cfg
@@ -198 +197 @@
     set_namelist namelist ln_clobber .true.
     set_namelist namelist cn_ocerst_in \"O2LP_LONG_00000075_restart.nc\"
-    set_namelist namelist_ice cn_ocerst_in \"O2LP_LONG_00000075_restart_ice.nc\"
+    set_namelist namelist_ice cn_icerst_in \"O2LP_LONG_00000075_restart_ice.nc\"
     set_namelist namelist_top ln_trcrad .false.
     set_namelist namelist_top ln_rsttr .true.
@@ -217 +216 @@
     ## Restartability tests for POMME
     cd ${SETTE_DIR}
-    . ../CONFIG/makenemo -m gfortran_linux -n POMME_LONG -r POMME
+    . ../CONFIG/makenemo -m ${CMP_NAM} -n POMME_LONG -r POMME
     cd ${SETTE_DIR}
     . param.cfg
@@ -281 +280 @@
     ## Repropducilibity tests for ORCA2_LIM_PISCES
     cd ${SETTE_DIR}
-    . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2LO2LPO2LP_4_4 -r ORCA2_LIM_PISCES add_key "key_mpp_mpi key_mpp_rep" del_key "key_vectopt_loop key_dtatrc key_diatrc" 
+    . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2LIMPIS_4_4 -r ORCA2_LIM_PISCES add_key "key_mpp_mpi key_mpp_rep" del_key "key_vectopt_loop key_dtatrc key_diatrc" 
     cd ${SETTE_DIR}
     . param.cfg
@@ -304 +303 @@
     
     cd ${SETTE_DIR}
-    . ../CONFIG/makenemo -n ORCA2LIMPIS_2_8 -r ORCA2_LIM_PISCES add_key "key_mpp_rep key_mpp_mpi" del_key "key_vectopt_loop key_dtatrc key_diatrc"
+    . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2LIMPIS_2_8 -r ORCA2_LIM_PISCES add_key "key_mpp_rep key_mpp_mpi" del_key "key_vectopt_loop key_dtatrc key_diatrc"
     cd ${SETTE_DIR}
     . param.cfg
@@ -330 +329 @@
     ## Reproductibility tests for POMME
     cd ${SETTE_DIR}
-    . ../CONFIG/makenemo -m gfortran_linux -n POMME_1_4 -r POMME add_key "key_mpp_mpi key_mpp_rep"
+    . ../CONFIG/makenemo -m ${CMP_NAM} -n POMME_1_4 -r POMME add_key "key_mpp_mpi key_mpp_rep"
     cd ${SETTE_DIR}
     . param.cfg
@@ -346 +345 @@
     
     cd ${SETTE_DIR}
-    . ../CONFIG/makenemo -m gfortran_linux -n POMME_2_2 -r POMME add_key "key_mpp_mpi key_mpp_rep"
+    . ../CONFIG/makenemo -m ${CMP_NAM} -n POMME_2_2 -r POMME add_key "key_mpp_mpi key_mpp_rep"
     cd ${SETTE_DIR}
     . param.cfg