Changeset 13689

Timestamp:

10/16/12 09:37:32 (12 years ago)

Author:

Eric.Larour

Message:

CHG: moved UpdateVertexPositionx to FemModel method

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/FemModel.cpp (modified) (1 diff)
• classes/FemModel.h (modified) (1 diff)
• modules/UpdateVertexPositionsx (deleted)
• modules/modules.h (modified) (1 diff)
• solutions/transient_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -290 +290 @@
                                         ./modules/TimeAdaptx/TimeAdaptx.h\
                                         ./modules/TimeAdaptx/TimeAdaptx.cpp\
-                                        ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.h\
-                                        ./modules/UpdateVertexPositionsx/UpdateVertexPositionsx.cpp\
                                         ./modules/ConfigureObjectsx/ConfigureObjectsx.h\
                                         ./modules/ConfigureObjectsx/ConfigureObjectsx.cpp\

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -337 +337 @@
 }
 /*}}}*/
+
+/*Modules:*/
+/*FUNCTION FemModel::UpdateVertexPositionsx(void){{{*/
+int FemModel::UpdateVertexPositionsx(void){
+
+        int     i;
+        Vector<IssmDouble>*     vz        = NULL;
+        Vertex *vertex    = NULL;
+        IssmDouble *thickness = NULL;
+        IssmDouble *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);
+
+        /*Allocate vector*/
+        vz=new Vector<IssmDouble>(vertices->NumberOfVertices());
+
+        /*Update verices new geometry: */
+        for (i=0;i<vertices->Size();i++){
+                vertex=(Vertex*)vertices->GetObjectByOffset(i);
+                vertex->UpdatePosition(vz,parameters,thickness,bed);
+        }
+
+        /*Assemble mesh velocity*/
+        vz->Assemble();
+
+        /*Update element inputs*/
+        InputUpdateFromVectorx(elements,nodes,vertices,loads,materials,parameters,vz,VzMeshEnum,VertexEnum);
+
+        /*Free ressources:*/
+        xDelete<IssmDouble>(thickness);
+        xDelete<IssmDouble>(bed);
+        xdelete(&vz);
+        return 1;
+}
+/*}}}*/

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -64 +64 @@
                 /*}}}*/
                 /*Modules: {{{*/
-
-
+                int UpdateVertexPositionsx(void);
 
                 /*}}}*/

issm/trunk-jpl/src/c/modules/modules.h

@@ -121 +121 @@
 #include "./ThicknessAlongGradientx/ThicknessAlongGradientx.h"
 #include "./ThicknessAcrossGradientx/ThicknessAcrossGradientx.h"
-#include "./UpdateVertexPositionsx/UpdateVertexPositionsx.h"
 #include "./UpdateConstraintsx/UpdateConstraintsx.h"
 #include "./UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.h"

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

@@ -121 +121 @@
                         prognostic_core(femmodel);
                         if(VerboseSolution()) _pprintLine_("   updating vertices positions");
-                        UpdateVertexPositionsx(femmodel->elements, femmodel->nodes,femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); 
+                        femmodel->UpdateVertexPositionsx();
                 }