Changeset 196

Timestamp:

11/10/09 17:13:13 (14 years ago)

Author:

sdipsl

Message:

• Some more step towards post processing from cesium
• Wait from CCRT actions (cesium node can not ssh mercure), necessary because cesium do not see mercure workdir and thus do not see card
• Do not use this version on sx9, post-process will fail

Location:

trunk/libIGCM

Files:

• AA_create_ts (modified) (1 diff)
• AA_rebuild_fromWorkdir (modified) (2 diffs)
• libIGCM_config/libIGCM_config.ksh (modified) (1 diff)
• libIGCM_post/libIGCM_post.ksh (modified) (3 diffs)
• libIGCM_sys/libIGCM_sys_cesium.ksh (modified) (2 diffs)
• libIGCM_sys/libIGCM_sys_mercurex9.ksh (modified) (1 diff)

trunk/libIGCM/AA_create_ts

@@ -1 +1 @@
 #-Q- platine #!/usr/bin/ksh
-#-Q- platine ##################
+#-Q- platine ###################
 #-Q- platine ## PLATINE   CEA ##
-#-Q- platine ##################
+#-Q- platine ###################
 #-Q- platine #BSUB -J TS                     # Nom du job
 #-Q- platine #BSUB -N                        # message a la fin du job

trunk/libIGCM/AA_rebuild_fromWorkdir

@@ -116 +116 @@
 RESOL_ICE=${RESOL_ICE:=ORCA2}
 
-#D- TEMPORARY Flag to determine ice resolution
-#D- Default : value from marine biogeochemistry driver if any
+#D- TEMPORARY Flag to determine biogeochemistry resolution
+#D- Default : value from ice driver if any
 RESOL_MBG=${RESOL_MBG:=ORCA2}
-
 
 #D- Flag to determine surface resolution
@@ -142 +141 @@
 
 RUN_DIR=${REBUILD_DIR}
-ListAllRebuildDir=$( ls -d ${REBUILD_DIR}/REBUILD_* | grep -B $(( ${NbRebuildDir} -1 )) ${PeriodDateBegin} )
+ListAllRebuildDir=$( IGCM_sys_RshMaster ls -d ${REBUILD_DIR}/REBUILD_* | grep -B $(( ${NbRebuildDir} -1 )) ${PeriodDateBegin} )
 #
 IGCM_sys_Cd ${RUN_DIR}
 
 for directory in ${ListAllRebuildDir} ; do
+    #
+    IGCM_sys_Get_Master ${directory} ${RUN_DIR}
     #
     IGCM_sys_Cd ${RUN_DIR}/$( basename ${directory} )

trunk/libIGCM/libIGCM_config/libIGCM_config.ksh

@@ -215 +215 @@
                 echo "DEBUG mode : activation of 'set -vx' mode."
                 echo "DEBUG mode : no protection for output files."
-                echo "DEBUG mode : force online rebuild."
+                echo "DEBUG mode : if active force asynchronous rebuild frequency to PeriodLength frequency."
                 ;;
             DEV)
                 echo "DEVelopment mode : no protection for output files."
-                echo "DEVelopment mode : force online rebuild."
+                echo "DEVelopment mode : if active force asynchronous rebuild frequency to PeriodLength frequency."
                 ;;
         esac

trunk/libIGCM/libIGCM_post/libIGCM_post.ksh

@@ -650 +650 @@
             #
             typeset listVarEnv
-            listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,REBUILD_DIR,POST_DIR,DateBegin,PeriodDateBegin,PeriodDateEnd,NbRebuildDir,StandAlone,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_MBG,RESOL_SRF,RESOL_BIOS"
+            listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,REBUILD_DIR,POST_DIR,MASTER,DateBegin,PeriodDateBegin,PeriodDateEnd,NbRebuildDir,StandAlone,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_MBG,RESOL_SRF,RESOL_BIOS"
             IGCM_sys_RshPost <<-EOF
             export DEBUG_debug=${DEBUG_debug}
@@ -659 +659 @@
             export REBUILD_DIR=${REBUILD_DIR}
             export POST_DIR=${POST_DIR}
+            export MASTER=${MASTER}
             export DateBegin=${DateBegin}
             export PeriodDateBegin=${PeriodDateBegin}
@@ -683 +684 @@
             #
             typeset listVarEnv
-            listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,REBUILD_DIR,POST_DIR,DateBegin,PeriodDateBegin,PeriodDateEnd,NbRebuildDir,StandAlone,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_MBG,RESOL_SRF,RESOL_BIOS"
+            listVarEnv="DEBUG_debug,MODIPSL,libIGCM,libIGCM_SX,SUBMIT_DIR,REBUILD_DIR,POST_DIR,MASTER,DateBegin,PeriodDateBegin,PeriodDateEnd,NbRebuildDir,StandAlone,RESOL_ATM,RESOL_OCE,RESOL_ICE,RESOL_MBG,RESOL_SRF,RESOL_BIOS"
             IGCM_sys_RshPost <<-EOF
             export DEBUG_debug=${DEBUG_debug}
             export MODIPSL=${MODIPSL}
             export libIGCM_SX=${libIGCM}
-            export libIGCM=${libIGCM}
+            export libIGCM=${libIGCM_POST}
             export SUBMIT_DIR=${SUBMIT_DIR}
             export REBUILD_DIR=${REBUILD_DIR}
             export POST_DIR=${POST_DIR}
+            export MASTER=${MASTER}
             export DateBegin=${DateBegin}
             export PeriodDateBegin=${PeriodDateBegin}

trunk/libIGCM/libIGCM_sys/libIGCM_sys_cesium.ksh

@@ -157 +157 @@
 #====================================================
 #- RUN_DIR_PATH : Temporary working directory (=> TMP)
-typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${TMPDIR}}
+typeset -r RUN_DIR_PATH=${RUN_DIR_PATH:=${SCRATCHDIR}/${PBS_JOBID}}
 
 #====================================================
@@ -818 +818 @@
         #
         # USUAL WAY
-        putfer $1 $2 > out_rsync 2>&1
+        cp $1 $2 > out_rsync 2>&1
         RET=$?
 

trunk/libIGCM/libIGCM_sys/libIGCM_sys_mercurex9.ksh

@@ -184 +184 @@
     i=0
     while [ $i -ne $NB_ESSAI ] ; do
-        ssh cesium /bin/ksh ${@}
+        ssh -t mercure ssh cesium /bin/ksh ${@} 2>/dev/null
         status=$?
         if [ ${status} -ne 0 ];