Changeset 24567

Timestamp:

02/19/20 02:35:13 (5 years ago)

Author:

bdef

Message:

BUG:minor changes to suit my new numpy

Location:

issm/trunk-jpl/src/m

Files:

• classes/thermal.py (modified) (3 diffs)
• mesh/roundmesh.py (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/thermal.py

@@ -15 +15 @@
 
     def __init__(self):  # {{{
-        self.spctemperature = float('NaN')
+        self.spctemperature = np.nan
         self.penalty_threshold = 0
         self.stabilization = 0
@@ -107 +107 @@
             md = checkfield(md, 'fieldname', 'thermal.watercolumn_upperlimit', '>=', 0)
 
-            TEMP = md.thermal.spctemperature[:-1].flatten(-1)
+            TEMP = md.thermal.spctemperature[:-1].flatten()
             pos = np.where(~np.isnan(TEMP))
             try:
@@ -114 +114 @@
                 spccol = 1
 
-            replicate = np.tile(md.geometry.surface - md.mesh.z, (spccol)).flatten(-1)
+            replicate = np.tile(md.geometry.surface - md.mesh.z, (spccol)).flatten()
             control = md.materials.meltingpoint - md.materials.beta * md.materials.rho_ice * md.constants.g * replicate + 1.0e-5
-            md = checkfield(md, 'fieldname', 'thermal.spctemperature', 'field', md.thermal.spctemperature.flatten(-1)[pos], '<=', control[pos], 'message', "spctemperature should be below the adjusted melting point")
+            md = checkfield(md, 'fieldname', 'thermal.spctemperature', 'field', md.thermal.spctemperature.flatten()[pos], '<=', control[pos], 'message', "spctemperature should be below the adjusted melting point")
             md = checkfield(md, 'fieldname', 'thermal.isenthalpy', 'numel', [1], 'values', [0, 1])
             md = checkfield(md, 'fieldname', 'thermal.isdynamicbasalspc', 'numel', [1], 'values', [0, 1])

issm/trunk-jpl/src/m/mesh/roundmesh.py

@@ -17 +17 @@
           md = roundmesh(md, radius, resolution)
     """
+    # First we have to create the domain outline
+    # Get number of points on the circle
+    pointsonedge = int(np.floor((2. * np.pi * radius) / resolution) + 1)  # + 1 to close the outline
 
-    #First we have to create the domain outline
-
-    #Get number of points on the circle
-    pointsonedge = np.floor((2. * np.pi * radius) / resolution) + 1  # + 1 to close the outline
-
-    #Calculate the cartesians coordinates of the points
+    # Calculate the cartesians coordinates of the points
     theta = np.linspace(0., 2. * np.pi, pointsonedge)
     x_list = roundsigfig(radius * np.cos(theta), 12)
@@ -33 +31 @@
     expwrite(A, 'RoundDomainOutline.exp')
 
-    #Call Bamg
+    # Call Bamg
     md = triangle(md, 'RoundDomainOutline.exp', resolution)
-    #md = bamg(md, 'domain', 'RoundDomainOutline.exp', 'hmin', resolution)
+    # md = bamg(md, 'domain', 'RoundDomainOutline.exp', 'hmin', resolution)
 
-    #move the closest node to the center
+    # move the closest node to the center
     pos = np.argmin(md.mesh.x**2 + md.mesh.y**2)
     md.mesh.x[pos] = 0.
     md.mesh.y[pos] = 0.
 
-    #delete domain
+    # delete domain
     os.remove('RoundDomainOutline.exp')