Changeset 19094 for issm/trunk-jpl/src/c/classes/Elements/Element.cpp

Timestamp:

02/06/15 16:44:07 (10 years ago)

Author:

bdef

Message:

CHG: Adding node capbility for inputupdatefromvector and changes in the zigzag counter in epl

File:

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

issm/trunk-jpl/src/c/classes/Elements/Element.cpp ¶

@@ -862 +862 @@
 }
 /*}}}*/
-void       Element::GetVectorFromInputs(Vector<IssmDouble>* vector,int input_enum){/*{{{*/
+/* void       Element::GetVectorFromInputs(Vector<IssmDouble>* vector,int input_enum){/\*{{{*\/ */
+
+/*      /\*Fetch number vertices for this element and allocate arrays*\/ */
+/*      int numvertices = this->GetNumberOfVertices(); */
+/*      int*        vertexpidlist = xNew<int>(numvertices); */
+/*      IssmDouble* values        = xNew<IssmDouble>(numvertices); */
+
+/*      /\*Fill in values*\/ */
+/*      this->GetVertexPidList(vertexpidlist); */
+/*      this->GetInputListOnVertices(values,input_enum); */
+/*      vector->SetValues(numvertices,vertexpidlist,values,INS_VAL); */
+
+/*      /\*Clean up*\/ */
+/*      xDelete<int>(vertexpidlist); */
+/*      xDelete<IssmDouble>(values); */
+
+/* } */
+/* /\*}}}*\/ */
+void       Element::GetVectorFromInputs(Vector<IssmDouble>* vector,int input_enum,int type){/*{{{*/
 
         /*Fetch number vertices for this element and allocate arrays*/
-        int numvertices = this->GetNumberOfVertices();
-        int*        vertexpidlist = xNew<int>(numvertices);
-        IssmDouble* values        = xNew<IssmDouble>(numvertices);
-
-        /*Fill in values*/
-        this->GetVertexPidList(vertexpidlist);
-        this->GetInputListOnVertices(values,input_enum);
-        vector->SetValues(numvertices,vertexpidlist,values,INS_VAL);
-
+        int         numvertices = this->GetNumberOfVertices();
+        int         numnodes    = this->GetNumberOfNodes();
+        int*        doflist     = NULL;
+        IssmDouble* values      = NULL;
+
+        switch(type){
+        case VertexPIdEnum:
+                doflist = xNew<int>(numvertices);
+                values = xNew<IssmDouble>(numvertices);
+                /*Fill in values*/
+                this->GetVertexPidList(doflist);
+                this->GetInputListOnVertices(values,input_enum);
+                vector->SetValues(numvertices,doflist,values,INS_VAL);
+                break;
+        case VertexSIdEnum:
+                doflist = xNew<int>(numvertices);
+                values = xNew<IssmDouble>(numvertices);
+                /*Fill in values*/
+                this->GetVerticesSidList(doflist);
+                this->GetInputListOnVertices(values,input_enum);
+                vector->SetValues(numvertices,doflist,values,INS_VAL);
+                break;
+        case NodesEnum:
+                doflist = xNew<int>(numnodes);
+                values = xNew<IssmDouble>(numnodes);
+                /*Fill in values*/
+                this->GetInputListOnNodes(values,input_enum);
+                this->GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
+                vector->SetValues(numnodes,doflist,values,INS_VAL);
+                break;
+        case NodeSIdEnum:
+                doflist = xNew<int>(numnodes);
+                values = xNew<IssmDouble>(numnodes);
+                /*Fill in values*/
+                this->GetNodesSidList(doflist);
+                this->GetInputListOnNodes(values,input_enum);
+                vector->SetValues(numnodes,doflist,values,INS_VAL);
+                break;
+        default:
+                _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
+        }
+        
         /*Clean up*/
-        xDelete<int>(vertexpidlist);
+        xDelete<int>(doflist);
         xDelete<IssmDouble>(values);