Changeset 25034

Timestamp:

06/12/20 11:03:07 (5 years ago)

Author:

jdquinn

Message:

CHG: Fixes for test2002.m

Location:

issm/trunk-jpl

Files:

• jenkins/ross-debian_linux-solid_earth (modified) (1 diff)
• packagers/linux/package-issm-linux-binaries-solid_earth.sh (modified) (1 diff)
• src/m/coordsystems/epsg2proj.m (modified) (1 diff)
• test/Archives/Archive2004.arch (modified) ( previous)

issm/trunk-jpl/jenkins/ross-debian_linux-solid_earth

@@ -77 +77 @@
 # See documentation in test/NightlyRun/runme.* for more information.
 #
-MATLAB_NROPTIONS="'benchmark','slr','exclude',[2004]"
-PYTHON_NROPTIONS="--benchmark=slr --exclude=[2004]"
+MATLAB_NROPTIONS="'benchmark','slr'"
+PYTHON_NROPTIONS="--benchmark=slr"

issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-solid_earth.sh

@@ -6 +6 @@
 LIBGFORTRAN="/usr/lib/x86_64-linux-gnu/libgfortran.so.5.0.0" # Important that this is the library itself
 LIBGFORTRAN_DIST="${ISSM_DIR}/lib/libgfortran.so.5" # Important the file name matches the SONAME entry in the binaries and other shared libraries which link to it
-MATLAB_NROPTIONS="'benchmark','slr','exclude',[2004]"
+MATLAB_NROPTIONS="'benchmark','slr'"
 MATLAB_PATH="/usr/local/MATLAB/R2019b"
 PACKAGE="ISSM-Solid_Earth" # Name of directory to copy distributable files to
-PYTHON_NROPTIONS="--benchmark slr --exclude 2004"
+PYTHON_NROPTIONS="--benchmark slr"
 TARBALL_NAME="issm-linux-solid_earth"
 TARBALL="${TARBALL_NAME}.tar.gz"

issm/trunk-jpl/src/m/coordsystems/epsg2proj.m

@@ -11 +11 @@
 
         [s,r]=system(['gdalsrsinfo  epsg:' num2str(epsg)  ' | grep PROJ.4 | sed "s/PROJ.4 : //"']);
-        r=r(2:end-2);
 
         if s~=0,