Changeset 4914

Timestamp:

02/07/20 15:19:58 (4 years ago)

Author:

jgipsl

Message:

Corrected how the parameter ok_volcan was changed. In previous version, the flag LMDZ_strataero could not change ok_volcan as it was already change before.

File:

• CONFIG/UNIFORM/v6/LMDZOR_v6/GENERAL/DRIVER/lmdz.driver (modified) (1 diff)

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

@@ -491 +491 @@
     fi 
 
-    # config.def : Modify parameter ok_volcan if it is set in lmdz.card
-    if [ ! X${lmdz_UserChoices_ok_volcan} = X ]; then
-    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan ${lmdz_UserChoices_ok_volcan}
-    else
-    # Take default value set in config.def
-    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan DEFAULT
-    fi
-
-    # config.def : set ok_volcan to y if we are in the strataero config
-    if [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then
-    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan y
-    else
-    IGCM_comp_modifyDefFile nonblocker config.def ok_volcan DEFAULT
-    fi
-
+    # config.def : Modify parameter ok_volcan if ok_volcan=y or LMDZ_strataero=y in lmdz.card
     # Note: ok_volcan is a flag allowing a double-call with/without natural forcing (instead of with/without anthro forcing).
+    if [ ! X${lmdz_UserChoices_ok_volcan} = X ] || [ X${lmdz_UserChoices_LMDZ_strataero} = Xy ] ; then
+        IGCM_comp_modifyDefFile nonblocker config.def ok_volcan ${lmdz_UserChoices_ok_volcan}
+    else
+        # Take default value set in config.def
+        IGCM_comp_modifyDefFile nonblocker config.def ok_volcan DEFAULT
+    fi
+
+
 
     # physiq.def : Modify parameter tau_gl if it is set in lmdz.card