Changeset 1326

Timestamp:

04/15/16 14:40:03 (8 years ago)

Author:

sdipsl

Message:

• Bugfix. IPSLCM6.0.2 ORCA1 monitoring was fully broken.

Location:

trunk/libIGCM

Files:

• AA_create_multi_se (modified) (1 diff)
• AA_create_se (modified) (1 diff)
• AA_create_ts (modified) (1 diff)
• AA_monitoring (modified) (2 diffs)
• AA_rebuild_fromWorkdir (modified) (1 diff)

trunk/libIGCM/AA_create_multi_se

@@ -112 +112 @@
 #D- TEMPORARY Flag to determine ice resolution
 #D- Default : value from ice driver if any
-RESOL_ICE=${RESOL_ICE:=ORCA2}
+RESOL_ICE=${RESOL_OCE:=ORCA2}
 
 #D- TEMPORARY Flag to determine marine biogeochemistry resolution
 #D- Default : value from ice driver if any
-RESOL_MBG=${RESOL_MBG:=ORCA2}
+RESOL_MBG=${RESOL_OCE:=ORCA2}
 
 ########################################################################

trunk/libIGCM/AA_create_se

@@ -119 +119 @@
 #D- TEMPORARY Flag to determine ice resolution
 #D- Default : value from ice driver if any
-RESOL_ICE=${RESOL_ICE:=ORCA2}
+RESOL_ICE=${RESOL_OCE:=ORCA2}
 
 #D- TEMPORARY Flag to determine marine biogeochemistry resolution
 #D- Default : value from ice driver if any
-RESOL_MBG=${RESOL_MBG:=ORCA2}
+RESOL_MBG=${RESOL_OCE:=ORCA2}
 
 ########################################################################

trunk/libIGCM/AA_create_ts

@@ -131 +131 @@
 #D- TEMPORARY Flag to determine ice resolution
 #D- Default : value from ice driver if any
-RESOL_ICE=${RESOL_ICE:=ORCA2}
+RESOL_ICE=${RESOL_OCE:=ORCA2}
 
 #D- TEMPORARY Flag to determine marine biogeochemistry resolution
 #D- Default : value from ice driver if any
-RESOL_MBG=${RESOL_MBG:=ORCA2}
+RESOL_MBG=${RESOL_OCE:=ORCA2}
 
 ########################################################################

trunk/libIGCM/AA_monitoring

@@ -112 +112 @@
 #D- TEMPORARY Flag to determine ice resolution
 #D- Default : value from ice driver if any
-RESOL_ICE=${RESOL_ICE:=ORCA2}
+RESOL_ICE=${RESOL_OCE:=ORCA2}
 
 #D- TEMPORARY Flag to determine marine biogeochemistry resolution
 #D- Default : value from ice driver if any
-RESOL_MBG=${RESOL_MBG:=ORCA2}
+RESOL_MBG=${RESOL_OCE:=ORCA2}
 
 ######################################################################
@@ -197 +197 @@
   PATH_monitoring_file=""
   eval monitoring_file=monitoring01_${compname}_\${RESOL_${comp}}.cfg > /dev/null 2>&1
-  if [[ -d ${CARD_DIR}/POST && -f ${CARD_DIR}/POST/monitoring01_${compname}.cfg ]] ; then
+  if [[ -d ${CARD_DIR}/POST && -f ${CARD_DIR}/POST/${monitoring_file} ]] ; then
+    PATH_monitoring_file=${CARD_DIR}/POST/${monitoring_file}
+  elif if [[ -d ${CARD_DIR}/POST && -f ${CARD_DIR}/POST/monitoring01_${compname}.cfg ]] ; then
     PATH_monitoring_file=${CARD_DIR}/POST/monitoring01_${compname}.cfg
-  elif [[ -d ${CARD_DIR}/POST && -f ${CARD_DIR}/POST/${monitoring_file} ]] ; then
-    PATH_monitoring_file=${CARD_DIR}/POST/${monitoring_file}
   elif [ -f ${FER_ATLAS}/${monitoring_file} ] ; then
     PATH_monitoring_file=${FER_ATLAS}/${monitoring_file}

trunk/libIGCM/AA_rebuild_fromWorkdir

@@ -131 +131 @@
 #D- TEMPORARY Flag to determine ice resolution
 #D- Default : value from ice driver if any
-RESOL_ICE=${RESOL_ICE:=ORCA2}
+RESOL_ICE=${RESOL_OCE:=ORCA2}
 
 #D- TEMPORARY Flag to determine biogeochemistry resolution
 #D- Default : value from ice driver if any
-RESOL_MBG=${RESOL_MBG:=ORCA2}
+RESOL_MBG=${RESOL_OCE:=ORCA2}
 
 #D- Flag to determine surface resolution