Changeset 17806 for issm/trunk/src/m/classes/groundingline.py

Timestamp:

04/22/14 10:39:19 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 17804

Location:

issm/trunk

Files:

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

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

@@ -3 +3 @@
 from EnumDefinitions import *
 from StringToEnum import StringToEnum
-from checkfield import *
-from WriteData import *
-from MatlabFuncs import *
+from checkfield import checkfield
+from WriteData import WriteData
+import MatlabFuncs as m
 
 class groundingline(object):
@@ -42 +42 @@
         def checkconsistency(self,md,solution,analyses):    # {{{
 
-                md = checkfield(md,'groundingline.migration','values',['None','AgressiveMigration','SoftMigration','SubelementMigration','SubelementMigration2'])
+                md = checkfield(md,'fieldname','groundingline.migration','values',['None','AgressiveMigration','SoftMigration','SubelementMigration','SubelementMigration2','Contact'])
 
-                if not strcmp(self.migration,'None'):
-                        if numpy.any(numpy.isnan(md.geometry.bathymetry)):
+                if not m.strcmp(self.migration,'None'):
+                        if numpy.any(numpy.isnan(md.geometry.bed)):
                                 md.checkmessage("requesting grounding line migration, but bathymetry is absent!")
                         pos=numpy.nonzero(md.mask.groundedice_levelset>0.)[0]
-                        if any(numpy.abs(md.geometry.bed[pos]-md.geometry.bathymetry[pos])>10**-10):
+                        if any(numpy.abs(md.geometry.base[pos]-md.geometry.bed[pos])>10**-10):
                                 md.checkmessage("bathymetry not equal to bed on grounded ice!")
-                        pos=numpy.nonzero(md.mask.groundedice_levelset<0.)[0]
-                        if any(md.geometry.bathymetry[pos]-md.geometry.bed[pos]>10**-9):
+                        if any(md.geometry.bed - md.geometry.base > 10**-9):
                                 md.checkmessage("bathymetry superior to bed on floating ice!")