Changeset 24388

Timestamp:

11/22/19 12:22:15 (5 years ago)

Author:

jdquinn

Message:

BUG: Testing if parallel HDF5/NetCDF resolve SE issue (works locally).

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (3 diffs)
• externalpackages/gmt/configs/Linux/cmake/ConfigUser.cmake (modified) (1 diff)
• externalpackages/netcdf/install-4.7-parallel-with_tests.sh (modified) (1 diff)
• externalpackages/netcdf/install-4.7-parallel.sh (modified) (1 diff)
• jenkins/linux64_ross_se (modified) (2 diffs)

issm/trunk-jpl/etc/environment.sh

@@ -4 +4 @@
 # ISSM_DIR and ISSM_ARCH should have been defined already in your shell
 # settings file (i.e. .bashrc, .cshrc).
+#
+# TODO:
+# - Condition all path modifications on existence of external package 'install'
+#       directory
+#
 
 ## Functions
@@ -159 +164 @@
         fi
 } #}}}
-
-# FIXME: during installation packages are installed one by one but
-# environment.sh was sourced before so new packages are NOT in the path. May
-# source environment.sh again with:
-#       if [ -z $(echo "$PATH" | grep "$MATLAB_DIR") ]; then export $PATH...; fi
 
 # Windows compilers:
@@ -437 +437 @@
 
 #CURL
-ld_library_path_prepend "${ISSM_DIR}/externalpackages/curl/install/lib"
-dyld_library_path_prepend "${ISSM_DIR}/externalpackages/curl/install/lib"
-path_prepend "${ISSM_DIR}/externalpackages/curl/install/bin"
+CURL_DIR="${ISSM_DIR}/externalpackages/curl/install"
+if [ -d "${CURL_DIR}" ]; then
+        ld_library_path_prepend "${CURL_DIR}/lib"
+        dyld_library_path_prepend "${CURL_DIR}/lib"
+        path_prepend "${CURL_DIR}/bin"
+fi
 
 #NEOPZ

issm/trunk-jpl/externalpackages/gmt/configs/Linux/cmake/ConfigUser.cmake

@@ -136 +136 @@
 # Set location of NetCDF (can be root directory, path to header file or path
 # to nc-config) [auto]:
-set (NETCDF_ROOT "$ENV{ISSM_DIR}/externalpackages/petsc/install")
+set (NETCDF_ROOT "$ENV{ISSM_DIR}/externalpackages/netcdf/install")
 
 # Set location of GDAL (can be root directory, path to header file or path to

issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel-with_tests.sh

@@ -41 +41 @@
 ./configure \
         --prefix="${ISSM_DIR}/externalpackages/netcdf/install" \
-        --disbable-shared \
         --enable-parallel-tests \
         --disable-doxygen

issm/trunk-jpl/externalpackages/netcdf/install-4.7-parallel.sh

@@ -41 +41 @@
 ./configure \
         --prefix="${ISSM_DIR}/externalpackages/netcdf/install" \
-        --disable-shared \
         --disable-doxygen
 

issm/trunk-jpl/jenkins/linux64_ross_se

@@ -48 +48 @@
         cmake           install.sh
         mpich           install-3.2-linux64.sh
-        hdf5            install-1.10.sh
-        netcdf          install-4.7.sh
+        hdf5            install-1.10-parallel.sh
+        netcdf          install-4.7-parallel.sh
         lapack          install-3.8-linux.sh
         petsc           install-3.7-linux64.sh
@@ -80 +80 @@
 # NOTE: Possible problem of access to all_vertices.txt if more than 1.
 #
-NUMCPUS_RUN=1
+NUMCPUS_RUN=8
 
 #Nightly run options. The matlab routine runme.m will be called