Changeset 3132

Timestamp:

02/25/10 07:47:21 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed nightly run (new login name in cluster.rc)

Location:

issm/trunk/cron

Files:

• nightlyrun.sh (modified) (1 diff)
• report.sh (modified) (5 diffs)

issm/trunk/cron/nightlyrun.sh

@@ -75 +75 @@
 cluster_codepath=$ISSM_DIR/bin
 cluster_executionpath=$EXECUTION_PATH
+cluster_login=$USER
 
 end

issm/trunk/cron/report.sh

@@ -2 +2 @@
 #generate html report from nightly.log output file
 
+#First go to the nightly run directory (created by nightlyrun.sh)
 cd $ISSM_DIR/test/Verification/NightlyRun/
+
+#----------------------------#
+# Initialize local variables #
+#----------------------------#
 
 #process nightly.log
@@ -58 +63 @@
 fi
 
-#build report.html
+#-------------------#
+# build report.html #
+#-------------------#
 
 #first: summary
@@ -111 +118 @@
 fi
 
-#Matlab error report
-if [ -e matlaberror.log ]
-then
-cat << END > matlaberror.html
-<table $H2_STYLE><tr><td $H2_FONT>Matlab error</td></tr></table>
-<table $MATLAB_STYLE><tr><td $MATLAB_FONT>
-<pre>$(cat matlaberror.log)</pre>
-</td></tr></table>
-END
-else
-        mktemp matlaberror.html
-fi
-
-#report content
+
+#report table
 if [ $IS_RUN -eq 1 ];
 then
@@ -189 +184 @@
 fi
 
+#Matlab error report
+if [ -e matlaberror.log ]
+then
+cat << END > matlaberror.html
+<table $H2_STYLE><tr><td $H2_FONT>Matlab error</td></tr></table>
+<table $MATLAB_STYLE><tr><td $MATLAB_FONT>
+<pre>$(cat matlaberror.log)</pre>
+</td></tr></table>
+END
+else
+        mktemp matlaberror.html
+fi
+
 #last footer
 cat << END > footer.html
@@ -197 +205 @@
 
 #concatenate files
-cat summary.html matlaberror.html content.html footer.html > report.html
+cat summary.htmlcontent.html matlaberror.html footer.html > report.html
 rm  summary.html content.html footer.html matlaberror.html matlab.log