Changeset 24313 for issm/trunk/test/NightlyRun/test2110.py

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test2110.py (modified) (4 diffs)

issm/trunk/test/NightlyRun/test2110.py

@@ -10 +10 @@
 from paterson import *
 
-#mesh earth: 
+#mesh earth:
 md = model()
-md = roundmesh(md,50000,2000)     # radius and element size (meters)
+md = roundmesh(md, 50000, 2000)  # radius and element size (meters)
 
-#define load 
-md.esa.deltathickness = np.zeros((md.mesh.numberofelements,))
-disc_radius = 20 # km
+#define load
+md.esa.deltathickness = np.zeros((md.mesh.numberofelements, ))
+disc_radius = 20  # km
 index = md.mesh.elements
 x_element = np.mean(md.mesh.x[index - 1], 1)
 y_element = np.mean(md.mesh.y[index - 1], 1)
 rad_dist = np.sqrt(x_element**2 + y_element**2) / 1000  # radial distance in km
-md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = -1   # 1 m water withdrawl
+md.esa.deltathickness[np.where(rad_dist <= disc_radius)] = -1  # 1 m water withdrawl
 
 #love numbers:
-nlov = 10000    # horizontal displacements do not work for low degree truncation, e.g., 101
+nlov = 10000  # horizontal displacements do not work for low degree truncation, e.g., 101
 md.esa.love_h = np.array(love_numbers('h'))
 md.esa.love_h = np.resize(md.esa.love_h, nlov + 1)
@@ -31 +31 @@
 
 #mask:  {{{
-#make sure wherever there is an ice load, that the mask is set to ice: 
-md.mask.ice_levelset = np.ones((md.mesh.numberofvertices,))
+#make sure wherever there is an ice load, that the mask is set to ice:
+md.mask.ice_levelset = np.ones((md.mesh.numberofvertices, ))
 pos = np.where(md.esa.deltathickness)
-md.mask.ice_levelset[md.mesh.elements[pos,:]-1] = -1
+md.mask.ice_levelset[md.mesh.elements[pos, :] - 1] = -1
 
-#is ice grounded? 
-md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices,))
+#is ice grounded?
+md.mask.groundedice_levelset = -np.ones((md.mesh.numberofvertices, ))
 pos = np.where(md.mask.ice_levelset <= 0)
 md.mask.groundedice_levelset[pos] = 1
@@ -44 +44 @@
 #geometry:  {{{
 di = md.materials.rho_ice / md.materials.rho_water
-md.geometry.thickness = np.ones((md.mesh.numberofvertices,))
-md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices,))
+md.geometry.thickness = np.ones((md.mesh.numberofvertices, ))
+md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices, ))
 md.geometry.base = md.geometry.surface - md.geometry.thickness
 md.geometry.bed = md.geometry.base
 # }}}
 #materials:  {{{
-md.initialization.temperature = 273.25 * np.ones((md.mesh.numberofvertices,))
+md.initialization.temperature = 273.25 * np.ones((md.mesh.numberofvertices, ))
 md.materials.rheology_B = paterson(md.initialization.temperature)
-md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements,))
+md.materials.rheology_n = 3 * np.ones((md.mesh.numberofelements, ))
 # }}}
 #Miscellaneous: {{{
@@ -60 +60 @@
 md.esa.degacc = 0.01
 
-#solve esa 
-md.esa.requested_outputs = ['EsaUmotion','EsaXmotion','EsaYmotion',
-        'EsaStrainratexx','EsaStrainratexy','EsaStrainrateyy','EsaRotationrate']
-md.cluster = generic('name',gethostname(),'np',3)
+#solve esa
+md.esa.requested_outputs = ['EsaUmotion', 'EsaXmotion', 'EsaYmotion',
+                            'EsaStrainratexx', 'EsaStrainratexy', 'EsaStrainrateyy', 'EsaRotationrate']
+md.cluster = generic('name', gethostname(), 'np', 3)
 md.verbose = verbose('111111111')
-md = solve(md,'Esa')
+md = solve(md, 'Esa')
 
 #Fields and tolerances to track changes
-field_names     = ['EsaUmotion','EsaXmotion','EsaYmotion',
-        'EsaStrainratexx','EsaStrainratexy','EsaStrainrateyy','EsaRotationrate']
-field_tolerances = [1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
-field_values = [
-        md.results.EsaSolution.EsaUmotion,
-        md.results.EsaSolution.EsaXmotion,
-        md.results.EsaSolution.EsaYmotion,
-        md.results.EsaSolution.EsaStrainratexx,
-        md.results.EsaSolution.EsaStrainratexy,
-        md.results.EsaSolution.EsaStrainrateyy,
-        md.results.EsaSolution.EsaRotationrate,
-        ]
-
+field_names = ['EsaUmotion', 'EsaXmotion', 'EsaYmotion',
+               'EsaStrainratexx', 'EsaStrainratexy', 'EsaStrainrateyy', 'EsaRotationrate']
+field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13]
+field_values = [md.results.EsaSolution.EsaUmotion,
+                md.results.EsaSolution.EsaXmotion,
+                md.results.EsaSolution.EsaYmotion,
+                md.results.EsaSolution.EsaStrainratexx,
+                md.results.EsaSolution.EsaStrainratexy,
+                md.results.EsaSolution.EsaStrainrateyy,
+                md.results.EsaSolution.EsaRotationrate]