Changeset 16125 for issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

Timestamp:

09/11/13 14:22:13 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: cleaning up Node that is not an Update object anymore, and removed unused InputUpdateFromVector functions

File:

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

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

@@ -1767 +1767 @@
 void  Tria::InputUpdateFromVector(IssmDouble* vector, int name, int type){
 
-        const int   numnodes = NUMVERTICES;
-        int        *doflist  = NULL;
-        IssmDouble  values[numnodes];
 
         /*Check that name is an element input*/
         if (!IsInput(name)) return;
+
+        int         numnodes;
+        int        *doflist = NULL;
+        IssmDouble *values  = NULL;
 
         switch(type){
@@ -1802 +1803 @@
 
         case NodesEnum:
-                _assert_(this->element_type==P1Enum);
-                /*Get dof list: */
+
+                /*Get number of nodes and dof list: */
+                numnodes = this->NumberofNodes();
+                values   = xNew<IssmDouble>(numnodes);
                 GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
 
@@ -1809 +1812 @@
                 for(int i=0;i<numnodes;i++){
                         values[i]=vector[doflist[i]];
-                        if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
-                }
+                        if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in vector");
+                }
+
                 /*Add input to the element: */
-                this->inputs->AddInput(new TriaInput(name,values,P1Enum));
+                this->inputs->AddInput(new TriaInput(name,values,this->element_type));
 
                 /*Free ressources:*/
@@ -1819 +1823 @@
 
         case NodeSIdEnum:
-                _assert_(this->element_type==P1Enum);
-                for(int i=0;i<NUMVERTICES;i++){
+
+                /*Get number of nodes and dof list: */
+                numnodes = this->NumberofNodes();
+                values   = xNew<IssmDouble>(numnodes);
+
+                for(int i=0;i<numnodes;i++){
                         values[i]=vector[nodes[i]->Sid()];
-                        if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
+                        if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in vector");
                 }
                 /*Add input to the element: */
-                this->inputs->AddInput(new TriaInput(name,values,P1Enum));
+                this->inputs->AddInput(new TriaInput(name,values,this->element_type));
                 return;
 
@@ -1832 +1840 @@
         }
 
-}
-/*}}}*/
-/*FUNCTION Tria::InputUpdateFromVector(int* vector, int name, int type);{{{*/
-void  Tria::InputUpdateFromVector(int* vector, int name, int type){
-        _error_("not supported yet!");
-}
-/*}}}*/
-/*FUNCTION Tria::InputUpdateFromVector(bool* vector, int name, int type);{{{*/
-void  Tria::InputUpdateFromVector(bool* vector, int name, int type){
-        _error_("not supported yet!");
+        /*Clean-up*/
+        xDelete<int>(doflist);
+        xDelete<IssmDouble>(values);
+
 }
 /*}}}*/
@@ -5574 +5576 @@
 
         gauss=new GaussTria();
-        for (int iv=0;iv<NUMVERTICES;iv++){
+        for(int iv=0;iv<NUMVERTICES;iv++){
                 gauss->GaussVertex(iv);
                 surfaceslopex_input->GetInputValue(&dsdx,gauss);
@@ -7003 +7005 @@
         }
 
-}
-/*}}}*/
-/*FUNCTION Tria::InputUpdateFromVectorDakota(int* vector, int name, int type);{{{*/
-void  Tria::InputUpdateFromVectorDakota(int* vector, int name, int type){
-        _error_("not supported yet!");
-}
-/*}}}*/
-/*FUNCTION Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type);{{{*/
-void  Tria::InputUpdateFromVectorDakota(bool* vector, int name, int type){
-        _error_("not supported yet!");
 }
 /*}}}*/