Changeset 20991

Timestamp:

07/23/16 20:33:38 (9 years ago)

Author:

Mathieu Morlighem

Message:

BUG: spctemperature might have 2 dim

Location:

issm/trunk-jpl/src/m/classes

Files:

• initialization.py (modified) (1 diff)
• thermal.py (modified) (1 diff)

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

@@ -62 +62 @@
 
                 #Lithostatic pressure by default
-                #self.pressure=md.constants.g*md.materials.rho_ice*(md.geometry.surface[:,0]-md.mesh.z)
-                self.pressure=md.constants.g*md.materials.rho_ice*(md.geometry.surface-md.mesh.z.reshape(-1,1))
+                self.pressure=md.constants.g*md.materials.rho_ice*(md.geometry.surface[:,0]-md.mesh.z)
+                #self.pressure=md.constants.g*md.materials.rho_ice*(md.geometry.surface-md.mesh.z.reshape(-1,1))
                 return self
         #}}}

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

@@ -47 +47 @@
                 self.spctemperature=project3d(md,'vector',self.spctemperature,'type','node','layer',md.mesh.numberoflayers,'padding',numpy.nan)
                 if isinstance(md.initialization.temperature,numpy.ndarray) and numpy.size(md.initialization.temperature,axis=0)==md.mesh.numberofvertices:
-                        self.spctemperature=float('nan')*numpy.ones(md.mesh.numberofvertices)
+                        self.spctemperature=float('nan')*numpy.ones((md.mesh.numberofvertices,1))
                         pos=numpy.nonzero(md.mesh.vertexonsurface)[0]
                         self.spctemperature[pos]=md.initialization.temperature[pos]    #impose observed temperature on surface