Changeset 6217

Timestamp:

10/08/10 17:12:51 (14 years ago)

Author:

Mathieu Morlighem

Message:

Control fields loaded only once

Location:

issm/trunk/src/c/modules/ModelProcessorx

Files:

• Balancedthickness/UpdateElementsBalancedthickness.cpp (modified) (2 diffs)
• DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (3 diffs)

issm/trunk/src/c/modules/ModelProcessorx/Balancedthickness/UpdateElementsBalancedthickness.cpp

@@ -36 +36 @@
                 IoModelFetchData(&iomodel->elementonsurface,NULL,NULL,iomodel_handle,"elementonsurface");
         }
-        if(iomodel->control_analysis){
-                IoModelFetchData(&iomodel->control_type,NULL,NULL,iomodel_handle,"control_type");
-                IoModelFetchData(&iomodel->thickness_obs,NULL,NULL,iomodel_handle,"thickness_obs");
-                IoModelFetchData(&iomodel->weights,NULL,NULL,iomodel_handle,"weights");
-        }
 
         /*Update elements: */
@@ -65 +60 @@
         xfree((void**)&iomodel->melting_rate);
         xfree((void**)&iomodel->accumulation_rate);
-        xfree((void**)&iomodel->thickness_obs);
-        xfree((void**)&iomodel->weights);
-        xfree((void**)&iomodel->control_type);
 }

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp

@@ -47 +47 @@
         }
         if(iomodel->control_analysis){
-                IoModelFetchData(&iomodel->control_type,NULL,NULL,iomodel_handle,"control_type");
                 IoModelFetchData(&iomodel->vx_obs,NULL,NULL,iomodel_handle,"vx_obs");
                 IoModelFetchData(&iomodel->vy_obs,NULL,NULL,iomodel_handle,"vy_obs");
-                IoModelFetchData(&iomodel->weights,NULL,NULL,iomodel_handle,"weights");
         }
 
@@ -62 +60 @@
                 }
         }
-        cleanup_and_return:
+cleanup_and_return:
 
         /*Free data: */
@@ -87 +85 @@
         xfree((void**)&iomodel->vx_obs);
         xfree((void**)&iomodel->vy_obs);
-        xfree((void**)&iomodel->weights);
-        xfree((void**)&iomodel->control_type);
 }