Changeset 24039

Timestamp:

06/24/19 04:26:34 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: adding new field to levelset

Location:

issm/trunk-jpl/src/m/classes

Files:

• levelset.js (modified) (2 diffs)
• levelset.m (modified) (5 diffs)
• levelset.py (modified) (5 diffs)

issm/trunk-jpl/src/m/classes/levelset.js ¶

@@ -21 +21 @@
 
         }// }}}
-    this.extrude = function(md) {//{{{
-        this.spclevelset=project3d(md,'vector',this.spclevelset,'type','node');
-        return this;
-    }//}}}
+        this.extrude = function(md) {//{{{
+                this.spclevelset=project3d(md,'vector',this.spclevelset,'type','node');
+                return this;
+        }//}}}
         this.classname= function(){// {{{
                 return "levelset";
@@ -41 +41 @@
 
         }//}}}
-                this.fix=function() { //{{{
-                        this.spclevelset=NullFix(this.spclevelset,NaN);
-                }//}}}
+        this.fix=function() { //{{{
+                this.spclevelset=NullFix(this.spclevelset,NaN);
+        }//}}}
         //properties 
         // {{{

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

@@ -9 +9 @@
                 spclevelset                     = NaN;
                 reinit_frequency        = 5;
+                kill_icebergs     = 0;
                 calving_max       = 0.;
                 fe                = 'P1';
@@ -40 +41 @@
                         self.stabilization    = 1;
                         self.reinit_frequency = 5;
+                        self.kill_icebergs    = true;
                         self.calving_max      = 3000.;
 
@@ -52 +54 @@
                         md = checkfield(md,'fieldname','levelset.spclevelset','Inf',1,'timeseries',1);
                         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.fe','values',{'P1','P2'});
@@ -60 +63 @@
                         fielddisplay(self,'spclevelset','Levelset constraints (NaN means no constraint)');
                         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,'fe','Finite Element type: ''P1'' (default), or ''P2''');
@@ -70 +74 @@
                         WriteData(fid,prefix,'object',self,'fieldname','spclevelset','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         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','fe','format','String');
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
-                
                         writejsdouble(fid,[modelname '.levelset.stabilization'],self.stabilization);
                         writejs1Darray(fid,[modelname '.levelset.spclevelset'],self.spclevelset);
                         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);
-
                 end % }}}
         end

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

@@ -17 +17 @@
                 self.spclevelset      = float('NaN')
                 self.reinit_frequency = 0
+                self.kill_icebergs    = 0
                 self.calving_max      = 0.
                 self.fe               = 'P1'
@@ -29 +30 @@
                 string="%s\n%s"%(string,fielddisplay(self,'spclevelset','levelset constraints (NaN means no constraint)'))
                 string="%s\n%s"%(string,fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized'))
+                string="%s\n%s"%(string,fielddisplay(self,'kill_icebergs','remove floating icebergs to prevent rigid body motions (1: true, 0: false)'))
                 string="%s\n%s"%(string,fielddisplay(self,'calving_max','maximum allowed calving rate (m/a)'))
                 string="%s\n%s"%(string,fielddisplay(self,'fe','Finite Element type: ''P1'' (default), or ''P2'''))
@@ -43 +45 @@
                 self.stabilization              = 1
                 self.reinit_frequency = 5
+                self.kill_icebergs    = 1
                 self.calving_max      = 3000.
 
@@ -57 +60 @@
 
                 md = checkfield(md,'fieldname','levelset.spclevelset','Inf',1,'timeseries',1)
-                md = checkfield(md,'fieldname','levelset.stabilization','values',[0,1,2]);
-                md = checkfield(md,'fieldname','levelset.calving_max','NaN',1,'Inf',1,'>',0);
+                md = checkfield(md,'fieldname','levelset.stabilization','numel',[1],'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.fe','values',['P1','P2']);
 
@@ -70 +74 @@
                 WriteData(fid,prefix,'object',self,'fieldname','spclevelset','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                 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','fe','format','String');