Changeset 25836 for issm/trunk/src/m/classes/levelset.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/classes/levelset.m (modified) (6 diffs)

issm/trunk/src/m/classes/levelset.m

@@ -10 +10 @@
                 reinit_frequency        = 5;
                 kill_icebergs     = 0;
-                calving_max       = 0.;
+                migration_max       = 0.;
                 fe                = 'P1';
         end
@@ -42 +42 @@
                         self.reinit_frequency = 5;
                         self.kill_icebergs    = 1;
-                        self.calving_max      = 3000.;
+                        self.migration_max      = 3000.;
 
                         %Linear elements by default
@@ -55 +55 @@
                         md = checkfield(md,'fieldname','levelset.stabilization','values',[0 1 2]);
                         md = checkfield(md,'fieldname','levelset.kill_icebergs','numel',1,'values',[0 1]);
-                        md = checkfield(md,'fieldname','levelset.calving_max','numel',1,'NaN',1,'Inf',1,'>',0);
+                        md = checkfield(md,'fieldname','levelset.migration_max','numel',1,'NaN',1,'Inf',1,'>',0);
                         md = checkfield(md,'fieldname','levelset.fe','values',{'P1','P2'});
                 end % }}}
@@ -64 +64 @@
                         fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized');
                         fielddisplay(self,'kill_icebergs','remove floating icebergs to prevent rigid body motions (1: true, 0: false)');
-                        fielddisplay(self,'calving_max','maximum allowed calving rate (m/a)');
+                        fielddisplay(self,'migration_max','maximum allowed migration rate (m/a)');
                         fielddisplay(self,'fe','Finite Element type: ''P1'' (default), or ''P2''');
                 end % }}}
@@ -75 +75 @@
                         WriteData(fid,prefix,'object',self,'fieldname','reinit_frequency','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','kill_icebergs','format','Boolean');
-                        WriteData(fid,prefix,'object',self,'fieldname','calving_max','format','Double','scale',1./yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','migration_max','format','Double','scale',1./yts);
                         WriteData(fid,prefix,'object',self,'fieldname','fe','format','String');
                 end % }}}
@@ -83 +83 @@
                         writejs1Darray(fid,[modelname '.levelset.reinit_frequency'],self.reinit_frequency);
                         writejsdouble(fid,[modelname '.levelset.kill_icebergs'],self.kill_icebergs);
-                        writejsdouble(fid,[modelname '.levelset.calving_max'],self.calving_max);
+                        writejsdouble(fid,[modelname '.levelset.migration_max'],self.migration_max);
                 end % }}}
         end