Changeset 26907


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/test/NightlyRun/test257.py

    r26810 r26907  
    4343md.smb = SMBautoregression()
    4444md.smb.num_basins = 3  # number of basins
    45 md.smb.basin_id = idbasin - 1  # prescribe basin ID number to elements; # NOTE: offset because of 1-based vertex indexing
     45md.smb.basin_id = idbasin  # prescribe basin ID number to elements;
    4646md.smb.beta0 = np.array([[0.5, 1.2, 1.5]])  # intercept values of SMB in basins [m ice eq./yr]
    4747md.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

    r26638 r26907  
    11#Test Name: PigTranFrontalforcingsrignot
    22import numpy as np
    3 
    4 from calvingvonmises import *
    5 from frontalforcingsrignot import *
     3from calvingvonmises import calvingvonmises
     4from frontalforcingsrignot import frontalforcingsrignot
    65from socket import gethostname
    76from model import *
    8 from parameterize import *
    9 from setflowequation import *
    10 from setmask import *
    11 from solve import *
    12 from triangle import *
     7from parameterize import parameterize
     8from setflowequation import setflowequation
     9from setmask import setmask
     10from solve import solve
     11from triangle import triangle
    1312
    1413
     
    3534md.frontalforcings = frontalforcingsrignot()
    3635md.frontalforcings.num_basins = 2
    37 md.frontalforcings.basin_id = idbasin - 1  # NOTE: offset because of 1-based vertex indexing
     36md.frontalforcings.basin_id = idbasin
    3837md.frontalforcings.subglacial_discharge = 0.1 * np.ones((md.mesh.numberofvertices,))
    3938md.frontalforcings.thermalforcing = 0.5 * np.ones((md.mesh.numberofvertices,))
    4039for elem in range(md.mesh.numberofelements):
    4140    if idbasin[elem] == 2:
    42         md.frontalforcings.thermalforcing[md.mesh.elements[elem, 0:3] - 1] = 1.5  # NOTE: offset because of 1-based vertex indexing
     41        md.frontalforcings.thermalforcing[md.mesh.elements[elem, 0:3] - 1] = 1.5  #NOTE: offset because of 1-based vertex indexing
    4342
    4443md.transient.ismovingfront = 1
     
    5150
    5251# Fields and tolerances to track changes
    53 field_names = [
    54     'Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'MaskIceLevelset1', 'CalvingMetlingRate1',
    55     'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'MaskIceLevelset2', 'CalvingMetlingRate2',
    56     'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Bed10', 'Surface10', 'Thickness10', 'MaskIceLevelset10', 'CalvingMetlingRate10'
    57 ]
     52field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'MaskIceLevelset1', 'CalvingMetlingRate1',
     53               'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'MaskIceLevelset2', 'CalvingMetlingRate2',
     54               'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Bed10', 'Surface10', 'Thickness10', 'MaskIceLevelset10', 'CalvingMetlingRate10']
    5855field_tolerances = [
    5956    1e-11, 2e-11, 2e-11, 1e-12, 2e-11, 6e-12, 9e-12, 1e-12, 1e-9,
    6057    2e-11, 1e-11, 1e-11, 9e-12, 2e-1, 2e-11, 2e-11, 1e-11, 1e-9,
    61     2e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-9, 1e-9
    62 ]
     58    2e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-10, 1e-9, 1e-9]
    6359field_values = [
    6460    md.results.TransientSolution[0].Vx,
  • issm/trunk-jpl/test/NightlyRun/test543.py

    r26674 r26907  
    11#Test Name: PigTranStochasticforcing
    22import numpy as np
    3 
    4 from frontalforcingsrignotautoregression import *
     3from frontalforcingsrignotautoregression import frontalforcingsrignotautoregression
    54from socket import gethostname
    65from model import *
    7 from parameterize import *
    8 from setflowequation import *
    9 from setmask import *
    10 from solve import *
    11 from triangle import *
     6from parameterize import parameterize
     7from setflowequation import setflowequation
     8from setmask import setmask
     9from solve import solve
     10from triangle import triangle
    1211
    1312
     
    4140            idb_df[ii] = 2
    4241#Dimensionalities
    43 nb_tf    = 2
    44 nb_clv   = 2
     42nb_tf = 2
     43nb_clv  = 2
    4544nb_flmlt = 2
    4645
    4746# Calving parameters
    4847md.mask.ice_levelset = 1e4 * (md.mask.ice_levelset + 0.5)
    49 md.calving.calvingrate = 0.3*np.ones((md.mesh.numberofvertices,))
     48md.calving.calvingrate = 0.3 * np.ones((md.mesh.numberofvertices,))
    5049md.levelset.spclevelset = np.full((md.mesh.numberofvertices,), np.nan)
    5150md.levelset.migration_max = 10.0
     
    5352md.frontalforcings = frontalforcingsrignotautoregression()
    5453md.frontalforcings.num_basins = nb_tf
    55 md.frontalforcings.basin_id = idb_tf - 1  # NOTE: offset because of 1-based vertex indexing
     54md.frontalforcings.basin_id = idb_tf
    5655md.frontalforcings.subglacial_discharge = 0.1 * np.ones((md.mesh.numberofvertices,))
    5756md.frontalforcings.beta0 = np.array([[0.05, 0.01]])  # intercept values of TF in basins [C]
     
    6261md.frontalforcings.phi = np.array([[0.1, -0.1, 0.01, -0.01], [0.2, -0.2, 0.1, 0.0]])  # autoregressive parameters
    6362#Floating Ice Melt parameters
    64 md.basalforcings.floatingice_melting_rate = 0.1*np.ones((md.mesh.numberofvertices,))
     63md.basalforcings.floatingice_melting_rate = 0.1 * np.ones((md.mesh.numberofvertices,))
    6564
    6665#Covariance matrix
    67 covtf            = 1e-4*np.identity(nb_tf)
    68 covclv           = 1e-1*np.identity(nb_clv)
    69 covclv[0,0]      = 1/10*covclv[0,0]
    70 covflmlt         = 0.05*np.identity(nb_flmlt)
     66covtf = 1e-4 * np.identity(nb_tf)
     67covclv = 1e-1 * np.identity(nb_clv)
     68covclv[0, 0] = 1 / 10 * covclv[0, 0]
     69covflmlt = 0.05 * np.identity(nb_flmlt)
    7170#covglob          = np.zeros([6,6])
    7271#covglob[0:2,0:2] = covtf
     
    7574
    7675#Hard-coding covariance matrix because python is complaining
    77 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]])
     76covglob = np.array([[1e-4, 0., 0., 0., 0., 0.],
     77                    [0., 1e-4, 0., 0., 0., 0.],
     78                    [0., 0., 1e-2, 0., 0., 0.],
     79                    [0., 0., 0., 1e-1, 0., 0.],
     80                    [0., 0., 0., 0., 0.05, 0.],
     81                    [0., 0., 0., 0., 0., 0.05]])
    7882#testchol = np.linalg.cholesky(covglob)
    7983#print(testchol)
     
    8185# Stochastic forcing
    8286md.stochasticforcing.isstochasticforcing = 1
    83 md.stochasticforcing.fields = ['FrontalForcingsRignotAutoregression','DefaultCalving','FloatingMeltRate']
     87md.stochasticforcing.fields = ['FrontalForcingsRignotAutoregression', 'DefaultCalving', 'FloatingMeltRate']
    8488md.stochasticforcing.defaultdimension = 2
    85 md.stochasticforcing.default_id       = idb_df-1 #NOTE: offset because of 1-based vertex indexing
    86 md.stochasticforcing.covariance       = covglob # global covariance among- and between-fields
    87 md.stochasticforcing.randomflag       = 0 # determines true/false randomness
     89md.stochasticforcing.default_id = idb_df
     90md.stochasticforcing.covariance = covglob # global covariance among- and between-fields
     91md.stochasticforcing.randomflag = 0 # determines true/false randomness
    8892
    89 md.transient.ismovingfront   = 1
     93md.transient.ismovingfront = 1
    9094md.transient.isgroundingline = 1
    9195
    92 md.transient.requested_outputs = ['default', 'CalvingCalvingrate','CalvingMeltingrate','BasalforcingsFloatingiceMeltingRate']
     96md.transient.requested_outputs = ['default', 'CalvingCalvingrate', 'CalvingMeltingrate', 'BasalforcingsFloatingiceMeltingRate']
    9397md.cluster = generic('name', gethostname(), 'np', 2)
    9498md = solve(md, 'Transient')
     
    96100# Fields and tolerances to track changes
    97101field_names = [
    98     'Vx1' ,'Vy1' ,'Vel1' ,'Thickness1' ,'MaskIceLevelset1' ,'CalvingCalvingrate1' ,'CalvingMeltingrate1' ,'BasalforcingsFloatingiceMeltingRate1',
    99     'Vx2' ,'Vy2' ,'Vel2' ,'Thickness2' ,'MaskIceLevelset2' ,'CalvingCalvingrate1' ,'CalvingMeltingrate2' ,'BasalforcingsFloatingiceMeltingRate2',
    100     'Vx10','Vy10','Vel10','Thickness10','MaskIceLevelset10','CalvingCalvingrate10','CalvingMeltingrate10','BasalforcingsFloatingiceMeltingRate10'
    101 ]
     102    'Vx1', 'Vy1', 'Vel1', 'Thickness1', 'MaskIceLevelset1', 'CalvingCalvingrate1', 'CalvingMeltingrate1', 'BasalforcingsFloatingiceMeltingRate1',
     103    'Vx2', 'Vy2', 'Vel2', 'Thickness2', 'MaskIceLevelset2', 'CalvingCalvingrate1', 'CalvingMeltingrate2', 'BasalforcingsFloatingiceMeltingRate2',
     104    'Vx10', 'Vy10', 'Vel10', 'Thickness10', 'MaskIceLevelset10', 'CalvingCalvingrate10', 'CalvingMeltingrate10', 'BasalforcingsFloatingiceMeltingRate10']
    102105
    103106field_tolerances = [
    104     1e-11,2e-11,2e-11,1e-11,1e-9,1e-10,1e-10,1e-10,
    105     2e-11,1e-11,1e-11,9e-11,2e-9,1e-10,1e-10,1e-10,
    106     2e-10,1e-10,1e-10,1e-10,5e-9,1e-10,1e-10,1e-10
    107 ]
     107    1e-11, 2e-11, 2e-11, 1e-11, 1e-9, 1e-10, 1e-10, 1e-10,
     108    2e-11, 1e-11, 1e-11, 9e-11, 2e-9, 1e-10, 1e-10, 1e-10,
     109    2e-10, 1e-10, 1e-10, 1e-10, 5e-9, 1e-10, 1e-10, 1e-10]
    108110field_values = [
    109111    md.results.TransientSolution[0].Vx,
     
    130132    md.results.TransientSolution[9].CalvingCalvingrate,
    131133    md.results.TransientSolution[9].CalvingMeltingrate,
    132     md.results.TransientSolution[9].BasalforcingsFloatingiceMeltingRate
    133 ]
     134    md.results.TransientSolution[9].BasalforcingsFloatingiceMeltingRate]
  • issm/trunk-jpl/test/NightlyRun/test544.py

    r26837 r26907  
    11#Test Name: PigTranAutoregressionAndStochasticforcings
    22import numpy as np
    3 
    4 from autoregressionlinearbasalforcings import *
    5 from SMBautoregression import *
    6 from stochasticforcing import *
     3from autoregressionlinearbasalforcings import autoregressionlinearbasalforcings
     4from SMBautoregression import SMBautoregression
     5from stochasticforcing import stochasticforcing
    76from socket import gethostname
    87from model import *
    9 from parameterize import *
    10 from setflowequation import *
    11 from setmask import *
    12 from solve import *
    13 from triangle import *
     8from parameterize import parameterize
     9from setflowequation import setflowequation
     10from setmask import setmask
     11from solve import solve
     12from triangle import triangle
    1413
    1514
     
    3736md.smb = SMBautoregression()
    3837md.smb.num_basins = nb_bas  # number of basins
    39 md.smb.basin_id = idb - 1  # prescribe basin ID number to elements; # NOTE: offset because of 1-based vertex indexing
     38md.smb.basin_id = idb  # prescribe basin ID number to elements;
    4039md.smb.beta0 = np.array([[0.5, 1.2]])  # intercept values of SMB in basins [m ice eq./yr]
    4140md.smb.beta1 = np.array([[0.0, 0.01]])  # trend values of SMB in basins [m ice eq./yr^2]
     
    4948md.calving.calvingrate = 0.1*np.ones((md.mesh.numberofvertices,))
    5049md.levelset.spclevelset = np.full((md.mesh.numberofvertices,), np.nan)
    51 md.levelset.migration_max = 10.0 
     50md.levelset.migration_max = 10.0
    5251md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices,))
    5352
    5453#Basal forcing implementation
    5554md.basalforcings = autoregressionlinearbasalforcings()
    56 md.basalforcings.num_basins     = nb_bas
    57 md.basalforcings.basin_id       = idb - 1  # NOTE: offset because of 1-based vertex indexing
    58 md.basalforcings.beta0          = np.array([[1.0, 2.50]])  # intercept values of DeepwaterMelt in basins [m/yr]
    59 md.basalforcings.beta1          = np.array([[0.2, 0.01]])  # trend values of DeepwaterMelt in basins [m/yr^2]
     55md.basalforcings.num_basins = nb_bas
     56md.basalforcings.basin_id  = idb
     57md.basalforcings.beta0 = np.array([[1.0, 2.50]])  # intercept values of DeepwaterMelt in basins [m/yr]
     58md.basalforcings.beta1  = np.array([[0.2, 0.01]])  # trend values of DeepwaterMelt in basins [m/yr^2]
    6059md.basalforcings.ar_initialtime = md.timestepping.start_time  # initial time in the AR model parameterization [yr]
    61 md.basalforcings.ar_order       = 1
    62 md.basalforcings.ar_timestep    = 1.0  # timestep of the autoregressive model [yr]
    63 md.basalforcings.phi            = np.array([[0.0], [0.1]])  # autoregressive parameters
    64 md.basalforcings.deepwater_elevation      = np.array([[-1000, -1520]])
    65 md.basalforcings.upperwater_elevation     = np.array([[0, -50]])
    66 md.basalforcings.upperwater_melting_rate  = np.array([[0,0]])
     60md.basalforcings.ar_order  = 1
     61md.basalforcings.ar_timestep  = 1.0  # timestep of the autoregressive model [yr]
     62md.basalforcings.phi  = np.array([[0.0], [0.1]])  # autoregressive parameters
     63md.basalforcings.deepwater_elevation = np.array([[-1000, -1520]])
     64md.basalforcings.upperwater_elevation = np.array([[0, -50]])
     65md.basalforcings.upperwater_melting_rate = np.array([[0,0]])
    6766md.basalforcings.groundedice_melting_rate = np.zeros((md.mesh.numberofvertices,))
    6867
    6968#Covariance matrix (hard-coding)
    70 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]])
     69covglob = np.array([[3.0, 0., 0., 0., 0., 0.],
     70                    [0., 3.0, 0., 0., 0., 0.],
     71                    [0., 0., 0.01, 0., 0., 0.],
     72                    [0., 0., 0., 0.1, 0., 0.],
     73                    [0., 0., 0., 0., 400, 0.],
     74                    [0., 0., 0., 0., 0., 400]])
    7175
    7276#Stochastic forcing
    7377md.stochasticforcing.isstochasticforcing = 1
    74 md.stochasticforcing.fields = ['SMBautoregression','DefaultCalving','BasalforcingsDeepwaterMeltingRateAutoregression']
     78md.stochasticforcing.fields = ['SMBautoregression', 'DefaultCalving', 'BasalforcingsDeepwaterMeltingRateAutoregression']
    7579md.stochasticforcing.defaultdimension = 2
    76 md.stochasticforcing.default_id       = idb-1 #NOTE: offset because of 1-based vertex indexing
    77 md.stochasticforcing.covariance       = covglob # global covariance among- and between-fields
    78 md.stochasticforcing.randomflag       = 0 # determines true/false randomness
     80md.stochasticforcing.default_id = idb
     81md.stochasticforcing.covariance = covglob # global covariance among- and between-fields
     82md.stochasticforcing.randomflag = 0 # determines true/false randomness
    7983
    80 md.transient.ismovingfront     = 1
    81 md.transient.requested_outputs = ['default','SmbMassBalance','BasalforcingsFloatingiceMeltingRate','BasalforcingsSpatialDeepwaterMeltingRate']
    82 md.transient.isstressbalance   = 1
    83 md.transient.ismasstransport   = 1
    84 md.transient.issmb             = 1
    85 md.transient.isthermal         = 0
    86 md.transient.isgroundingline   = 1
     84md.transient.ismovingfront = 1
     85md.transient.requested_outputs = ['default', 'SmbMassBalance', 'BasalforcingsFloatingiceMeltingRate', 'BasalforcingsSpatialDeepwaterMeltingRate']
     86md.transient.isstressbalance = 1
     87md.transient.ismasstransport = 1
     88md.transient.issmb = 1
     89md.transient.isthermal = 0
     90md.transient.isgroundingline = 1
    8791
    8892md.cluster = generic('name', gethostname(), 'np', 2)
     
    9195# Fields and tolerances to track changes
    9296field_names = [
    93     'Vx1','Vy1','Vel1','Thickness1','SmbMassBalance1','BasalforcingsFloatingiceMeltingRate1','BasalforcingsSpatialDeepwaterMeltingRate1',
    94     'Vx5','Vy5','Vel5','Thickness5','SmbMassBalance5','BasalforcingsFloatingiceMeltingRate5','BasalforcingsSpatialDeepwaterMeltingRate5',
    95     'Vx10','Vy10','Vel10','Thickness10','SmbMassBalance10','BasalforcingsFloatingiceMeltingRate10','BasalforcingsSpatialDeepwaterMeltingRate10'
    96 ]
     97    'Vx1', 'Vy1', 'Vel1', 'Thickness1', 'SmbMassBalance1', 'BasalforcingsFloatingiceMeltingRate1', 'BasalforcingsSpatialDeepwaterMeltingRate1',
     98    'Vx5', 'Vy5', 'Vel5', 'Thickness5', 'SmbMassBalance5', 'BasalforcingsFloatingiceMeltingRate5', 'BasalforcingsSpatialDeepwaterMeltingRate5',
     99    'Vx10', 'Vy10', 'Vel10', 'Thickness10', 'SmbMassBalance10', 'BasalforcingsFloatingiceMeltingRate10', 'BasalforcingsSpatialDeepwaterMeltingRate10']
    97100
    98101field_tolerances = [
    99     1e-11,1e-11,2e-11,1e-11,1e10,1e-9,1e-10,
    100     1e-11,1e-11,2e-11,9e-11,1e10,1e-9,1e-10,
    101     2e-10,2e-10,2e-10,1e-10,1e10,1e-9,1e-10
    102 ]
     102    1e-11, 1e-11, 2e-11, 1e-11, 1e10, 1e-9, 1e-10,
     103    1e-11, 1e-11, 2e-11, 9e-11, 1e10, 1e-9, 1e-10,
     104    2e-10, 2e-10, 2e-10, 1e-10, 1e10, 1e-9, 1e-10]
    103105field_values = [
    104106    md.results.TransientSolution[0].Vx,
     
    122124    md.results.TransientSolution[9].SmbMassBalance,
    123125    md.results.TransientSolution[9].BasalforcingsFloatingiceMeltingRate,
    124     md.results.TransientSolution[9].BasalforcingsSpatialDeepwaterMeltingRate
    125 ]
     126    md.results.TransientSolution[9].BasalforcingsSpatialDeepwaterMeltingRate]
  • issm/trunk-jpl/test/NightlyRun/test621.py

    r26679 r26907  
    1212
    1313md = triangle(model(), '../Exp/79North.exp', 6000)
    14 md = setmask(md, '../Exp/79NorthShelf.exp','')
     14md = setmask(md, '../Exp/79NorthShelf.exp', '')
    1515md = parameterize(md, '../Par/79North.py')
    1616md = setflowequation(md, 'SSA', 'all')
    1717
    1818#Default friction
    19 md.friction         = friction()
    20 md.friction.coefficient = 30*np.ones(md.mesh.numberofvertices)
    21 md.friction.p           = 1*np.ones((md.mesh.numberofelements))
    22 md.friction.q           = 1*np.ones((md.mesh.numberofelements))
     19md.friction = friction()
     20md.friction.coefficient = 30 * np.ones(md.mesh.numberofvertices)
     21md.friction.p = np.ones((md.mesh.numberofelements))
     22md.friction.q = np.ones((md.mesh.numberofelements))
    2323
    2424# Basin separation default
    25 idb_df = np.zeros((md.mesh.numberofelements,))
    26 iid1 = np.where(md.mesh.y<=-1.08e6)[0]
     25idb_df = np.zeros((md.mesh.numberofelements))
     26iid1 = np.where(md.mesh.y <= -1.08e6)[0]
    2727for ii in range(md.mesh.numberofelements):
    2828    for vertex in range(3):
     
    3333            idb_df[ii] = 2
    3434#Covariance matrix
    35 covPw = np.array([[0.75e10,0.0],[0.0,0.5e10]])
     35covPw = np.array([[0.75e10, 0.0], [0.0, 0.5e10]])
    3636
    3737# Stochastic forcing
    3838md.stochasticforcing.isstochasticforcing = 1
    39 md.stochasticforcing.fields              = ['FrictionWaterPressure']
    40 md.stochasticforcing.defaultdimension    = 2
    41 md.stochasticforcing.default_id          = idb_df-1 #NOTE: offset because of 1-based vertex indexing
    42 md.stochasticforcing.covariance          = covPw # global covariance
    43 md.stochasticforcing.randomflag          = 0 # determines true/false randomness
     39md.stochasticforcing.fields = ['FrictionWaterPressure']
     40md.stochasticforcing.defaultdimension = 2
     41md.stochasticforcing.default_id = idb_df
     42md.stochasticforcing.covariance = covPw # global covariance
     43md.stochasticforcing.randomflag = 0 # determines true/false randomness
    4444
    45 md.transient.issmb              = 0;
    46 md.transient.ismasstransport    = 1;
    47 md.transient.isstressbalance    = 1;
    48 md.transient.isthermal          = 0;
    49 md.transient.isgroundingline    = 0;
     45md.transient.issmb = 0
     46md.transient.ismasstransport = 1
     47md.transient.isstressbalance = 1
     48md.transient.isthermal = 0
     49md.transient.isgroundingline = 0
    5050
    5151md.transient.requested_outputs = ['default', 'FrictionWaterPressure']
    5252md.timestepping.start_time = 0
    53 md.timestepping.time_step  = 1
     53md.timestepping.time_step = 1
    5454md.timestepping.final_time = 5
    55 md.cluster = generic('name',gethostname(),'np',3)
     55md.cluster = generic('name', gethostname(), 'np', 3)
    5656md = solve(md, 'Transient')
    5757
    5858# Fields and tolerances to track changes
    59 field_names = [
    60     'Vx1','Vy1','Vel1','Thickness1','FrictionWaterPressure1',
    61     'Vx2','Vy2','Vel2','Thickness2','FrictionWaterPressure2',
    62     'Vx10','Vy10','Vel10','Thickness10','FrictionWaterPressure10'
    63     ]
     59field_names = ['Vx1', 'Vy1', 'Vel1', 'Thickness1', 'FrictionWaterPressure1',
     60               'Vx2', 'Vy2', 'Vel2', 'Thickness2', 'FrictionWaterPressure2',
     61               'Vx10', 'Vy10', 'Vel10', 'Thickness10', 'FrictionWaterPressure10']
    6462
    65 field_tolerances = [
    66     2e-10,2e-10,2e-10,2e-10,2e-10,
    67     4e-10,4e-10,4e-10,4e-10,4e-10,
    68     8e-10,8e-10,8e-10,8e-10,8e-10
    69     ]
     63field_tolerances = [2e-10, 2e-10, 2e-10, 2e-10, 2e-10,
     64                    4e-10, 4e-10, 4e-10, 4e-10, 4e-10,
     65                    8e-10, 8e-10, 8e-10, 8e-10, 8e-10]
    7066
    71 field_values = [
    72     md.results.TransientSolution[0].Vx,
    73     md.results.TransientSolution[0].Vy,
    74     md.results.TransientSolution[0].Vel,
    75     md.results.TransientSolution[0].Thickness,
    76     md.results.TransientSolution[0].FrictionWaterPressure,
    77     md.results.TransientSolution[1].Vx,
    78     md.results.TransientSolution[1].Vy,
    79     md.results.TransientSolution[1].Vel,
    80     md.results.TransientSolution[1].Thickness,
    81     md.results.TransientSolution[1].FrictionWaterPressure,
    82     md.results.TransientSolution[4].Vx,
    83     md.results.TransientSolution[4].Vy,
    84     md.results.TransientSolution[4].Vel,
    85     md.results.TransientSolution[4].Thickness,
    86     md.results.TransientSolution[4].FrictionWaterPressure
    87     ]
    88    
    89 
    90 
    91 
     67field_values = [md.results.TransientSolution[0].Vx,
     68                md.results.TransientSolution[0].Vy,
     69                md.results.TransientSolution[0].Vel,
     70                md.results.TransientSolution[0].Thickness,
     71                md.results.TransientSolution[0].FrictionWaterPressure,
     72                md.results.TransientSolution[1].Vx,
     73                md.results.TransientSolution[1].Vy,
     74                md.results.TransientSolution[1].Vel,
     75                md.results.TransientSolution[1].Thickness,
     76                md.results.TransientSolution[1].FrictionWaterPressure,
     77                md.results.TransientSolution[4].Vx,
     78                md.results.TransientSolution[4].Vy,
     79                md.results.TransientSolution[4].Vel,
     80                md.results.TransientSolution[4].Thickness,
     81                md.results.TransientSolution[4].FrictionWaterPressure]
Note: See TracChangeset for help on using the changeset viewer.