Changeset 15038

Timestamp:

05/16/13 09:39:33 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removing approximation from inputs

Location:

issm/trunk-jpl/src/c/classes

Files:

• Node.cpp (modified) (4 diffs)
• Node.h (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Node.cpp

@@ -18 +18 @@
 /*FUNCTION Node::Node() default constructor {{{*/
 Node::Node(){
-                 this->inputs=NULL;
-                 this->hvertex=NULL;
-                 return;
+        this->approximation=0;
+        this->inputs=NULL;
+        this->hvertex=NULL;
 }
 /*}}}*/
@@ -49 +49 @@
         /*Hooks*/
         this->hvertex=new Hook(&vertex_id,1); //node id is the same as the vertex id, continuous galerkin!
+
+        if (analysis_type==DiagnosticHorizAnalysisEnum)
+         this->approximation=reCast<int>(iomodel->Data(FlowequationVertexEquationEnum)[io_index]);
+        else
+         this->approximation=0;
 
         //intialize inputs, and add as many inputs per element as requested: 
@@ -57 +62 @@
           this->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,reCast<bool>(iomodel->Data(MaskVertexongroundediceEnum)[io_index])));
         if (analysis_type==DiagnosticHorizAnalysisEnum)
-         this->inputs->AddInput(new IntInput(ApproximationEnum,reCast<IssmInt>(iomodel->Data(FlowequationVertexEquationEnum)[io_index])));
+         this->approximation=reCast<int>(iomodel->Data(FlowequationVertexEquationEnum)[io_index]);
         /*set single point constraints: */
 
@@ -525 +530 @@
 /*FUNCTION Node::GetApproximation {{{*/
 int   Node::GetApproximation(){
-
-        int approximation;
-
-        /*recover parameters: */
-        inputs->GetInputValue(&approximation,ApproximationEnum);
 
         return approximation;

issm/trunk-jpl/src/c/classes/Node.h

@@ -24 +24 @@
 
 class Node: public Object ,public Update{
+
+        private:
+                int approximation; //For ice flow models, we need to know what ice flow approximation is employed on this node
 
         public: