source: issm/oecreview/Archive/19101-20495/ISSM-19469-19470.diff@ 20498

Index: ../trunk-jpl/jenkins/jenkins.sh
===================================================================
--- ../trunk-jpl/jenkins/jenkins.sh     (revision 19469)
+++ ../trunk-jpl/jenkins/jenkins.sh     (revision 19470)
@@ -184,7 +184,7 @@
 #matlab tests
 if [ $MATLAB_TEST -eq 1 ]; then
 #Launch all tests on different cpus {{{
-for (( i=1;i<=$NUMCPUS_RUN;i*=2 ))
+for (( i=1;i<=$NUMCPUS_RUN;i++ ))
 do
        #Launch matlab and the nightly run script
        cat > $ISSM_DIR/nightlylog/matlab_run$i.m << EOF
@@ -230,7 +230,7 @@
 #concatenate reports
 cd $ISSM_DIR/nightlylog/
 rm matlab_log.log
-for (( i=1;i<=$NUMCPUS_RUN;i*=2 ))
+for (( i=1;i<=$NUMCPUS_RUN;i++ ))
 do
        cat matlab_log$i.log >> matlab_log.log
 done
@@ -245,7 +245,7 @@
 #Launch all tests on different cpus {{{
 PYTHON_START_TIME=$(timer);
 export PYTHONSTARTUP=$ISSM_DIR/src/m/dev/devpath.py
-for (( i=1;i<=$NUMCPUS_RUN;i*=2 ))
+for (( i=1;i<=$NUMCPUS_RUN;i++ ))
 do
        cd $ISSM_DIR/test/NightlyRun
        echo "--------------Running Python test for Rank $i---------------------"
@@ -257,7 +257,7 @@
 # concatenate reports
 cd $ISSM_DIR/nightlylog/
 rm python_log.log
-for (( i=1;i<=$NUMCPUS_RUN;i*=2 ))
+for (( i=1;i<=$NUMCPUS_RUN;i++ ))
 do
        echo "This is the concatenation phase for rank: python_log$i.log"
        #cat python_log$i.log
Index: ../trunk-jpl/jenkins/linux64_caladan
===================================================================
--- ../trunk-jpl/jenkins/linux64_caladan        (revision 19469)
+++ ../trunk-jpl/jenkins/linux64_caladan        (revision 19470)
@@ -84,7 +84,7 @@
 NUMCPUS_INSTALL=4
 
 #number of cpus used in the nightly runs.
-NUMCPUS_RUN=4
+NUMCPUS_RUN=2
 
 #Nightly run options. The matlab routine runme.m will be called
 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable