Changeset 25836 for issm/trunk/test/NightlyRun/test2111.py

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun (modified) (1 prop)
• test/NightlyRun/test2111.py (modified) (2 diffs)

issm/trunk/test/NightlyRun

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err

issm/trunk/test/NightlyRun/test2111.py

@@ -1 +1 @@
 #Test Name: Esa2Dsurface
 #AIS - -     southern hemisphere example for north - south, east - west components of horiz motion
+from socket import gethostname
 
 import numpy as np
+
+from lovenumbers import *
 from model import *
-from socket import gethostname
+from paterson import *
+from roundmesh import *
 from solve import *
-from roundmesh import *
-from love_numbers import *
-from paterson import *
+
 
 #mesh ais: {{{
@@ -15 +17 @@
 # }}}
 #define load: {{{
-md.esa.deltathickness = np.zeros((md.mesh.numberofelements, ))
+md.esa.deltathickness = np.zeros((md.mesh.numberofelements, 1))
 disc_radius = 500  # km
 index = md.mesh.elements
-x_element = np.mean(md.mesh.x[index - 1], 1) - 1.0e6
-y_element = np.mean(md.mesh.y[index - 1], 1) - 1.0e6
+x_element = md.mesh.x[index - 1].mean(axis=1) - 1.0e6
+y_element = md.mesh.y[index - 1].mean(axis=1) - 1.0e6
 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
+pos = np.where(rad_dist <= disc_radius)[0]
+md.esa.deltathickness[pos] = -1  # 1 m water withdrawl
 # }}}
 #love numbers: {{{
-nlov = 10000  # horizontal displacements do not work for low degree truncation, e.g., 101
-md.esa.love_h = np.array(love_numbers('h', 'CF'))
-md.esa.love_h = np.resize(md.esa.love_h, nlov + 1)
-md.esa.love_l = np.array(love_numbers('l', 'CF'))
-md.esa.love_l = np.resize(md.esa.love_l, nlov + 1)
+md.solidearth.lovenumbers = lovenumbers('maxdeg', 10000, 'referenceframe', 'CF')
 # }}}
 #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, ))
-pos = np.where(md.esa.deltathickness)
+md.mask.ice_levelset = np.ones((md.mesh.numberofvertices, 1))
+pos = np.where(md.esa.deltathickness)[0]
 md.mask.ice_levelset[md.mesh.elements[pos, :]] = -1
 
 #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
+md.mask.ocean_levelset = -np.ones((md.mesh.numberofvertices, 1))
+pos = np.where(md.mask.ice_levelset <= 0)[0]
+md.mask.ocean_levelset[pos] = 1
 # }}}
 #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, 1))
+md.geometry.surface = (1 - di) * np.zeros((md.mesh.numberofvertices, 1))
 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, 1))
 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, 1))
 # }}}
 #additional parameters, miscellaneous: {{{

@@ -18 +18 @@
 run.old
 run_matlab
+test218.qmu.in
+test218.qmu.out
+test218.qmu.err