Changeset 22758 for issm/trunk/src/m/classes/mismipbasalforcings.py

Timestamp:

05/10/18 10:24:27 (7 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 22757

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/mismipbasalforcings.py (modified) (2 diffs)

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

@@ -40 +40 @@
     def initialize(self,md): # {{{
         if np.all(np.isnan(self.groundedice_melting_rate)):
-            self.groundedice_melting_rate=np.zeros(md.mesh.numberofvertices)
+            self.groundedice_melting_rate=np.zeros((md.mesh.numberofvertices))
             print ' no basalforcings.groundedice_melting_rate specified: values set as zero'
+        if np.all(np.isnan(self.geothermalflux)):
+                        self.geothermalflux=np.zeros((md.mesh.numberofvertices))
+                        print "      no basalforcings.geothermalflux specified: values set as zero"
         return self
     #}}}
@@ -83 +86 @@
             print 'WARNING: value of yts for MISMIP+ runs different from ISSM default!'
 
-        floatingice_melting_rate = np.zeros((md.mesh.numberofvertices))
-        floatingice_melting_rate = md.basalforcings.meltrate_factor*np.tanh((md.geometry.base-md.geometry.bed)/md.basalforcings.threshold_thickness)*np.amax(md.basalforcings.upperdepth_melt-md.geometry.base,0)
-
         WriteData(fid,prefix,'name','md.basalforcings.model','data',3,'format','Integer')
-        WriteData(fid,prefix,'data',floatingice_melting_rate,'format','DoubleMat','name','md.basalforcings.floatingice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
         WriteData(fid,prefix,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','name','md.basalforcings.groundedice_melting_rate','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)
         WriteData(fid,prefix,'object',self,'fieldname','geothermalflux','name','md.basalforcings.geothermalflux','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts)