Changeset 26907

Timestamp:

02/25/22 00:34:01 (3 years ago)

Author:

bdef

Message:

CHG: id indexing change in autoregression to be consistent with matlab

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test257.py (modified) (1 diff)
• test542.py (modified) (3 diffs)
• test543.py (modified) (8 diffs)
• test544.py (modified) (5 diffs)
• test621.py (modified) (2 diffs)

issm/trunk-jpl/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]

issm/trunk-jpl/test/NightlyRun/test542.py

@@ -1 +1 @@
 #Test Name: PigTranFrontalforcingsrignot
 import numpy as np
-
-from calvingvonmises import *
-from frontalforcingsrignot import *
+from calvingvonmises import calvingvonmises
+from frontalforcingsrignot import frontalforcingsrignot
 from socket import gethostname
 from model import *
-from parameterize import *
-from setflowequation import *
-from setmask import *
-from solve import *
-from triangle import *
+from parameterize import parameterize
+from setflowequation import setflowequation
+from setmask import setmask
+from solve import solve
+from triangle import triangle
 
 
@@ -35 +34 @@
 md.frontalforcings = frontalforcingsrignot()
 md.frontalforcings.num_basins = 2
-md.frontalforcings.basin_id = idbasin - 1  # NOTE: offset because of 1-based vertex indexing
+md.frontalforcings.basin_id = idbasin
 md.frontalforcings.subglacial_discharge = 0.1 * np.ones((md.mesh.numberofvertices,))
 md.frontalforcings.thermalforcing = 0.5 * np.ones((md.mesh.numberofvertices,))
 for elem in range(md.mesh.numberofelements):
     if idbasin[elem] == 2:
-        md.frontalforcings.thermalforcing[md.mesh.elements[elem, 0:3] - 1] = 1.5  # NOTE: offset because of 1-based vertex indexing
+        md.frontalforcings.thermalforcing[md.mesh.elements[elem, 0:3] - 1] = 1.5  #NOTE: offset because of 1-based vertex indexing
 
 md.transient.ismovingfront = 1
@@ -51 +50 @@
 
 # Fields and tolerances to track changes
