Changeset 21354

Timestamp:

11/10/16 02:14:35 (8 years ago)

Author:

sjohnsen

Message:

CHG: added def_initialize and removed md in def_init to make it more python

File:

• issm/trunk-jpl/src/m/classes/mismipbasalforcings.py (modified) (4 diffs)

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

@@ -6 +6 @@
 
 class mismipbasalforcings(object):
-    """
+    """ 
     MISMIP Basal Forcings class definition
 
@@ -13 +13 @@
     """
 
-    def __init__(self,md): # {{{
+    def __init__(self): # {{{
 
         self.groundedice_melting_rate = float('NaN')
@@ -20 +20 @@
         self.upperdepth_melt = float('NaN')
         self.geothermalflux = float('NaN')
-
-        if np.all(np.isnan(self.groundedice_melting_rate)):
-            self.groundedice_melting_rate=np.zeros(md.mesh.numberofvertices)
-            print ' no basalforcings.groundedice_melting_rate specified: values set as zero'
 
         self.setdefaultparameters()
@@ -41 +37 @@
         self.geothermalflux=project3d(md,'vector',self.geothermalflux,'type','node','layer',1)    #bedrock only gets geothermal flux
         return self
+    #}}}
+    def initialize(self,md): # {{{
+        if np.all(np.isnan(self.groundedice_melting_rate)):
+            self.groundedice_melting_rate=np.zeros(md.mesh.numberofvertices)
+            print ' no basalforcings.groundedice_melting_rate specified: values set as zero'
+        return self
     #}}}
     def setdefaultparameters(self): # {{{