source: issm/oecreview/Archive/19101-20495/ISSM-20103-20104.diff@ 20498

Last change on this file since 20498 was 20498, checked in by Mathieu Morlighem, 9 years ago

CHG: done with Archive/19101-20495

File size: 1.3 KB
  • ../trunk-jpl/m4/issm_options.m4

     
    314314                                         MEXLINK=$(cat conftest.tmp | grep LDFLAGS  | sed -e "s/LDFLAGS ://g")
    315315                                         MEXLIB=$( cat conftest.tmp | grep LINKLIBS | sed -e "s/LINKLIBS ://g")
    316316                                         MEXEXT=$( cat conftest.tmp | grep LDEXT    | sed -e "s/LDEXT ://g" | awk '{print $[1]}')
    317                                          dnl rm -f conftest.tmp
     317                                         rm -f conftest.tmp
    318318                                fi
    319319
    320320                                dnl Make sure mexFunction.map is not in MEXLIB to avoid problems with global variables
  • ../trunk-jpl/jenkins/macosx_pine-island

     
    7070
    7171#number of cpus used in ISSM installation and compilation (one is usually
    7272#safer as some packages are very sensitive to parallel compilation)
    73 NUMCPUS_INSTALL=3
     73NUMCPUS_INSTALL=4
    7474
    7575#number of cpus used in the nightly runs.
    76 NUMCPUS_RUN=1
     76NUMCPUS_RUN=2
    7777
    7878#Nightly run options. The matlab routine runme.m will be called
    7979#as follows: runme($MATLAB_NROPTIONS). The options must be understandable
Note: See TracBrowser for help on using the repository browser.