Changeset 21049 for issm/trunk-jpl/src/m/classes/basalforcings.py

Timestamp:

08/02/16 17:06:46 (9 years ago)

Author:

agscott1

Message:

CHG: Replaced Enums with Strings in matlab and python. Updated corresponding cpp code.

File:

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

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

@@ -1 +1 @@
 from fielddisplay import fielddisplay
 from project3d import project3d
-from EnumDefinitions import *
 from checkfield import checkfield
 from WriteData import WriteData
@@ -54 +53 @@
         def checkconsistency(self,md,solution,analyses):    # {{{
 
-                if MasstransportAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.ismasstransport):
+                if 'MasstransportAnalysis' in analyses and not (solution=='TransientSolution' and not md.transient.ismasstransport):
                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
                         md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
 
-                if BalancethicknessAnalysisEnum() in analyses:
+                if 'BalancethicknessAnalysis' in analyses:
                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
                         md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices])
 
-                if ThermalAnalysisEnum() in analyses and not (solution==TransientSolutionEnum() and not md.transient.isthermal):
+                if 'ThermalAnalysis' in analyses and not (solution=='TransientSolution' and not md.transient.isthermal):
                         md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1)
                         md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'Inf',1,'timeseries',1)