Changeset 11245

Timestamp:

01/30/12 08:25:57 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added vz mesh vertical velocity for Arbitrary Eulerian Lagrangian formulation

Location:

issm/trunk-jpl/src/c

Files:

• modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (1 diff)
• objects/Vertex.cpp (modified) (1 diff)
• solutions/transient_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp

@@ -35 +35 @@
         VecAssemblyEnd(vz);
 
+        /*Update element inputs*/
+        InputUpdateFromVectorx(elements,nodes,vertices,loads,materials,parameters,vz,VzMeshEnum,VertexEnum);
+
         /*Free ressources:*/
         xfree((void**)&thickness);

issm/trunk-jpl/src/c/objects/Elements/Penta.cpp

@@ -2043 +2043 @@
                                 name==VyEnum ||
                                 name==VzEnum ||
+                                name==VxMeshEnum ||
+                                name==VyMeshEnum ||
+                                name==VzMeshEnum ||
                                 name==InversionVxObsEnum ||
                                 name==InversionVyObsEnum ||

issm/trunk-jpl/src/c/objects/Vertex.cpp

@@ -286 +286 @@
         velz = (newz-oldz)/dt;
         this->z = newz;
+        //velz = 0; //FOR NOW!!!
 
         /*put vz in vector*/
-        VecSetValue(vz,this->Sid(),velz,INSERT_VALUES);
-}
-/*}}}*/
+        VecSetValue(vz,this->dof,velz,INSERT_VALUES);
+}
+/*}}}*/

issm/trunk-jpl/src/c/solutions/transient_core.cpp

@@ -125 +125 @@
                 if(solution_type==TransientSolutionEnum && !control_analysis && (step%output_frequency==0 || time==finaltime)){
                         _printf_(VerboseSolution(),"   saving results\n");
+                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VzMeshEnum,step,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VxEnum,step,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,VyEnum,step,time);