Changeset 23845

Timestamp:

04/15/19 09:01:16 (6 years ago)

Author:

seroussi

Message:

FIX: allowed small tolerance for bed> base (10^-12)

Location:

issm/trunk-jpl/src/m/classes

Files:

• geometry.m (modified) (1 diff)
• geometry.py (modified) (1 diff)

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

@@ -66 +66 @@
                                 if strcmp(solution,'TransientSolution') & md.transient.isgroundingline,
                                         md = checkfield(md,'fieldname','geometry.bed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
-                                        if any(self.bed>self.base),
+                                        if any(self.bed-self.base>10^-12),
                                                 md = checkmessage(md,['base<bed on one or more vertex']);
                                         end 

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

@@ -58 +58 @@
                         if solution=='TransientSolution' and md.transient.isgroundingline:
                                 md = checkfield(md,'fieldname','geometry.bed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
-                                if np.any(self.bed > self.base):
+                                if np.any(self.bed - self.base > 10**-12):
                                     md.checkmessage('base<bed on one or more vertex')
                                 pos = np.where(md.mask.groundedice_levelset > 0)