Changeset 28212


Ignore:
Timestamp:
04/05/24 15:57:17 (12 months ago)
Author:
jdquinn
Message:

CHG: Removing optional dependencies; adjusted tolerances

Location:
issm/trunk-jpl
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/externalpackages/gdal/install-3-python-static.sh

    r28197 r28212  
    4545        -DCURL_LIBRARY_RELEASE="${CURL_ROOT}/lib/libcurl.a" \
    4646        -DCURL_USE_STATIC_LIBS=ON \
     47        -DGDAL_USE_EXPAT=OFF \
    4748        -DGDAL_USE_JPEG_INTERNAL=ON \
    4849        -DGDAL_USE_JPEG12_INTERNAL=ON \
     50        -DGDAL_USE_LIBAEC=OFF \
     51        -DGDAL_USE_LIBXML2=OFF \
     52        -DGDAL_USE_LIBLZMA=OFF \
     53        -DGDAL_USE_LZ4=OFF \
    4954        -DNETCDF_INCLUDE_DIR="${NETCDF_ROOT}/include" \
    5055        -DNETCDF_LIBRARY="${NETCDF_ROOT}/lib/libnetcdf.a" \
    … …  
    5257        -DGDAL_USE_OPENSSL=OFF \
    5358        -DGDAL_USE_PNG_INTERNAL=ON \
     59        -DGDAL_USE_POSTGRESQL=OFF \
    5460        -DPROJ_INCLUDE_DIR="${PROJ_ROOT}/include" \
    5561        -DPROJ_LIBRARY_RELEASE="${PROJ_ROOT}/lib/libproj.a" \

  • issm/trunk-jpl/externalpackages/gdal/install-3-static.sh

    r28197 r28212  
    22set -e
    33
    4 
    5 ## TODO
    6 #       - May want to supply path to Python instead of, effectively, using result of `which python`
    7 #
    84
    95## Constants
    … …  
    4541        -DCURL_LIBRARY_RELEASE="${CURL_ROOT}/lib/libcurl.a" \
    4642        -DCURL_USE_STATIC_LIBS=ON \
     43        -DGDAL_USE_EXPAT=OFF \
    4744        -DGDAL_USE_JPEG_INTERNAL=ON \
    4845        -DGDAL_USE_JPEG12_INTERNAL=ON \
     46        -DGDAL_USE_LIBAEC=OFF \
     47        -DGDAL_USE_LIBXML2=OFF \
     48        -DGDAL_USE_LIBLZMA=OFF \
     49        -DGDAL_USE_LZ4=OFF \
    4950        -DNETCDF_INCLUDE_DIR="${NETCDF_ROOT}/include" \
    5051        -DNETCDF_LIBRARY="${NETCDF_ROOT}/lib/libnetcdf.a" \
    … …  
    5253        -DGDAL_USE_OPENSSL=OFF \
    5354        -DGDAL_USE_PNG_INTERNAL=ON \
     55        -DGDAL_USE_POSTGRESQL=OFF \
    5456        -DPROJ_INCLUDE_DIR="${PROJ_ROOT}/include" \
    5557        -DPROJ_LIBRARY_RELEASE="${PROJ_ROOT}/lib/libproj.a" \

  • issm/trunk-jpl/externalpackages/gmt/install-6-linux-static.sh

    r28200 r28212  
    2727export CC=mpicc
    2828export CFLAGS="${CFLAGS} -w"
    29 export CURL_INCLUDE_DIRS="${CURL_ROOT}/include"
    30 export CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;${ZLIB_ROOT}/lib/libz.a"
    31 export LDFLAGS="-llzma -lexpat -laec"
    3229
    3330# Download source

  • issm/trunk-jpl/externalpackages/gmt/install-6-mac-static.sh

    r28197 r28212  
    3131LIBGLIB=$(find /usr /opt -name libglib-2.0.* 2>/dev/null | egrep -n libglib-2.0.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    3232LIBGLIB_ROOT=${LIBGLIB%/*}
     33GLIB_H=$(find /usr /opt -name glib.h 2>/dev/null | head -1)
     34GLIB_H_DIR=${GLIB_H%/*}
     35GLIBCONFIG_H=$(find /opt -name glibconfig.h 2>/dev/null | head -1)
     36GLIBCONFIG_H_DIR=${GLIBCONFIG_H%/*}
    3337echo "Finding libintl..."
    3438LIBINTL=$(find /usr /opt -name libintl.* 2>/dev/null | egrep -n libintl.a | egrep -v i386 | sed "s/[0-9]*://g" | head -1)
    … …  
    4347export CC=mpicc
    4448export CFLAGS="${CFLAGS} -w"
    45 export CURL_INCLUDE_DIRS="${CURL_ROOT}/include"
    46 export CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;${ZLIB_ROOT}/lib/libz.a"
    4749
    4850# Download source
    … …  
    8890        -DCURL_LIBRARY="${CURL_ROOT}/lib/libcurl.a" \
    8991        -DGDAL_EXTRA_LIBS="${GDAL_EXTRA_LIBS}" \
    90         -DGLIB_GTHREAD_LIBRARIES="${LIBGLIB_ROOT}/libgthread-2.0.a" \
    91         -DGLIB_LIBRARY="${LIBGLIB} ${LIBINTL} -liconv ${LIBPCRE} -framework Foundation" \
     92        -DGLIB_INCLUDE_DIRS="${GLIB_H_DIR};${GLIBCONFIG_H_DIR}" \
     93        -DGLIB_LIBRARY="${LIBGLIB} ${LIBGLIB_ROOT}/libgthread-2.0.a ${LIBINTL} -liconv ${LIBPCRE} -framework Foundation" \
    9294        -DLAPACK_LIBRARIES="${LAPACK_ROOT}/lib/libflapack.a;${LIBGFORTRAN_ROOT}/libgfortran.a;${LIBGFORTRAN_ROOT}/libquadmath.a" \
    9395        -DNETCDF_EXTRA_LIBS="${NETCDF_EXTRA_LIBS}" \

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

    r26321 r28212  
    1414        md=solve(md,'Stressbalance');
    1515        field_names     ={field_names{:},['Vx' i{1}],['Vy' i{1}],['Vz' i{1}],['Vel' i{1}],['Pressure' i{1}]};
    16         field_tolerances={field_tolerances{:},8e-08,6e-08,6e-08,6e-08,3e-13};
     16        field_tolerances={field_tolerances{:},9e-08,6e-08,6e-08,6e-08,3e-13};
    1717        field_values={field_values{:},...
    1818        (md.results.StressbalanceSolution.Vx),...

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

    r26321 r28212  
    2323    md = solve(md, 'Stressbalance')
    2424    field_names = field_names + ['Vx' + i, 'Vy' + i, 'Vz' + i, 'Vel' + i, 'Pressure' + i]
    25     field_tolerances = field_tolerances + [8e-08, 6e-08, 6e-08, 6e-08, 3e-13]
     25    field_tolerances = field_tolerances + [9e-08, 6e-08, 6e-08, 6e-08, 3e-13]
    2626    field_values = field_values + [md.results.StressbalanceSolution.Vx,
    2727                                   md.results.StressbalanceSolution.Vy,
Note: See TracChangeset for help on using the changeset viewer.