Changeset 21661

Timestamp:

04/05/17 10:04:51 (8 years ago)

Author:

seroussi

Message:

FIX: upperwater elevation can be equal to 0 (surface)

Location:

issm/trunk-jpl/src/m/classes

Files:

• linearbasalforcings.m (modified) (1 diff)
• linearbasalforcings.py (modified) (1 diff)

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

@@ -55 +55 @@
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<','basalforcings.upperwater_elevation','numel',1);
-                                md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0,'numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<=',0,'numel',1);
                         end
                         if ismember('ThermalAnalysis',analyses) & ~(strcmp(solution,'TransientSolution') & md.transient.isthermal==0),

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

@@ -83 +83 @@
                         md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0);
                         md = checkfield(md,'fieldname','basalforcings.deepwater_elevation','<',md.basalforcings.upperwater_elevation);
-                        md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0);
+                        md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<=',0);
                         md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'Inf',1,'timeseries',1,'>=',0)