Changeset 9340 for issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.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/Qmu/CreateParametersQmu.cpp (modified) (6 diffs)

issm/trunk/src/c/modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp

@@ -13 +13 @@
 #include "../ModelProcessorx.h"
 
-void CreateParametersQmu(Parameters** pparameters,IoModel* iomodel,FILE* iomodel_handle,int solution_type,int analysis_type){
+void CreateParametersQmu(Parameters** pparameters,IoModel* iomodel,int solution_type,int analysis_type){
 
         /*variable declarations: {{{1*/
@@ -75 +75 @@
                 /*}}}*/
                 /*Fetch variable descriptors: {{{1*/
-                IoModelFetchData(&variabledescriptors,&numvariabledescriptors,iomodel_handle,VariabledescriptorsEnum);
+                iomodel->FetchData(&variabledescriptors,&numvariabledescriptors,VariabledescriptorsEnum);
 
                 /*Ok, we have all the variable descriptors. Build a parameter with it: */
@@ -82 +82 @@
                 /*}}}*/
                 /*Fetch response descriptors: {{{1*/
-                IoModelFetchData(&responsedescriptors,&numresponsedescriptors,iomodel_handle,ResponsedescriptorsEnum);
+                iomodel->FetchData(&responsedescriptors,&numresponsedescriptors,ResponsedescriptorsEnum);
 
                 /*Ok, we have all the response descriptors. Build a parameter with it: */
@@ -92 +92 @@
                 parameters->AddObject(new    IntParam(QmuNPartEnum,iomodel->qmu_npart));
                 
-                IoModelFetchData(&dpart,NULL,NULL,iomodel_handle,PartEnum);
+                iomodel->FetchData(&dpart,NULL,NULL,PartEnum);
 
                 if(!dpart){
 
                         /*Partition elements and vertices and nodes: */
-                        ElementsAndVerticesPartitioning(&iomodel->my_elements,&iomodel->my_vertices,iomodel,iomodel_handle);
+                        ElementsAndVerticesPartitioning(&iomodel->my_elements,&iomodel->my_vertices,iomodel);
 
                         dpart=(double*)xmalloc(iomodel->numberofvertices*sizeof(double));
@@ -113 +113 @@
                                 
                                 /*Recover data: */
-                                IoModelFetchData(&dakota_parameter,NULL,NULL,iomodel_handle,StringToEnumx(tag));
+                                iomodel->FetchData(&dakota_parameter,NULL,NULL,StringToEnumx(tag));
 
                                 /*Convert units: */
@@ -138 +138 @@
                         
                         /*Fetch the mass flux segments necessary to compute the mass fluxes.  Build a DoubleMatArrayParam object out of them: */ 
-                        IoModelFetchData(&array,&mdims_array,&ndims_array,&qmu_mass_flux_num_profiles,iomodel_handle,QmuMassFluxSegmentsEnum);
+                        iomodel->FetchData(&array,&mdims_array,&ndims_array,&qmu_mass_flux_num_profiles,QmuMassFluxSegmentsEnum);
                         if(qmu_mass_flux_num_profiles==0)_error_(" qmu_mass_flux_num_profiles is 0, when MassFlux computations were requested!");