-field_names = [
-    'Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'MaskIceLevelset1', 'CalvingMetlingRate1',
-    'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'MaskIceLevelset2', 'CalvingMetlingRate2',
-    'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Bed10', 'Surface10', 'Thickness10', 'MaskIceLevelset10', 'CalvingMetlingRate10'
-]
+field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'MaskIceLevelset1', 'CalvingMetlingRate1',
+               'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'MaskIceLevelset2', 'CalvingMetlingRate2',
+               'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Bed10', 'Surface10', 'Thickness10', 'MaskIceLevelset10', 'CalvingMetlingRate10']
 field_tolerances = [
     1e-11, 2e-11, 2e-11, 1e-12, 2e-11, 6e-12, 9e-12, 1e-12, 1e-9,
     2e-11, 1e-11, 1e-11, 9e-12, 2e-1, 2e-11, 2e-11, 1e-11, 1e-9,
-    2e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-9, 1e-9
-]
+    2e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-9, 1e-9]
 field_values = [
     md.results.TransientSolution[0].Vx,

issm/trunk-jpl/test/NightlyRun/test543.py

@@ -1 +1 @@
 #Test Name: PigTranStochasticforcing
 import numpy as np
-
-from frontalforcingsrignotautoregression import *
+from frontalforcingsrignotautoregression import frontalforcingsrignotautoregression
 from socket import gethostname
 from model import *
-from parameterize import *
-from setflowequation import *
-from setmask import *
-from solve import *
-from triangle import *
+from parameterize import parameterize
+from setflowequation import setflowequation
+from setmask import setmask
+from solve import solve
+from triangle import triangle
 
 
@@ -41 +40 @@
             idb_df[ii] = 2
 #Dimensionalities
-nb_tf    = 2
-nb_clv   = 2
+nb_tf = 2
+nb_clv  = 2
 nb_flmlt = 2
 
 # Calving parameters
 md.mask.ice_levelset = 1e4 * (md.mask.ice_levelset + 0.5)
-md.calving.calvingrate = 0.3*np.ones((md.mesh.numberofvertices,))
+md.calving.calvingrate = 0.3 * np.ones((md.mesh.numberofvertices,))
 md.levelset.spclevelset = np.full((md.mesh.numberofvertices,), np.nan)
 md.levelset.migration_max = 10.0
@@ -53 +52 @@
 md.frontalforcings = frontalforcingsrignotautoregression()
 md.frontalforcings.num_basins = nb_tf
-md.frontalforcings.basin_id = idb_tf - 1  # NOTE: offset because of 1-based vertex indexing
+md.frontalforcings.basin_id = idb_tf
 md.frontalforcings.subglacial_discharge = 0.1 * np.ones((md.mesh.numberofvertices,))
 md.frontalforcings.beta0 = np.array([[0.05, 0.01]])  # intercept values of TF in basins [C]
@@ -62 +61 @@
 md.frontalforcings.phi = np.array([[0.1, -0.1, 0.01, -0.01], [0.2, -0.2, 0.1, 0.0]])  # autoregressive parameters
 #Floating Ice Melt parameters
-md.basalforcings.floatingice_melting_rate = 0.1*np.ones((md.mesh.numberofvertices,))
+md.basalforcings.floatingice_melting_rate = 0.1 * np.ones((md.mesh.numberofvertices,))
 
 #Covariance matrix
-covtf            = 1e-4*np.identity(nb_tf)
-covclv           = 1e-1*np.identity(nb_clv)
-covclv[0,0]      = 1/10*covclv[0,0]
-covflmlt         = 0.05*np.identity(nb_flmlt)
+covtf = 1e-4 * np.identity(nb_tf)
+covclv = 1e-1 * np.identity(nb_clv)
+covclv[0, 0] = 1 / 10 * covclv[0, 0]
+covflmlt = 0.05 * np.identity(nb_flmlt)
 #covglob          = np.zeros([6,6])
 #covglob[0:2,0:2] = covtf
@@ -75 +74 @@
 
 #Hard-coding covariance matrix because python is complaining
-covglob = np.array([[1e-4,0.,0.,0.,0.,0.],[0.,1e-4,0.,0.,0.,0.],[0.,0.,1e-2,0.,0.,0.],[0.,0.,0.,1e-1,0.,0.],[0.,0.,0.,0.,0.05,0.],[0.,0.,0.,0.,0.,0.05]])
+covglob = np.array([[1e-4, 0., 0., 0., 0., 0.],
+                    [0., 1e-4, 0., 0., 0., 0.],
+                    [0., 0., 1e-2, 0., 0., 0.],
+                    [0., 0., 0., 1e-1, 0., 0.],
+                    [0., 0., 0., 0., 0.05, 0.],
+                    [0., 0., 0., 0., 0., 0.05]])
 #testchol = np.linalg.cholesky(covglob)
 #print(testchol)
@@ -81 +85 @@
 # Stochastic forcing
 md.stochasticforcing.isstochasticforcing = 1
-md.stochasticforcing.fields = ['FrontalForcingsRignotAutoregression','DefaultCalving','FloatingMeltRate']
+md.stochasticforcing.fields = ['FrontalForcingsRignotAutoregression', 'DefaultCalving', 'FloatingMeltRate']
 md.stochasticforcing.defaultdimension = 2
-md.stochasticforcing.default_id       = idb_df-1 #NOTE: offset because of 1-based vertex indexing
-md.stochasticforcing.covariance       = covglob # global covariance among- and between-fields
-md.stochasticforcing.randomflag       = 0 # determines true/false randomness
+md.stochasticforcing.default_id = idb_df
+md.stochasticforcing.covariance = covglob  # global covariance among- and between-fields
+md.stochasticforcing.randomflag = 0  # determines true/false randomness
 
-md.transient.ismovingfront   = 1
+md.transient.ismovingfront = 1
 md.transient.isgroundingline = 1
 
-md.transient.requested_outputs = ['default', 'CalvingCalvingrate','CalvingMeltingrate','BasalforcingsFloatingiceMeltingRate']
+md.transient.requested_outputs = ['default', 'CalvingCalvingrate', 'CalvingMeltingrate', 'BasalforcingsFloatingiceMeltingRate']
 md.cluster = generic('name', gethostname(), 'np', 2)
 md = solve(md, 'Transient')
@@ -96 +100 @@
 # Fields and tolerances to track changes
 field_names = [
-    'Vx1' ,'Vy1' ,'Vel1' ,'Thickness1' ,'MaskIceLevelset1' ,'CalvingCalvingrate1' ,'CalvingMeltingrate1' ,'BasalforcingsFloatingiceMeltingRate1',
-    'Vx2' ,'Vy2' ,'Vel2' ,'Thickness2' ,'MaskIceLevelset2' ,'CalvingCalvingrate1' ,'CalvingMeltingrate2' ,'BasalforcingsFloatingiceMeltingRate2',
-    'Vx10','Vy10','Vel10','Thickness10','MaskIceLevelset10','CalvingCalvingrate10','CalvingMeltingrate10','BasalforcingsFloatingiceMeltingRate10'
-]
+    'Vx1', 'Vy1', 'Vel1', 'Thickness1', 'MaskIceLevelset1', 'CalvingCalvingrate1', 'CalvingMeltingrate1', 'BasalforcingsFloatingiceMeltingRate1',
+    'Vx2', 'Vy2', 'Vel2', 'Thickness2', 'MaskIceLevelset2', 'CalvingCalvingrate1', 'CalvingMeltingrate2', 'BasalforcingsFloatingiceMeltingRate2',
+    'Vx10', 'Vy10', 'Vel10', 'Thickness10', 'MaskIceLevelset10', 'CalvingCalvingrate10', 'CalvingMeltingrate10', 'BasalforcingsFloatingiceMeltingRate10']
 
 field_tolerances = [
-    1e-11,2e-11,2e-11,1e-11,1e-9,1e-10,1e-10,1e-10,
-    2e-11,1e-11,1e-11,9e-11,2e-9,1e-10,1e-10,1e-10,
-    2e-10,1e-10,1e-10,1e-10,5e-9,1e-10,1e-10,1e-10
-]
+    1e-11, 2e-11, 2e-11, 1e-11, 1e-9, 1e-10, 1e-10, 1e-10,
+    2e-11, 1e-11, 1e-11, 9e-11, 2e-9, 1e-10, 1e-10, 1e-10,
+    2e-10, 1e-10, 1e-10, 1e-10, 5e-9, 1e-10, 1e-10, 1e-10]
 field_values = [
     md.results.TransientSolution[0].Vx,
@@ -130 +132 @@
     md.results.TransientSolution[9].CalvingCalvingrate,
     md.results.TransientSolution[9].CalvingMeltingrate,
-    md.results.TransientSolution[9].BasalforcingsFloatingiceMeltingRate
-]
+    md.results.TransientSolution[9].BasalforcingsFloatingiceMeltingRate]

