Changeset 3648 for CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER

Timestamp:

03/16/18 10:30:44 (6 years ago)

Author:

acosce

Message:

update LMDZORINCA_v6 to 6.0.15

Location:

CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER

Files:

• lmdz.driver (modified) (3 diffs)
• orchidee.driver (modified) (3 diffs)
• stomate.driver (modified) (2 diffs)

CONFIG/UNIFORM/v6/LMDZORINCA_v6/GENERAL/DRIVER/lmdz.driver

@@ -81 +81 @@
     done
 
-    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then
-        ok_mensuel=.FALSE.
-        ok_journe=.FALSE.
-        ok_hf=.FALSE.
-        ok_hf3h=.FALSE.
-        ok_hf3hm=.FALSE.
-        ok_stn=.FALSE.
-    fi
 
 ##  Read LMDZ_COSP_OK in lmdz.card
@@ -169 +161 @@
 
     # Read value for co2_ppm from file CO2.txt. If file not existing, take DEFAULT value from file. 
+    # Calculate co2_ppm_per as co2_ppm*4.
     if [ -f CO2.txt ] ; then
         value=`grep Annee_${year} CO2.txt | awk -F= '{print $2}'`
@@ -176 +169 @@
             IGCM_debug_Verif_Exit
         fi
+        value4=`grep Annee_${year} CO2.txt | awk -F= '{print $2 * 4}'`
     else
         value=DEFAULT
+        value4=DEFAULT
     fi
     IGCM_comp_modifyDefFile nonblocker config.def co2_ppm $value
+    IGCM_comp_modifyDefFile nonblocker config.def co2_ppm_per $value4
 
 

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

@@ -34 +34 @@
         # Deactivate output files for stomate
         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 enabled .FALSE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_level 0
         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_freq 1mo
         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 enabled .FALSE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_level 0
         IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_freq 1mo
     fi
@@ -46 +48 @@
     fi
 
+    # Set VEGET_UPDATE=1Y in orchidee.def if VEGET_UPDATE_at_start=y in orchidee.card and if it is the first cumul periond (start of new simulation)
+    if [ X${orchidee_UserChoices_VEGET_UPDATE_at_start} = Xy ] && [ ${CumulPeriod} -eq 1 ] ; then
+        IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE   1Y
+    fi
+
     # Modify in orchidee.def VEGET_UPDATE if it is set in orchidee.card section UserChoices
+    # Note: if the variable has been set by VEGET_UPDATE_at_start, this section will not overwrite it.
     if [ ! X${orchidee_UserChoices_VEGET_UPDATE} = X ] ; then
         IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE   ${orchidee_UserChoices_VEGET_UPDATE}
@@ -62 +70 @@
 
     ## 2. Mangement of output and modifications of related xml files
-
-    # Set default values for sechiba1_enabled and sechiba1_freq.
-    # These variables are used only to modify file_def_orchidee.xml
-    sechiba1_enabled=.FALSE.
-    sechiba2_enabled=.FALSE.
-    sechiba1_freq=0s
-    sechiba2_freq=0s
-
-
-    # Get WriteFrenquecy for SRF (SECHIBA) from config.card
-    # 1 or 2 frequencies can be set in WriteFrenquecy for SRF
-    # The first frequency will always be used for the sechiba_history file and the 
-    # second frequency will be used for the sechiba_out_2.nc file. 
-    # The files are activated only if its corresponding frequency is set in WriteFrequency
-    ifreq=0
-    for frequency in ${config_SRF_WriteFrequency} ; do
-        case ${frequency} in
-            *Y|*y) 
-                NbYears=$( echo ${frequency} | awk -F '[yY]' '{print $1}' )
-                NbDaysYear=$( IGCM_date_DaysInYear ${year} )
-                file_enabled=.TRUE.
-                file_freq=${NbYears}y ;;
-            *M|*m)
-                NbMonths=$( echo ${frequency} | awk -F '[mM]' '{print $1}' )
-                file_enabled=.TRUE.
-                file_freq=${NbMonths}mo ;;
-            *D|*d)
-                NbDays=$( echo ${frequency} | awk -F '[dD]' '{print $1}' )
-                file_enabled=.TRUE.
-                file_freq=${NbDays}d ;;
-            *s)
-                WriteInSeconds=$( echo ${frequency} | awk -F '[s]' '{print $1}' )
-                file_enabled=.TRUE.
-                file_freq=${WriteInSeconds}s ;;
-            HF|hf) 
-                file_enabled=.TRUE. 
-                file_freq=10800s ;;
-            *) 
-                IGCM_debug_Exit "SRF_Update " ${frequency} " invalid WriteFrequency : choose in xY, xM, xD, xs and HF" 
-                IGCM_debug_Verif_Exit ;;
-        esac
-
-        (( ifreq = ifreq + 1 ))
-        case ${ifreq} in
-            1)
-                sechiba1_enabled=${file_enabled}
-                sechiba1_freq=${file_freq} ;;
-            2)
-                sechiba2_enabled=${file_enabled}
-                sechiba2_freq=${file_freq} ;;
-        *)
-                IGCM_debug_Exit "SRF_Update: It is not possible to set more than 2 output files for sechiba from config.card"
-                IGCM_debug_Exit "You must correct WriteFrequancy in SRF secion in config.card."
-                IGCM_debug_Exit "Adapt file_def_orchidee.xml directly if you want more output files"
-                IGCM_debug_Verif_Exit ;;
-        esac
-    done
-
-
-    # Modify file_def_orchidee.xml file
-    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 enabled ${sechiba1_enabled}
-    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_freq ${sechiba1_freq}
-    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 enabled ${sechiba2_enabled}
-    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 output_freq ${sechiba2_freq}
-    # Use same values for sechiba1 and for sechiba3 files
-    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 enabled ${sechiba1_enabled}
-    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 output_freq ${sechiba1_freq}
+    # Modify file_def_orchidee.xml file using settings from orchidee.card
+    # We here suppose that for each file, in orchidee.card UserChoices section, if the parameter 
+    # output_level_filename is set, then also output_freq_filename must be set. The existance of output_freq_filename will not be checked. 
+    # If output_level_filename=NONE or if it is not set, the corresponding file will be deactivated.
+    # Settings in config.card WriteFrequency are not used any more.
     
