Changeset 1598

Timestamp:

09/20/23 15:28:50 (8 months ago)

Author:

falletti

Message:

Integration of C-ESM-EP (post-processing) in libIGCM. From the work done by Stephane Senesi. To be activated in config.card [Post] with the keyword Cesmep (default: FALSE).

Location:

trunk/libIGCM

Files:

• . (modified) (1 prop)
• AA_create_se (modified) (1 diff)
• AA_create_ts (modified) (2 diffs)
• AA_pack_output (modified) (1 diff)
• AA_purge_simulation (modified) (1 diff)
• ins_job (modified) (1 diff)
• libIGCM_config/libIGCM_config.ksh (modified) (1 diff)
• libIGCM_post/libIGCM_post.ksh (modified) (15 diffs)
• libIGCM_sys/libIGCM_sys_irene.ksh (modified) (2 diffs)

trunk/libIGCM/AA_create_se

@@ -728 +728 @@
 fi
 
+# Execute C-ESM-EP driver (which launches jobs)
+if [ $PostCesmep = SE ] ; then
+    ${SUBMIT_DIR}/cesmep_lite/libIGCM_post.sh $DateBegin $PeriodDateEnd
+fi
+
 # Clean RUN_DIR_PATH (necessary for cesium and titane only)
 IGCM_sys_RmRunDir -Rf ${RUN_DIR_PATH}

trunk/libIGCM/AA_create_ts

@@ -829 +829 @@
 IGCM_debug_Verif_Exit
 # --------------------------------------------------------------------
-#D- Submit MONITORING
+#D- Submit MONITORING and C-ESM-EP
 # --------------------------------------------------------------------
 if ( [ X${TsTask} = X2D ] || [ X${TsTask} = X3D ] || [ X${TsTask} = X ] ) ; then
@@ -836 +836 @@
     Script_Post_Output=monitoring.${PeriodDateEnd}
     IGCM_sys_QsubPost monitoring
+    if [ $PostCesmep = TS ] ; then
+        ${SUBMIT_DIR}/cesmep_lite/libIGCM_post.sh $DateBegin $PeriodDateEnd
+    fi
   fi
 fi

trunk/libIGCM/AA_pack_output

@@ -330 +330 @@
 done
 
+# Execute C-ESM-EP driver (which launches jobs)
+if [ $PostCesmep = Pack ] ; then
+    ${SUBMIT_DIR}/cesmep_lite/libIGCM_post.sh $DateBegin $DateEnd
+fi
+
 # Flush post-processing submission
 if [ -f ${R_BUFR}/FlushPost_${DateEnd}.ksh ] ; then

trunk/libIGCM/AA_purge_simulation

@@ -171 +171 @@
 fi
 
+IGCM_card_DefineVariableFromOption ${prefix}config.card Post Cesmep
+if [ ${config_Post_Cesmep} != FALSE ]; 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"
+    read reponse
+    case ${reponse} in
+        oui|OUI|o|y|yes|YES)
+            $SUBMIT_DIR/cesmep_lite/libIGCM_clean.sh
+            ;;
+    esac
+fi
+
 exit 0

trunk/libIGCM/ins_job

@@ -702 +702 @@
   
 fi
+#
+# Install a light copy of C-ESM-EP in SUBMIT_DIR/Cesmep and create a
+# C-ESM-EP launch script there.
+#
+[ ${new_struct?} == yes ] && prefix="$JobName/"  
+IGCM_card_DefineVariableFromOption ${prefix}config.card Post Cesmep
+if ( [ X${config_Post_Cesmep} = X${NULL_STR} ] || [ X${config_Post_Cesmep} = XNONE ] || \
+         [ X${config_Post_Cesmep} = X ] ) ; then
+    config_Post_Cesmep=FALSE
+fi
+if [ ${config_Post_Cesmep} != FALSE ]; then
+    IGCM_config_CommonConfiguration ${prefix}config.card
+    if [ x"${config_Post_CesmepMail}" == x"TRUE" ] || [ x"${config_Post_CesmepMail}" == x"True" ] ; then
+        # Compute mail adress - inspired by libIGCM_post.ksh - should be turned in a function 
+        if [ ! -z ${config_UserChoices_MailName} ] ; then
+            MailAdress=${config_UserChoices_MailName}
+        elif [ -f ~/.forward ] ; then
+            MailAdress=$( cat ~/.forward )
+        else
+            MailAdress=${USER}
+        fi
+    else
+        MailAdress=None
+    fi
+    #
+    components=","
+    for comp in ${config_ListOfComponents[*]} ; do
+        components=${components}${comp}, ;
+    done
+    if ( [ X"${SYSTEM}" == X"irene" ]    || [ X"${SYSTEM}" == X"irene-amd" ] || \
+         [ X"${SYSTEM}" == X"mesoipsl" ] || [ X"${SYSTEM}" == X"jeanzay" ] ) ; then
+        IGCM_card_DefineVariableFromOption ${prefix}config.card UserChoices DateBegin
+        ${config_Post_CesmepCode}/libIGCM_install.sh $(pwd)/${prefix} \
+                   ${config_Post_CesmepComparison} $JobName ${R_SAVE} "${ProjectID}" \
+                   ${MailAdress} ${config_UserChoices_DateBegin//-/} \
+                   ${config_Post_Cesmep} ${CesmepPeriod} ${config_Post_CesmepSlices} \
+                   $components $CENTER
+        [ $? -ne 0 ] && echo -e "\nERROR : cannot configure C-ESM-EP run" && exit 5
+    else
+        echo -e "\nERROR Cannot (yet) handle CESMEP atlas on this computer system (${SYSTEM})"
+        echo "=> Variable Cesmep in config.card's section Post must be set to FALSE (rather than $config_Post_Cesmep)"
+        exit 6
+    fi
+fi
 #-
 [[ ${x_v} = 'verbose' ]] && print - "";

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -225 +225 @@
     config_Post_MetricsPCMDI=FALSE
   fi
-
+  #====================================================
+  # Cesmep : apply default value FALSE if not defined, and if TRUE
+  # or *Y set it based on an adhoc algorithm
+  if ( [ X${config_Post_Cesmep} = X${NULL_STR} ] || [ X${config_Post_Cesmep} = XNONE ] || \
+       [ X${config_Post_Cesmep} = X ] || [ X${config_Post_Cesmep} = XFALSE ] ) ; then
+    config_Post_Cesmep=FALSE
+  elif [ X${config_Post_Cesmep} = XTRUE ] || [[ X${config_Post_Cesmep} =~ X[1-9][0-9]?Y ]] ; then
+      if [[ X${config_Post_Cesmep} =~ X[1-9][0-9]?Y ]] ; then
+          CesmepPeriod=${config_Post_Cesmep%Y}
+      fi
+      if ([ ! X${config_Post_SeasonalFrequency} = XNONE ] && [ ! X${config_Post_SeasonalFrequency} = X ] ) ; then
+          config_Post_Cesmep="SE"
+      elif ([ ! X${config_Post_TimeSeriesFrequency} = XNONE ] && [ ! X${config_Post_TimeSeriesFrequency} = X ] ) ; then
+          config_Post_Cesmep="TS"
+      elif ([ ! X${config_Post_PackFrequency} = XNONE ] && [ ! X${config_Post_PackFrequency} = X ] ) ; then
+          config_Post_Cesmep="Pack"
+      else
+          # This covers case SpaceName=TEST with no SE nor TS (nor Pack)
+          config_Post_Cesmep=AtEnd
+      fi
+  fi
+  #
+  if [ X${config_Post_Cesmep} != XFALSE ] ; then
+      if [ X${config_Post_Cesmep} = XSE ] ; then
+          if ([ X${config_Post_SeasonalFrequency} = XNONE ] || [ X${config_Post_SeasonalFrequency} = X ] ) ; then
+              IGCM_debug_Exit "Cannot use SE for Cesmep : SE post-processing is not active"
+          else
+              [ -z $CesmepPeriod ] && CesmepPeriod=${config_Post_SeasonalFrequency%Y}
+          fi
+      elif [ X${config_Post_Cesmep} = XTS ] ; then
+          if ([ X${config_Post_TimeSeriesFrequency} = XNONE ] || [ X${config_Post_TimeSeriesFrequency} = X ] ) ; then
+              IGCM_debug_Exit "Cannot use TS for Cesmep : TS post-processing is not active"
+          else
+              [ -z $CesmepPeriod ] && CesmepPeriod=${config_Post_TimeSeriesFrequency%Y}
+          fi
+      elif [ X${config_Post_Cesmep} = XPack ] ; then
+          if ([ X${config_Post_PackFrequency} = XNONE ] || [ X${config_Post_PackFrequency} = X ] ) ; then
+              IGCM_debug_Exit "Cannot use Packed output for Cesmep : Pack post-processing is not active"
+          else
+              [ -z $CesmepPeriod ] && CesmepPeriod=${config_Post_PackFrequency%Y}
+          fi
+      elif [ X${config_Post_Cesmep} != XAtEnd ] ; then
+          IGCM_debug_Exit "config.card's Post section's value for Cesmep (${config_Post_Cesmep}) is invalid; use SE, TS, Pack, AtEnd, TRUE or <n>Y"
+      else
+          [ -z $CesmepPeriod ] && CesmepPeriod=0
+      fi
+
+      if ( [ X${config_Post_CesmepComparison} = XNONE ] || [ X${config_Post_CesmepComparison} = X ] ) ; then
+          config_Post_CesmepComparison=run_comparison
+      fi
+      
+      if ( [ X${config_Post_CesmepCode} = XNONE ] || [ X${config_Post_CesmepCode} = X ] ) ; then
+          if ( [ X"${SYSTEM}" == "Xirene" ] || [ X"${SYSTEM}" == "Xirene-amd" ] ); then 
+              config_Post_CesmepCode=/ccc/cont003/home/igcmg/igcmg/Tools/cesmep
+          elif ( [ X"${SYSTEM}" == "Xjeanzay" ] ); then
+              config_Post_CesmepCode=/gpfswork/rech/psl/commun/Tools/cesmep
+          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
+              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
+      fi
+  fi
+  IGCM_debug_Print 3 "config_Post_Cesmep=${config_Post_Cesmep}, CesmepPeriod=$CesmepPeriod, config_Post_CesmepSlices=$config_Post_CesmepSlices  "
   #====================================================
   # IgnoreNonMonotonic : apply default value if not defined

trunk/libIGCM/libIGCM_post/libIGCM_post.ksh

@@ -29 +29 @@
   TimeSeriesFrequency=false
   SeasonalFrequency=false
+  CesmepAtEnd=false
   unset list_post
   #
@@ -108 +109 @@
     fi
   fi
+
+  if ( [ ${SimulationLengthInDays} -ge ${ExperienceLengthInDays} ] && [ X${config_Post_Cesmep} = XAtEnd ] ) ; then
+      CesmepAtEnd=true
+  fi
+  
+  
   IGCM_debug_PopStack "IGCM_post_Configure"
 }
