Changeset 19783

Timestamp:

11/22/15 06:43:10 (9 years ago)

Author:

cborstad

Message:

BUG: fixed a couple minor bugs in class

File:

• issm/trunk-jpl/src/m/classes/mismipbasalforcings.py (modified) (2 diffs)

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

@@ -59 +59 @@
 
             md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
-            md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',1)
-            md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',1)
-            md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',1)
+            md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',[1])
+            md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',[1])
+            md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',[1])
 
         if BalancethicknessAnalysisEnum() in analyses:
 
             md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'size',[md.mesh.numberofvertices])
-            md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',1)
-            md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',1)
-            md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',1)
+            md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',[1])
+            md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',[1])
+            md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',[1])
 
         if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and md.transient.isthermal==0):
 
             md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1)
-            md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',1)
-            md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',1)
-            md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',1)
-            md = checkfield(md,'fieldname','basalforcings.geothermal_flux','NaN',1,'timeseries',1,'>=',0)
+            md = checkfield(md,'fieldname','basalforcings.meltrate_factor','>=',0,'numel',[1])
+            md = checkfield(md,'fieldname','basalforcings.threshold_thickness','>=',0,'numel',[1])
+            md = checkfield(md,'fieldname','basalforcings.upperdepth_melt','<=',0,'numel',[1])
+            md = checkfield(md,'fieldname','basalforcings.geothermalflux','NaN',1,'timeseries',1,'>=',0)
         return md
     # }}}
@@ -91 +91 @@
         WriteData(fid,'data',floatingice_melting_rate,'format','DoubleMat','enum',BasalforcingsFloatingiceMeltingRateEnum(),'mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
         WriteData(fid,'object',self,'fieldname','groundedice_melting_rate','format','DoubleMat','enum',BasalforcingsGroundediceMeltingRateEnum(),'mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
-        WriteData(fid,'object',self,'fieldname','geothermal_flux','enum',BasalforcingsGeothermalfluxEnum(),'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
+        WriteData(fid,'object',self,'fieldname','geothermalflux','enum',BasalforcingsGeothermalfluxEnum(),'format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1)
         WriteData(fid,'object',self,'fieldname','meltrate_factor','format','Double','enum',BasalforcingsMeltrateFactorEnum(),'scale',1./yts)
         WriteData(fid,'object',self,'fieldname','threshold_thickness','format','Double','enum',BasalforcingsThresholdThicknessEnum())