Changeset 22757 for issm/trunk-jpl/packagers/ubuntu/package.sh

Timestamp:

05/10/18 10:20:20 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk and trunk-jpl

Location:

issm/trunk-jpl

Files:

• . (modified) (1 prop)
• packagers/ubuntu/package.sh (modified) (1 diff)

issm/trunk-jpl/packagers/ubuntu/package.sh

@@ -5 +5 @@
 cat generic_static.m | sed -e "s/generic_static/generic/g" > generic.m
 echo "move mpiexec to bin" 
+cp ../externalpackages/mpich/install/bin/mpiexec .
+cp ../externalpackages/mpich/install/bin/hydra_pmi_proxy .
 
 #Check that test101 runs
 cd $ISSM_DIR/test/NightlyRun
 rm matlab.log
-$MATLAB_DIR/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
+/usr/local/MATLAB/R2015a/bin/matlab -nojvm -nosplash -r "try, addpath $ISSM_DIR/bin $ISSM_DIR/lib; runme('id',101);exit; catch me,fprintf('%s',getReport(me)); exit; end" -logfile matlab.log
 
 if [[ $(cat matlab.log | grep -c SUCCESS) -lt 10 ]]; then