Changeset 27021

Timestamp:

05/24/22 04:48:35 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG:minor

Location:

issm/trunk-jpl/src/m/classes

Files:

• calvingtest.m (modified) (1 diff)
• initialization.m (modified) (1 diff)

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

@@ -35 +35 @@
                         %Early return
                         if (~strcmp(solution,'TransientSolution') | md.transient.ismovingfront==0), return; end
-                        md = checkfield(md,'fieldname','calving.speedfactor','NaN',1,'Inf',1, 'singletimeseries', 1);
+                        md = checkfield(md,'fieldname','calving.speedfactor','>=',0,'NaN',1,'Inf',1, 'singletimeseries', 1);
                 end % }}}
                 function disp(self) % {{{
                         disp(sprintf('   Calving test parameters:'));
-                        fielddisplay(self,'speedfactor','calving rate is proportional to the ice velocity.');
+                        fielddisplay(self,'speedfactor','calving rate is proportional to the ice velocity (e.g. speedfactor=1 -> calving front should not move)');
                 end % }}}
                 function marshall(self,prefix,md,fid) % {{{

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

@@ -59 +59 @@
                                 md = checkfield(md,'fieldname','initialization.vy','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                                 %Triangle with zero velocity
-                                if any(sum(abs(md.initialization.vx(md.mesh.elements)),2)==0 & sum(abs(md.initialization.vy(md.mesh.elements)),2)==0)
+                                if any(sum(abs(md.initialization.vx(md.mesh.elements)),2)==0 & sum(abs(md.initialization.vy(md.mesh.elements)),2)==0 & min(md.mask.ice_levelset(md.mesh.elements),[],2)<0)
                                         md = checkmessage(md,'at least one triangle has all its vertices with a zero velocity');
                                 end