Changeset 1633

Timestamp:

03/11/24 10:37:15 (7 weeks ago)

Author:

ssenesi

Message:

Manage CesmpInputFrequency?, plus small fixes

Location:

trunk/libIGCM

Files:

• AA_purge_simulation (modified) (1 diff)
• ins_job (modified) (2 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (3 diffs)

trunk/libIGCM/AA_purge_simulation

@@ -179 +179 @@
 fi
 
-if [ ${config_Post_Cesmep} != FALSE ]; then
+if [ ${config_Post_Cesmep} != FALSE -a -d $SUBMIT_DIR/cesmep_lite ]; then
     echo -e "\033[1;32mDo you want to erase the CESMEP atlas and dedicated CliMAF cache) ?"
     echo -n -e " Your answer (y/n) : \033[m"

trunk/libIGCM/ins_job

@@ -698 +698 @@
   
 fi
-
 #
 # Install a light copy of C-ESM-EP in SUBMIT_DIR/Cesmep and create a
@@ -741 +740 @@
                 ${config_Post_Cesmep} ${CesmepPeriod} ${config_Post_CesmepSlices} \
                 $components $CENTER ${CesmepSlicesDuration} \
-                ${config_Post_CesmepReferences} 
+                ${config_Post_CesmepReferences} ${config_Post_CesmepInputFrequency} 
             [ $? -ne 0 ] && echo -e "\nERROR : cannot configure C-ESM-EP run" && exit 5
         else

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -248 +248 @@
       if ( [ X${config_Post_CesmepPeriod} != X${NULL_STR} ] && [ X${config_Post_CesmepPeriod} != X ] ) ; then
           CesmepPeriod=${config_Post_CesmepPeriod%Y}
+          if [ $config_Post_CesmepPeriod = 12M ] ; then
+              CesmepPeriod=1
+          fi
       fi
       if [ X${config_Post_Cesmep} = XSE ] ; then
@@ -284 +287 @@
           elif ( [ X"${SYSTEM}" == "Xmesoipsl" ] ); then
               config_Post_CesmepCode=/net/nfs/tools/Users/SU/jservon/cesmep_installs/cesmep_for_libIGCM
-          elif [ ${config_Post_Cesmep} != FALSE ] ; then
+          else 
               IGCM_debug_Exit "Cannot locate a default C-ESM-EP code on $SYSTEM, please set CesmepCode in section Post"
           fi
       fi
+      
       if ( [ X${config_Post_CesmepSlices} = XNONE ] || [ X${config_Post_CesmepSlices} = X ] ) ; then
           config_Post_CesmepSlices=8
@@ -304 +308 @@
           config_Post_CesmepReferences=NONE 
       fi
-  fi
-  IGCM_debug_Print 3 "config_Post_Cesmep=${config_Post_Cesmep}, CesmepPeriod=$CesmepPeriod, config_Post_CesmepSlices=$config_Post_CesmepSlices  "
+      if [ X${config_Post_CesmepInputFrequency} = X${NULL_STR} ] || [ X${config_Post_CesmepInputFrequency} = XNONE ] || \
+             [ X${config_Post_CesmepInputFrequency} = X ] ; then 
+          config_Post_CesmepInputFrequency=monthly
+      fi
+  fi
   #====================================================
   # IgnoreNonMonotonic : apply default value if not defined