Changeset 2186

Timestamp:

09/10/09 14:11:31 (16 years ago)

Author:

Mathieu Morlighem

Message:

some fixing

Location:

issm/trunk/cron

Files:

• configs/linux64_local (added)
• nightlyrun.sh (modified) (6 diffs)
• report.sh (modified) (1 diff)
• run.sh (modified) (4 diffs)

issm/trunk/cron/nightlyrun.sh

@@ -107 +107 @@
                         cd $ep
                         cp configs/$OS/* .
-                        ./install.sh $NUMCPUS
+                        ./install.sh $NUMCPUS_INSTALL
                         cd ..
                 done
@@ -135 +135 @@
         then
                 cd $ISSM_DIR/src/c
-                ./intel-compile.sh >> ../../c-compilation.log 2>&1
+                ./intel-compile.sh
                 cd $ISSM_DIR/src/mex
-                make install >> ../../mex-compilation.log 2>&1
+                make install
                 cd $ISSM_DIR
         else
-                make -j $NUMCPUS >> ../../cmex-compilation.log 2>&1
-                make -j $NUMCPUS install >> ../../cmex-compilation.log 2>&1
+                make -j $NUMCPUS_INSTALL
+                make -j $NUMCPUS_INSTALL install
         fi
 fi
@@ -162 +162 @@
 #Launch matlab and the nightly run script
 cd $ISSM_DIR/cron/
-./run.sh $NROPTIONS
+./run.sh $1
 ELAPSED_RUN=$(timer $INSTALL_TIME)
 ELAPSED_TOTAL=$(timer $START_TIME)
@@ -176 +176 @@
 exit
                 
-#send mail
-source cron/mailinglist
-for i in `echo $MAILINGLIST`; do
-
-        if [ "$OS" = "winxp32" ]
-        then
-                email -html -f "ISSM Nightly run $EMAIL_ADRESS" -s "Nightly runs of $ISSM_RELEASE , operating system: $OS. " $i < report.html 
-        else 
-                if [ "$OS" = "linux64" ]
+#send mail if requested
+if [ "$SKIPMAIL" != "yes" ]
+then
+        source cron/mailinglist
+        for i in `echo $MAILINGLIST`; do
+
+                if [ "$OS" = "winxp32" ]
                 then
-                        cat - report.html <<HERE | /usr/lib/sendmail  -oi -t
+                        email -html -f "ISSM Nightly run $EMAIL_ADRESS" -s "Nightly runs of $ISSM_RELEASE , operating system: $OS. " $i < report.html 
+                else 
+                        if [ "$OS" = "linux64" ]
+                        then
+                                cat - report.html <<HERE | /usr/lib/sendmail  -oi -t
 From: "ISSM Nightly run" <$EMAIL_ADRESS>
 To: $i
@@ -194 +196 @@
 HERE
                 else
-                        cat - report.html <<HERE | /usr/sbin/sendmail  -oi -t
+cat - report.html <<HERE | /usr/sbin/sendmail  -oi -t
 From: "ISSM Nightly run" <$EMAIL_ADRESS>
 To: $i
@@ -201 +203 @@
 Content-Type: text/html
 HERE
+                        fi
                 fi
-        fi
-
-done
+        done
+fi

issm/trunk/cron/report.sh

@@ -125 +125 @@
 
 #report content
-if [ $IS_INSTALL -eq 1 ];
+if [ $IS_RUN -eq 1 ];
 then
         cat << END > content.html

issm/trunk/cron/run.sh

@@ -1 +1 @@
 #!/bin/bash
 
-numprocs=8;
+#get configs
+if [ $# -ne 1 ];
+then
+        #no config file specified: exit
+        echo "no config file specified. Exiting..."
+        exit 1
+fi
+source $1;
 
 #create softlink to startup
-rm startup.m
 cd $ISSM_DIR/test/Verification/NightlyRun/
+if [ -e startup.m ]
+then
+        rm startup.m
+fi
 ln -s $ISSM_DIR/startup.m .
 
 #Launch all tests on different cpus
-for (( i=1;i<=$numprocs;i++ ))
+for (( i=1;i<=$NUMCPUS_RUN;i++ ))
 do
         #Launch matlab and the nightly run script
@@ -17 +27 @@
         $(if [ "$1" = ""  ]
         then
-                echo "nightlyrun('rank',$i,'numprocs',$numprocs);"
+                echo "nightlyrun;"
         else
-                echo "nightlyrun($1,'rank',$i,'numprocs',$numprocs);"
+                echo "nightlyrun($NROPTIONS,'rank',$i,'numproc',$NUMCPUS_RUN);"
         fi
                 )
@@ -26 +36 @@
                 directory=strsplit(pwd,'/');
                 message=getReport(me)
-                fid=fopen([ISSM_DIR '/test/Verification/NightlyRun/matlaberror.log'], 'wt');
+                fid=fopen([ISSM_DIR '/test/Verification/NightlyRun/matlaberror.log'], 'at');
                 fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end});
                 fprintf(fid,'%s',message);
@@ -43 +53 @@
 #concatenate all reports
 mv matlab_log1.log  matlab_log.log
-for (( i=2;i<=$numprocs;i++ ))
+for (( i=2;i<=$NUMCPUS_RUN;i++ ))
 do
         cat matlab_log.log matlab_log$i.log > matlab_log.log.bak