Changeset 21049 for issm/trunk-jpl/src/m/classes/thermal.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/thermal.m (modified) (1 diff)

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

@@ -72 +72 @@
 
                         %Early return
-                        if (~ismember(ThermalAnalysisEnum(),analyses) & ~ismember(EnthalpyAnalysisEnum(),analyses)) | (solution==TransientSolutionEnum() & md.transient.isthermal==0), return; end
+                        if (~ismember('ThermalAnalysis',analyses) & ~ismember('EnthalpyAnalysis',analyses)) | (strcmp(solution,'TransientSolution') & md.transient.isthermal==0), return; end
 
                         md = checkfield(md,'fieldname','thermal.stabilization','numel',[1],'values',[0 1 2]);
                         md = checkfield(md,'fieldname','thermal.spctemperature','Inf',1,'timeseries',1,'>=',0);
-                        if (ismember(EnthalpyAnalysisEnum(),analyses) & md.thermal.isenthalpy & dimension(md.mesh)==3),
+                        if (ismember('EnthalpyAnalysis',analyses) & md.thermal.isenthalpy & dimension(md.mesh)==3),
 
                                 %Make sure the spc are less than melting point