@@ -197 +204 @@
             echo "export RESOL_SBG=${RESOL_SBG}                            " >> ${FunctionPath}
             echo "export listVarEnv=${listVarEnv}                          " >> ${FunctionPath}
+            echo "export PostCesmep=${config_Post_Cesmep}                  " >> ${FunctionPath}
             echo "export Script_Post_Output=${Script_Post_Output}          " >> ${FunctionPath}
 #           if [ X${MASTER} = Xtitane ] ; then
@@ -234 +242 @@
                     export RESOL_SRF=${RESOL_SRF}
                     export RESOL_SBG=${RESOL_SBG}
+                    export PostCesmep=${config_Post_Cesmep}
                     export listVarEnv=${listVarEnv}
                     export Script_Post_Output=${Script_Post_Output}
@@ -315 +324 @@
               echo "export RESOL_SBG=${RESOL_SBG}                            " >> ${FunctionPath}
               echo "export listVarEnv=${listVarEnv}                          " >> ${FunctionPath}
+              echo "export PostCesmep=${config_Post_Cesmep}                  " >> ${FunctionPath}
               echo "export Script_Post_Output=${Script_Post_Output}          " >> ${FunctionPath}
 #             if [ X${MASTER} = Xtitane ] ; then
@@ -353 +363 @@
                         export RESOL_SBG=${RESOL_SBG}
                         export listVarEnv=${listVarEnv}
+                        export PostCesmep=${config_Post_Cesmep}
                         export Script_Post_Output=${Script_Post_Output}
                         . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh
