Changeset 1585 for branches/libIGCM_CESMEP/AA_create_ts

Timestamp:

04/25/23 14:26:44 (15 months ago)

Author:

ssenesi

Message:

merge branch libIGCM_CESMEP with trunk that handles RedHat8 on Irene

File:

• branches/libIGCM_CESMEP/AA_create_ts (modified) (3 diffs)

branches/libIGCM_CESMEP/AA_create_ts

@@ -70 +70 @@
 #-Q- ada # @ environment  = $DEBUG_debug ; $BigBrother ; $postProcessingStopLevel ; $MODIPSL ; $libIGCM ; $libIGCM_SX ; $SUBMIT_DIR ; $POST_DIR ; $Script_Post_Output ; $MASTER ; $RebuildFrequency ; $DateBegin ; $PeriodDateEnd ; $StandAlone ; $CompletedFlag ; $TsTask ; $CompToRead ; $FlagToRead ; $RESOL_ATM ; $RESOL_OCE ; $RESOL_ICE ; $RESOL_MBG ; $RESOL_SRF ; $RESOL_SBG ; wall_clock_limit=$(wall_clock_limit)
 #-Q- ada # @ queue
-#-Q- lxiv8 ######################
-#-Q- lxiv8 ## OBELIX      LSCE ##
-#-Q- lxiv8 ######################
-#-Q- lxiv8 #PBS -N TS
-#-Q- lxiv8 #PBS -m a
-#-Q- lxiv8 #PBS -j oe
-#-Q- lxiv8 #PBS -q medium
-#-Q- lxiv8 #PBS -o TS.$$
-#-Q- lxiv8 #PBS -S /bin/ksh
+#-Q- obelix ######################
+#-Q- obelix ## OBELIX      LSCE ##
+#-Q- obelix ######################
+#-Q- obelix #PBS -N TS
+#-Q- obelix #PBS -m a
+#-Q- obelix #PBS -j oe
+#-Q- obelix #PBS -q medium
+#-Q- obelix #PBS -o TS.$$
+#-Q- obelix #PBS -S /bin/ksh
+#-Q- mesoipsl #!/bin/ksh
+#-Q- mesoipsl ######################
+#-Q- mesoipsl ## MESO ESPRI IPSL  ##
+#-Q- mesoipsl ######################
+#-Q- mesoipsl #SBATCH --job-name=TS         # Job Name
+#-Q- mesoipsl #SBATCH --output=TS.out_%I    # standard output
+#-Q- mesoipsl #SBATCH --error=TS.out_%I     # error output
+#-Q- mesoipsl #SBATCH -N  1                        # Number of core
+#-Q- mesoipsl #SBATCH --time=10:00:00       # Wall clock limit (seconds)
 #-Q- ifort_CICLAD ######################
 #-Q- ifort_CICLAD ##   CICLAD    IPSL ##
@@ -824 +833 @@
 if ( [ X${TsTask} = X2D ] || [ X${TsTask} = X3D ] || [ X${TsTask} = X ] ) ; then
   # From 2D and 3D it is the last one to finish that will submit the monitoring.
-  if [ ! "X$( grep "IGCM_sys_RmRunDir" ${POST_DIR}/create_ts.${PeriodDateEnd}.[23]D.out 2> /dev/null )" = "X" ] ; then
+  if ( [ $( ls ${POST_DIR}/create_ts.${PeriodDateEnd}.[23]D.out | wc -l ) = 1 ] || [ ! "X$( grep "IGCM_sys_RmRunDir" ${POST_DIR}/create_ts.${PeriodDateEnd}.[23]D.out 2> /dev/null )" = "X" ] ) ; then
     Script_Post_Output=monitoring.${PeriodDateEnd}
     IGCM_sys_QsubPost monitoring
@@ -832 +841 @@
   fi
 fi
-
 #D-
 # --------------------------------------------------------------------