issm/trunk-jpl/test/NightlyRun/test544.py

@@ -1 +1 @@
 #Test Name: PigTranAutoregressionAndStochasticforcings
 import numpy as np
-
-from autoregressionlinearbasalforcings import *
-from SMBautoregression import *
-from stochasticforcing import *
+from autoregressionlinearbasalforcings import autoregressionlinearbasalforcings
+from SMBautoregression import SMBautoregression
+from stochasticforcing import stochasticforcing
 from socket import gethostname
 from model import *
-from parameterize import *
-from setflowequation import *
-from setmask import *
-from solve import *
-from triangle import *
+from parameterize import parameterize
+from setflowequation import setflowequation
+from setmask import setmask
+from solve import solve
+from triangle import triangle
 
 
@@ -37 +36 @@
 md.smb = SMBautoregression()
 md.smb.num_basins = nb_bas  # number of basins
-md.smb.basin_id = idb - 1  # prescribe basin ID number to elements; # NOTE: offset because of 1-based vertex indexing
+md.smb.basin_id = idb  # prescribe basin ID number to elements;
 md.smb.beta0 = np.array([[0.5, 1.2]])  # intercept values of SMB in basins [m ice eq./yr]
 md.smb.beta1 = np.array([[0.0, 0.01]])  # trend values of SMB in basins [m ice eq./yr^2]
