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

Timestamp:

05/08/13 21:00:42 (12 years ago)

Author:

adhikari

Message:

CHG: dWdt now assembles solution properly in parallel runs as well

File:

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

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

@@ -1881 +1881 @@
 void  Tria::InputUpdateFromVector(IssmDouble* vector, int name, int type){
 
-        
         const int   numdof         = NDOF1 *NUMVERTICES;
         int        *doflist        = NULL;
@@ -1890 +1889 @@
 
         switch(type){
+        #ifdef _HAVE_GIA_
+        case GiaAnalysisEnum:
+                InputUpdateFromVectorGia(vector);
+                break;
+        #endif
         case VertexEnum: 
                 /*Get values on the 3 vertices*/
@@ -1902 +1906 @@
                         this->inputs->AddInput(new TriaP1Input(name,values));
                 }
-                return;
+                return; 
 
         case NodesEnum:
@@ -1915 +1919 @@
                 /*Add input to the element: */
                 this->inputs->AddInput(new TriaP1Input(name,values));
+                
                 /*Free ressources:*/
                 xDelete<int>(doflist);
@@ -1920 +1925 @@
 
         default:
-        
-                        _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
-        }
+                _error_("type " << type << " (" << EnumToStringx(type) << ") not implemented yet");
+        }
+
 }
 /*}}}*/
@@ -3235 +3240 @@
         /*Add input to the element: */
         this->inputs->AddInput(new TriaP1Input(GiaWEnum,values));
+
+}
+/*}}}*/
+/*FUNCTION Tria::InputUpdateFromVectorGia{{{*/
+void  Tria::InputUpdateFromVectorGia(IssmDouble* vector){
+
+        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]=vector[vertexsidlist[i]];
+                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
+        }
+
+        /*Add input to the element: */
+        this->inputs->AddInput(new TriaP1Input(GiadWdtEnum,values));
 
 }