Changeset 9340 for issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

Timestamp:

08/12/11 18:07:26 (14 years ago)

Author:

Eric.Larour

Message:

Propping up IoModel class, to contain the iomodel handlle. This simplifies IoModelFetchDAta,
which then becomes the FetchData method of the IoModel class.

File:

• issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (3 diffs)

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

@@ -13 +13 @@
 #include "./ModelProcessorx.h"
 
-void    CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,Materials** pmaterials, IoModel* iomodel,FILE* iomodel_handle,const int nummodels){
+void    CreateElementsVerticesAndMaterials(Elements** pelements,Vertices** pvertices,Materials** pmaterials, IoModel* iomodel,const int nummodels){
 
         /*Intermediary*/
@@ -32 +32 @@
         
         /*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_handle);
+        ElementsAndVerticesPartitioning(&iomodel->my_elements,&iomodel->my_vertices,iomodel);
         
         /*Fetch data needed: */
-        IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
-        IoModelFetchData(&iomodel->elementconnectivity,NULL,NULL,iomodel_handle,ElementconnectivityEnum);
-        IoModelFetchData(&iomodel->upperelements,NULL,NULL,iomodel_handle,UpperelementsEnum);
-        IoModelFetchData(&iomodel->lowerelements,NULL,NULL,iomodel_handle,LowerelementsEnum);
-        IoModelFetchData(&iomodel->rheology_B,NULL,NULL,iomodel_handle,RheologyBEnum);
-        IoModelFetchData(&iomodel->rheology_n,NULL,NULL,iomodel_handle,RheologyNEnum);
-        IoModelFetchData(&iomodel->control_type,NULL,NULL,iomodel_handle,ControlTypeEnum);
-        IoModelFetchData(&iomodel->cm_min,NULL,NULL,iomodel_handle,CmMinEnum);
-        IoModelFetchData(&iomodel->cm_max,NULL,NULL,iomodel_handle,CmMaxEnum);
+        iomodel->FetchData(&iomodel->elements,NULL,NULL,ElementsEnum);
+        iomodel->FetchData(&iomodel->elementconnectivity,NULL,NULL,ElementconnectivityEnum);
+        iomodel->FetchData(&iomodel->upperelements,NULL,NULL,UpperelementsEnum);
+        iomodel->FetchData(&iomodel->lowerelements,NULL,NULL,LowerelementsEnum);
+        iomodel->FetchData(&iomodel->rheology_B,NULL,NULL,RheologyBEnum);
+        iomodel->FetchData(&iomodel->rheology_n,NULL,NULL,RheologyNEnum);
+        iomodel->FetchData(&iomodel->control_type,NULL,NULL,ControlTypeEnum);
+        iomodel->FetchData(&iomodel->cm_min,NULL,NULL,CmMinEnum);
+        iomodel->FetchData(&iomodel->cm_max,NULL,NULL,CmMaxEnum);
         
         /*Create elements and materials: */
@@ -76 +76 @@
         
         /*Create vertices: */
-        IoModelFetchData(&iomodel->x,NULL,NULL,iomodel_handle,XEnum);
-        IoModelFetchData(&iomodel->y,NULL,NULL,iomodel_handle,YEnum);
-        IoModelFetchData(&iomodel->z,NULL,NULL,iomodel_handle,ZEnum);
-        IoModelFetchData(&iomodel->bed,NULL,NULL,iomodel_handle,BedEnum);
-        IoModelFetchData(&iomodel->thickness,NULL,NULL,iomodel_handle,ThicknessEnum);
+        iomodel->FetchData(&iomodel->x,NULL,NULL,XEnum);
+        iomodel->FetchData(&iomodel->y,NULL,NULL,YEnum);
+        iomodel->FetchData(&iomodel->z,NULL,NULL,ZEnum);
+        iomodel->FetchData(&iomodel->bed,NULL,NULL,BedEnum);
+        iomodel->FetchData(&iomodel->thickness,NULL,NULL,ThicknessEnum);
         
         for (i=0;i<iomodel->numberofvertices;i++){