Rev | Line | |
---|
[20498] | 1 | Index: ../trunk-jpl/m4/issm_options.m4
|
---|
| 2 | ===================================================================
|
---|
| 3 | --- ../trunk-jpl/m4/issm_options.m4 (revision 20103)
|
---|
| 4 | +++ ../trunk-jpl/m4/issm_options.m4 (revision 20104)
|
---|
| 5 | @@ -314,7 +314,7 @@
|
---|
| 6 | MEXLINK=$(cat conftest.tmp | grep LDFLAGS | sed -e "s/LDFLAGS ://g")
|
---|
| 7 | MEXLIB=$( cat conftest.tmp | grep LINKLIBS | sed -e "s/LINKLIBS ://g")
|
---|
| 8 | MEXEXT=$( cat conftest.tmp | grep LDEXT | sed -e "s/LDEXT ://g" | awk '{print $[1]}')
|
---|
| 9 | - dnl rm -f conftest.tmp
|
---|
| 10 | + rm -f conftest.tmp
|
---|
| 11 | fi
|
---|
| 12 |
|
---|
| 13 | dnl Make sure mexFunction.map is not in MEXLIB to avoid problems with global variables
|
---|
| 14 | Index: ../trunk-jpl/jenkins/macosx_pine-island
|
---|
| 15 | ===================================================================
|
---|
| 16 | --- ../trunk-jpl/jenkins/macosx_pine-island (revision 20103)
|
---|
| 17 | +++ ../trunk-jpl/jenkins/macosx_pine-island (revision 20104)
|
---|
| 18 | @@ -70,10 +70,10 @@
|
---|
| 19 |
|
---|
| 20 | #number of cpus used in ISSM installation and compilation (one is usually
|
---|
| 21 | #safer as some packages are very sensitive to parallel compilation)
|
---|
| 22 | -NUMCPUS_INSTALL=3
|
---|
| 23 | +NUMCPUS_INSTALL=4
|
---|
| 24 |
|
---|
| 25 | #number of cpus used in the nightly runs.
|
---|
| 26 | -NUMCPUS_RUN=1
|
---|
| 27 | +NUMCPUS_RUN=2
|
---|
| 28 |
|
---|
| 29 | #Nightly run options. The matlab routine runme.m will be called
|
---|
| 30 | #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
|
---|
Note:
See
TracBrowser
for help on using the repository browser.