Changeset 15421

Timestamp:

07/03/13 16:20:05 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moved Element and Vertex partitioning to CreateDataSets

Location:

issm/trunk-jpl/src/c/modules/ModelProcessorx

Files:

• CreateDataSets.cpp (modified) (2 diffs)
• CreateElementsVerticesAndMaterials.cpp (modified) (2 diffs)

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

@@ -11 +11 @@
 #include "../../classes/classes.h"
 #include "../../shared/shared.h"
+#include "../MeshPartitionx/MeshPartitionx.h"
 #include "./ModelProcessorx.h"
 
@@ -19 +20 @@
         Materials  *materials  = NULL;
         Parameters *parameters = NULL;
+
+        /*Process Finite Element Mesh*/
+
+        /*Partition Elements and Nodes*/
+        ElementsAndVerticesPartitioning(&iomodel->my_elements,&iomodel->my_vertices,iomodel);
 
         /*Create elements, vertices and materials, independent of analysis_type: */

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

@@ -6 +6 @@
 #include "../../classes/classes.h"
 #include "../../shared/shared.h"
-#include "../MeshPartitionx/MeshPartitionx.h"
 #include "./ModelProcessorx.h"
 
@@ -39 +38 @@
         vertices  = new Vertices();
         materials = new Materials();
-
-        /*First, partition elements and vertices. Nodes will partitioned on a per analysis_type basis. If partitining already done, ignore: */
-        ElementsAndVerticesPartitioning(&iomodel->my_elements,&iomodel->my_vertices,iomodel);
 
         iomodel->FetchData(2,MeshElementsEnum,MeshElementconnectivityEnum);