Changeset 2199

Timestamp:

09/11/09 06:53:32 (15 years ago)

Author:

Mathieu Morlighem

Message:

some bug fix...

Location:

issm/trunk/cron

Files:

• nightlyrun.sh (modified) (2 diffs)
• run.sh (modified) (2 diffs)

issm/trunk/cron/nightlyrun.sh

@@ -51 +51 @@
 HOST_NAME=$(host_name $OS);
 START_TIME=$(timer)
-
-#Initialize nightly run output
-rm -rf $ISSM_DIR/test/Verification/NightlyRun
-mkdir  $ISSM_DIR/test/Verification/NightlyRun
-cat << END > $ISSM_DIR/test/Verification/NightlyRun/nightly.log
-today:   $(echo $TODAY)
-user:    $(whoami)
-host:    $(echo $HOST_NAME)
-OS:      $(echo $OS)
-release: $(echo "issm")
-END
+ISSM_RELEASE="issm";
 
 #create ISSM variables
@@ -156 +146 @@
 INSTALL_TIME=$(timer)
 ELAPSED_INSTALL=$(timer $START_TIME)
-cat << END >> $ISSM_DIR/test/Verification/NightlyRun/nightly.log
+rm -rf $ISSM_DIR/test/Verification/NightlyRun
+mkdir  $ISSM_DIR/test/Verification/NightlyRun
+cat << END > $ISSM_DIR/test/Verification/NightlyRun/nightly.log
+today:   $(echo $TODAY)
+user:    $(whoami)
+host:    $(echo $HOST_NAME)
+OS:      $(echo $OS)
+release: $(echo "issm")
 elapsed_install: $(echo $ELAPSED_INSTALL)
 END

issm/trunk/cron/run.sh

@@ -10 +10 @@
 source $1;
 
+#check NUMCPUS_RUN options
+if [ "$NUMCPUS_RUN" = "" ]
+then
+        echo "NUMCPUS_RUN option not found, defaulting to NUMCPUS_RUN = 1"
+        NUMCPUS_RUN=1
+fi
+
 #create softlink to startup
 cd $ISSM_DIR/test/Verification/NightlyRun/
-if [ -e startup.m ]
-then
-        rm startup.m
-fi
 ln -s $ISSM_DIR/startup.m .
 
@@ -25 +28 @@
         warning off %necessary to avoid a nightly.log of several Go for cielo_parallel
         try,
-        $(if [ "$1" = ""  ]
+        $(if [ "$NROPTIONS" = ""  ]
         then
-                echo "nightlyrun;"
+                echo "nightlyrun('rank',$i,'numprocs',$NUMCPUS_RUN);"
         else
                 echo "nightlyrun($NROPTIONS,'rank',$i,'numprocs',$NUMCPUS_RUN);"