Changeset 1595

Timestamp:

08/05/09 16:53:45 (16 years ago)

Author:

Eric.Larour

Message:

Matlab better launching

Location:

issm/trunk/cron

Files:

• nightlyrun.sh (modified) (3 diffs)
• winxp32_cronfile (modified) (1 diff)

issm/trunk/cron/nightlyrun.sh

@@ -51 +51 @@
 
 #Erase previous code and Fetch the new one
-#rm -rf trunk
-#svn checkout $REPOSITORY
+rm -rf trunk
+svn checkout $REPOSITORY
 
 #install ISSM
@@ -77 +77 @@
         cd $ISSM_DIR
         rm -rf externalpackages
-        ln -s $EXTERNALPACKAGESDIR ./
+        cp -Rf $EXTERNALPACKAGESDIR ./
 
         rm -rf devpackages
-        ln -s $DEVPACKAGESDIR ./
+        cp -Rf $DEVPACKAGESDIR ./
 else
         #2: install some required external packages
@@ -103 +103 @@
 
 #4: compile and install ISSM
-make -j $NUMCPUS
-make -j $NUMCPUS install
+if [[ "$OS" == "winxp32" ]] 
+then
+        cd $ISSM_DIR/src/c
+        ./intel-compile.sh
+        cd $ISSM_DIR/src/mex
+        make install
+        cd $ISSM_DIR
+else
+        make -j $NUMCPUS
+        make -j $NUMCPUS install
+fi
+
 INSTAL_TIME=$(timer)
 export ELAPSED_INSTAL=$(timer $START_TIME)
 
 #Launch matlab and the nightly run script
-matlab -nojvm -nosplash  > ./nightlylong.log << EOF 
+cat > matlab_run.m << EOF
 startup
 nightlyrun($PACKAGES);
+exit
 EOF
+
+matlab -wait -nojvm -nosplash  -r matlab_run -logfile nightlylong.log
 
 #removed unused lines to deal with a smaller file

issm/trunk/cron/winxp32_cronfile

@@ -2 +2 @@
 SHELL=/bin/bash
 
-#mail output to Mathieu
+#mail output to Eric
 MAILTO=eric.larour@jpl.nasa.gov
 
 #cronjob: issm sunday-friday 9:00pm
-0 21 * * 0-5 cd /u/wilkes-r1b/morlighe/svn/issm/trunk/cron/ && ./nightlyrun.sh configs/winxp32_larour
+0 21 * * 0-5 cd /cygdrive/c/issm/trunk/cron  && ./nightlyrun.sh configs/winxp32_larour