Changeset 4323

Timestamp:

03/18/19 13:07:02 (5 years ago)

Author:

jgipsl

Message:

• Correction: set dayref and anneeref also when running with DYNAMICO
• RESOL_NBP is mandatory in dynamico.card when running with DYNAMICO. It is now also read by lmdz.driver

Location:

CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER

Files:

• dynamico.driver (modified) (1 diff)
• lmdz.driver (modified) (2 diffs)

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

@@ -9 +9 @@
         RESOL_NBP=${dynamico_UserChoices_RESOL_NBP}
     else
-        # Set default resolution
-        RESOL_NBP=20
+        # Exit
+        IGCM_debug_Exit "RESOL_NBP must be set in dynamico.card UserSection"
+    IGCM_debug_Verif_Exit
     fi
 

CONFIG/UNIFORM/v7/ICOLMDZOR_v7/GENERAL/DRIVER/lmdz.driver

@@ -18 +18 @@
     else
         RESOL_ATM_Z=${dynamico_UserChoices_RESOL_ATM_Z}
+        RESOL_NBP=${dynamico_UserChoices_RESOL_NBP}
     fi
 
@@ -362 +363 @@
 
 
-    ## -- Modify more calendar related variables. These variables are only read by LMDZ dynamics part. 
-    #     Set them to dummy if component ICO (DYNAMICO) is set in config.card.
-    if [ X${config_ListOfComponents_ICO} = X ] ; then
-        # Following variables are read by LMDZ dynamics 
-        IGCM_comp_modifyDefFile blocker run.def dayref    ${InitDay}
-        IGCM_comp_modifyDefFile blocker run.def nday      ${PeriodLengthInDays}
-
-        # Set anneeref different for gcm and ce0l
-        # Test if executable create_etat0_limit is present and lmdz.x is not present
-        if [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then
-            # for case ce0l : always take current year
-            IGCM_comp_modifyDefFile blocker run.def anneeref ${year}
-            
-            # Temporary, set use_filtre_fft=n because we now use dyn3d for ce0l version where fft is not implemented. 
-            # In more recent versions of LMDZ, this will not be needed. 
-            IGCM_comp_modifyDefFile force   run.def use_filtre_fft n
-        else
-            # for case gcm : take first year of simulation
-            IGCM_comp_modifyDefFile blocker run.def anneeref ${InitYear}
-        fi
-        
-    else
-        # ICO is found in config.card which means that DYNMAICO is activated. 
-        # Set these variables to DUMMY. They will not be read.
-        IGCM_comp_modifyDefFile blocker run.def dayref           DUMMY
-        IGCM_comp_modifyDefFile blocker run.def nday             DUMMY
-        IGCM_comp_modifyDefFile blocker run.def anneeref         DUMMY
-        IGCM_comp_modifyDefFile force   run.def use_filtre_fft   DUMMY
-    fi
+    ## -- Modify more calendar related variables.
+    IGCM_comp_modifyDefFile blocker run.def dayref    ${InitDay}
+    # Following variables are read by LMDZ dynamics 
+    IGCM_comp_modifyDefFile blocker run.def nday      ${PeriodLengthInDays}
+
+    # Set anneeref different for gcm and ce0l
+    # Test if executable create_etat0_limit is present and lmdz.x is not present
+    if [ -f create_etat0_limit* ] || [ -f ce0l* ] && [ ! -f lmdz.x ] ; then
+        # for case ce0l : always take current year
+        IGCM_comp_modifyDefFile blocker run.def anneeref ${year}
+        
+        # Temporary, set use_filtre_fft=n because we now use dyn3d for ce0l version where fft is not implemented. 
+        # In more recent versions of LMDZ, this will not be needed. 
+        IGCM_comp_modifyDefFile force   run.def use_filtre_fft n
+    else
+        # for case gcm : take first year of simulation
+        IGCM_comp_modifyDefFile blocker run.def anneeref ${InitYear}
+    fi
+    
 
     ## Determine from the variable ListOfComponents in config.card coupling to external models