Changeset 23514

Timestamp:

12/06/18 20:57:59 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving epart to iomodel

Location:

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

Files:

• ElementsAndVerticesPartitioning.cpp (modified) (3 diffs)
• ModelProcessorx.cpp (modified) (1 diff)
• ModelProcessorx.h (modified) (1 diff)

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

@@ -15 +15 @@
 #include "../ModelProcessorx/ModelProcessorx.h"
 
-void  ElementsAndVerticesPartitioning(bool** pmy_elements,bool** pmy_vertices,IoModel* iomodel){
+void  ElementsAndVerticesPartitioning(IoModel* iomodel){
 
         int numberofelements2d;
@@ -33 +33 @@
 
         /*First, check that partitioning has not yet been carryed out. Just check whether my_elements pointers is not already assigned a value: */
-        if(*pmy_elements) return;
+        if(iomodel->my_elements) return;
 
         /*Number of vertices per elements, needed to correctly retrieve data: */
@@ -120 +120 @@
         xDelete<int>(vertex_pairing);
 
-        /*cleanup and assign output pointer*/
-        xDelete<int>(epart);
-        *pmy_elements=my_elements;
-        *pmy_vertices=my_vertices;
+        /*Assign pointers to iomodel*/
+        iomodel->epart      =epart;
+        iomodel->my_elements=my_elements;
+        iomodel->my_vertices=my_vertices;
 }

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

@@ -40 +40 @@
 
         /*Partition Elements and Nodes*/
-        ElementsAndVerticesPartitioning(&iomodel->my_elements,&iomodel->my_vertices,iomodel);
+        ElementsAndVerticesPartitioning(iomodel);
 
         /*Create elements, vertices and materials, independent of analysis_enum: */

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

@@ -25 +25 @@
 
 /*partitioning: */
-void ElementsAndVerticesPartitioning(bool** pmy_elements,bool** pmy_vertices, IoModel* iomodel);
+void ElementsAndVerticesPartitioning(IoModel* iomodel);
 void DiscontinuousGalerkinNodesPartitioning(bool** pmy_nodes,bool* my_elements,bool* my_vertices,  IoModel* iomodel);
 void FacesPartitioning(IoModel* iomodel);