+    if [ X${orchidee_UserChoices_output_level_sechiba_history} = X ] || [ X${orchidee_UserChoices_output_level_sechiba_history} = XNONE ] ; then
+        # output_level_sechiba_history is not set in orchidee.card or it is set to NONE.
+        # Deactivate the file.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 enabled .FALSE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_level 0
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_freq 1mo
+    else
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 enabled      .TRUE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_level ${orchidee_UserChoices_output_level_sechiba_history}
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba1 output_freq  ${orchidee_UserChoices_output_freq_sechiba_history}
+    fi
+    
+    if [ X${orchidee_UserChoices_output_level_sechiba_out_2} = X ] || [ X${orchidee_UserChoices_output_level_sechiba_out_2} = XNONE ] ; then
+        # output_level_sechiba_out_2 is not set in orchidee.card or it is set to NONE.
+        # Deactivate the file.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 enabled .FALSE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 output_level 0
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 output_freq 1mo
+    else
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 enabled      .TRUE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 output_level ${orchidee_UserChoices_output_level_sechiba_out_2}
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba2 output_freq  ${orchidee_UserChoices_output_freq_sechiba_out_2}
+    fi
+    
+    if [ X${orchidee_UserChoices_output_level_sechiba_history_4dim} = X ] || [ X${orchidee_UserChoices_output_level_sechiba_history_4dim} = XNONE ] ; then
+        # output_level_sechiba_history_4dim is not set in orchidee.card or it is set to NONE.
+        # Deactivate the file.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 enabled .FALSE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 output_level 0
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 output_freq 1mo
+    else
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 enabled      .TRUE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 output_level ${orchidee_UserChoices_output_level_sechiba_history_4dim}
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml sechiba3 output_freq  ${orchidee_UserChoices_output_freq_sechiba_history_4dim}
+    fi
+        
 
     # Add include of orchidee context in iodef.xml

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

@@ -1 +1 @@
 #!/bin/ksh
 
-#D- Driver pour ORCHIDEE stomate component
+#D- Driver for ORCHIDEE stomate component (SBG)
 
 #-----------------------------------------------------------------
@@ -17 +17 @@
     
     # Output management
-
-    # Set default values for stomate output files.
-    stomate_enabled=.FALSE.
-    stomate_freq=0s
-
-    # Read WriteFrequency set in config.card section SBG. 
-    # Only one choice can be set as WriteFrequency. The same choice will be used for 
-    # both stomate_history and stomate_ipcc_history files. 
-    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
-
-    if [ X"$( echo ${config_UserChoices_ExpType} | grep CMIP6 )" != "X" ] ; then       
-        stomate_enabled=.FALSE.
+    # Modify file_def_orchidee.xml file using settings from stomate.card
+    # We here suppose that for each file, in stomate.card UserChoices section, if the parameter 
+    # output_level_filename is set, then also output_freq_filename must be set. The existance of output_freq_filename will not be checked. 
+    # If output_level_filename=NONE or if it is not set, the corresponding file will be deactivated.
+    
+    if [ X${stomate_UserChoices_output_level_stomate_history} = X ] || [ X${stomate_UserChoices_output_level_stomate_history} = XNONE ] ; then
+        # output_level_stomate_history is not set in stomate.card or it is set to NONE.
+        # Deactivate the file.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 enabled .FALSE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_level 0
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_freq 1mo
+    else
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 enabled      .TRUE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_level ${stomate_UserChoices_output_level_stomate_history}
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_freq  ${stomate_UserChoices_output_freq_stomate_history}
+    fi
+    
+    if [ X${stomate_UserChoices_output_level_stomate_ipcc_history} = X ] || [ X${stomate_UserChoices_output_level_stomate_ipcc_history} = XNONE ] ; then
+        # output_level_stomate_ipcc_history is not set in stomate.card or it is set to NONE.
+        # Deactivate the file.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 enabled .FALSE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_level 0
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_freq 1mo
+    else
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 enabled      .TRUE.
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_level ${stomate_UserChoices_output_level_stomate_ipcc_history}
+        IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_freq  ${stomate_UserChoices_output_freq_stomate_ipcc_history}
     fi
 
-    # Modify file_def_orchidee.xml
-    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 enabled ${stomate_enabled}
-    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate1 output_freq ${stomate_freq}
-    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 enabled ${stomate_enabled}
-    IGCM_comp_modifyXmlFile nonblocker file_def_orchidee.xml stomate2 output_freq ${stomate_freq}
-    
+        
 
     # Define in orchidee.def if restart file should be used