Changeset 23653

Timestamp:

01/23/19 14:53:54 (6 years ago)

Author:

youngmc3

Message:

CHG: python class for frontalforcings

Location:

issm/trunk-jpl

Files:

• src/m/classes/frontalforcings.py (added)
• src/m/classes/model.py (modified) (5 diffs)
• test/NightlyRun/test540.py (modified) (1 diff)
• test/NightlyRun/test804.py (modified) (1 diff)
• test/NightlyRun/test805.py (modified) (1 diff)
• test/NightlyRun/test806.py (modified) (1 diff)
• test/NightlyRun/test807.py (modified) (1 diff)
• test/NightlyRun/test808.py (modified) (1 diff)

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

@@ -111 +111 @@
                 self.levelset         = levelset()
                 self.calving          = calving()
-                self.gia              = giaivins()
+                self.frontalforcings  = frontalforcings()
+                self.gia              = giaivins()
                 self.love             = fourierlove()
                 self.esa              = esa()
@@ -117 +118 @@
                 self.inversion        = inversion()
                 self.qmu              = qmu()
-                self.amr                                         = amr()
+                self.amr              = amr()
 
                 self.results          = results()
@@ -156 +157 @@
                         'levelset',
                         'calving',
+                        'frontalforcings',
                         'love',
                         'gia',
@@ -200 +202 @@
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("levelset","[%s,%s]" % ("1x1",obj.levelset.__class__.__name__),"parameters for moving boundaries (level-set method)"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("calving","[%s,%s]" % ("1x1",obj.calving.__class__.__name__),"parameters for calving"))
+                string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("frontalforcings","[%s,%s]" % ("1x1",obj.frontalforcings.__class__.__name__),"parameters for frontalforcings"))
                 string="%s\n%s" % (string,"%19s: %-22s -- %s" % ("gia","[%s,%s]" % ("1x1",obj.gia.__class__.__name__),"parameters for gia solution"))
                 string="%s\n%s" % (string,'%19s: %-22s -- %s' % ("love","[%s,%s]" % ("1x1",obj.love.__class__.__name__),"parameters for love solution"))
@@ -661 +664 @@
                 md.levelset.extrude(md)
                 md.calving.extrude(md)
+                md.frontalforcings.extrude(md)
 
                 #connectivity

issm/trunk-jpl/test/NightlyRun/test540.py

@@ -19 +19 @@
 md.mask.ice_levelset = 1e4 * (md.mask.ice_levelset + 0.5)
 md.calving = calvingvonmises()
-md.calving.meltingrate = np.zeros((md.mesh.numberofvertices,))
+md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices,))
 md.transient.ismovingfront = 1
 md.levelset.spclevelset = float('NaN') * np.ones((md.mesh.numberofvertices,))

issm/trunk-jpl/test/NightlyRun/test804.py

@@ -25 +25 @@
 
 md.calving.calvingrate=1000.*np.ones((md.mesh.numberofvertices))
-md.calving.meltingrate=np.zeros((md.mesh.numberofvertices))
+md.frontalforcings.meltingrate=np.zeros((md.mesh.numberofvertices))
 
 md=solve(md,'Transient')

issm/trunk-jpl/test/NightlyRun/test805.py

@@ -32 +32 @@
 
 md.calving.calvingrate=1000.*np.ones((md.mesh.numberofvertices))
-md.calving.meltingrate=np.zeros((md.mesh.numberofvertices))
+md.frontalforcings.meltingrate=np.zeros((md.mesh.numberofvertices))
 md.groundingline.melt_interpolation='SubelementMelt1'
 md.levelset.stabilization=2

issm/trunk-jpl/test/NightlyRun/test806.py

@@ -37 +37 @@
 md.calving=calvinglevermann()
 md.calving.coeff=4.89e13*np.ones((md.mesh.numberofvertices))
-md.calving.meltingrate=np.zeros((md.mesh.numberofvertices))
+md.frontalforcings.meltingrate=np.zeros((md.mesh.numberofvertices))
 md.levelset.spclevelset=np.nan*np.ones((md.mesh.numberofvertices))
 

issm/trunk-jpl/test/NightlyRun/test807.py

@@ -36 +36 @@
 
 md.calving.calvingrate=np.zeros((md.mesh.numberofvertices))
-md.calving.meltingrate=10000*np.ones((md.mesh.numberofvertices))
+md.forcings.meltingrate=10000*np.ones((md.mesh.numberofvertices))
 md.levelset.spclevelset=np.nan*np.ones((md.mesh.numberofvertices))
 

issm/trunk-jpl/test/NightlyRun/test808.py

@@ -37 +37 @@
 md.calving = calvingminthickness()
 md.calving.min_thickness = 400
-md.calving.meltingrate = np.zeros((md.mesh.numberofvertices,))
+md.frontalforcings.meltingrate = np.zeros((md.mesh.numberofvertices,))
 md.levelset.spclevelset = float('NaN')* np.ones((md.mesh.numberofvertices,))
 md.levelset.reinit_frequency = 1