@@ -49 +48 @@
 md.calving.calvingrate = 0.1*np.ones((md.mesh.numberofvertices,))
 md.levelset.spclevelset = np.full((md.mesh.numberofvertices,), np.nan)
-md.levelset.migration_max = 10.0 
+md.levelset.migration_max = 10.0
 md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices,))
 
 #Basal forcing implementation
 md.basalforcings = autoregressionlinearbasalforcings()
-md.basalforcings.num_basins     = nb_bas
-md.basalforcings.basin_id       = idb - 1  # NOTE: offset because of 1-based vertex indexing
-md.basalforcings.beta0          = np.array([[1.0, 2.50]])  # intercept values of DeepwaterMelt in basins [m/yr]
-md.basalforcings.beta1          = np.array([[0.2, 0.01]])  # trend values of DeepwaterMelt in basins [m/yr^2]
+md.basalforcings.num_basins = nb_bas
+md.basalforcings.basin_id  = idb
+md.basalforcings.beta0 = np.array([[1.0, 2.50]])  # intercept values of DeepwaterMelt in basins [m/yr]
+md.basalforcings.beta1  = np.array([[0.2, 0.01]])  # trend values of DeepwaterMelt in basins [m/yr^2]
 md.basalforcings.ar_initialtime = md.timestepping.start_time  # initial time in the AR model parameterization [yr]
-md.basalforcings.ar_order       = 1
-md.basalforcings.ar_timestep    = 1.0  # timestep of the autoregressive model [yr]
-md.basalforcings.phi            = np.array([[0.0], [0.1]])  # autoregressive parameters
-md.basalforcings.deepwater_elevation      = np.array([[-1000, -1520]])
-md.basalforcings.upperwater_elevation     = np.array([[0, -50]])
-md.basalforcings.upperwater_melting_rate  = np.array([[0,0]])
+md.basalforcings.ar_order  = 1
+md.basalforcings.ar_timestep  = 1.0  # timestep of the autoregressive model [yr]
+md.basalforcings.phi  = np.array([[0.0], [0.1]])  # autoregressive parameters
+md.basalforcings.deepwater_elevation = np.array([[-1000, -1520]])
+md.basalforcings.upperwater_elevation = np.array([[0, -50]])
+md.basalforcings.upperwater_melting_rate = np.array([[0,0]])
 md.basalforcings.groundedice_melting_rate = np.zeros((md.mesh.numberofvertices,))
 
 #Covariance matrix (hard-coding)
-covglob = np.array([[3.0,0.,0.,0.,0.,0.],[0.,3.0,0.,0.,0.,0.],[0.,0.,0.01,0.,0.,0.],[0.,0.,0.,0.1,0.,0.],[0.,0.,0.,0.,400,0.],[0.,0.,0.,0.,0.,400]])
+covglob = np.array([[3.0, 0., 0., 0., 0., 0.],
+                    [0., 3.0, 0., 0., 0., 0.],
+                    [0., 0., 0.01, 0., 0., 0.],
+                    [0., 0., 0., 0.1, 0., 0.],
+                    [0., 0., 0., 0., 400, 0.],
+                    [0., 0., 0., 0., 0., 400]])
 
 #Stochastic forcing
 md.stochasticforcing.isstochasticforcing = 1
