Changeset 24380

Timestamp:

11/21/19 15:58:21 (5 years ago)

Author:

jdquinn

Message:

CHG: Fixes for Solid Earth configuration

Location:

issm/trunk-jpl

Files:

• etc/environment.sh (modified) (3 diffs)
• externalpackages/gdal/install-3.0-netcdf.sh (modified) (3 diffs)
• externalpackages/gdal/install-3.0-python-netcdf.sh (modified) (3 diffs)
• externalpackages/gdal/install-3.0-python.sh (modified) (1 diff)
• externalpackages/gdal/install-3.0.sh (modified) (2 diffs)
• externalpackages/hdf5/install-1.10-parallel-with_tests.sh (modified) (1 diff)
• externalpackages/hdf5/install-1.10-parallel.sh (modified) (1 diff)
• externalpackages/hdf5/install-1.10-with_tests.sh (modified) (1 diff)
• externalpackages/hdf5/install-1.10.sh (modified) (1 diff)
• externalpackages/netcdf/install-4.7-parallel-with_tests.sh (modified) (1 diff)
• externalpackages/netcdf/install-4.7-parallel.sh (modified) (2 diffs)
• externalpackages/netcdf/install-4.7-with_tests.sh (modified) (1 diff)
• externalpackages/netcdf/install-4.7.sh (modified) (1 diff)
• jenkins/linux64_ross_se (modified) (1 diff)

issm/trunk-jpl/etc/environment.sh

@@ -188 +188 @@
         export MPI_DIR
         export MPI_INC_DIR="$MPI_DIR/include"
-        path_prepend    "$MPI_DIR/bin"
+        path_prepend "${MPI_DIR}/bin"
+        cpath_prepend "${MPI_DIR}/include"
         ld_library_path_prepend "$MPI_DIR/lib"
 fi
@@ -200 +201 @@
 if [ -d "$PETSC_DIR" ]; then
         export PETSC_DIR
-        ld_library_path_append "$PETSC_DIR/lib"
+        ld_library_path_append "${PETSC_DIR}/lib"
 fi
 
@@ -347 +348 @@
 path_append "$ASPELL_DIR/bin"
 
+NETCDF_DIR="${ISSM_DIR}/externalpackages/netcdf/install"
+if [ -d "${NETCDF_DIR}" ]; then
+        path_append "${NETCDF_DIR}/bin"
+        cpath_append "${NETCDF_DIR}/include"
+        library_path_append "${NETCDF_DIR}/lib"
+        dyld_library_path_append "${NETCDF_DIR}/lib"
+        ld_library_path_append "${NETCDF_DIR}/lib"
+fi
+
+NETCDF_CXX_DIR="${ISSM_DIR}/externalpackages/netcdf-cxx/install"
+if [ -d "${NETCDF_CXX_DIR}" ]; then
+        ld_library_path_append "${NETCDF_CXX_DIR}/lib"
+fi
+
 HDF5_DIR="${ISSM_DIR}/externalpackages/hdf5/install"
 if [ -d "${HDF5_DIR}" ]; then
-        c_include_path_append "${HDF5_DIR}/include"
+        cpath_append "${HDF5_DIR}/include"
         library_path_append "${HDF5_DIR}/lib"
         dyld_library_path_append "${HDF5_DIR}/lib"
         ld_library_path_append "${HDF5_DIR}/lib"
-fi
-
-NETCDF_DIR="${ISSM_DIR}/externalpackages/netcdf/install"
-if [ -d "${NETCDF_DIR}" ]; then
-        path_append "${NETCDF_DIR}/bin"
-        c_include_path_append "${NETCDF_DIR}/include"
-        library_path_append "${NETCDF_DIR}/lib"
-        dyld_library_path_append "${NETCDF_DIR}/lib"
-        ld_library_path_append "${NETCDF_DIR}/lib"
-fi
-
-NETCDF_CXX_DIR="${ISSM_DIR}/externalpackages/netcdf-cxx/install"
-if [ -d "${NETCDF_CXX_DIR}" ]; then
-        ld_library_path_append "${NETCDF_CXX_DIR}/lib"
 fi
 

issm/trunk-jpl/externalpackages/gdal/install-3.0-netcdf.sh

@@ -6 +6 @@
 #
 VER="3.0.2"
+HDF5_ROOT="${ISSM_DIR}/externalpackages/hdf5/install"
+NETCDF_ROOT="${ISSM_DIR}/externalpackages/netcdf/install"
 PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install"
 
@@ -26 +28 @@
 ./configure \
         --prefix="${ISSM_DIR}/externalpackages/gdal/install" \
+        --with-hdf5="${HDF5_ROOT}" \
+        --with-netcdf="${NETCDF_ROOT}" \
         --with-proj="${PROJ_ROOT}"
 
@@ -36 +40 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

issm/trunk-jpl/externalpackages/gdal/install-3.0-python-netcdf.sh

@@ -7 +7 @@
 #
 
-## Constants
+# Constants
 #
 VER="3.0.2"
+HDF5_ROOT="${ISSM_DIR}/externalpackages/hdf5/install"
+NETCDF_ROOT="${ISSM_DIR}/externalpackages/netcdf/install"
 PROJ_ROOT="${ISSM_DIR}/externalpackages/proj/install"
 
@@ -31 +33 @@
         --prefix="${ISSM_DIR}/externalpackages/gdal/install" \
         --with-python \
+        --with-hdf5="${HDF5_ROOT}" \
+        --with-netcdf="${NETCDF_ROOT}" \
         --with-proj="${PROJ_ROOT}"
 
@@ -41 +45 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

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

@@ -43 +43 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

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

@@ -30 +30 @@
         --with-proj="${PROJ_ROOT}"
 
+
 # Compile and install
 if [ $# -eq 0 ]; then
@@ -38 +39 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

issm/trunk-jpl/externalpackages/hdf5/install-1.10-parallel-with_tests.sh

@@ -42 +42 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

issm/trunk-jpl/externalpackages/hdf5/install-1.10-parallel.sh

@@ -40 +40 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

issm/trunk-jpl/externalpackages/hdf5/install-1.10-with_tests.sh

@@ -37 +37 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

issm/trunk-jpl/externalpackages/hdf5/install-1.10.sh

@@ -35 +35 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

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

@@ -55 +55 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

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

@@ -41 +41 @@
 ./configure \
         --prefix="${ISSM_DIR}/externalpackages/netcdf/install" \
-        --disbable-shared \
+        --disable-shared \
         --disable-doxygen
 
@@ -52 +52 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

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

@@ -51 +51 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

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

@@ -49 +49 @@
         make -j $1 install
 fi
+
+# Return to initial directory
+cd ..

issm/trunk-jpl/jenkins/linux64_ross_se

@@ -76 +76 @@
 NUMCPUS_INSTALL=8
 
-#number of cpus used in the nightly runs. (pb of access to all_vertices.txt if more than 1)
+# Number of cpus used in the nightly runs
+#
+# NOTE: Possible problem of access to all_vertices.txt if more than 1.
+#
 NUMCPUS_RUN=8