Changeset 5076

Timestamp:

08/09/10 12:03:08 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/cron

Files:

• nightlyrun.sh (modified) (2 diffs)
• report.sh (modified) (1 diff)
• run.sh (modified) (1 diff)

issm/trunk/cron/nightlyrun.sh

@@ -39 +39 @@
 
 #Get configuration
-#Check that no other nightly run is running {{{1
-if [ "$(ps aux | grep "nightlyrun\.sh" | grep -v "grep")" ]
-then
-        echo "WARNING: A nightly run is already running. Killing..."
-
-        for JOBID in $(ps aux | grep "nighltyrun\.sh" | grep -v "grep" | awk '{printf("%s\n",$2);}');
-        do
-                kill -9 $JOBID;
-        done;
-fi
-#}}}
 #Source config file{{{1
 if [ $# -ne 1 ];
@@ -257 +246 @@
 #Send Report
 #Build html report {{{1
-cd $ISSM_DIR/cron/
-./report.sh
+cd $ISSM_DIR/nightlylog/
+sh ../cron/report.sh
 echo "html report located in $ISSM_DIR/nightlylog/report.html"
 #}}}

issm/trunk/cron/report.sh

@@ -1 +1 @@
 #!/bin/bash
 #generate html report from nightly.log output file
-
-#First go to the nightly run directory (created by nightlyrun.sh)
-cd $ISSM_DIR/nightlylog/
 
 #----------------------------#

issm/trunk/cron/run.sh

@@ -38 +38 @@
                 $(if [ "$NROPTIONS" = ""  ]
         then
-                echo "runme('rank',$i,'numprocs',$NUMCPUS_RUN);"
+                echo "runme('output','nightly','rank',$i,'numprocs',$NUMCPUS_RUN);"
         else
-                echo "runme($NROPTIONS,'rank',$i,'numprocs',$NUMCPUS_RUN);"
+                echo "runme($NROPTIONS,'output','nightly','rank',$i,'numprocs',$NUMCPUS_RUN);"
         fi
         )