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

Timestamp:

10/08/13 16:39:54 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: adding some support for 2d FS

File:

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

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

@@ -2242 +2242 @@
         #endif
 
-        //Need to know the type of approximation for this element
+        /*Need to know the type of approximation for this element*/
         if(iomodel->Data(FlowequationElementEquationEnum)){
-                if (iomodel->Data(FlowequationElementEquationEnum)[index]==SSAApproximationEnum){
-                        this->inputs->AddInput(new IntInput(ApproximationEnum,SSAApproximationEnum));
-                }
-                else if (iomodel->Data(FlowequationElementEquationEnum)[index]==HOApproximationEnum){
-                        this->inputs->AddInput(new IntInput(ApproximationEnum,HOApproximationEnum));
-                }
-                else if (iomodel->Data(FlowequationElementEquationEnum)[index]==SSAHOApproximationEnum){
-                        this->inputs->AddInput(new IntInput(ApproximationEnum,SSAHOApproximationEnum));
-                }
-                else if (iomodel->Data(FlowequationElementEquationEnum)[index]==SIAApproximationEnum){
-                        this->inputs->AddInput(new IntInput(ApproximationEnum,SIAApproximationEnum));
-                }
-                else if (iomodel->Data(FlowequationElementEquationEnum)[index]==L1L2ApproximationEnum){
-                        this->inputs->AddInput(new IntInput(ApproximationEnum,L1L2ApproximationEnum));
-                }
-                else if (iomodel->Data(FlowequationElementEquationEnum)[index]==FSApproximationEnum){
-                        this->inputs->AddInput(new IntInput(ApproximationEnum,FSApproximationEnum));
-                }
-                else if (iomodel->Data(FlowequationElementEquationEnum)[index]==SSAFSApproximationEnum){
-                        this->inputs->AddInput(new IntInput(ApproximationEnum,SSAFSApproximationEnum));
-                }
-                else if (iomodel->Data(FlowequationElementEquationEnum)[index]==HOFSApproximationEnum){
-                        this->inputs->AddInput(new IntInput(ApproximationEnum,HOFSApproximationEnum));
-                }
-                else if (iomodel->Data(FlowequationElementEquationEnum)[index]==NoneApproximationEnum){
-                        this->inputs->AddInput(new IntInput(ApproximationEnum,NoneApproximationEnum));
-                }
-                else{
-                        _error_("Approximation type " << EnumToStringx(reCast<int,IssmDouble>(iomodel->Data(FlowequationElementEquationEnum)[index])) << " not supported yet");
-                }
+                this->inputs->AddInput(new IntInput(ApproximationEnum,iomodel->Data(FlowequationElementEquationEnum)[index]));
         }