Changeset 11242

Timestamp:

01/29/12 20:04:20 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added mesh vertical velocity computation for ALE formulation

Location:

issm/trunk-jpl/src/c

Files:

• modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp (modified) (1 diff)
• objects/Vertex.cpp (modified) (2 diffs)
• objects/Vertex.h (modified) (1 diff)

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

@@ -12 +12 @@
 int UpdateVertexPositionsx(Elements* elements,Nodes* nodes,Vertices* vertices,Loads* loads,Materials* materials,Parameters* parameters){
 
-        int i;
-        Vertex* vertex=NULL;
-        double* thickness=NULL;
-        double* bed=NULL;
+        int     i;
+        Vec     vz        = NULL;
+        Vertex *vertex    = NULL;
+        double *thickness = NULL;
+        double *bed       = NULL;
 
         /*get vertex vectors for bed and thickness: */
-        GetVectorFromInputsx( &thickness,elements,nodes, vertices, loads, materials, parameters, ThicknessEnum,VertexEnum);
-        GetVectorFromInputsx( &bed      ,elements,nodes, vertices, loads, materials, parameters, BedEnum,      VertexEnum);
+        GetVectorFromInputsx(&thickness,elements,nodes, vertices, loads, materials, parameters, ThicknessEnum,VertexEnum);
+        GetVectorFromInputsx(&bed      ,elements,nodes, vertices, loads, materials, parameters, BedEnum,      VertexEnum);
+
+        /*Allocate vector*/
+        vz=NewVec(vertices->NumberOfVertices());
 
         /*Update verices new geometry: */
         for (i=0;i<vertices->Size();i++){
                 vertex=(Vertex*)vertices->GetObjectByOffset(i);
-                vertex->UpdatePosition(thickness,bed);
+                vertex->UpdatePosition(vz,parameters,thickness,bed);
         }
+
+        /*Assemble mesh velocity*/
+        VecAssemblyBegin(vz);
+        VecAssemblyEnd(vz);
 
         /*Free ressources:*/
         xfree((void**)&thickness);
         xfree((void**)&bed);
+        VecFree(&vz);
         return 1;
 }

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

@@ -71 +71 @@
         printf("   z: %g\n",z);
         printf("   sigma: %g\n",sigma);
-        printf("   connectivity: %g\n",connectivity);
+        printf("   connectivity: %i\n",connectivity);
         printf("   dof: %i\n",dof);
         printf("   clone: %i\n",clone);
@@ -273 +273 @@
 /*}}}*/
 /*FUNCTION Vertex::UpdateVertexPosition {{{1*/
-void  Vertex::UpdatePosition(double* thickness,double* bed){
+void  Vertex::UpdatePosition(Vec vz,Parameters* parameters,double* thickness,double* bed){
+
+        double oldz,newz;
+        double dt,velz;
+
+        /*Get time stepping*/
+        parameters->FindParam(&dt,TimesteppingTimeStepEnum);
 
         /*sigma remains constant. z=bed+sigma*thickness*/
-        this->z=bed[this->dof]+sigma*thickness[this->dof];
-
-}
-/*}}}*/
+        oldz = this->z;
+        newz = bed[this->dof]+sigma*thickness[this->dof];
+        velz = (newz-oldz)/dt;
+        this->z = newz;
+
+        /*put vz in vector*/
+        VecSetValue(vz,this->Sid(),velz,INSERT_VALUES);
+}
+/*}}}*/

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

@@ -63 +63 @@
                 int   Sid(void); 
                 int   Connectivity(void); 
-                void  UpdatePosition(double* thickness,double* bed);
+                void  UpdatePosition(Vec vz,Parameters* parameters,double* thickness,double* bed);
                 /*}}}*/
 };