Changeset 19470

Timestamp:

07/30/15 16:30:12 (10 years ago)

Author:

glperez

Message:

CHG: Restored previous increment style for rank.
CHG: Reduced number of CPUs for new Jenkins, as it was overworking the machine.

Location:

issm/trunk-jpl/jenkins

Files:

• jenkins.sh (modified) (4 diffs)
• linux64_caladan (modified) (1 diff)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -185 +185 @@
 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
@@ -231 +231 @@
 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
@@ -246 +246 @@
 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
@@ -258 +258 @@
 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"

issm/trunk-jpl/jenkins/linux64_caladan

@@ -85 +85 @@
 
 #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