Changeset 16336

Timestamp:

10/08/13 11:01:21 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: improving mesh2dvertical capabilities

Location:

issm/trunk-jpl/src/c

Files:

• classes/Vertex.cpp (modified) (1 diff)
• modules/IoModelToConstraintsx/IoModelToConstraintsx.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp (modified) (1 diff)

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

@@ -45 +45 @@
 
         /*all the initialization has been done by the initializer, just fill in the id: */
-        this->id=vertex_id;
-        this->sid=vertex_sid;
-        this->pid=UNDEF;
-        this->x=vertex_x;
-        this->y=vertex_y;
-        this->z=vertex_z;
-        this->sigma=vertex_sigma;
-        this->connectivity=vertex_connectivity;
+        this->id           = vertex_id;
+        this->sid          = vertex_sid;
+        this->pid          = UNDEF;
+        this->x            = vertex_x;
+        this->y            = vertex_y;
+        this->z            = vertex_z;
+        this->sigma        = vertex_sigma;
+        this->connectivity = vertex_connectivity;
 
         return;

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

@@ -50 +50 @@
                         switch(iomodel->meshtype){
                                 case Mesh2DhorizontalEnum: elementnbv = 3; break;
+                                case Mesh2DverticalEnum:   elementnbv = 3; break;
                                 case Mesh3DEnum:           elementnbv = 6; break;
-                                default: _error_("3d is the only supported dimension");
+                                default: _error_("mesh type not supported yet");
                         }
                         break;

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

@@ -99 +99 @@
 
         for(i=0;i<iomodel->numberofvertices;i++){
-
-                /*vertices and nodes (same number, as we are running continuous galerkin formulation): */
-                if(iomodel->my_vertices[i]){
-
-                        /*Add vertex to vertices dataset: */
-                        vertices->AddObject(new Vertex(i+1,i,i,iomodel));
-                }
+                if(iomodel->my_vertices[i]) vertices->AddObject(new Vertex(i+1,i,i,iomodel));
         }
 

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateNumberNodeToElementConnectivity.cpp

@@ -35 +35 @@
         connectivity=xNewZeroInit<int>(iomodel->numberofvertices);
 
-        /*Get element width (3 or 6)*/
-        if(iomodel->meshtype==Mesh2DhorizontalEnum){
-                elementswidth=3;
-        }
-        else{
-                elementswidth=6;
+        /*Get element width*/
+        switch(iomodel->meshtype){
+                case Mesh2DhorizontalEnum: elementswidth=3; break;
+                case Mesh2DverticalEnum:   elementswidth=3; break;
+                case Mesh3DEnum:           elementswidth=6; break;
+                default:                   _error_("mesh not supported yet");
         }