Changeset 23275


Ignore:
Timestamp:
09/13/18 00:11:07 (7 years ago)
Author:
jdquinn
Message:

CHG: Activating Python Dakota tests on Pine Island; adjusting all Mac configs to match number of cores available on Pine Island

Location:
issm/trunk-jpl/jenkins
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/jenkins/macosx_pine-island

    r23155 r23275  
    55
    66#MATLAB path
    7 MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
     7MATLAB_PATH="/Applications/MATLAB_R2015b.app"
    88
    99#ISSM CONFIGURATION
    … …  
    4848
    4949#number of cpus used in the nightly runs.
    50 NUMCPUS_RUN=2
     50NUMCPUS_RUN=4
    5151
    5252#Nightly run options. The matlab routine runme.m will be called

  • issm/trunk-jpl/jenkins/macosx_pine-island_dakota

    r23274 r23275  
    55
    66#MATLAB path
    7 MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
     7MATLAB_PATH="/Applications/MATLAB_R2015b.app"
    88
    99#ISSM CONFIGURATION
    1010ISSM_CONFIG='--prefix=$ISSM_DIR \
    1111        --with-matlab-dir=$MATLAB_PATH \
     12        --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/bin/python2.7 \
     13        --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python \
    1214        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
    1315        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
    … …  
    2729#PYTHON and MATLAB testing
    2830MATLAB_TEST=1
    29 PYTHON_TEST=0
     31PYTHON_TEST=1
    3032
    3133#-----------------------------------#
    … …  
    5456
    5557#number of cpus used in the nightly runs.
    56 NUMCPUS_RUN=2
     58NUMCPUS_RUN=4
    5759
    5860#Nightly run options. The matlab routine runme.m will be called
    … …  
    6062#by Matlab and runme.m
    6163#ex: "'id',[101 102 103]"  ERRORS ARE LARGE FOR: 418 420
    62 PYTHON_NROPTIONS=""
     64PYTHON_NROPTIONS="--exclude 119 243 514 701 702 703 234 235 418 420 --include_name 'Dakota'"
    6365MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,703,234,235,418,420]"

  • issm/trunk-jpl/jenkins/macosx_pine-island_dakota_static

    r23155 r23275  
    44
    55#MATLAB path
    6 MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
     6MATLAB_PATH="/Applications/MATLAB_R2015b.app"
    77
    8 #ISSM CONFIGURATION 
     8#ISSM CONFIGURATION
    99ISSM_CONFIG='--prefix=$ISSM_DIR \
    1010        --disable-static \
    … …  
    5656
    5757#number of cpus used in the nightly runs.
    58 NUMCPUS_RUN=2
     58NUMCPUS_RUN=4
    5959
    6060#Nightly run options. The matlab routine runme.m will be called
    … …  
    6262#by Matlab and runme.m
    6363#ex: "'id',[101 102 103]"
    64 ##                           bamg mesh   FS                     
     64##                           bamg mesh   FS
    6565#PYTHON_NROPTIONS="--exclude_name 'Dakota'"
    6666#MATLAB_NROPTIONS="'exclude',[243,701,702,703,435,IdFromString('Dakota')]"

  • issm/trunk-jpl/jenkins/macosx_pine-island_examples

    r21694 r23275  
    55
    66#MATLAB path
    7 MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
     7MATLAB_PATH="/Applications/MATLAB_R2015b.app"
    88
    9 #ISSM CONFIGURATION 
     9#ISSM CONFIGURATION
    1010ISSM_CONFIG='--prefix=$ISSM_DIR \
    1111        --with-matlab-dir=$MATLAB_PATH \

  • issm/trunk-jpl/jenkins/macosx_pine-island_static

    r23155 r23275  
    55
    66#MATLAB path
    7 MATLAB_PATH="/Applications/MATLAB_R2015b.app/"
     7MATLAB_PATH="/Applications/MATLAB_R2015b.app"
    88
    99#ISSM CONFIGURATION
    … …  
    5555
    5656#number of cpus used in the nightly runs.
    57 NUMCPUS_RUN=2
     57NUMCPUS_RUN=4
    5858
    5959#Nightly run options. The matlab routine runme.m will be called
Note: See TracChangeset for help on using the changeset viewer.