Changeset 23355

Timestamp:

09/28/18 13:45:13 (6 years ago)

Author:

seroussi

Message:

CHG: same change in grounding line for python and js

Location:

issm/trunk-jpl/src/m/classes

Files:

• groundingline.js (modified) (1 diff)
• groundingline.py (modified) (1 diff)

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

@@ -29 +29 @@
                         checkfield(md,'fieldname','groundingline.melt_interpolation','values',['NoMeltOnPartiallyFloating', 'SubelementMelt1', 'SubelementMelt2', 'FullMeltOnPartiallyFloating']);
 
-                        if (this.migration !='None'){
+                        if(this.migration !='None' & md.trans.isgroundingline==1 & solution == 'TransientSolution'){
                                 if (isNaN(md.geometry.bed)){
                                         md.checkmessage('requesting grounding line migration, but bathymetry is absent!');

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

@@ -45 +45 @@
                 md = checkfield(md,'fieldname','groundingline.melt_interpolation','values',['SubelementMelt1','SubelementMelt2','NoMeltOnPartiallyFloating','FullMeltOnPartiallyFloating'])
 
-                if not m.strcmp(self.migration,'None'):
+                if(not m.strcmp(self.migration,'None') and md.transient.isgroundingline and solution=='TransientSolution'):
                         if np.any(np.isnan(md.geometry.bed)):
                                 md.checkmessage("requesting grounding line migration, but bathymetry is absent!")