-md.stochasticforcing.fields = ['SMBautoregression','DefaultCalving','BasalforcingsDeepwaterMeltingRateAutoregression']
+md.stochasticforcing.fields = ['SMBautoregression', 'DefaultCalving', 'BasalforcingsDeepwaterMeltingRateAutoregression']
 md.stochasticforcing.defaultdimension = 2
-md.stochasticforcing.default_id       = idb-1 #NOTE: offset because of 1-based vertex indexing
-md.stochasticforcing.covariance       = covglob # global covariance among- and between-fields
-md.stochasticforcing.randomflag       = 0 # determines true/false randomness
+md.stochasticforcing.default_id = idb
+md.stochasticforcing.covariance = covglob  # global covariance among- and between-fields
+md.stochasticforcing.randomflag = 0  # determines true/false randomness
 
-md.transient.ismovingfront     = 1
-md.transient.requested_outputs = ['default','SmbMassBalance','BasalforcingsFloatingiceMeltingRate','BasalforcingsSpatialDeepwaterMeltingRate']
-md.transient.isstressbalance   = 1
-md.transient.ismasstransport   = 1
-md.transient.issmb             = 1
-md.transient.isthermal         = 0
-md.transient.isgroundingline   = 1
+md.transient.ismovingfront = 1
+md.transient.requested_outputs = ['default', 'SmbMassBalance', 'BasalforcingsFloatingiceMeltingRate', 'BasalforcingsSpatialDeepwaterMeltingRate']
+md.transient.isstressbalance = 1
+md.transient.ismasstransport = 1
+md.transient.issmb = 1
+md.transient.isthermal = 0
+md.transient.isgroundingline = 1
 
 md.cluster = generic('name', gethostname(), 'np', 2)
@@ -91 +95 @@
 # Fields and tolerances to track changes
 field_names = [
-    'Vx1','Vy1','Vel1','Thickness1','SmbMassBalance1','BasalforcingsFloatingiceMeltingRate1','BasalforcingsSpatialDeepwaterMeltingRate1',
-    'Vx5','Vy5','Vel5','Thickness5','SmbMassBalance5','BasalforcingsFloatingiceMeltingRate5','BasalforcingsSpatialDeepwaterMeltingRate5',
-    'Vx10','Vy10','Vel10','Thickness10','SmbMassBalance10','BasalforcingsFloatingiceMeltingRate10','BasalforcingsSpatialDeepwaterMeltingRate10'
-]
+    'Vx1', 'Vy1', 'Vel1', 'Thickness1', 'SmbMassBalance1', 'BasalforcingsFloatingiceMeltingRate1', 'BasalforcingsSpatialDeepwaterMeltingRate1',
+    'Vx5', 'Vy5', 'Vel5', 'Thickness5', 'SmbMassBalance5', 'BasalforcingsFloatingiceMeltingRate5', 'BasalforcingsSpatialDeepwaterMeltingRate5',
+    'Vx10', 'Vy10', 'Vel10', 'Thickness10', 'SmbMassBalance10', 'BasalforcingsFloatingiceMeltingRate10', 'BasalforcingsSpatialDeepwaterMeltingRate10']
 
 field_tolerances = [
-    1e-11,1e-11,2e-11,1e-11,1e10,1e-9,1e-10,
-    1e-11,1e-11,2e-11,9e-11,1e10,1e-9,1e-10,
-    2e-10,2e-10,2e-10,1e-10,1e10,1e-9,1e-10
-]
+    1e-11, 1e-11, 2e-11, 1e-11, 1e10, 1e-9, 1e-10,
+    1e-11, 1e-11, 2e-11, 9e-11, 1e10, 1e-9, 1e-10,
+    2e-10, 2e-10, 2e-10, 1e-10, 1e10, 1e-9, 1e-10]
 field_values = [
     md.results.TransientSolution[0].Vx,
@@ -122 +124 @@
     md.results.TransientSolution[9].SmbMassBalance,
     md.results.TransientSolution[9].BasalforcingsFloatingiceMeltingRate,
-    md.results.TransientSolution[9].BasalforcingsSpatialDeepwaterMeltingRate
-]
+    md.results.TransientSolution[9].BasalforcingsSpatialDeepwaterMeltingRate]

