Changeset 3462

Timestamp:

04/08/10 09:02:06 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor bug fix

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• Balancedthickness/CreateParametersBalancedthickness.cpp (modified) (2 diffs)
• Prognostic/CreateParametersPrognostic.cpp (modified) (3 diffs)

issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateParametersBalancedthickness.cpp

@@ -1 @@
- * \brief driver for creating parameters dataset, for prognostic analysis.
+ /* \brief driver for creating parameters dataset, for prognostic analysis.
  */ 
 
@@ -50 +50 @@
         count++;
         param= new Param(count,"m_g",DOUBLEVEC);
-        if(iomodel->melting) param->SetDoubleVec(melting,iomodel->numberofvertices,1);
-        else param->SetDoubleVec(melting,0,1);
+        if(iomodel->melting) param->SetDoubleVec(iomodel->melting,iomodel->numberofvertices,1);
+        else param->SetDoubleVec(iomodel->melting,0,1);
         parameters->AddObject(param);
 

issm/trunk/src/c/ModelProcessorx/Prognostic/CreateParametersPrognostic.cpp

@@ -50 +50 @@
         parameters->FindParam(&dim,"dim");
         if (dim==3){ 
-                IoModelFetchData(&pressure,NULL,NULL,iomodel_handle,"pressure");
+                IoModelFetchData(&iomodel->pressure,NULL,NULL,iomodel_handle,"pressure");
                 
                 count++;
                 param= new Param(count,"p_g",DOUBLEVEC);
-                if(pressure) param->SetDoubleVec(pressure,iomodel->numberofvertices,1);
-                else param->SetDoubleVec(pressure,0,0);
+                if(iomodel->pressure) param->SetDoubleVec(iomodel->pressure,iomodel->numberofvertices,1);
+                else param->SetDoubleVec(iomodel->pressure,0,0);
                 parameters->AddObject(param);
 
                 /*Free pressure: */
-                xfree((void**)&pressure);
+                xfree((void**)&iomodel->pressure);
         }
 
@@ -65 +65 @@
         parameters->FindParam(&dim,"dim");
         if (dim==3){ 
-                IoModelFetchData(&temperature,NULL,NULL,iomodel_handle,"temperature");
+                IoModelFetchData(&iomodel->temperature,NULL,NULL,iomodel_handle,"temperature");
                 
                 count++;
                 param= new Param(count,"t_g",DOUBLEVEC);
-                if(temperature) param->SetDoubleVec(temperature,iomodel->numberofvertices,1);
-                else param->SetDoubleVec(temperature,0,0);
+                if(iomodel->temperature) param->SetDoubleVec(iomodel->temperature,iomodel->numberofvertices,1);
+                else param->SetDoubleVec(iomodel->temperature,0,0);
                 parameters->AddObject(param);
 
                 /*Free temperature: */
-                xfree((void**)&temperature);
+                xfree((void**)&iomodel->temperature);
         }
 
@@ -114 +114 @@
 
         /*Get melting: */
-        IoModelFetchData(&iiomodel->melting,NULL,NULL,iomodel_handle,"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;