Changeset 3773

Timestamp:

04/19/18 14:47:19 (6 years ago)

Author:

jgipsl

Message:

Propagate previous commit [3772] into IPSLCM6.

Location:

CONFIG/UNIFORM/v6/IPSLCM6

Files:

• EXPERIMENTS/LMDZOR/highresmip_CMIP6 (copied) (copied from CONFIG/UNIFORM/v6/LMDZOR_v6/EXPERIMENTS/LMDZOR/highresmip_CMIP6)
• GENERAL/DRIVER/orchidee.driver (modified) (1 diff)
• GENERAL/PARAM/orchidee.def_CWRR (modified) (1 diff)
• GENERAL/PARAM/orchidee.def_Choi (modified) (1 diff)

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

@@ -59 +59 @@
     else
         IGCM_comp_modifyDefFile nonblocker orchidee.def VEGET_UPDATE 0Y
+    fi
+
+    # Set LAI_MAP in orchidee.def acording to value set in orchidee.card section UserChoices
+    # If LAI_MAP is not definded in orchidee.card, set default value n
+    # Note: this option is only read by ORCHIDEE if starting without restart files
+    if [ ! X${orchidee_UserChoices_LAI_MAP} = X ] ; then
+        IGCM_comp_modifyDefFile nonblocker orchidee.def LAI_MAP   ${orchidee_UserChoices_LAI_MAP}
+    else
+        IGCM_comp_modifyDefFile nonblocker orchidee.def LAI_MAP   DEFAULT
     fi
 

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/orchidee.def_CWRR

@@ -190 +190 @@
 VEGET_UPDATE = _AUTO_
 
+# Read lai map (default n)
+LAI_MAP = _AUTO_ : DEFAULT = n
 
 # Parameters related to surface and thermal physical properties

CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/orchidee.def_Choi

@@ -80 +80 @@
 VEGET_UPDATE = _AUTO_
 
+# Read lai map (default n)
+LAI_MAP = _AUTO_ : DEFAULT = n
 
 # Create river description file