Changeset 6791 for CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/DRIVER/dynamico.driver

Timestamp:

04/05/24 15:18:20 (3 months ago)

Author:

aclsce

Message:

Merge ICOLMDZORINCA_v7_work into IPSLCM7_work

• Added LAM experiments into ICOLMDZ and ICOLMDZOR experiment directory
• Use of guided_type variable (instead of ok_guide) into dynamico.card
• Added create_etat0_limit_unstruct_mod.F90 into SOURCES/LMDZ to fix bad termination in case of create_etat0 with DYNAMICO.

File:

• CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/DRIVER/dynamico.driver (modified) (3 diffs)

CONFIG/UNIFORM/v7/IPSLCM7/GENERAL/DRIVER/dynamico.driver

@@ -59 +59 @@
 
     #  Activate nudging if ok_guide=y set in dynamico.card
-    if [  X${dynamico_UserChoices_ok_guide} = Xy ] ; then
-        IGCM_comp_modifyDefFile nonblocker run_dynamico.def guided_type  nudging
+    if [ X${dynamico_UserChoices_guided_type} != X ] ; then
+        IGCM_comp_modifyDefFile nonblocker run_dynamico.def guided_type ${dynamico_UserChoices_guided_type} 
     else
         IGCM_comp_modifyDefFile nonblocker run_dynamico.def guided_type  none
@@ -76 +76 @@
         if [ X${dynamico_UserChoices_iflag_phys} = X ] || [ X${dynamico_UserChoices_iflag_phys} = X1 ]; then 
             # iflag_phys is not set or iflag_phys=1 => run is not an aquaplanet
-            IGCM_comp_modifyDefFile nonblocker run_dynamico.def etat0              database
+            IGCM_comp_modifyDefFile nonblocker run_dynamico.def etat0              ${dynamico_UserChoices_etat0}
             IGCM_comp_modifyDefFile nonblocker run_dynamico.def iflag_phys         1
         else
@@ -124 +124 @@
     fi
 
-    if [  X${dynamico_UserChoices_ok_guide} = Xy ] ; then
+    if [ X${dynamico_UserChoices_guided_type} = Xnudging_forcing ] || [ X${dynamico_UserChoices_guided_type} = Xnudging ] ; then
         if [ -f nudging_dynamico.xml ] ; then
             echo '<context id="icosagcm" src="./nudging_dynamico.xml" />'  >> add.tmp
         else
-            IGCM_debug_Exit "you choose ok_guide=y and forget to add the copy of nudging_dynamico.xml file in dynamico.card"
+            IGCM_debug_Exit "you choose to activate guided mode and forget to add the copy of nudging_dynamico.xml file in dynamico.card"
             IGCM_debug_Verif_Exit
         fi