Changeset 14782

Timestamp:

04/29/13 11:26:07 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: InputUpdateFromSolution for GIA has to be different because it uses Vertices SIDs

Location:

issm/trunk-jpl/src/c/classes/objects/Elements

Files:

• Tria.cpp (modified) (2 diffs)
• Tria.h (modified) (1 diff)

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

@@ -1765 +1765 @@
                 #ifdef _HAVE_GIA_
                 case GiaAnalysisEnum:
-                        InputUpdateFromSolutionOneDof(solution,GiaWEnum);
+                        InputUpdateFromSolutionGia(solution);
                         break;
                 #endif
@@ -3179 +3179 @@
 
         return;
+}
+/*}}}*/
+/*FUNCTION Tria::InputUpdateFromSolutionGia{{{*/
+void  Tria::InputUpdateFromSolutionGia(IssmDouble* solution){
+
+        int vertexsidlist[NUMVERTICES];
+        IssmDouble    values[NUMVERTICES];
+
+        /*Get sid list: */
+        this->GetVertexSidList(&vertexsidlist[0]);
+
+        /*Use the dof list to index into the solution vector: */
+        for(int i=0;i<NUMVERTICES;i++){
+                values[i]=solution[vertexsidlist[i]];
+                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
+        }
+
+        /*Add input to the element: */
+        this->inputs->AddInput(new TriaP1Input(enum_type,values));
+
+        /*Free ressources:*/
+        xDelete<int>(doflist);
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h

@@ -143 +143 @@
                 #ifdef _HAVE_GIA_
                 void   GiaDeflection(Vector<IssmDouble>* wg,IssmDouble* x,IssmDouble* y);
+                void   InputUpdateFromSolutionGia(IssmDouble* solution);
                 #endif