Changeset 1012

Timestamp:

07/03/14 18:28:24 (10 years ago)

Author:

sdipsl

Message:

just replacing gaya by ergon
will work when submitting a new simulation from scratch.
won't find regular restart on gaya
won't find tared restart on gaya
Continuing a simulation is currently at risk if possible ...

File:

• trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh (modified) (11 diffs)

trunk/libIGCM/libIGCM_sys/libIGCM_sys_ada.ksh

@@ -82 +82 @@
 typeset -r RSYNC_opt="-va"
 # ie storage filesystem
-typeset -r STOREHOST=gaya
+###typeset -r STOREHOST=gaya
+typeset -r STOREHOST=ergon
 typeset -r REMOTE_RSYNC=/u/rech/ces/rces452/RSYNC/bin/rsync
 
@@ -115 +116 @@
 #====================================================
 #- SUBMIT_DIR : submission dir
-typeset SUBMIT_DIR=${SUBMIT_DIR:=${LOADL_STEP_INITDIR}}
+typeset -x SUBMIT_DIR=${SUBMIT_DIR:=${LOADL_STEP_INITDIR}}
 
 #====================================================
@@ -124 +125 @@
 #====================================================
 #- ARCHIVE (dedicated to large files)
-typeset ARCHIVE=$(echo ${HOME} | sed -e "s,/.*home/,/u/,")
+typeset ARCHIVE=$(echo ${HOME} | sed -e "s,/.*home/,/arch/home/,")
 
 #====================================================
@@ -475 +476 @@
     echo "IGCM_sys_TestDirArchive :" $@
   fi
-  typeset ExistFlag
+  typeset ExistFlag TempCommandDir
+  TempCommandDir="[ -d $1 ] && echo 0 || echo 1"
   #Command depends on targeted file system
   DEBUG_sys=false IGCM_sys_IsFileArchived $1
   if [ $? = 0 ] ; then
-    ExistFlag=$( IGCM_sys_RshArchive "[ -d $1 ] && echo 0 || echo 1" )
+    ExistFlag=$( IGCM_sys_RshArchive ${TempCommandDir} )
   else
-    ExistFlag=$( [ -d $1 ] && echo 0 || echo 1 )
+    ExistFlag=$( ${TempCommandDir} )
   fi
   IGCM_debug_PopStack "IGCM_sys_TestDirArchive"
@@ -489 +491 @@
 #D-#==================================================
 #D-function IGCM_sys_IsFileArchived
-#D-* Purpose: Test file that must NOT EXISTS on Archive
+#D-* Purpose: Test file that must NOT EXISTS on Archive based on filename only
 #D-* Examples:
 #D-
@@ -498 +500 @@
   fi
   typeset IsArchivedFlag
-  IsArchivedFlag=$( [ "X$( echo $@ | grep \/u\/rech )" != "X" ] && echo 0 || echo 1 )
+  IsArchivedFlag=$( ( [ "X$( echo $@ | grep \/u\/rech )" != "X" ] || [ "X$( echo $@ | grep \/\arch\/home\/rech )" != "X" ] ) && echo 0 || echo 1 )
   IGCM_debug_PopStack "IGCM_sys_IsFileArchived"
 
@@ -511 +513 @@
 function IGCM_sys_TestFileArchive {
   IGCM_debug_PushStack "IGCM_sys_TestFileArchive" $@
-  typeset ExistFlag
+  typeset ExistFlag TempCommandFile
+  TempCommandFile="[ -f $1 ] && echo 0 || echo 1"
   #Command depends on targeted file system
   #We want it quiet
   DEBUG_sys=false IGCM_sys_IsFileArchived $1
   if [ $? = 0 ] ; then
-    ExistFlag=$( IGCM_sys_RshArchive "[ -f $1 ] && echo 0 || echo 1" )
+    ExistFlag=$( IGCM_sys_RshArchive ${TempCommandFile} )
   else
-    ExistFlag=$( [ -f $1 ] && echo 0 || echo 1 )
+    ExistFlag=$( ${TempCommandFile} )
   fi
   IGCM_debug_PopStack "IGCM_sys_TestFileArchive"
@@ -1007 +1010 @@
     if [ $? = 0 ] ; then
       # add dmget (to demigrate all offline files) to reduce time of this command :
-      IGCM_sys_RshArchive "dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget -q -n"
+      #IGCM_sys_RshArchive "dmfind $1 -state MIG -o -state OFL -o -state PAR | dmget -q -n"
       i=0
       while [ $i -lt $NB_ESSAI ] ; do
@@ -1613 +1616 @@
     typeset status
     #
-    rsh gaya exec /bin/ksh <<EOF
+    rsh ${STOREHOST} exec /bin/ksh <<EOF
           cd ${R_SAVE}
-          /usr/local/bin/dods_rm DODS/pub/${LOGIN}/${R_DODS}/${1} > /dev/null 2>&1
+          /arch/local/bin/dods_rm DODS/pub/${LOGIN}/${R_DODS}/${1} > /dev/null 2>&1
           /bin/chmod -R u+w ${R_SAVE}/${1}
-          /usr/local/bin/dods_cp ${1} DODS/pub/${LOGIN}/${R_DODS} > /dev/null 2>&1
+          /arch/local/bin/dods_cp ${1} DODS/pub/${LOGIN}/${R_DODS} > /dev/null 2>&1
           /bin/chmod -R +rX ${R_SAVE}/${1}
           /bin/chmod -R u+w ${R_SAVE}/${1}
@@ -1797 +1800 @@
 
   ulimit -s unlimited
-## to be done only one time 
-## export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/smplocal/pub/NetCDF/4.1.3/lib:/smplocal/pub/HDF5/1.8.9/seq/lib 
-  echo ${LD_LIBRARY_PATH} | grep -i netcdf >/dev/null 2>&1 || export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/smplocal/pub/NetCDF/4.1.3/lib:/smplocal/pub/HDF5/1.8.9/seq/lib 
-  IGCM_debug_Print 1 "set LD_LIBRARY_PATH=${LD_LIBRARY_PATH}" 
+## to be done only one time
+## export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/smplocal/pub/NetCDF/4.1.3/lib:/smplocal/pub/HDF5/1.8.9/seq/lib
+  echo ${LD_LIBRARY_PATH} | grep -i netcdf >/dev/null 2>&1 || export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/smplocal/pub/NetCDF/4.1.3/lib:/smplocal/pub/HDF5/1.8.9/seq/lib
+  IGCM_debug_Print 1 "set LD_LIBRARY_PATH=${LD_LIBRARY_PATH}"
 
   export MP_STDOUTMODE=combined
@@ -1977 +1980 @@
   fi
 
-  if ( [ X${RUN_DIR_PATH} = X${HOME} ] || [ X${RUN_DIR_PATH} = X${WORKDIR} ] || [ X${RUN_DIR_PATH} = X${HOMEGAYA} ] ) ; then
+  if ( [ X${RUN_DIR_PATH} = X${HOME} ] || [ X${RUN_DIR_PATH} = X${WORKDIR} ] || [ X${RUN_DIR_PATH} = X${ARCHIVE} ] ) ; then
     IGCM_debug_Print 1 "Variable RUN_DIR_PATH is pointing to an important directory : ${RUN_DIR_PATH}"
     IGCM_debug_Print 1 "Please check the RUN_DIR_PATH definition in your Job : Job_${config_UserChoices_JobName}"