Changeset 15428 for issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp

Timestamp:

07/04/13 10:44:52 (12 years ago)

Author:

Mathieu Morlighem

Message:

NEW: mesh properties (elements,dim,numberofvertices,...) are now Iomodel fields and fetch in the constructor. This cleans up ModelProcessor and will ease the implementation of quadratic elements

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp

@@ -12 +12 @@
 
         /*Intermediary*/
-        int i;
-        bool continuous_galerkin=true;
-        int    numberofvertices;
-        bool   ishutter;
+        bool continuous_galerkin = true;
+        bool ishutter;
 
         /*Fetch parameters: */
-        iomodel->Constant(&numberofvertices,MeshNumberofverticesEnum);
         iomodel->Constant(&ishutter,FlowequationIshutterEnum);
 
@@ -37 +34 @@
 
         /*First fetch data: */
-        iomodel->FetchData(7,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MeshElementsEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum);
+        iomodel->FetchData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum);
 
-        for (i=0;i<numberofvertices;i++){
+        for(int i=0;i<iomodel->numberofvertices;i++){
                 if(iomodel->my_vertices[i]){
 
@@ -49 +46 @@
 
         /*Clean fetched data: */
-        iomodel->DeleteData(7,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,MeshElementsEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum);
+        iomodel->DeleteData(6,MeshVertexonbedEnum,MeshVertexonsurfaceEnum,MaskVertexongroundediceEnum,MaskVertexonfloatingiceEnum,FlowequationVertexEquationEnum,MaskVertexonwaterEnum);
 
         /*Assign output pointer: */