Changeset 28118

Timestamp:

02/29/24 15:56:37 (13 months ago)

Author:

poinelli

Message:

CHG: Add python and javascript fields related to IntrusionMelt

Location:

issm/trunk-jpl/src/m/classes

Files:

• groundingline.js (modified) (5 diffs)
• groundingline.m (modified) (1 diff)
• groundingline.py (modified) (5 diffs)

issm/trunk-jpl/src/m/classes/groundingline.js

@@ -11 +11 @@
                 this.friction_interpolation     = 'SubelementFriction1';
                 this.melt_interpolation         = 'NoMeltOnPartiallyFloating';
+                this.intrusion_distance         = 0;
 
         }// }}}
@@ -17 +18 @@
                 fielddisplay(this,'migration',"type of grounding line migration: 'SubelementMigration','SoftMigration','AggressiveMigration','Contact' or 'None'");
                 fielddisplay(this,'friction_interpolation',"type of friction interpolation forpartially floating elements: 'NoFrictionOnPartiallyFloating','SubelementFriction1' or 'SubelementFriction2'");
-                fielddisplay(this,'melt_interpolation',"type of melt interpolation forpartially floating elements: 'NoMeltOnPartiallyFloating','FullMeltOnPartiallyFloating','SubelementMelt1' or 'SubelementMelt2'");
+                fielddisplay(this,'melt_interpolation',"type of melt interpolation forpartially floating elements: 'NoMeltOnPartiallyFloating','FullMeltOnPartiallyFloating','SubelementMelt1','SubelementMelt2' or 'IntrusionMelt'");
+                fielddisplay(this,'intrusion_distance','distance of seawater intrusion from grounding line [m]');
 
         }// }}}
@@ -27 +29 @@
                         checkfield(md,'fieldname','groundingline.migration','values',['None', 'AggressiveMigration', 'SoftMigration', 'Contact', 'GroundingOnly']);
                         checkfield(md,'fieldname','groundingline.friction_interpolation','values',['NoFrictionOnPartiallyFloating', 'SubelementFriction1', 'SubelementFriction2']);
-                        checkfield(md,'fieldname','groundingline.melt_interpolation','values',['NoMeltOnPartiallyFloating', 'SubelementMelt1', 'SubelementMelt2', 'FullMeltOnPartiallyFloating']);
+                        checkfield(md,'fieldname','groundingline.melt_interpolation','values',['NoMeltOnPartiallyFloating', 'SubelementMelt1', 'SubelementMelt2', 'IntrusionMelt', 'FullMeltOnPartiallyFloating']);
+                        checkfield(md,'fieldname','groundingline.intrusion_distance','>=',0)
 
                         if (this.migration !='None'){
@@ -49 +52 @@
                         WriteData(fid,prefix,'data',this.friction_interpolation,'name','md.groundingline.friction_interpolation','format','String');
                         WriteData(fid,prefix,'data',this.melt_interpolation,'name','md.groundingline.melt_interpolation','format','String');
+                        WriteData(fid,prefix,'object',self,'fieldname','intrusion_distance','format','Double');
+
                 }//}}}
                 this.fix=function() { //{{{
@@ -57 +62 @@
         this.friction_interpolation = '';
         this.melt_interpolation     = '';
+        this.intrusion_distance         = 0;
         this.setdefaultparameters();
         //}}}

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

@@ -89 +89 @@
                         writejsstring(fid,[modelname '.groundingline.friction_interpolation'],self.friction_interpolation);
                         writejsstring(fid,[modelname '.groundingline.melt_interpolation'],self.melt_interpolation);
+                        writejsdouble(fif,[modelname '.groundingline.intrusion_distance'],self.intrusion_distance);
                         writejscellstring(fid,[modelname '.groundingline.requested_outputs'],self.requested_outputs);
 

issm/trunk-jpl/src/m/classes/groundingline.py

@@ -18 +18 @@
         self.friction_interpolation = ''
         self.melt_interpolation = ''
+        self.intrusion_distance = 0
         self.requested_outptuts = []
 
@@ -29 +30 @@
         s += '{}\n'.format(fielddisplay(self, 'migration', 'type of grounding line migration: \'SoftMigration\', \'SubelementMigration\', \'AggressiveMigration\', \'Contact\', \'None\''))
         s += '{}\n'.format(fielddisplay(self, 'migration', 'type of friction interpolation on partially floating elements: ''SubelementFriction1'', ''SubelementFriction2'', ''NoFrictionOnPartiallyFloating'''))
-        s += '{}\n'.format(fielddisplay(self, 'migration', 'type of melt interpolation on partially floating elements: \'SubelementMelt1\', \'SubelementMelt2\', \'NoMeltOnPartiallyFloating\', \'FullMeltOnPartiallyFloating\''))
+        s += '{}\n'.format(fielddisplay(self, 'migration', 'type of melt interpolation on partially floating elements: \'SubelementMelt1\', \'SubelementMelt2\', \'IntrusionMelt\', \'NoMeltOnPartiallyFloating\', \'FullMeltOnPartiallyFloating\''))
         s += '{}\n'.format(fielddisplay(self, 'requested_outputs', 'additional outputs requested'))
         return s
@@ -44 +45 @@
         self.friction_interpolation = 'SubelementFriction1'
         self.melt_interpolation = 'NoMeltOnPartiallyFloating'
+        self.intrusion_distance = 0
         # Default output
         self.requested_outputs = ['default']
@@ -53 +55 @@
         md = checkfield(md, 'fieldname', 'groundingline.migration', 'values', ['None', 'SubelementMigration', 'AggressiveMigration', 'SoftMigration', 'Contact', 'GroundingOnly'])
         md = checkfield(md, 'fieldname', 'groundingline.friction_interpolation', 'values', ['SubelementFriction1', 'SubelementFriction2', 'NoFrictionOnPartiallyFloating'])
-        md = checkfield(md, 'fieldname', 'groundingline.melt_interpolation', 'values', ['SubelementMelt1', 'SubelementMelt2', 'NoMeltOnPartiallyFloating', 'FullMeltOnPartiallyFloating'])
+        md = checkfield(md, 'fieldname', 'groundingline.melt_interpolation', 'values', ['SubelementMelt1', 'SubelementMelt2', 'IntrusionMelt', 'NoMeltOnPartiallyFloating', 'FullMeltOnPartiallyFloating'])
+        md = checkfield(md, 'fieldname', 'groundingline.intrusion_distance','>=',0)
         md = checkfield(md, 'fieldname', 'groundingline.requested_outputs', 'stringrow', 1)
 
@@ -72 +75 @@
         WriteData(fid, prefix, 'data', self.friction_interpolation, 'name', 'md.groundingline.friction_interpolation', 'format', 'String')
         WriteData(fid, prefix, 'data', self.melt_interpolation, 'name', 'md.groundingline.melt_interpolation', 'format', 'String')
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'intrusion_distance', 'format', 'Double')
         
         # Process requested outputs