Changeset 23838

Timestamp:

04/09/19 13:27:11 (7 years ago)

Author:

kruegern

Message:

BUG: fixed bug in Pig.py and tab misalignment in calvingonmises.py

Location:

issm/trunk-jpl

Files:

• src/m/classes/calvingvonmises.py (modified) (1 diff)
• test/Par/Pig.py (modified) (1 diff)

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

@@ -5 +5 @@
 
 class calvingvonmises(object):
-        """
-        CALVINGVONMISES class definition
+    """
+    CALVINGVONMISES class definition
 
-           Usage:
-              calvingvonmises=calvingvonmises()
-        """
+       Usage:
+          calvingvonmises=calvingvonmises()
+    """
 
-        def __init__(self): # {{{
+    def __init__(self): # {{{
 
-                self.stress_threshold_groundedice = 0.
-                self.stress_threshold_floatingice = 0.
-                self.meltingrate   = float('NaN')
-                self.min_thickness = 0.
+        self.stress_threshold_groundedice = 0.
+        self.stress_threshold_floatingice = 0.
+        self.meltingrate   = float('NaN')
+        self.min_thickness = 0.
 
-                #set defaults
-                self.setdefaultparameters()
+        #set defaults
+        self.setdefaultparameters()
 
-        #}}}
-        def __repr__(self): # {{{
-                string='   Calving VonMises parameters:'
-                string="%s\n%s"%(string,fielddisplay(self,'stress_threshold_groundedice','sigma_max applied to grounded ice only [Pa]'))
-                string="%s\n%s"%(string,fielddisplay(self,'stress_threshold_floatingice','sigma_max applied to floating ice only [Pa]'))
-                string="%s\n%s"%(string,fielddisplay(self,'min_thickness','minimum thickness below which no ice is allowed [m]'))
+    #}}}
+    def __repr__(self): # {{{
+        string='   Calving VonMises parameters:'
+        string="%s\n%s"%(string,fielddisplay(self,'stress_threshold_groundedice','sigma_max applied to grounded ice only [Pa]'))
+        string="%s\n%s"%(string,fielddisplay(self,'stress_threshold_floatingice','sigma_max applied to floating ice only [Pa]'))
+        string="%s\n%s"%(string,fielddisplay(self,'min_thickness','minimum thickness below which no ice is allowed [m]'))
 
-                return string
-        #}}}
-        def extrude(self,md): # {{{
-                return self
-        #}}}
-        def setdefaultparameters(self): # {{{
-                #Default sigma max
-                self.stress_threshold_groundedice = 1e6
-                self.stress_threshold_floatingice = 150e3
+        return string
+    #}}}
+    def extrude(self,md): # {{{
+        return self
+    #}}}
+    def setdefaultparameters(self): # {{{
+        #Default sigma max
+        self.stress_threshold_groundedice = 1e6
+        self.stress_threshold_floatingice = 150e3
 
-                #turn off min_thickness by default.
-                self.min_thickness=0.
-                return self
-        #}}}
-        def checkconsistency(self,md,solution,analyses):    # {{{
-                #Early return
-                if solution == 'TransientSolution' or md.transient.ismovingfront == 0:
-                        return
+        #turn off min_thickness by default.
+        self.min_thickness=0.
+        return self
+    #}}}
+    def checkconsistency(self,md,solution,analyses):    # {{{
+        #Early return
+        if solution == 'TransientSolution' or md.transient.ismovingfront == 0:
+            return
 
-                md = checkfield(md,'fieldname','calving.stress_threshold_groundedice','>',0,'nan',1,'Inf',1)
-                md = checkfield(md,'fieldname','calving.stress_threshold_floatingice','>',0,'nan',1,'Inf',1)
-                md = checkfield(md,'fieldname','calving.min_thickness','>=',0,'NaN',1,'Inf',1,'numel',[1]);
+        md = checkfield(md,'fieldname','calving.stress_threshold_groundedice','>',0,'nan',1,'Inf',1)
+        md = checkfield(md,'fieldname','calving.stress_threshold_floatingice','>',0,'nan',1,'Inf',1)
+        md = checkfield(md,'fieldname','calving.min_thickness','>=',0,'NaN',1,'Inf',1,'numel',[1]);
 
-                return md
-        # }}}
-        def marshall(self,prefix,md,fid):    # {{{
-                yts=md.constants.yts
+        return md
+    # }}}
+    def marshall(self,prefix,md,fid):    # {{{
+        yts=md.constants.yts
 
-                WriteData(fid,prefix,'name','md.calving.law','data',2,'format','Integer')
-                WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_groundedice','format','DoubleMat','mattype',1)
-                WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_floatingice','format','DoubleMat','mattype',1)
-                WriteData(fid,prefix,'object',self,'fieldname','min_thickness','format','Double');
-        # }}}
+        WriteData(fid,prefix,'name','md.calving.law','data',2,'format','Integer')
+        WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_groundedice','format','DoubleMat','mattype',1)
+        WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_floatingice','format','DoubleMat','mattype',1)
+        WriteData(fid,prefix,'object',self,'fieldname','min_thickness','format','Double');
+    # }}}

issm/trunk-jpl/test/Par/Pig.py

@@ -25 +25 @@
 md.geometry.thickness=InterpFromMeshToMesh2d(index,x,y,thickness,md.mesh.x,md.mesh.y)[0][:,0]
 md.geometry.base=md.geometry.surface-md.geometry.thickness
-md.geometry.bed =md.geometry.base
-pos = np.where(md.mask.groundedice_levelset<0.)[0]
-md.geometry.bed[pos] =InterpFromMeshToMesh2d(index,x,y,bed,md.mesh.x[pos],md.mesh.y[pos])
+md.geometry.bed =numpy.array(md.geometry.base)
+pos = np.where(md.mask.groundedice_levelset<0.)
+md.geometry.bed[pos] =InterpFromMeshToMesh2d(index,x,y,bed,md.mesh.x[pos],md.mesh.y[pos])[0][:,0]
 md.initialization.vx=md.inversion.vx_obs
 md.initialization.vy=md.inversion.vy_obs