Changeset 25841


Ignore:
Timestamp:
12/08/20 13:38:01 (4 years ago)
Author:
jdquinn
Message:

CHG: MATLAB -> Python; missing comment char; clean up

Location:
issm/trunk-jpl
Files:
1 deleted
8 edited
1 copied

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/jenkins/pine_island-mac-full

    r25820 r25841  
    11# NOTE: This configuration adds solid earth and Dakota capabilities to the
    2                 basic build.
     2#               basic build.
    33
    44#--------------------#

  • issm/trunk-jpl/jenkins/pine_island-mac-full-valgrind

    r25820 r25841  
    11# NOTE: This configuration adds solid earth and Dakota capabilities to the
    2                 basic build, as well as the ability to debug with Valgrind.
     2#               basic build, as well as the ability to debug with Valgrind.
    33
    44#--------------------#

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

    r24214 r25841  
    11#Test Name: PigTranCalvingDevSSA2d
     2import numpy as np
     3from calvingvonmises import *
     4from MatlabFuncs import oshostname
    25from model import *
    3 from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    66from parameterize import *
    77from setflowequation import *
     8from setmask import *
    89from solve import *
    9 from calvingvonmises import *
     10from triangle import *
    1011
    1112md = triangle(model(), '../Exp/Pig.exp', 10000.)
    … …  
    2223md.transient.ismovingfront = 1
    2324md.transient.isgroundingline = 1
    24 md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices, ))
     25md.levelset.spclevelset = np.nan * np.ones((md.mesh.numberofvertices, ))
    2526pos = np.where(md.mesh.vertexonboundary)
    2627md.levelset.spclevelset[pos] = md.mask.ice_levelset[pos]
     28md.levelset.migration_max = 1e10
    2729
    2830#Force MUMPS sequential analysis
    2931md.toolkits.DefaultAnalysis.mat_mumps_icntl_28 = 1
    30 md.cluster = generic('name', gethostname(), 'np', 2)
     32md.cluster = generic('name', oshostname(), 'np', 2)
    3133md = solve(md, 'Transient')
    3234

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

    r24214 r25841  
    1 #Test Name: PigTranCalvingDevd
     1#Test Name: PigTranCalvingDevdHO3d
     2import numpy as np
     3from calvingvonmises import *
     4from MatlabFuncs import oshostname
    25from model import *
    3 from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    66from parameterize import *
    77from setflowequation import *
     8from setmask import *
    89from solve import *
    9 from calvingvonmises import *
     10from triangle import *
    1011
    1112md = triangle(model(), '../Exp/Pig.exp', 10000.)
    … …  
    2223md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices, ))
    2324md.transient.ismovingfront = 1
    24 md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices, ))
     25md.levelset.spclevelset = np.nan * np.ones((md.mesh.numberofvertices, ))
    2526pos = np.where(md.mesh.vertexonboundary)
    2627md.levelset.spclevelset[pos] = md.mask.ice_levelset[pos]
     28md.levelset.migration_max = 1e10
    2729
    2830#Force MUMPS sequential analysis
    2931md.toolkits.DefaultAnalysis.mat_mumps_icntl_28 = 1
    30 md.cluster = generic('name', gethostname(), 'np', 2)
     32md.cluster = generic('name', oshostname(), 'np', 2)
    3133md = solve(md, 'Transient')
    3234

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

    r23793 r25841  
    11#Test Name: ValleyGlacierLevelsetCalvingSIA2d
     2import numpy as np
     3from MatlabFuncs import oshostname
    24from model import *
    3 from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    65from parameterize import *
    76from setflowequation import *
     7from setmask import *
    88from solve import *
     9from triangle import *
    910
    1011
    … …  
    1314md = parameterize(md, '../Par/ValleyGlacierShelf.py')
    1415md = setflowequation(md, 'SIA', 'all')
    15 md.cluster = generic('name', gethostname(), 'np', 3)
     16md.cluster = generic('name', oshostname(), 'np', 3)
    1617
    1718#Transient
    … …  
    2627md.calving.calvingrate = 1000. * np.ones((md.mesh.numberofvertices))
    2728md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices))
     29md.levelset.migration_max = 1e10
    2830
    2931md = solve(md, 'Transient')

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

    r23793 r25841  
    11#Test Name: ValleyGlacierLevelsetEnthCalvingHO3d
     2import numpy as np
     3from MatlabFuncs import oshostname
    24from model import *
    3 from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    65from parameterize import *
    76from setflowequation import *
     7from setmask import *
    88from solve import *
     9from triangle import *
    910
    1011
    … …  
    1415md.extrude(3, 2.)
    1516md = setflowequation(md, 'HO', 'all')
    16 md.cluster = generic('name', gethostname(), 'np', 3)
     17md.cluster = generic('name', oshostname(), 'np', 3)
    1718
    1819#Thermal model
    … …  
    3536md.groundingline.melt_interpolation = 'SubelementMelt1'
    3637md.levelset.stabilization = 2
     38md.levelset.migration_max = 1e10
    3739
    3840md = solve(md, 'Transient')

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

    r24214 r25841  
    11#Test Name: SquareShelfLevelsetCalvingSSA2dLevermann
     2import numpy as np
     3from MatlabFuncs import oshostname
    24from model import *
    3 from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    65from parameterize import *
    76from setflowequation import *
     7from setmask import *
    88from solve import *
    9 
    10 import numpy as np
     9from triangle import *
    1110
    1211md = triangle(model(), '../Exp/Square.exp', 50000.)
    … …  
    1413md = parameterize(md, '../Par/SquareShelf.py')
    1514md = setflowequation(md, 'SSA', 'all')
    16 md.cluster = generic('name', gethostname(), 'np', 3)
     15md.cluster = generic('name', oshostname(), 'np', 3)
    1716
    1817x = md.mesh.x
    … …  
    4241md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices))
    4342md.levelset.spclevelset = np.nan * np.ones((md.mesh.numberofvertices))
     43md.levelset.migration_max = 1e8
    4444
    4545md.transient.requested_outputs = ['default', 'StrainRateparallel', 'StrainRateperpendicular', 'Calvingratex', 'Calvingratey', 'CalvingCalvingrate']

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

    r24261 r25841  
    11#Test Name: SquareShelfLevelsetCalvingSSA2dMinThickness
     2import numpy as np
     3from calvingminthickness import *
     4from MatlabFuncs import oshostname
    25from model import *
    3 from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    66from parameterize import *
    77from setflowequation import *
     8from setmask import *
    89from solve import *
    9 import numpy as np
    10 from calvingminthickness import *
     10from triangle import *
    1111
    1212md = triangle(model(), '../Exp/Square.exp', 30000.)
    … …  
    1414md = parameterize(md, '../Par/SquareShelf.py')
    1515md = setflowequation(md, 'SSA', 'all')
    16 md.cluster = generic('name', gethostname(), 'np', 3)
     16md.cluster = generic('name', oshostname(), 'np', 3)
    1717
    1818#Do not kill ice bergs as all is floating
    … …  
    4141md.calving.min_thickness = 400
    4242md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices, ))
    43 md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices, ))
     43md.levelset.spclevelset = np.nan * np.ones((md.mesh.numberofvertices, ))
    4444md.levelset.reinit_frequency = 1
     45md.levelset.migration_max = 1e10
    4546
    4647md = solve(md, 'Transient')

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

    r25839 r25841  
    1 #Test Name: SquareShelfLevelsetCalvingSSA2dMinThickness
     1#Test Name: ValleyGlacierLevelsetCalvingSSA2dCrevassedepth
     2import numpy as np
     3from calvingcrevassedepth import *
     4from MatlabFuncs import oshostname
    25from model import *
    3 from socket import gethostname
    4 from triangle import *
    5 from setmask import *
    66from parameterize import *
    77from setflowequation import *
     8from setmask import *
    89from solve import *
    9 import numpy as np
    10 from calvingminthickness import *
     10from triangle import *
    1111
    12 md = triangle(model(), '../Exp/Square.exp', 30000.)
    13 md = setmask(md, 'all', '')
    14 md = parameterize(md, '../Par/SquareShelf.py')
     12md = triangle(model(), '../Exp/Square.exp', 50000.)
     13md = setmask(md, '', '')
     14md = parameterize(md, '../Par/ValleyGlacierShelf.py')
    1515md = setflowequation(md, 'SSA', 'all')
    16 md.cluster = generic('name', gethostname(), 'np', 3)
    17 
    18 #Do not kill ice bergs as all is floating
    19 md.levelset.kill_icebergs = 0
    20 
    21 x = md.mesh.x
    22 xmin = min(x)
    23 xmax = max(x)
    24 Lx = (xmax - xmin)
    25 alpha = 2. / 3.
    26 md.mask.ice_levelset = -1 + 2 * (md.mesh.y > 9e5)
    27 
    28 md.timestepping.time_step = 1
    29 md.timestepping.final_time = 3
     16md.timestepping.time_step = 2
     17md.timestepping.final_time = 50
     18md.cluster = generic('name', oshostname(), 'np', 3)
    3019
    3120#Transient
    3221md.transient.isstressbalance = 1
     22md.transient.ismovingfront = 1
    3323md.transient.ismasstransport = 1
    3424md.transient.issmb = 1
    3525md.transient.isthermal = 0
    36 md.transient.isgroundingline = 0
     26md.transient.isgroundingline = 1
    3727md.transient.isgia = 0
    38 md.transient.ismovingfront = 1
    3928
    40 md.calving = calvingminthickness()
    41 md.calving.min_thickness = 400
     29md.calving = calvingcrevassedepth()
     30md.calving.crevasse_opening_stress=1
     31md.calving.water_height = 50 * np.ones((md.mesh.numberofvertices, ))
    4232md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices, ))
    43 md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices, ))
     33md.levelset.spclevelset = np.nan * np.ones((md.mesh.numberofvertices, ))
    4434md.levelset.reinit_frequency = 1
     35md.levelset.migration_max = 1e10
    4536
    4637md = solve(md, 'Transient')
    … …  
    4940field_names = ['Vx1', 'Vy1', 'Vel1', 'Pressure1', 'Thickness1', 'Surface1', 'MaskIceLevelset1'
    5041               'Vx2', 'Vy2', 'Vel2', 'Pressure2', 'Thickness2', 'Surface2', 'MaskIceLevelset2'
    51                'Vx3', 'Vy3', 'Vel3', 'Pressure3', 'Thickness3', 'Surface3', 'MaskIceLevelset3']
     42               'Vx10', 'Vy10', 'Vel10', 'Pressure10', 'Thickness10', 'Surface10', 'MaskIceLevelset10']
    5243field_tolerances = [1e-8, 1e-8, 1e-8, 1e-9, 1e-9, 1e-9, 3e-9,
    5344                    1e-8, 1e-8, 1e-8, 1e-9, 1e-9, 1e-9, 3e-9,
    … …  
    6758                md.results.TransientSolution[1].Surface,
    6859                md.results.TransientSolution[1].MaskIceLevelset,
    69                 md.results.TransientSolution[2].Vx,
    70                 md.results.TransientSolution[2].Vy,
    71                 md.results.TransientSolution[2].Vel,
    72                 md.results.TransientSolution[2].Pressure,
    73                 md.results.TransientSolution[2].Thickness,
    74                 md.results.TransientSolution[2].Surface,
    75                 md.results.TransientSolution[2].MaskIceLevelset]
     60                md.results.TransientSolution[11].Vx,
     61                md.results.TransientSolution[11].Vy,
     62                md.results.TransientSolution[11].Vel,
     63                md.results.TransientSolution[11].Pressure,
     64                md.results.TransientSolution[11].Thickness,
     65                md.results.TransientSolution[11].Surface,
     66                md.results.TransientSolution[11].MaskIceLevelset]
Note: See TracChangeset for help on using the changeset viewer.