issm/trunk-jpl/test/NightlyRun/test621.py

@@ -12 +12 @@
 
 md = triangle(model(), '../Exp/79North.exp', 6000)
-md = setmask(md, '../Exp/79NorthShelf.exp','')
+md = setmask(md, '../Exp/79NorthShelf.exp', '')
 md = parameterize(md, '../Par/79North.py')
 md = setflowequation(md, 'SSA', 'all')
 
 #Default friction
-md.friction         = friction()
-md.friction.coefficient = 30*np.ones(md.mesh.numberofvertices)
-md.friction.p           = 1*np.ones((md.mesh.numberofelements))
-md.friction.q           = 1*np.ones((md.mesh.numberofelements))
+md.friction = friction()
+md.friction.coefficient = 30 * np.ones(md.mesh.numberofvertices)
+md.friction.p = np.ones((md.mesh.numberofelements))
+md.friction.q = np.ones((md.mesh.numberofelements))
 
 # Basin separation default
-idb_df = np.zeros((md.mesh.numberofelements,))
-iid1 = np.where(md.mesh.y<=-1.08e6)[0]
+idb_df = np.zeros((md.mesh.numberofelements))
+iid1 = np.where(md.mesh.y <= -1.08e6)[0]
 for ii in range(md.mesh.numberofelements):
     for vertex in range(3):
@@ -33 +33 @@
             idb_df[ii] = 2
 #Covariance matrix
-covPw = np.array([[0.75e10,0.0],[0.0,0.5e10]])
+covPw = np.array([[0.75e10, 0.0], [0.0, 0.5e10]])
 
 # Stochastic forcing
 md.stochasticforcing.isstochasticforcing = 1
-md.stochasticforcing.fields              = ['FrictionWaterPressure']
-md.stochasticforcing.defaultdimension    = 2
-md.stochasticforcing.default_id          = idb_df-1 #NOTE: offset because of 1-based vertex indexing
-md.stochasticforcing.covariance          = covPw # global covariance
-md.stochasticforcing.randomflag          = 0 # determines true/false randomness
+md.stochasticforcing.fields = ['FrictionWaterPressure']
+md.stochasticforcing.defaultdimension = 2
+md.stochasticforcing.default_id = idb_df
+md.stochasticforcing.covariance = covPw  # global covariance
+md.stochasticforcing.randomflag = 0  # determines true/false randomness
 
-md.transient.issmb              = 0;
-md.transient.ismasstransport    = 1;
-md.transient.isstressbalance    = 1;
-md.transient.isthermal          = 0;
-md.transient.isgroundingline    = 0;
+md.transient.issmb = 0
+md.transient.ismasstransport = 1
+md.transient.isstressbalance = 1
+md.transient.isthermal = 0
+md.transient.isgroundingline = 0
 
 md.transient.requested_outputs = ['default', 'FrictionWaterPressure']
 md.timestepping.start_time = 0
-md.timestepping.time_step  = 1
+md.timestepping.time_step = 1
 md.timestepping.final_time = 5
-md.cluster = generic('name',gethostname(),'np',3)
+md.cluster = generic('name', gethostname(), 'np', 3)
 md = solve(md, 'Transient')
 
 # Fields and tolerances to track changes
-field_names = [
-    'Vx1','Vy1','Vel1','Thickness1','FrictionWaterPressure1',
-    'Vx2','Vy2','Vel2','Thickness2','FrictionWaterPressure2',
-    'Vx10','Vy10','Vel10','Thickness10','FrictionWaterPressure10'
-    ]
+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_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
-    ]
-    
-
-
-
+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]