Changeset 27035 for issm/trunk/test/NightlyRun/test257.py

Timestamp:

06/01/22 05:01:48 (3 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 27033

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test257.py (modified) (3 diffs)

issm/trunk/test/NightlyRun/test257.py

@@ -43 +43 @@
 md.smb = SMBautoregression()
 md.smb.num_basins = 3  # number of basins
-md.smb.basin_id = idbasin - 1  # prescribe basin ID number to elements; # NOTE: offset because of 1-based vertex indexing
+md.smb.basin_id = idbasin  # prescribe basin ID number to elements;
 md.smb.beta0 = np.array([[0.5, 1.2, 1.5]])  # intercept values of SMB in basins [m ice eq./yr]
 md.smb.beta1 = np.array([[0.0, 0.01, -0.01]])  # trend values of SMB in basins [m ice eq./yr^2]
@@ -50 +50 @@
 md.smb.ar_timestep = 2.0  #timestep of the autoregressive model [yr]
 md.smb.phi = np.array([[0.2, 0.1, 0.05, 0.01], [0.4, 0.2, -0.2, 0.1], [0.4, -0.4, 0.1, -0.1]])
+md.smb.lapserates        = np.array([[0.01,0.0],[0.01,-0.01],[0.0,-0.01]])
+md.smb.elevationbins  = np.array([100,150,100]).reshape(md.smb.num_basins,1)
 
 # Stochastic forcing
@@ -56 +58 @@
 md.stochasticforcing.covariance = np.array([[0.15, 0.08, -0.02], [0.08, 0.12, -0.05], [-0.02, -0.05, 0.1]])  # global covariance among- and between-fields
 md.stochasticforcing.randomflag = 0  # fixed random seeds
-
+md.stochasticforcing.stochastictimestep  = 1.0
 
 md = solve(md, 'Transient')