Changeset 24313 for issm/trunk/test/Par/ISMIPD.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/Par/ISMIPD.py (modified) (1 diff)

issm/trunk/test/Par/ISMIPD.py

@@ -1 @@
-import numpy
+import numpy as np
 from SetIceSheetBC import SetIceSheetBC
 
 #Ok, start defining model parameters here
 
-print "      creating thickness"
-md.geometry.surface=2000.-md.mesh.x*numpy.tan(0.1*numpy.pi/180.)    #to have z>0
-md.geometry.base=md.geometry.surface-1000.
-md.geometry.thickness=md.geometry.surface-md.geometry.base
+print("      creating thickness")
+md.geometry.surface = 2000. - md.mesh.x * np.tan(0.1 * np.pi / 180.)  #to have z > 0
+md.geometry.base = md.geometry.surface - 1000.
+md.geometry.thickness = md.geometry.surface - md.geometry.base
 
-print "      creating drag"
-md.friction.coefficient=numpy.sqrt(md.constants.yts*(1000.+1000.*numpy.sin(md.mesh.x*2.*numpy.pi/numpy.max(md.mesh.x))))
-md.friction.coefficient[numpy.nonzero(md.mask.groundedice_levelset<0.)[0]]=0.
-md.friction.p=numpy.ones((md.mesh.numberofelements))
-md.friction.q=numpy.zeros((md.mesh.numberofelements))
+print("      creating drag")
+md.friction.coefficient = np.sqrt(md.constants.yts * (1000. + 1000. * np.sin(md.mesh.x * 2. * np.pi / np.max(md.mesh.x))))
+md.friction.coefficient[np.nonzero(md.mask.groundedice_levelset < 0.)[0]] = 0.
+md.friction.p = np.ones((md.mesh.numberofelements))
+md.friction.q = np.zeros((md.mesh.numberofelements))
 
-print "      creating flow law parameter"
-md.materials.rheology_B=6.8067*10**7*numpy.ones((md.mesh.numberofvertices))
-md.materials.rheology_n=3.*numpy.ones((md.mesh.numberofelements))
+print("      creating flow law parameter")
+md.materials.rheology_B = 6.8067 * 10**7 * np.ones((md.mesh.numberofvertices))
+md.materials.rheology_n = 3. * np.ones((md.mesh.numberofelements))
 
-print "      boundary conditions for stressbalance model:"
+print("      boundary conditions for stressbalance model:")
 #Create node on boundary first (because we can not use mesh)
-md=SetIceSheetBC(md)
+md = SetIceSheetBC(md)