Changeset 21049 for issm/trunk-jpl/src/m/classes/frictioncoulomb.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/frictioncoulomb.py (modified) (2 diffs)

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

@@ -1 +1 @@
 from fielddisplay import fielddisplay
 from project3d import project3d
-from EnumDefinitions import *
 from checkfield import checkfield
 from WriteData import WriteData
@@ -45 +44 @@
 
         #Early return
-        if StressbalanceAnalysisEnum() not in analyses and ThermalAnalysisEnum() not in analyses:
+        if 'StressbalanceAnalysis' not in analyses and 'ThermalAnalysis' not in analyses:
             return md