Changeset 4424

Timestamp:

07/07/10 09:17:03 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed Prognostic2

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/Prognostic2/CreateNodesPrognostic2.cpp (modified) (2 diffs)
• objects/Elements/Tria.cpp (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/Prognostic2/CreateNodesPrognostic2.cpp

@@ -61 +61 @@
 
                                 /*Add node to nodes dataset: */
-                                nodes->AddObject(new Node(node_id,node_id-1,vertex_id,io_index,iomodel,Balancedthickness2AnalysisEnum));
+                                nodes->AddObject(new Node(node_id,node_id-1,vertex_id,io_index,iomodel,Prognostic2AnalysisEnum));
 
                         }
@@ -75 +75 @@
         xfree((void**)&iomodel->gridonicesheet);
         xfree((void**)&iomodel->gridoniceshelf);
+        xfree((void**)&iomodel->elements);
 
         /*Assign output pointer: */

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -5796 +5796 @@
 /*FUNCTION Tria::InputUpdateFromSolutionPrognostic2 {{{1*/
 void  Tria::InputUpdateFromSolutionPrognostic2(double* solution){
-        ISSMERROR(" not supported yet!");
+        int i;
+
+        const int    numvertices=3;
+        const int    numdofpervertex=1;
+        const int    numdof=numdofpervertex*numvertices;
+
+        int          doflist[numdof];
+        double       values[numdof];
+
+        int          dummy;
+
+        /*Get dof list: */
+        GetDofList(&doflist[0],&dummy);
+
+        /*Use the dof list to index into the solution vector: */
+        for(i=0;i<numdof;i++){
+                values[i]=solution[doflist[i]];
+        }
+
+        /*Add thickness as inputs to the tria element: */
+        this->inputs->AddInput(new TriaVertexInput(ThicknessEnum,values));
 }
 /*}}}*/