Changeset 28139


Ignore:
Timestamp:
03/13/24 11:58:20 (12 months ago)
Author:
jdquinn
Message:

CHG: Corrected path to libgfortran

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

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/jenkins/mac-intel-basic

    r28127 r28139  
    1212        --with-numthreads=4 \
    1313        --with-matlab-dir=${MATLAB_PATH} \
    14         --with-fortran-lib="-L/usr/local/Cellar/gcc/13.1.0/lib/gcc/13 -lgfortran" \
     14        --with-fortran-lib="-L/usr/local/Cellar/gcc/13.2.0/lib/gcc/current -lgfortran" \
    1515        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    1616        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
  • issm/trunk-jpl/jenkins/mac-intel-binaries-matlab

    r28116 r28139  
    2020        --disable-dependency-tracking \
    2121        --with-matlab-dir=${MATLAB_PATH} \
    22         --with-fortran-lib="/usr/local/Cellar/gcc/13.1.0/lib/gcc/13/libgfortran.a /usr/local/Cellar/gcc/13.1.0/lib/gcc/13/libquadmath.a /usr/local/Cellar/gcc/13.1.0/lib/gcc/13/gcc/x86_64-apple-darwin21/13/libgcc.a" \
     22        --with-fortran-lib="/usr/local/Cellar/gcc/13.2.0/lib/gcc/current/libgfortran.a /usr/local/Cellar/gcc/13.2.0/lib/gcc/current/libquadmath.a /usr/local/Cellar/gcc/13.2.0/lib/gcc/current/gcc/x86_64-apple-darwin21/13/libgcc.a" \
    2323        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    2424        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
  • issm/trunk-jpl/jenkins/mac-intel-binaries-python-3

    r28116 r28139  
    2020        --with-python-dir=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \
    2121        --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \
    22         --with-fortran-lib="/usr/local/Cellar/gcc/13.1.0/lib/gcc/13/libgfortran.a /usr/local/Cellar/gcc/13.1.0/lib/gcc/13/libquadmath.a /usr/local/Cellar/gcc/13.1.0/lib/gcc/13/gcc/x86_64-apple-darwin21/13/libgcc.a" \
     22        --with-fortran-lib="/usr/local/Cellar/gcc/13.2.0/lib/gcc/current/libgfortran.a /usr/local/Cellar/gcc/13.2.0/lib/gcc/current/libquadmath.a /usr/local/Cellar/gcc/13.2.0/lib/gcc/current/gcc/x86_64-apple-darwin21/13/libgcc.a" \
    2323        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    2424        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
  • issm/trunk-jpl/jenkins/mac-intel-dakota

    r28129 r28139  
    2020        --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \
    2121        --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \
    22         --with-fortran-lib="-L/usr/local/Cellar/gcc/13.1.0/lib/gcc/13 -lgfortran" \
     22        --with-fortran-lib="-L/usr/local/Cellar/gcc/13.2.0/lib/gcc/current -lgfortran" \
    2323        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    2424        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
  • issm/trunk-jpl/jenkins/mac-intel-examples

    r28079 r28139  
    2020        --with-numthreads=4 \
    2121        --with-matlab-dir=${MATLAB_PATH} \
    22         --with-fortran-lib="-L/usr/local/Cellar/gcc/13.1.0/lib/gcc/13 -lgfortran" \
     22        --with-fortran-lib="-L/usr/local/Cellar/gcc/13.2.0/lib/gcc/current -lgfortran" \
    2323        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    2424        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
  • issm/trunk-jpl/jenkins/mac-intel-full

    r28138 r28139  
    2424        --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \
    2525        --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \
    26         --with-fortran-lib="-L/usr/local/Cellar/gcc/13.2.0/lib/gcc/13 -lgfortran" \
     26        --with-fortran-lib="-L/usr/local/Cellar/gcc/13.2.0/lib/gcc/current -lgfortran" \
    2727        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    2828        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
     
    9191
    9292# Nightly run options
    93 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota'),119,216,274,423,430,433,435,441:442,448,462:464,508,517,544,546,701,702,703,808]"
    94 PYTHON_NROPTIONS="--exclude Dakota 119 216 274 423 430 433 435 441:442 448 462:464 508 517 544 546 702:703 808"
     93MATLAB_NROPTIONS=""
     94PYTHON_NROPTIONS=""
    9595
  • issm/trunk-jpl/jenkins/mac-intel-solid_earth

    r28079 r28139  
    2323        --with-python-dir=/System/Volumes/Data/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9 \
    2424        --with-python-numpy-dir=/Library/Python/3.9/site-packages/numpy/core/include/numpy \
    25         --with-fortran-lib="-L/usr/local/Cellar/gcc/13.1.0/lib/gcc/13 -lgfortran" \
     25        --with-fortran-lib="-L/usr/local/Cellar/gcc/13.2.0/lib/gcc/current -lgfortran" \
    2626        --with-mpi-include=${ISSM_DIR}/externalpackages/petsc/install/include \
    2727        --with-mpi-libflags="-L${ISSM_DIR}/externalpackages/petsc/install/lib -lmpi -lmpicxx -lmpifort" \
Note: See TracChangeset for help on using the changeset viewer.