Changeset 21065 for issm/trunk-jpl/src/m/classes/flowequation.js

Timestamp:

08/04/16 02:11:14 (9 years ago)

Author:

agscott1

Message:

CHG: Replaced all javascript enums with solution strings and analyses strings to match matlab and python code

File:

• issm/trunk-jpl/src/m/classes/flowequation.js (modified) (3 diffs)

issm/trunk-jpl/src/m/classes/flowequation.js ¶

@@ -49 +49 @@
 
                         //Early return
-                        if ( ((!ArrayAnyEqual(ArrayIsMember(StressbalanceAnalysisEnum(),analyses),1)) & (!ArrayAnyEqual(ArrayIsMember(StressbalanceSIAAnalysisEnum(),analyses),1))) | 
-                                        (solution==TransientSolutionEnum() & md.trans.isstressbalance==0)
+                        if ( ((!ArrayAnyEqual(ArrayIsMember('StressbalanceAnalysis',analyses),1)) & (!ArrayAnyEqual(ArrayIsMember('StressbalanceSIAAnalysis',analyses),1))) | 
+                                        (solution=='TransientSolution' & md.trans.isstressbalance==0)
                            ) return ;
 
@@ -90 +90 @@
                                 md = checkmessage(md,['no element types set for this model']);
                         }
-                        if(ArrayAnyEqual(ArrayIsMember(StressbalanceSIAAnalysisEnum(), analyses),1)){
+                        if(ArrayAnyEqual(ArrayIsMember('StressbalanceSIAAnalysis', analyses),1)){
                                 if (ArrayAnyEqual(this.element_equation,1)){
                                         if(this.vertex_equation & ArrayAnyBelowStrict(md.mask.groundedice_levelset)){
@@ -117 +117 @@
                         WriteData(fid,prefix,'object',this,'fieldname','borderFS','format','DoubleMat','mattype',1);
 
-                        //convert approximations to enums
+                        //convert approximations to integers 
                         WriteData(fid,prefix,'data',this.vertex_equation,'name','md.flowequation.vertex_equation','format','DoubleMat','mattype',1);
                         WriteData(fid,prefix,'data',this.element_equation,'name','md.flowequation.element_equation','format','DoubleMat','mattype',2);