Changeset 3673 for issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateParametersPrognostic2.cpp

Timestamp:

05/08/10 14:37:25 (15 years ago)

Author:

Eric.Larour

Message:

Redid Params and Inputs

File:

• issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateParametersPrognostic2.cpp (modified) (2 diffs)

issm/trunk/src/c/ModelProcessorx/Prognostic2/CreateParametersPrognostic2.cpp

@@ -11 +11 @@
 #include "../ModelProcessorx.h"
 
-void CreateParametersPrognostic2(DataSet** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){
+void CreateParametersPrognostic2(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){
         
         Param*   param = NULL;
-        DataSet* parameters=NULL;
+        Parameters* parameters=NULL;
         int      count;
         int      i;
@@ -86 +86 @@
         xfree((void**)&iomodel->bed);
 
-        /*Get melting: */
-        IoModelFetchData(&iomodel->melting,NULL,NULL,iomodel_handle,"melting");
-        if(iomodel->melting) for(i=0;i<iomodel->numberofvertices;i++)iomodel->melting[i]=iomodel->melting[i]/iomodel->yts;
+        /*Get melting_rate: */
+        IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate");
+        if(iomodel->melting_rate) for(i=0;i<iomodel->numberofvertices;i++)iomodel->melting_rate[i]=iomodel->melting_rate[i]/iomodel->yts;
         
         count++;
         param= new Param(count,"m_g",DOUBLEVEC);
-        if(iomodel->melting) param->SetDoubleVec(iomodel->melting,iomodel->numberofvertices,1);
-        else param->SetDoubleVec(iomodel->melting,0,1);
+        if(iomodel->melting_rate) param->SetDoubleVec(iomodel->melting_rate,iomodel->numberofvertices,1);
+        else param->SetDoubleVec(iomodel->melting_rate,0,1);
         parameters->AddObject(param);
 
-        /*Free melting: */
-        xfree((void**)&iomodel->melting);
+        /*Free melting_rate: */
+        xfree((void**)&iomodel->melting_rate);
 
-        /*Get accumulation: */
-        IoModelFetchData(&iomodel->accumulation,NULL,NULL,iomodel_handle,"accumulation");
-        if(iomodel->accumulation) for(i=0;i<iomodel->numberofvertices;i++)iomodel->accumulation[i]=iomodel->accumulation[i]/iomodel->yts;
+        /*Get accumulation_rate: */
+        IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate");
+        if(iomodel->accumulation_rate) for(i=0;i<iomodel->numberofvertices;i++)iomodel->accumulation_rate[i]=iomodel->accumulation_rate[i]/iomodel->yts;
         
         count++;
         param= new Param(count,"a_g",DOUBLEVEC);
-        if(iomodel->accumulation) param->SetDoubleVec(iomodel->accumulation,iomodel->numberofvertices,1);
-        else param->SetDoubleVec(iomodel->accumulation,0,0);
+        if(iomodel->accumulation_rate) param->SetDoubleVec(iomodel->accumulation_rate,iomodel->numberofvertices,1);
+        else param->SetDoubleVec(iomodel->accumulation_rate,0,0);
         parameters->AddObject(param);
 
-        /*Free accumulation: */
-        xfree((void**)&iomodel->accumulation);
+        /*Free accumulation_rate: */
+        xfree((void**)&iomodel->accumulation_rate);
 
         /*Assign output pointer: */