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

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/linearbasalforcings.m (modified) (3 diffs)

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

@@ -41 +41 @@
                 function md = checkconsistency(self,md,solution,analyses) % {{{
 
-                        if ismember(MasstransportAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.ismasstransport==0),
+                        if ismember('MasstransportAnalysis',analyses) & ~(strcmp(solution,'TransientSolution') & md.transient.ismasstransport==0),
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1);
@@ -47 +47 @@
                                 md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0,'numel',1);
                         end
-                        if ismember(BalancethicknessAnalysisEnum(),analyses),
+                        if ismember('BalancethicknessAnalysis',analyses),
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1);
@@ -53 +53 @@
                                 md = checkfield(md,'fieldname','basalforcings.upperwater_elevation','<',0,'numel',1);
                         end
-                        if ismember(ThermalAnalysisEnum(),analyses) & ~(solution==TransientSolutionEnum() & md.transient.isthermal==0),
+                        if ismember('ThermalAnalysis',analyses) & ~(strcmp(solution,'TransientSolution') & md.transient.isthermal==0),
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'Inf',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.deepwater_melting_rate','>=',0,'numel',1);