Changeset 24313 for issm/trunk/src/m/classes/geometry.m

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

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

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

@@ -54 +54 @@
 
                         if (strcmp(solution,'TransientSolution') & md.transient.isgia) | strcmp(solution,'GiaSolution'),
-                                md = checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'Inf',1,'>=',0);
+                                md = checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'Inf',1);
                         elseif strcmpi(solution,'LoveSolution')
                                 return; 
@@ -65 +65 @@
                                 end 
                                 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>10^-12),
+                                                md = checkmessage(md,['base<bed on one or more vertex']);
+                                        end 
+                                        pos = find(md.mask.groundedice_levelset>0);
+                                        if any(abs(self.bed(pos)-self.base(pos))>10^-9),
+                                                md = checkmessage(md,['equality base=bed on grounded ice violated']);
+                                        end 
                                         md = checkfield(md,'fieldname','geometry.bed','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                                 end