Changeset 2601

Timestamp:

06/30/15 11:05:38 (8 years ago)

Author:

jgipsl

Message:

• Corrected error introduced in rev 2995.
• Deactivate NMC as default
• Better error handeling

Location:

CONFIG/UNIFORM/v6/LMDZOR_v6

Files:

• EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card (modified) (1 diff)
• EXPERIMENTS/LMDZOR/clim/COMP/lmdz.card (modified) (1 diff)
• GENERAL/DRIVER/orchidee.driver (modified) (2 diffs)
• GENERAL/DRIVER/stomate.driver (modified) (1 diff)

CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/amip/COMP/lmdz.card

@@ -52 +52 @@
 
 # Set NMC Outputs frequency (monthly, daily, HF) = y/n
-LMDZ_NMC_monthly=y
+LMDZ_NMC_monthly=n
 LMDZ_NMC_daily=n
 LMDZ_NMC_hf=n

CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/clim/COMP/lmdz.card

@@ -52 +52 @@
 
 # Set NMC Outputs frequency (monthly, daily, HF) = y/n
-LMDZ_NMC_monthly=y
+LMDZ_NMC_monthly=n
 LMDZ_NMC_daily=n
 LMDZ_NMC_hf=n

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/orchidee.driver

@@ -55 +55 @@
                 sechiba1_freq=${NbMonths}mo ;;
             *D|*d)
-                NbDayss=$( echo ${frequency} | awk -F '[dD]' '{print $1}' )
+                NbDays=$( echo ${frequency} | awk -F '[dD]' '{print $1}' )
                 sechiba1_enabled=.TRUE.
                 sechiba1_freq=${NbDays}d ;;
@@ -63 +63 @@
                 sechiba1_freq=${WriteInSeconds}s ;;
             HF|hf) 
-                SRF_ok_hf=y 
                 sechiba2_enabled=.TRUE. ;;
             *) 
-                IGCM_debug_Exit "SRF_Update " ${frequency} " invalid WriteFrequency : choose in xY, xM, xD, xs and HF" 
-                IGCM_debug_Verif_Exit ;;
+                IGCM_debug_Exit "SRF WriteFrequency=${frequency} is invalid. Choose between xY, xM, xD, xs and HF for Sechiba." ;;
         esac
     done

CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/stomate.driver

@@ -25 +25 @@
     # Only one choice can be set as WriteFrequency. The same choice will be used for 
     # both stomate_history and stomate_ipcc_history files. 
-    case ${config_SBG_WriteFrequency} in
-        *Y|*y) 
-            NbYears=$( echo ${config_SBG_WriteFrequency} | awk -F '[yY]' '{print $1}' )
-            NbDaysYear=$( IGCM_date_DaysInYear ${year} )
-            stomate_enabled=.TRUE.
-            stomate_freq=${NbYears}y ;;
-        *M|*m) 
-            NbMonths=$( echo ${config_SBG_WriteFrequency} | awk -F '[mM]' '{print $1}' )
-            stomate_enabled=.TRUE.
-            stomate_freq=${NbMonths}mo ;;
-        *D|*d)
-            NbDays=$( echo ${frequency} | awk -F '[dD]' '{print $1}' )
-            stomate_enabled=.TRUE.
-            stomate_freq=${NbDays}d ;;
-        *) 
-            IGCM_debug_Exit "SBG_Update " ${config_SBG_WriteFrequency} " invalid WriteFrequency : choose between xY, xM, xD" 
-            IGCM_debug_Verif_Exit ;;
-    esac
+    for frequency in ${config_SBG_WriteFrequency} ; do
+        case ${frequency} in
+            *Y|*y) 
+                NbYears=$( echo ${frequency} | awk -F '[yY]' '{print $1}' )
+                NbDaysYear=$( IGCM_date_DaysInYear ${year} )
+                stomate_enabled=.TRUE.
+                stomate_freq=${NbYears}y ;;
+            *M|*m) 
+                NbMonths=$( echo ${frequency} | awk -F '[mM]' '{print $1}' )
+                stomate_enabled=.TRUE.
+                stomate_freq=${NbMonths}mo ;;
+            *D|*d)
+                NbDays=$( echo ${frequency} | awk -F '[dD]' '{print $1}' )
+                stomate_enabled=.TRUE.
+                stomate_freq=${NbDays}d ;;
+            *) 
+                IGCM_debug_Exit "SBG WriteFrequency=${frequency} is invalid. Choose between xY, xM and xD for Stomate." ;;
+        esac
+    done
 
     # Modify file_def_orchidee.xml