Changeset 20993 for issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

Timestamp:

07/24/16 00:20:27 (9 years ago)

Author:

agscott1

Message:

CHG: Changed flowequation classes to use IoCodeToEnumElementEquation and IoCodeToEnumVertexEquation for StressbalanceAnalysis and Penta/Tetra/Tria Elements.

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -1483 +1483 @@
         /*Need to know the type of approximation for this element*/
         if(iomodel->Data("md.flowequation.element_equation")){
-                this->inputs->AddInput(new IntInput(ApproximationEnum,reCast<int>(iomodel->Data("md.flowequation.element_equation")[index])));
+                this->inputs->AddInput(new IntInput(ApproximationEnum,IoCodeToEnumElementEquation(reCast<int>(iomodel->Data("md.flowequation.element_equation")[index]))));
         }
 
@@ -3077 +3077 @@
                         _assert_(iomodel->Data("md.flowequation.element_equation"));
 
-                        if(*(iomodel->Data("md.flowequation.element_equation")+index)==HOFSApproximationEnum){
+                        if((IoCodeToEnumElementEquation(reCast<int>(iomodel->Data("md.flowequation.element_equation")[index])))==HOFSApproximationEnum){
                                 /*Create VzHO and VzFS Enums*/
                                 if(iomodel->Data("md.initialization.vz") && iomodel->Data("md.flowequation.borderFS")){
@@ -3091 +3091 @@
                                 }
                         }
-                        if(*(iomodel->Data("md.flowequation.element_equation")+index)==SSAFSApproximationEnum){
+                        if((IoCodeToEnumElementEquation(reCast<int>(iomodel->Data("md.flowequation.element_equation")[index])))==SSAFSApproximationEnum){
                                 /*Create VzSSA and VzFS Enums*/
                                 if(iomodel->Data("md.initialization.vz") && iomodel->Data("md.flowequation.borderFS")){