Index: /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh =================================================================== --- /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 27496) +++ /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh (revision 27497) @@ -30,5 +30,5 @@ 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','all','exclude',[125,126,234,235,418,420,435,444,445,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2021,2051,2052,2053,2084,2085,2090,2101,2424,2425,3001:3200,3201,3202,3300,3480,3481,4001,4002,4003]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded +MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,234,235,418,420,435,444,445,622,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2021,2051,2052,2053,2084,2085,2090,2101,2424,2425,3001:3200,3201,3202,3300,3480,3481,4001,4002,4003]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded MATLAB_PATH="/usr/local/MATLAB/R2019b" Index: /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh =================================================================== --- /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh (revision 27496) +++ /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-2.sh (revision 27497) @@ -30,5 +30,5 @@ 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 -PYTHON_NROPTIONS="--benchmark all --exclude 125 126 234 235 418 420 435 444 445 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded +PYTHON_NROPTIONS="--benchmark all --exclude 125 126 234 235 418 420 435 444 445 622 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded ## Environment Index: /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh =================================================================== --- /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 27496) +++ /issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python-3.sh (revision 27497) @@ -30,5 +30,5 @@ 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 -PYTHON_NROPTIONS="--benchmark all --exclude 125 126 234 235 418 420 435 444 445 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded +PYTHON_NROPTIONS="--benchmark all --exclude 125 126 234 235 418 420 435 444 445 622 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded ## Environment Index: /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh (revision 27496) +++ /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-matlab.sh (revision 27497) @@ -11,5 +11,5 @@ # INSTALL_DIR=. -MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,234,235,418,420,435,444,445,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2021,2051,2052,2053,2084,2085,2090,2101,2424,2425,3001:3200,3201,3202,3300,3480,3481,4001,4002,4003]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded +MATLAB_NROPTIONS="'benchmark','all','exclude',[125,126,234,235,418,420,435,444,445,622,701,702,703,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1201,1202,1203,1204,1205,1206,1207,1208,1301,1302,1303,1304,1401,1402,1601,1602,2002,2003,2004,2006,2007,2008,2010,2011,2021,2051,2052,2053,2084,2085,2090,2101,2424,2425,3001:3200,3201,3202,3300,3480,3481,4001,4002,4003]" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded MATLAB_PATH="/Applications/MATLAB_R2018a.app" PKG="ISSM-macOS-MATLAB" Index: /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-2.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-2.sh (revision 27496) +++ /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-2.sh (revision 27497) @@ -12,5 +12,5 @@ INSTALL_DIR=. PKG="ISSM-macOS-Python-2" -PYTHON_NROPTIONS="--benchmark all --exclude 125 126 234 235 418 420 435 444 445 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded +PYTHON_NROPTIONS="--benchmark all --exclude 125 126 234 235 418 420 435 444 445 622 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded COMPRESSED_PKG="${PKG}.zip" Index: /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh =================================================================== --- /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh (revision 27496) +++ /issm/trunk-jpl/packagers/mac/test-issm-mac-binaries-python-3.sh (revision 27497) @@ -12,5 +12,5 @@ INSTALL_DIR=. PKG="ISSM-macOS-Python-3" -PYTHON_NROPTIONS="--benchmark all --exclude 125 126 234 235 418 420 435 444 445 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded +PYTHON_NROPTIONS="--benchmark all --exclude 125 126 234 235 418 420 435 444 445 622 701 702 703 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1201 1202 1203 1204 1205 1206 1207 1208 1301 1302 1303 1304 1401 1402 1601 1602 2002 2003 2004 2005 2006 2007 2008 2010 2011 2021 2051 2052 2053 2084 2085 2090 2101 2424 2425 3001:3200 3201 3202 3300 3480 3481 4001 4002 4003" # NOTE: Combination of test suites from basic, Dakota, and Solid Earth builds, with tests that require a restart and those that require the JVM excluded COMPRESSED_PKG="${PKG}.zip" Index: /issm/trunk-jpl/test/NightlyRun/test622.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test622.py (revision 27496) +++ /issm/trunk-jpl/test/NightlyRun/test622.py (revision 27497) @@ -1,3 +1,3 @@ -#Test Name:79NorthHydrologyArmapw +#Test Name:79NorthHydrologyArmapw import numpy as np @@ -17,5 +17,5 @@ md = setflowequation(md, 'SSA', 'all') -#Default friction +# Default friction md.friction = friction() md.friction.coefficient = 30 * np.ones(md.mesh.numberofvertices) @@ -30,39 +30,39 @@ if md.mesh.elements[ii][vertex] - 1 in iid1: # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing idb_df[ii] = 1 - if idb_df[ii] == 0: # no vertex was found in basin 1 + if idb_df[ii] == 0: # no vertex was found in basin 1 for vertex in range(3): idb_df[ii] = 2 -#Covariance matrix +# Covariance matrix covGlob = np.array([[1e9,0,0,0],[0,1e9,0,0],[0,0,0.1,0],[0,0,0,0.1]]) # Hydrology scheme -md.hydrology = hydrologyarmapw() +md.hydrology = hydrologyarmapw() md.hydrology.num_basins = 2 md.hydrology.basin_id = np.copy(idb_df).astype(int) -md.hydrology.monthlyfactors = 1*np.ones((md.hydrology.num_basins,12)); +md.hydrology.monthlyfactors = 1 * np.ones((md.hydrology.num_basins,12)); md.hydrology.monthlyfactors[:,0:3] = 0 -md.hydrology.num_params = 2 #number of parameters in the polynomial -md.hydrology.num_breaks = 2 #number of breakpoints -termconst = np.array([[0.5*1e6,0.1*1e6,0.5e6],[0.5*1e6,0.1*1e6,0.5e6]]) -termtrend = np.array([[1*1e5,0,0],[0,1*1e5,0]]) -md.hydrology.polynomialparams = np.transpose(np.stack((termconst,termtrend)),(1,2,0)) -md.hydrology.datebreaks = np.array([[20,40],[20,40]]) +md.hydrology.num_params = 2 # number of parameters in the polynomial +md.hydrology.num_breaks = 2 # number of breakpoints +termconst = np.array([[0.5 * 1e6, 0.1 * 1e6, 0.5e6],[0.5 * 1e6, 0.1 * 1e6, 0.5e6]]) +termtrend = np.array([[1 * 1e5, 0, 0],[0, 1 * 1e5, 0]]) +md.hydrology.polynomialparams = np.transpose(np.stack((termconst, termtrend)), (1, 2, 0)) +md.hydrology.datebreaks = np.array([[20, 40], [20, 40]]) md.hydrology.arma_timestep = 1 md.hydrology.ar_order = 1 md.hydrology.ma_order = 1 -md.hydrology.arlag_coefs = np.array([[0.98],[0.98]]) -md.hydrology.malag_coefs = np.array([[0],[0]]) +md.hydrology.arlag_coefs = np.array([[0.98], [0.98]]) +md.hydrology.malag_coefs = np.array([[0], [0]]) # SMB -md.smb = SMBarma() +md.smb = SMBarma() md.smb.num_basins = 2 md.smb.basin_id = np.copy(idb_df) md.smb.num_breaks = 0 md.smb.num_params = 1 -md.smb.polynomialparams = 0*np.array([[0.5],[0.2]]) +md.smb.polynomialparams = 0 * np.array([[0.5], [0.2]]) md.smb.ar_order = 1 md.smb.ma_order = 1 -md.smb.arlag_coefs = np.array([[0],[0]]) -md.smb.malag_coefs = np.array([[0],[0]]) +md.smb.arlag_coefs = np.array([[0], [0]]) +md.smb.malag_coefs = np.array([[0], [0]]) md.smb.arma_timestep = 1.0 @@ -73,5 +73,5 @@ md.stochasticforcing.default_id = idb_df md.stochasticforcing.covariance = covGlob # global covariance -md.stochasticforcing.stochastictimestep = 1; #time step of stochastic forcing +md.stochasticforcing.stochastictimestep = 1; # time step of stochastic forcing md.stochasticforcing.randomflag = 0 # determines true/false randomness @@ -91,7 +91,7 @@ # Fields and tolerances to track changes -field_names = [ 'Vel1', 'Thickness1', 'SmbMassBalance1', 'FrictionWaterPressure1', - 'Vel12', 'Thickness12','SmbMassBalance12', 'FrictionWaterPressure12', - 'Vel24', 'Thickness24','SmbMassBalance24', 'FrictionWaterPressure24'] +field_names = ['Vel1', 'Thickness1', 'SmbMassBalance1', 'FrictionWaterPressure1', + 'Vel12', 'Thickness12','SmbMassBalance12', 'FrictionWaterPressure12', + 'Vel24', 'Thickness24','SmbMassBalance24', 'FrictionWaterPressure24'] field_tolerances = [2e-10, 2e-10, 2e-10, 2e-10, @@ -111,29 +111,2 @@ md.results.TransientSolution[23].SmbMassBalance, md.results.TransientSolution[23].FrictionWaterPressure] - - - -## Fields and tolerances to track changes -#field_names = ['Vx1', 'Vy1', 'Vel1', 'Thickness1', 'FrictionWaterPressure1', -# 'Vx2', 'Vy2', 'Vel2', 'Thickness2', 'FrictionWaterPressure2', -# 'Vx10', 'Vy10', 'Vel10', 'Thickness10', 'FrictionWaterPressure10'] -# -#field_tolerances = [2e-10, 2e-10, 2e-10, 2e-10, 2e-10, -# 4e-10, 4e-10, 4e-10, 4e-10, 4e-10, -# 8e-10, 8e-10, 8e-10, 8e-10, 8e-10] -# -#field_values = [md.results.TransientSolution[0].Vx, -# md.results.TransientSolution[0].Vy, -# md.results.TransientSolution[0].Vel, -# md.results.TransientSolution[0].Thickness, -# md.results.TransientSolution[0].FrictionWaterPressure, -# md.results.TransientSolution[1].Vx, -# md.results.TransientSolution[1].Vy, -# md.results.TransientSolution[1].Vel, -# md.results.TransientSolution[1].Thickness, -# md.results.TransientSolution[1].FrictionWaterPressure, -# md.results.TransientSolution[4].Vx, -# md.results.TransientSolution[4].Vy, -# md.results.TransientSolution[4].Vel, -# md.results.TransientSolution[4].Thickness, -# md.results.TransientSolution[4].FrictionWaterPressure]