Changeset 20447

Timestamp:

04/07/16 10:58:01 (9 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cosemtics

Location:

issm/trunk-jpl/src/m

Files:

• classes/geometry.py (modified) (1 diff)
• mesh/planet/gmsh/gmshplanet.py (modified) (1 diff)

issm/trunk-jpl/src/m/classes/geometry.py ¶

@@ -46 +46 @@
         def checkconsistency(self,md,solution,analyses):    # {{{
 
-                md = checkfield(md,'fieldname','geometry.surface'  ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
-                md = checkfield(md,'fieldname','geometry.base'      ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
-                md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0,'timeseries',1)
-                if any(abs(self.thickness-self.surface+self.base)>10**-9):
-                        md.checkmessage("equality thickness=surface-base violated")
-                if solution==TransientSolutionEnum() and md.transient.isgroundingline:
-                        md = checkfield(md,'fieldname','geometry.bed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
+                if (solution==TransientSolutionEnum() and md.transient.isgia) or (solution==GiaSolutionEnum()):
+                        md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'Inf',1,'>=',0,'timeseries',1)
+                else:
+                        md = checkfield(md,'fieldname','geometry.surface'  ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
+                        md = checkfield(md,'fieldname','geometry.base'      ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
+                        md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0,'timeseries',1)
+                        if any(abs(self.thickness-self.surface+self.base)>10**-9):
+                                md.checkmessage("equality thickness=surface-base violated")
+                        if solution==TransientSolutionEnum() and md.transient.isgroundingline:
+                                md = checkfield(md,'fieldname','geometry.bed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
 
                 return md

issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py ¶

@@ -33 +33 @@
         #initialize mesh: 
         mesh=mesh3dsurface()
-        
 
         #create .geo file:  {{{