Changeset 28207

Timestamp:

04/04/24 19:42:43 (12 months ago)

Author:

jdquinn

Message:

CHG: Shared version of GDAL does not play nicely with library/include flags; adjusted tolerances

Location:

issm/trunk-jpl

Files:

• externalpackages/gdal/install-3-python.sh (modified) (2 diffs)
• externalpackages/gdal/install-3.sh (modified) (2 diffs)
• test/NightlyRun/test803.m (modified) (1 diff)
• test/NightlyRun/test803.py (modified) (1 diff)

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

@@ -42 +42 @@
         -DBUILD_PYTHON_BINDINGS=ON \
         -DGDAL_SET_INSTALL_RELATIVE_RPATH=ON \
-        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
-        -DCURL_LIBRARY_RELEASE="-L${CURL_ROOT}/lib -lcurl" \
+        -DCURL_DIR="${CURL_ROOT}" \
         -DGDAL_USE_JPEG_INTERNAL=ON \
         -DGDAL_USE_JPEG12_INTERNAL=ON \
-        -DNETCDF_INCLUDE_DIR="${NETCDF_ROOT}/include" \
-        -DNETCDF_LIBRARY="-L${NETCDF_ROOT}/lib -lnetcdf" \
+        -DNETCDF_DIR="${NETCDF_ROOT}" \
         -DGDAL_USE_OPENJPEG=OFF \
         -DGDAL_USE_OPENSSL=OFF \
@@ -53 +51 @@
         -DPROJ_DIR="${PROJ_ROOT}" \
         -DGDAL_USE_TIFF_INTERNAL=ON \
-        -DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \
-        -DZLIB_LIBRARY_RELEASE="-L${ZLIB_ROOT}/lib -lz" \
+        -DZLIB_DIR="${ZLIB_ROOT}" \
         -DGDAL_USE_ZSTD=OFF
 

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

@@ -42 +42 @@
         -DBUILD_PYTHON_BINDINGS=OFF \
         -DGDAL_SET_INSTALL_RELATIVE_RPATH=ON \
-        -DCURL_INCLUDE_DIR="${CURL_ROOT}/include" \
-        -DCURL_LIBRARY_RELEASE="-L${CURL_ROOT}/lib -lcurl" \
+        -DCURL_DIR="${CURL_ROOT}" \
         -DGDAL_USE_JPEG_INTERNAL=ON \
         -DGDAL_USE_JPEG12_INTERNAL=ON \
-        -DNETCDF_INCLUDE_DIR="${NETCDF_ROOT}/include" \
-        -DNETCDF_LIBRARY="-L${NETCDF_ROOT}/lib -lnetcdf" \
+        -DNETCDF_DIR="${NETCDF_ROOT}" \
         -DGDAL_USE_OPENJPEG=OFF \
         -DGDAL_USE_OPENSSL=OFF \
@@ -53 +51 @@
         -DPROJ_DIR="${PROJ_ROOT}" \
         -DGDAL_USE_TIFF_INTERNAL=ON \
-        -DZLIB_INCLUDE_DIR="${ZLIB_ROOT}/include" \
-        -DZLIB_LIBRARY_RELEASE="-L${ZLIB_ROOT}/lib -lz" \
+        -DZLIB_DIR="${ZLIB_ROOT}" \
         -DGDAL_USE_ZSTD=OFF
 

issm/trunk-jpl/test/NightlyRun/test803.m

@@ -29 +29 @@
                 'Vx3','Vy3','Vel3','Pressure3','Thickness3','Surface3','MaskIceLevelset3','Enthalpy3','Watercolumn3'};
 field_tolerances={...
-        2e-12,7e-13,2e-12,3e-13,3e-13,2e-13,2e-13,1e-13,1e-13,...
+        2e-12,9e-13,2e-12,3e-13,3e-13,2e-13,2e-13,1e-13,1e-13,...
         4e-12,5e-12,4e-12,3e-13,7e-13,2e-13,2e-13,1e-13,1e-13,...
         6e-12,2e-11,6e-12,7e-13,9e-13,3e-13,2e-13,1e-13,1e-13,...

issm/trunk-jpl/test/NightlyRun/test803.py

@@ -37 +37 @@
                'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Thickness2', 'Surface2', 'MaskIceLevelset2', 'Enthalpy2', 'Watercolumn2',
                'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Thickness3', 'Surface3', 'MaskIceLevelset3', 'Enthalpy3', 'Watercolumn3']
-field_tolerances = [2e-12, 7e-13, 2e-12, 3e-13, 3e-13, 2e-13, 2e-13, 1e-13, 1e-13,
+field_tolerances = [2e-12, 9e-13, 2e-12, 3e-13, 3e-13, 2e-13, 2e-13, 1e-13, 1e-13,
                     4e-12, 5e-12, 4e-12, 3e-13, 7e-13, 2e-13, 2e-13, 1e-13, 1e-13,
                     6e-12, 2e-11, 6e-12, 7e-13, 9e-13, 3e-13, 2e-13, 1e-13, 1e-13]