@@ -415 +426 @@
       echo "export RESOL_SBG=${RESOL_SBG}                            " >> ${FunctionPath}
       echo "export listVarEnv=${listVarEnv}                          " >> ${FunctionPath}
+      echo "export PostCesmep=${config_Post_Cesmep}                  " >> ${FunctionPath}
       echo "export Script_Post_Output=${Script_Post_Output}          " >> ${FunctionPath}
 #     if [ X${MASTER} = Xtitane ] ; then
@@ -448 +460 @@
             export RESOL_SBG=${RESOL_SBG}
             export listVarEnv=${listVarEnv}
+            export PostCesmep=${config_Post_Cesmep}
             export Script_Post_Output=${Script_Post_Output}
             . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh
@@ -499 +512 @@
     export StandAlone=false
     export listVarEnv=${listVarEnv}
+    export PostCesmep=${config_Post_Cesmep}
     export Script_Post_Output=${Script_Post_Output}
     . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh
@@ -529 +543 @@
       export StandAlone=false
       export listVarEnv=${listVarEnv}
+      export PostCesmep=${config_Post_Cesmep}
       export Script_Post_Output=${Script_Post_Output}
       . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh
@@ -560 +575 @@
       echo "export StandAlone=false                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
       echo "export listVarEnv=${listVarEnv}                " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
+      echo "export PostCesmep=${config_Post_Cesmep}        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
       echo "export Script_Post_Output=${Script_Post_Output}" >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
       echo "export script=${script}                        " >> ${RUN_DIR}/REBUILD_${PeriodDateBegin}/rebuild.ksh
@@ -590 +606 @@
         export StandAlone=false
         export listVarEnv=${listVarEnv}
+        export PostCesmep=${config_Post_Cesmep}
         export Script_Post_Output=${Script_Post_Output}
         . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh
@@ -645 +662 @@
       export RESOL_SBG=${RESOL_SBG}
       export listVarEnv=${listVarEnv}
+      export PostCesmep=${config_Post_Cesmep}
       export Script_Post_Output=${Script_Post_Output}
       . ${libIGCM_POST}/libIGCM_debug/libIGCM_debug.ksh
@@ -655 +673 @@
 EOF
   fi
+
+  #========== CESMEP POST-PROCESSING at job end  ========#
+
+  if [ ${CesmepAtEnd} = true ] ; then
+      #
+      IGCM_debug_Print 1 "Launching C-ESM-EP run script"
+      TaskType=post
+      . ${libIGCM_POST}/libIGCM_sys/libIGCM_sys.ksh
+      ${SUBMIT_DIR}/cesmep_lite/libIGCM_post.sh $DateBegin $PeriodDateEnd
+  fi
+
   IGCM_debug_PopStack "IGCM_post_Submit"
 }
@@ -790 +819 @@
   # - from libIGCM (config_UserChoices_PeriodLength frequency * CumulPeriod) and
   # - post-processing compatible frequency (*Y, *M, *D, *y, *m, *d)
-  # --> turn on post-processing submission when their modulo is zero
+  # --> turn on post-processing submission when their modulo is zero by 
+  # setting env variable post_freq
   # Input parameter are the name of the variable, not the frequency value itself
   # example

trunk/libIGCM/libIGCM_sys/libIGCM_sys_irene.ksh

@@ -226 +226 @@
 
   # Load dfldatadir depending on the project used for submission (default) or set in config.card (optional)
-  if [ X${config_UserChoices_DataProject} = X ] || [ X${config_UserChoices_DataProject} = DEFAULT ]; then
+  if [ X${config_UserChoices_DataProject} = X ] || [ X${config_UserChoices_DataProject} = XDEFAULT ]; then
     # Default option: Change the dfldatadir according to the project used for submission
     # The variable DataProject in section UserChoices in config.card is not set or is set to DEFAULT
@@ -239 +239 @@
     # Use the project set by the variable DataProject in section UserChoices in config.card
     module switch dfldatadir dfldatadir/${config_UserChoices_DataProject}
-    IGCM_debug_Print 1 "Load dfldatadir for DataProject red in config.card : ${config_UserChoices_DataProject}"
+    IGCM_debug_Print 1 "Load dfldatadir for DataProject read in config.card : ${config_UserChoices_DataProject}"
   fi