Changeset 27565

Timestamp:

02/10/23 13:57:01 (2 years ago)

Author:

jdquinn

Message:

CHG: Various fixes for static and shared versions of ext pkg install scripts; fixing EsaGRACE example

Location:

issm/trunk-jpl

Files:

• examples/EsaGRACE/runme.m (modified) (1 diff)
• externalpackages/dakota/install-6.2-mac-static.sh (modified) (1 diff)
• externalpackages/dakota/install-6.2-mac.sh (modified) (1 diff)
• externalpackages/gdal/install-3-python-static.sh (modified) (1 diff)
• externalpackages/gdal/install-3-static.sh (modified) (1 diff)
• externalpackages/gmt/configs/6/static/cmake/modules/FindGDAL.cmake (modified) (1 diff)
• externalpackages/gmt/configs/6/static/cmake/modules/FindNETCDF.cmake (modified) (1 diff)
• externalpackages/gmt/install-6-mac-static.sh (modified) (2 diffs)

issm/trunk-jpl/examples/EsaGRACE/runme.m

@@ -125 +125 @@
                 set(0,'DefaultAxesFontSize',18,'DefaultAxesLineWidth',1,'DefaultTextFontSize',18,'DefaultLineMarkerSize',8)
                 figure1=figure('Position', [100, 100, 1000, 500]);
-                gcf; load coast; cla;
+                gcf; load coastlines; cla;
                 pcolor(lon_grid,lat_grid,sol_grid); shading flat; hold on;
                 if (kk==1)
-                        geoshow(flipud(lat),flipud(long),'DisplayType','polygon','FaceColor','white');
+                        geoshow(flipud(coastlat),flipud(coastlon),'DisplayType','polygon','FaceColor','white');
                 end
-                plot(long,lat,'k'); hold off;
+                plot(coastlon,coastlat,'k'); hold off;
                 c1=colorbar;
                 colormap('haxby');

issm/trunk-jpl/externalpackages/dakota/install-6.2-mac-static.sh

@@ -28 +28 @@
 export DAK_SRC=${ISSM_DIR}/externalpackages/dakota/src # DO NOT CHANGE THIS
 export LAPACK_LIBS="-L${LAPACK_ROOT}/lib -lflapack ${LIBGFORTRAN_ROOT}/libgfortran.a ${LIBGFORTRAN_ROOT}/libquadmath.a ${LIBGCC}" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
+export LDFLAGS="-framework CoreFoundation"
 
 # Cleanup

issm/trunk-jpl/externalpackages/dakota/install-6.2-mac.sh

@@ -25 +25 @@
 export DAK_SRC=${ISSM_DIR}/externalpackages/dakota/src # DO NOT CHANGE THIS
 export LAPACK_LIBS="-L${LAPACK_ROOT}/lib -lflapack -L${LIBGFORTRAN_ROOT} -lgfortran" # Need to export LAPACK_LIBS *and* pass it as an option to CMake to ensure that external packages also find it
+export LDFLAGS="-framework CoreFoundation"
 
 # Cleanup

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

@@ -17 +17 @@
 export CXX=mpicxx
 export LDFLAGS="-L${HDF5_ROOT}/lib" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
-export LIBS="-lhdf5_hl -lhdf5" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
+export LIBS="-lsqlite3 -lhdf5_hl -lhdf5" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
 export PREFIX="${ISSM_DIR}/externalpackages/gdal/install" # Need this to properly set destination root for Python libraries on macOS (should not affect Linux build; do not need for this configuration, but including it for consistency)
 

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

@@ -17 +17 @@
 export CXX=mpicxx
 export LDFLAGS="-L${HDF5_ROOT}/lib" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
-export LIBS="-lhdf5_hl -lhdf5" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
+export LIBS="-lsqlite3 -lhdf5_hl -lhdf5" # Need to do this so HDF5 symbols referenced in NETCDF library are found at link time
 export PREFIX="${ISSM_DIR}/externalpackages/gdal/install" # NOTE: Need to export this to properly set destination root for Python libraries on macOS (should not affect Linux build). Set to location where external package should be installed.
 

issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindGDAL.cmake

@@ -166 +166 @@
 # find all manually-supplied libs
 if (GDAL_EXTRA_LIBS)
-        # Ensure -l is precedeced by whitespace to not match
+        # Ensure -l is preceded by whitespace to not match
         # '-l' in '-L/usr/lib/x86_64-linux-gnu/hdf5/serial'
         string (REGEX MATCHALL "(^| )-l[^ ]+" _gdal_extra_lib_dashl ${GDAL_EXTRA_LIBS})

issm/trunk-jpl/externalpackages/gmt/configs/6/static/cmake/modules/FindNETCDF.cmake

@@ -59 +59 @@
                         OUTPUT_VARIABLE NETCDF_CONFIG_LIBS)
                 if (NETCDF_CONFIG_LIBS)
-                        # Ensure -l is precedeced by whitespace to not match
+                        # Ensure -l is preceded by whitespace to not match
                         # '-l' in '-L/usr/lib/x86_64-linux-gnu/hdf5/serial'
                         string (REGEX MATCHALL "(^| )-l[^ ]+" _netcdf_dashl ${NETCDF_CONFIG_LIBS})

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

@@ -20 +20 @@
 
 GDAL_EXTRA_LIBS="-lc++" # `$GDAL_ROOT/bin/gdal-config --dep-libs` does not report need to link to libc++ (see also customized configuration file ./configs/6/static/cmake/modules/FindGDAL.cmake)
-NETCDF_EXTRA_LIBS="-lsqlite3 -lpthread -ldl -liconv" # `$NETCDF_ROOT/bin/nc-config --libs` does not report certain dependencies of certain static libraries (see also customized configuration file ./configs/6/static/cmake/modules/FindNETCDF.cmake)
+NETCDF_EXTRA_LIBS="-lpthread -ldl -liconv" # `$NETCDF_ROOT/bin/nc-config --libs` does not report certain dependencies of certain static libraries (see also customized configuration file ./configs/6/static/cmake/modules/FindNETCDF.cmake)
 
 # Environment
@@ -27 +27 @@
 export CURL_INCLUDE_DIRS="${CURL_ROOT}/include"
 export CURL_LIBRARIES="${CURL_ROOT}/lib/libcurl.a;${ZLIB_ROOT}/lib/libz.a"
-export LDFLAGS="-framework CoreFoundation -framework Security"
+export LDFLAGS="-lsqlite3 -framework CoreFoundation -framework Security"
 export PREFIX="${ISSM_DIR}/externalpackages/gmt/install" # NOTE: Need to export this to be picked up by customized ConfigUser.cmake (see below). Set to location where external package should be installed.