Changeset 24394


Ignore:
Timestamp:
11/25/19 13:39:22 (5 years ago)
Author:
jdquinn
Message:

CHG: Reverting to MPICH 3.2 and PETSc 3.7 for Mac builds; cleanup; eased field tolerance

Location:
issm/trunk-jpl
Files:
4 added
4 deleted
7 edited

Legend:

Unmodified
Added
Removed

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

    r24348 r24394  
    1111        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
    1212        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    13         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
     13        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    1414        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
    1515        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    … …  
    3939        autotools       install.sh
    4040        cmake           install.sh
    41         mpich           install-3.3.sh
    42         lapack          install-3.8-mac.sh
    43         petsc           install-3.11-macOS.sh
     41        mpich           install-3.3-mac.sh
     42        petsc           install-3.11-mac.sh
    4443        triangle        install-macosx64.sh
    4544        chaco           install.sh
    … …  
    5655#
    5756# NOTE: One is usually safer as some packages are very sensitive to parallel
    58 #               compilation.
     57#               compilation
    5958#
    6059NUMCPUS_INSTALL=8
    … …  
    6564# Nightly run options
    6665#
    67 # See documentation in test/NightlyRun/runme.* for more information.
     66# See documentation in test/NightlyRun/runme.* for more information
    6867#
    6968# NOTE:

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

    r23554 r24394  
    1 
    21#-------------------------------#
    32# 1: ISSM general configuration #
    43#-------------------------------#
    54
    6 #MATLAB path
     5# MATLAB path
    76MATLAB_PATH="/Applications/MATLAB_R2015b.app"
    87
    9 #ISSM CONFIGURATION
    10 ISSM_CONFIG='--prefix=$ISSM_DIR \
     8# ISSM CONFIGURATION
     9ISSM_CONFIG='\
     10        --prefix=$ISSM_DIR \
    1111        --with-matlab-dir=$MATLAB_PATH \
    1212        --with-python-dir=/System/Library/Frameworks/Python.framework/Versions/2.7 \
    1313        --with-python-numpy-dir=/System/Library/Frameworks/Python.framework/Versions/2.7/Extras/lib/python/numpy \
     14        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
     15        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
     16        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
     17        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
     18        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
     19        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
     20        --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
    1421        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
    15         --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
    16         --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi" \
    17         --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
    18         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
    19         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
    20         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
     22        --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
    2123        --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
    22         --with-boost-dir=$ISSM_DIR/externalpackages/boost/install \
    23         --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
    24         --with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
     24        --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
    2525        --with-cxxoptflags="-std=c++11" \
    2626        --with-numthreads=4 \
    … …  
    2828        --enable-development'
    2929
    30 #PYTHON and MATLAB testing
     30# Test suites
    3131MATLAB_TEST=1
    3232PYTHON_TEST=1
     33JAVASCRIPT_TEST=0
     34EXAMPLES_TEST=0
    3335
    3436#-----------------------------------#
    … …  
    3739
    3840#List of external pakages to be installed and their installation scripts
    39 EXTERNALPACKAGES="autotools    install.sh
    40                                                 cmake            install.sh
    41                                                 mpich        install-3.2-macosx64.sh
    42                                                 chaco        install-macosx64.sh
    43                                                 m1qn3        install.sh
    44                                                 petsc        install-3.7-macosx64.sh
    45                                                 triangle     install-macosx64.sh
    46                                                 boost        install-1.55-macosx-el_capitan.sh
    47                                                 dakota       install-6.2-macosx64.sh
    48                                                 shell2junit  install.sh"
     41EXTERNALPACKAGES="
     42        autotools       install.sh
     43        cmake           install.sh
     44        mpich           install-3.3-mac.sh
     45        petsc           install-3.11-mac.sh
     46        triangle        install-macosx64.sh
     47        chaco           install.sh
     48        m1qn3           install.sh
     49        semic           install.sh
     50        boost           install-1.55-macosx-el_capitan.sh
     51        dakota          install-6.2-macosx64.sh
     52        shell2junit     install.sh
     53"
    4954
    5055#-----------------#
    … …  
    5257#-----------------#
    5358
    54 #number of cpus used in ISSM installation and compilation (one is usually
    55 #safer as some packages are very sensitive to parallel compilation)
     59# Number of CPUs used in ISSM compilation
     60#
     61# NOTE: One is usually safer as some packages are very sensitive to parallel
     62#               compilation
     63#
    5664NUMCPUS_INSTALL=4
    5765
    58 #number of cpus used in the nightly runs.
     66# Number of CPUs used in the nightly runs
    5967NUMCPUS_RUN=4
    6068
    61 #Nightly run options. The matlab routine runme.m will be called
    62 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
    63 #by Matlab and runme.m
    64 #ex: "'id',[101 102 103]"  ERRORS ARE LARGE FOR: 418 420
     69# Nightly run options
     70#
     71# See documentation in test/NightlyRun/runme.* for more information
     72#
     73# NOTE:
     74#       - Errors are large for 418, 420
     75#
    6576PYTHON_NROPTIONS="--exclude 119 243 514 701 702 703 234 235 418 420 --include_name 'Dakota'"
    6677MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,703,234,235,418,420],'id',[IdFromString('Dakota')]"

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

    r24348 r24394  
    1212        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
    1313        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
    14         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
     14        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    1515        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
    1616        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    … …  
    4040        autotools       install.sh
    4141        cmake           install.sh
    42         mpich           install-3.3.sh
    43         lapack          install-3.8-mac.sh
    44         petsc           install-3.7-macosx64.sh
     42        mpich           install-3.3-mac.sh
     43        petsc           install-3.11-mac.sh
    4544        triangle        install-macosx64.sh
    4645        chaco           install.sh
    … …  
    6463#
    6564# NOTE: One is usually safer as some packages are very sensitive to parallel
    66 #       compilation.
     65#       compilation
    6766#
    68 NUMCPUS_INSTALL=10
     67NUMCPUS_INSTALL=8
     68
     69# Number of CPUs used in the nightly runs
     70NUMCPUS_RUN=8
     71
     72# Nightly run options
     73#
     74# See documentation in test/NightlyRun/runme.* for more information.
     75#
     76PYTHON_NROPTIONS=""
     77MATLAB_NROPTIONS=""
     78

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

    r23453 r24394  
    1 
    21#-------------------------------#
    32# 1: ISSM general configuration #
    43#-------------------------------#
    54
    6 #MATLAB path
     5# MATLAB path
    76MATLAB_PATH="/Applications/MATLAB_R2015b.app"
    87
    9 #ISSM CONFIGURATION
    10 ISSM_CONFIG='--prefix=$ISSM_DIR \
     8# ISSM CONFIGURATION
     9ISSM_CONFIG='\
     10        --prefix=$ISSM_DIR \
    1111        --disable-static \
    1212        --enable-standalone-executables \
    1313        --enable-standalone-libraries \
     14        --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin14/5.2.0/libgcc.a" \
    1415        --with-matlab-dir=$MATLAB_PATH \
    15         --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
    1616        --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
    1717        --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib -lmpi -lpmpi -lmpifort -lmpicxx" \
     18        --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
     19        --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
     20        --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
     21        --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
    1822        --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
    19         --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    20         --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
    21         --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install \
    22         --with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
     23        --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
     24        --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
    2325        --with-m1qn3-dir=$ISSM_DIR/externalpackages/m1qn3/install \
     26        --with-semic-dir=$ISSM_DIR/externalpackages/semic/install \
    2427        --with-math77-dir=$ISSM_DIR/externalpackages/math77/install \
    25         --with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a /usr/local/gfortran/lib/libquadmath.a /usr/local/gfortran/lib/gcc/x86_64-apple-darwin14/5.2.0/libgcc.a"'
     28'
    2629
    27 #PYTHON and MATLAB testing
     30# Test suites
    2831MATLAB_TEST=0
    2932PYTHON_TEST=0
     33JAVASCRIPT_TEST=0
     34EXAMPLES_TEST=0
    3035
    3136#-----------------------------------#
    … …  
    3338#-----------------------------------#
    3439
    35 #List of external pakages to be installed and their installation scripts
    36 EXTERNALPACKAGES="autotools             install.sh
    37                                         cmake           install.sh
    38                                         mpich           install-3.2-macosx64-static.sh
    39                                         m1qn3           install.sh
    40                                         petsc           install-3.7-macosx64-static.sh
    41                                         triangle        install-macosx64.sh
    42                                         math77          install.sh
    43                                         gmt                     install-mac-precompiled.sh
    44                                         gmsh            install-mac-precompiled.sh
    45                                         shell2junit     install.sh"
     40# List of external pakages to be installed and their installation scripts
     41#
     42# NOTE:
     43# - For SLR capabilities, we need gmsh, math77, and gmt
     44# - GMT depends on GDAL and NetCDF
     45#
     46EXTERNALPACKAGES="
     47        autotools       install.sh
     48        cmake           install.sh
     49        mpich           install-3.2-mac-static.sh
     50        petsc           install-3.7-mac-static.sh
     51        triangle        install-macosx64.sh
     52        chaco           install.sh
     53        m1qn3           install.sh
     54        semic           install.sh
     55        math77          install.sh
     56        gmt                     install-mac-precompiled.sh
     57        gmsh            install-mac-precompiled.sh
     58        shell2junit     install.sh
     59"
    4660
    47 #for SLR we need gmsh to mesh, math77, and gmt (which itself needs gdal and netcdf...)
    4861#-----------------#
    4962# 4: test options #
    5063#-----------------#
    5164
    52 #number of cpus used in ISSM installation and compilation (one is usually
    53 #safer as some packages are very sensitive to parallel compilation)
    54 NUMCPUS_INSTALL=4
     65# Number of CPUs used in ISSM compilation
     66#
     67# NOTE: One is usually safer as some packages are very sensitive to parallel
     68#               compilation
     69#
     70NUMCPUS_INSTALL=8
    5571
    56 #number of cpus used in the nightly runs.
    57 NUMCPUS_RUN=4
     72# Number of CPUs used in the nightly runs
     73NUMCPUS_RUN=8
    5874
    59 #Nightly run options. The matlab routine runme.m will be called
    60 #as follows: runme($MATLAB_NROPTIONS). The options must be understandable
    61 #by Matlab and runme.m
    62 #ex: "'id',[101 102 103]"
    63 ##                           bamg mesh   FS
    64 #PYTHON_NROPTIONS=""
    65 #MATLAB_NROPTIONS=""
     75# Nightly run options
     76#
     77# See documentation in test/NightlyRun/runme.* for more information.
     78#
     79PYTHON_NROPTIONS=""
     80MATLAB_NROPTIONS=""

  • issm/trunk-jpl/test/NightlyRun/test124.js

    r21175 r24394  
    2424        2e-09,3e-9,3e-9,3e-9,1e-13,1e-12,1e-12,
    2525        2e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10,
    26         2e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10];
     26        3e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10];
    2727field_values=[
    2828        (md.results.TransientSolution[0](1).Vx),

  • issm/trunk-jpl/test/NightlyRun/test124.m

    r21056 r24394  
    2323        2e-09,3e-9,3e-9,3e-9,1e-13,1e-12,1e-12,...
    2424        2e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10,...
    25         2e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10};
     25        3e-09,3e-9,3e-9,3e-9,1e-10,1e-10,1e-10};
    2626field_values={...
    2727        (md.results.TransientSolution(1).Vx),...

  • issm/trunk-jpl/test/NightlyRun/test124.py

    r23793 r24394  
    2929field_tolerances = [2e-09, 3e-9, 3e-9, 3e-9, 1e-13, 1e-12, 1e-12,
    3030                    2e-09, 3e-9, 3e-9, 3e-9, 1e-10, 1e-10, 1e-10,
    31                     2e-09, 3e-9, 3e-9, 3e-9, 1e-10, 1e-10, 1e-10]
     31                    3e-09, 3e-9, 3e-9, 3e-9, 1e-10, 1e-10, 1e-10]
    3232field_values = [md.results.TransientSolution[0].Vx,
    3333                md.results.TransientSolution[0].Vy,
Note: See TracChangeset for help on using the changeset viewer.