Changeset 11572

Timestamp:

02/28/12 15:17:05 (13 years ago)

Author:

Mathieu Morlighem

Message:

minor changes

File:

• issm/trunk-jpl/cron/nightlyrun.sh (modified) (8 diffs)

issm/trunk-jpl/cron/nightlyrun.sh

@@ -47 +47 @@
 }
 #}}}
+
 #Get configuration
 #Source config file{{{1
@@ -110 +111 @@
 cd $ISSM_TIER/test/NightlyRun/
 if [ "$MACHINE" = "win7" ]; then
-cat << END > $HOST_NAME"_settings.m"
+        cat << END > $HOST_NAME"_settings.m"
 cluster.login='$USER';
 cluster.codepath='`cygpath -m $ISSM_TIER/bin`';
@@ -116 +117 @@
 END
 else
-cat << END > $HOST_NAME"_settings.m"
+        cat << END > $HOST_NAME"_settings.m"
 cluster.login='$USER';
 cluster.codepath='$ISSM_TIER/bin';
@@ -139 +140 @@
                 package=`echo $EXTERNALPACKAGES | cut -d " " -f $i-$i`
                 package_config=`echo $EXTERNALPACKAGES_CONFIGS | cut -d " " -f $i-$i`
-                package_numcpus=`echo $EXTERNALPACKAGES_NUMCPUS | cut -d " " -f $i-$i`
 
                 cd $package
-                $package_config $package_numcpus
+                $package_config
                 cd ..
         done
-
 
 elif [ "$ISSM_EXTERNALPACKAGES" == "copy" ]
@@ -178 +177 @@
         ./scripts/automakererun.sh
         source ./configs/$COMPILE_CONFIG_FILE
-
-        make -j $NUMCPUS_INSTALL
-        make -j $NUMCPUS_INSTALL install
+        make install
 
 elif [ "$ISSM_COMPILATION" == "no" ]
@@ -194 +191 @@
 #create softlink to startup {{{1
 cd $ISSM_TIER/test/NightlyRun/
-if [ "$MACHINE" = "win7" ]; then
-        cp $ISSM_TIER/startup.m .
-else
-        ln -s $ISSM_TIER/startup.m .
-fi
+rm startup.m #in case it alreade exists
+cp $ISSM_TIER/startup.m .
 #}}}
 #Create nightlylog directory and info.log {{{1
@@ -231 +225 @@
         MATLAB_TIER=$ISSM_TIER
 fi
-
 #}}}
 #Launch all tests on different cpus {{{1
@@ -281 +274 @@
 #concatenate all reports {{{1
 cd $ISSM_TIER/nightlylog/
-mv matlab_log1.log  matlab_log.log
+cp matlab_log1.log  matlab_log.log
 for (( i=2;i<=$NUMCPUS_RUN;i++ ))
 do