Changeset 26637


Ignore:
Timestamp:
11/18/21 03:36:13 (3 years ago)
Author:
bdef
Message:

BUG: fixing import for SetMLHOBC

Location:
issm/trunk-jpl/test/NightlyRun
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/test/NightlyRun/test254.py

    r26555 r26637  
    33from socket import gethostname
    44import numpy as np
    5 from triangle import *
    6 from setmask import *
    7 from parameterize import *
    8 from setflowequation import *
    9 from paterson import *
    10 from solve import *
     5from triangle import triangle
     6from setmask import setmask
     7from parameterize import parameterize
     8from setflowequation import setflowequation
     9from paterson import paterson
     10from solve import solve
     11from SetMLHOBC import SetMLHOBC
    1112from generic import generic
    1213
    … …  
    7071
    7172md.stressbalance.requested_outputs = ['default', 'VySurface', 'VyShear', 'VyBase']
    72 md = SetMLHOBC(md);
     73md = SetMLHOBC(md)
    7374md = solve(md, 'Stressbalance')
    7475

  • issm/trunk-jpl/test/NightlyRun/test255.py

    r26555 r26637  
    22from model import *
    33from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    6 from parameterize import *
    7 from setflowequation import *
    8 from solve import *
    9 
     4from triangle import triangle
     5from setmask import setmask
     6from parameterize import parameterize
     7from setflowequation import setflowequation
     8from solve import solve
     9from SetMLHOBC import SetMLHOBC
    1010
    1111md = triangle(model(), '../Exp/Square.exp', 150000.)
    … …  
    1515md.cluster = generic('name', gethostname(), 'np', 3)
    1616md.masstransport.hydrostatic_adjustment = 'Incremental'
    17 md = SetMLHOBC(md);
     17md = SetMLHOBC(md)
    1818md = solve(md, 'Transient')
    1919

  • issm/trunk-jpl/test/NightlyRun/test257.py

    r26615 r26637  
    2525# Generate basin IDs for 3 basins
    2626idbasin = np.zeros((md.mesh.numberofelements,))
    27 iid1 = np.where(md.mesh.y >= 2/3 * ymax)[0]
    28 iid2 = intersect(np.where(md.mesh.y < 2/3 * ymax)[0], np.where(md.mesh.x >= 1/3 * xmax)[0])
    29 iid3 = intersect(np.where(md.mesh.y < 2/3 * ymax)[0], np.where(md.mesh.x < 1/3 * xmax)[0])
     27iid1 = np.where(md.mesh.y >= 2. / 3. * ymax)[0]
     28iid2 = intersect(np.where(md.mesh.y < 2. / 3. * ymax)[0], np.where(md.mesh.x >= 1. / 3. * xmax)[0])
     29iid3 = intersect(np.where(md.mesh.y < 2. / 3. * ymax)[0], np.where(md.mesh.x < 1. / 3. * xmax)[0])
    3030for ii in range(md.mesh.numberofelements):
    3131    for vertex in range(3):
    32         if md.mesh.elements[ii][vertex] - 1 in iid1: # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
     32        if md.mesh.elements[ii][vertex] - 1 in iid1:  # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
    3333            idbasin[ii] = 1
    34     if idbasin[ii] == 0: # no vertex was found in basin 1
     34    if idbasin[ii] == 0:  # no vertex was found in basin 1
    3535        for vertex in range(3):
    36             if md.mesh.elements[ii][vertex] - 1 in iid2: # one vertex in basin 2; NOTE: offset because of 1-based vertex indexing
     36            if md.mesh.elements[ii][vertex] - 1 in iid2:  # one vertex in basin 2; NOTE: offset because of 1-based vertex indexing
    3737                idbasin[ii] = 2
    38     if idbasin[ii] == 0: # no vertex was found in basin 1 and 2
     38    if idbasin[ii] == 0:  # no vertex was found in basin 1 and 2
    3939        idbasin[ii] = 3
    4040
    4141# SMB parameters
    4242md.timestepping.start_time = 0
    43 md.timestepping.time_step  = 1
     43md.timestepping.time_step = 1
    4444md.timestepping.final_time = 5
    4545md.smb = SMBautoregression()
    46 md.smb.num_basins = 3 # number of basins
    47 md.smb.basin_id = idbasin - 1 # prescribe basin ID number to elements; # NOTE: offset because of 1-based vertex indexing
    48 md.smb.beta0 = np.array([[0.5, 1.2, 1.5]]) # intercept values of SMB in basins [m ice eq./yr]
    49 md.smb.beta1 = np.array([[0.0, 0.01, -0.01]]) # trend values of SMB in basins [m ice eq./yr^2]
     46md.smb.num_basins = 3  # number of basins
     47md.smb.basin_id = idbasin - 1  # prescribe basin ID number to elements; # NOTE: offset because of 1-based vertex indexing
     48md.smb.beta0 = np.array([[0.5, 1.2, 1.5]])  # intercept values of SMB in basins [m ice eq./yr]
     49md.smb.beta1 = np.array([[0.0, 0.01, -0.01]])  # trend values of SMB in basins [m ice eq./yr^2]
    5050md.smb.ar_initialtime = md.timestepping.start_time
    5151md.smb.ar_order = 4
    52 md.smb.ar_timestep = 2.0 #timestep of the autoregressive model [yr]
     52md.smb.ar_timestep = 2.0  #timestep of the autoregressive model [yr]
    5353md.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]])
    5454
    … …  
    5858md.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
    5959md.stochasticforcing.randomflag = 0 # fixed random seeds
     60
    6061
    6162md = solve(md, 'Transient')

  • issm/trunk-jpl/test/NightlyRun/test330.py

    r26555 r26637  
    22from model import *
    33from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    6 from parameterize import *
    7 from setflowequation import *
    8 from solve import *
     4from triangle import triangle
     5from setmask import setmask
     6from parameterize import parameterize
     7from setflowequation import setflowequation
     8from solve import solve
     9from SetMLHOBC import SetMLHOBC
    910
    1011
    … …  
    1516md.cluster = generic('name', gethostname(), 'np', 3)
    1617md.stressbalance.requested_outputs = ['default', 'VxSurface', 'VySurface', 'VxShear', 'VyShear', 'VxBase', 'VyBase']
    17 md = SetMLHOBC(md);
     18md = SetMLHOBC(md)
    1819md = solve(md, 'Stressbalance')
    1920

  • issm/trunk-jpl/test/NightlyRun/test332.py

    r26555 r26637  
    22from model import *
    33from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    6 from parameterize import *
    7 from setflowequation import *
    8 from solve import *
    9 
     4from triangle import triangle
     5from setmask import setmask
     6from parameterize import parameterize
     7from setflowequation import setflowequation
     8from solve import solve
     9from SetMLHOBC import SetMLHOBC
    1010
    1111md = triangle(model(), '../Exp/Square.exp', 150000.)
    … …  
    1414md = setflowequation(md, 'MLHO', 'all')
    1515md.cluster = generic('name', gethostname(), 'np', 3)
    16 md = SetMLHOBC(md);
     16md = SetMLHOBC(md)
    1717md = solve(md, 'Transient')
    1818

  • issm/trunk-jpl/test/NightlyRun/test335.py

    r26555 r26637  
    22from model import *
    33from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    6 from parameterize import *
    7 from setflowequation import *
    8 from solve import *
     4from triangle import triangle
     5from setmask import setmask
     6from parameterize import parameterize
     7from setflowequation import setflowequation
     8from solve import solve
     9from SetMLHOBC import SetMLHOBC
    910
    1011
    … …  
    1314md = parameterize(md, '../Par/SquareSheetConstrained.py')
    1415md = setflowequation(md, 'MLHO', 'all')
    15 md = SetMLHOBC(md);
     16md = SetMLHOBC(md)
    1617md.extrude(5, 1.)
    1718md.cluster = generic('name', gethostname(), 'np', 3)

  • issm/trunk-jpl/test/NightlyRun/test447.py

    r26555 r26637  
    33from model import *
    44from socket import gethostname
    5 
    6 from triangle import *
    7 from setmask import *
    8 from parameterize import *
    9 from setflowequation import *
    10 from solve import *
     5from triangle import triangle
     6from setmask import setmask
     7from parameterize import parameterize
     8from setflowequation import setflowequation
     9from solve import solve
     10from SetMLHOBC import SetMLHOBC
    1111from frictioncoulomb import frictioncoulomb
     12from generic import generic
    1213
    1314md = triangle(model(), '../Exp/Square.exp', 150000.)
    … …  
    2728md.cluster = generic('name', gethostname(), 'np', 3)
    2829md.transient.requested_outputs = ['default', 'GroundedArea', 'FloatingArea', 'TotalFloatingBmb', 'TotalGroundedBmb', 'TotalSmb']
    29 md = SetMLHOBC(md);
     30md = SetMLHOBC(md)
    3031md = solve(md, 'Transient')
    3132
    3233#Fields and tolerances to track changes
    3334field_names = [
    34     'Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1', 'TotalSmb1', 
    35     'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'GroundedArea2', 'FloatingArea2', 'TotalFloatingBmb2', 'TotalGroundedBmb2', 'TotalSmb2', 
     35    'Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Bed1', 'Surface1', 'Thickness1', 'GroundedArea1', 'FloatingArea1', 'TotalFloatingBmb1', 'TotalGroundedBmb1', 'TotalSmb1',
     36    'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Bed2', 'Surface2', 'Thickness2', 'GroundedArea2', 'FloatingArea2', 'TotalFloatingBmb2', 'TotalGroundedBmb2', 'TotalSmb2',
    3637    'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Bed3', 'Surface3', 'Thickness3', 'GroundedArea3', 'FloatingArea3', 'TotalFloatingBmb3', 'TotalGroundedBmb3', 'TotalSmb3'
    3738]
    3839field_tolerances = [
    39     2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 
    40     2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 
    41     2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 
     40    2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
     41    2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
     42    2e-13, 2e-13, 2e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13,
    4243]
    4344field_values = [

  • issm/trunk-jpl/test/NightlyRun/test449.py

    r26555 r26637  
    33from model import *
    44from socket import gethostname
    5 from triangle import *
    6 from setmask import *
    7 from parameterize import *
    8 from setflowequation import *
    9 from solve import *
     5from triangle import triangle
     6from setmask import setmask
     7from parameterize import parameterize
     8from setflowequation import setflowequation
     9from solve import solve
     10from SetMLHOBC import SetMLHOBC
     11from generic import generic
     12
    1013
    1114md = triangle(model(), '../Exp/Square.exp', 100000.)
    … …  
    5659
    5760md.cluster = generic('name', gethostname(), 'np', 3)
    58 md = SetMLHOBC(md);
     61md = SetMLHOBC(md)
    5962md = solve(md, 'Transient')
    6063#print md.results.TransientSolution[0].BasalforcingsFloatingiceMeltingRate

  • issm/trunk-jpl/test/NightlyRun/test519.py

    r26555 r26637  
    11#Test Name: PigTranMLHO2d
     2import numpy as np
    23from model import *
    34from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    6 from parameterize import *
    7 from setflowequation import *
    8 from solve import *
    9 
     5from triangle import triangle
     6from setmask import setmask
     7from parameterize import parameterize
     8from setflowequation import setflowequation
     9from solve import solve
     10from SetMLHOBC import SetMLHOBC
     11from generic import generic
    1012
    1113md = triangle(model(), '../Exp/Pig.exp', 20000.)
    … …  
    1618md.transient.requested_outputs = ['default', 'IceVolume', 'IceVolumeScaled', 'GroundedArea', 'GroundedAreaScaled', 'FloatingArea', 'FloatingAreaScaled', 'TotalSmb', 'TotalSmbScaled', 'TotalFloatingBmb', 'TotalFloatingBmbScaled']
    1719md.cluster = generic('name', gethostname(), 'np', 3)
    18 md = SetMLHOBC(md);
     20md = SetMLHOBC(md)
    1921md = solve(md, 'Transient')
    2022

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

    r26553 r26637  
    1717md = parameterize(md, '../Par/Pig.py')
    1818md = setflowequation(md, 'SSA', 'all')
    19 md.timestepping.time_step  = 2
     19md.timestepping.time_step = 2
    2020md.timestepping.final_time = 50
    2121
    … …  
    2525for ii in range(md.mesh.numberofelements):
    2626    for vertex in range(3):
    27         if md.mesh.elements[ii][vertex] - 1 in iid1: # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
     27        if md.mesh.elements[ii][vertex] - 1 in iid1:  # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
    2828            idbasin[ii] = 1
    29     if idbasin[ii] == 0: # no vertex was found in basin 1
     29    if idbasin[ii] == 0:  # no vertex was found in basin 1
    3030        idbasin[ii] = 2
    3131
    … …  
    3535md.frontalforcings = frontalforcingsrignot()
    3636md.frontalforcings.num_basins = 2
    37 md.frontalforcings.basin_id = idbasin - 1 # NOTE: offset because of 1-based vertex indexing
     37md.frontalforcings.basin_id = idbasin - 1  # NOTE: offset because of 1-based vertex indexing
    3838md.frontalforcings.subglacial_discharge = 0.1 * np.ones((md.mesh.numberofvertices,))
    3939md.frontalforcings.thermalforcing = 0.5 * np.ones((md.mesh.numberofvertices,))
    4040for elem in range(md.mesh.numberofelements):
    4141    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
     42        md.frontalforcings.thermalforcing[md.mesh.elements[elem, 0:3] - 1] = 1.5  # NOTE: offset because of 1-based vertex indexing
    4343
    4444md.transient.ismovingfront = 1

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

    r26615 r26637  
    1818md = setflowequation(md, 'SSA', 'all')
    1919md.timestepping.start_time = 0
    20 md.timestepping.time_step  = 1
     20md.timestepping.time_step = 1
    2121md.timestepping.final_time = 25
    2222
    … …  
    2626for ii in range(md.mesh.numberofelements):
    2727    for vertex in range(3):
    28         if md.mesh.elements[ii][vertex] - 1 in iid1: # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
     28        if md.mesh.elements[ii][vertex] - 1 in iid1:  # one vertex in basin 1; NOTE: offset because of 1-based vertex indexing
    2929            idbasin[ii] = 1
    30     if idbasin[ii] == 0: # no vertex was found in basin 1
     30    if idbasin[ii] == 0:  # no vertex was found in basin 1
    3131        for vertex in range(3):
    3232            idbasin[ii] = 2
    … …  
    3737md.frontalforcings = frontalforcingsrignotautoregression()
    3838md.frontalforcings.num_basins = 2
    39 md.frontalforcings.basin_id = idbasin - 1 # NOTE: offset because of 1-based vertex indexing
     39md.frontalforcings.basin_id = idbasin - 1  # NOTE: offset because of 1-based vertex indexing
    4040md.frontalforcings.subglacial_discharge = 0.1 * np.ones((md.mesh.numberofvertices,))
    41 md.frontalforcings.beta0 = np.array([[0.05, 0.01]]) # intercept values of TF in basins [C]
    42 md.frontalforcings.beta1 = np.array([[0.001, 0.0001]]) # trend values of TF in basins [C/yr]
    43 md.frontalforcings.ar_initialtime = md.timestepping.start_time # initial time in the AR model parameterization [yr]
     41md.frontalforcings.beta0 = np.array([[0.05, 0.01]])  # intercept values of TF in basins [C]
     42md.frontalforcings.beta1 = np.array([[0.001, 0.0001]])  # trend values of TF in basins [C/yr]
     43md.frontalforcings.ar_initialtime = md.timestepping.start_time  # initial time in the AR model parameterization [yr]
    4444md.frontalforcings.ar_order = 4
    45 md.frontalforcings.ar_timestep = 2 # timestep of the autoregressive model [yr]
    46 md.frontalforcings.phi = np.array([[0.1, -0.1, 0.01, -0.01], [0.2, -0.2, 0.1, 0.0]]) # autoregressive parameters
     45md.frontalforcings.ar_timestep = 2  # timestep of the autoregressive model [yr]
     46md.frontalforcings.phi = np.array([[0.1, -0.1, 0.01, -0.01], [0.2, -0.2, 0.1, 0.0]])  # autoregressive parameters
    4747
    4848# Stochastic forcing
    4949md.stochasticforcing.isstochasticforcing = 1
    5050md.stochasticforcing.fields = ['FrontalForcingsRignotAutoregression']
     51
    5152md.stochasticforcing.covariance = 1e-4 * np.array([[1.5, 0.5], [0.5, 0.4]]) # global covariance among- and between-fields
    5253md.stochasticforcing.randomflag = 0 # determines true/false randomness
     54
    5355
    5456md.transient.ismovingfront = 1

  • issm/trunk-jpl/test/NightlyRun/test811.py

    r26555 r26637  
    11#Test Name: ValleyGlacierLevelsetCalvingMLHO2d
    22import numpy as np
    3 from MatlabFuncs import oshostname
    43from model import *
    5 from parameterize import *
    6 from setflowequation import *
    7 from setmask import *
    8 from solve import *
    9 from triangle import *
    10 
     4from socket import gethostname
     5from triangle import triangle
     6from setmask import setmask
     7from parameterize import parameterize
     8from setflowequation import setflowequation
     9from solve import solve
     10from SetMLHOBC import SetMLHOBC
     11from generic import generic
    1112
    1213md = triangle(model(), '../Exp/Square.exp', 50000)
    … …  
    1415md = parameterize(md, '../Par/ValleyGlacierShelf.py')
    1516md = setflowequation(md, 'MLHO', 'all')
    16 md.cluster = generic('name', oshostname(), 'np', 3)
     17md.cluster = generic('name', gethostname(), 'np', 3)
    1718
    1819#Transient
    … …  
    2829md.levelset.migration_max = 1e10
    2930
    30 md = SetMLHOBC(md);
     31md = SetMLHOBC(md)
    3132md = solve(md, 'Transient')
    3233
Note: See TracChangeset for help on using the changeset viewer.