Changeset 23824

Timestamp:

04/06/19 21:14:11 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added min_thickness field to calving VM (not implemented in C++ yet)

Location:

issm/trunk-jpl/src/m/classes

Files:

• calvingminthickness.m (modified) (1 diff)
• calvingvonmises.m (modified) (5 diffs)
• calvingvonmises.py (modified) (5 diffs)

issm/trunk-jpl/src/m/classes/calvingminthickness.m ¶

@@ -39 +39 @@
                         if (~strcmp(solution,'TransientSolution') | md.transient.ismovingfront==0), return; end
 
-                        md = checkfield(md,'fieldname','calving.min_thickness','>',0,'NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','calving.min_thickness','>',0,'NaN',1,'Inf',1,'numel',1);
                 end % }}}
                 function disp(self) % {{{
                         disp(sprintf('   Calving Minimum thickness:'));
-                        fielddisplay(self,'min_thickness','minimum thickness below which no ice is allowed');
+                        fielddisplay(self,'min_thickness','minimum thickness below which no ice is allowed [m]');
 
                 end % }}}

issm/trunk-jpl/src/m/classes/calvingvonmises.m ¶

@@ -9 +9 @@
                 stress_threshold_floatingice = 0.;
                 meltingrate=NaN;
+                min_thickness = 0.;
         end
         methods
@@ -36 +37 @@
                         self.stress_threshold_groundedice = 1e6;
                         self.stress_threshold_floatingice = 150e3;
+
+                        %For now we turn this off by setting the threshold to 0
+                        self.min_thickness = 0.;
                 end % }}}
                 function md = checkconsistency(self,md,solution,analyses) % {{{
@@ -43 +47 @@
                         md = checkfield(md,'fieldname','calving.stress_threshold_groundedice','>',0,'nan',1,'Inf',1);
                         md = checkfield(md,'fieldname','calving.stress_threshold_floatingice','>',0,'nan',1,'Inf',1);
+                        md = checkfield(md,'fieldname','calving.min_thickness','>=',0,'NaN',1,'Inf',1,'numel',1);
                 end % }}}
                 function disp(self) % {{{
@@ -48 +53 @@
                         fielddisplay(self,'stress_threshold_groundedice','sigma_max applied to grounded ice only [Pa]');
                         fielddisplay(self,'stress_threshold_floatingice','sigma_max applied to floating ice only [Pa]');
+                        fielddisplay(self,'min_thickness','minimum thickness below which no ice is allowed [m]');
 
                 end % }}}
@@ -55 +61 @@
                         WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_groundedice','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_floatingice','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'fieldname','min_thickness','format','Double');
                 end % }}}
         end

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

@@ -17 +17 @@
                 self.stress_threshold_floatingice = 0.
                 self.meltingrate   = float('NaN')
+                self.min_thickness = 0.
 
                 #set defaults
@@ -26 +27 @@
                 string="%s\n%s"%(string,fielddisplay(self,'stress_threshold_groundedice','sigma_max applied to grounded ice only [Pa]'))
                 string="%s\n%s"%(string,fielddisplay(self,'stress_threshold_floatingice','sigma_max applied to floating ice only [Pa]'))
+                string="%s\n%s"%(string,fielddisplay(self,'min_thickness','minimum thickness below which no ice is allowed [m]'))
 
                 return string
@@ -36 +38 @@
                 self.stress_threshold_groundedice = 1e6
                 self.stress_threshold_floatingice = 150e3
+
+                #turn off min_thickness by default.
+                self.min_thickness=0.
                 return self
         #}}}
@@ -45 +50 @@
                 md = checkfield(md,'fieldname','calving.stress_threshold_groundedice','>',0,'nan',1,'Inf',1)
                 md = checkfield(md,'fieldname','calving.stress_threshold_floatingice','>',0,'nan',1,'Inf',1)
+                md = checkfield(md,'fieldname','calving.min_thickness','>=',0,'NaN',1,'Inf',1,'numel',[1]);
 
                 return md
@@ -54 +60 @@
                 WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_groundedice','format','DoubleMat','mattype',1)
                 WriteData(fid,prefix,'object',self,'fieldname','stress_threshold_floatingice','format','DoubleMat','mattype',1)
+                WriteData(fid,prefix,'object',self,'fieldname','min_thickness','format','Double');
         # }}}