Changeset 4364

Timestamp:

06/30/10 15:26:03 (15 years ago)

Author:

Mathieu Morlighem

Message:

fields from control methods not needed anymore

Location:

issm/trunk/src/c/modules/ModelProcessorx

Files:

• DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (2 diffs)
• DiagnosticStokes/UpdateElementsDiagnosticStokes.cpp (modified) (2 diffs)

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

@@ -38 +38 @@
         IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
         IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy");
-        if (iomodel->control_analysis){
-                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");
-        }
-
         if (iomodel->dim==3){
                 IoModelFetchData(&iomodel->elementonbed,NULL,NULL,iomodel_handle,"elementonbed");
@@ -79 +73 @@
         xfree((void**)&iomodel->vy);
         xfree((void**)&iomodel->vz);
-        if (iomodel->control_analysis){
-                xfree((void**)&iomodel->vx_obs);
-                xfree((void**)&iomodel->vy_obs);
-                xfree((void**)&iomodel->weights);
-        }
         xfree((void**)&iomodel->upperelements);
         xfree((void**)&iomodel->lowerelements);

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticStokes/UpdateElementsDiagnosticStokes.cpp

@@ -45 +45 @@
         IoModelFetchData(&iomodel->upperelements,NULL,NULL,iomodel_handle,"upperelements");
         IoModelFetchData(&iomodel->lowerelements,NULL,NULL,iomodel_handle,"lowerelements");
-        if (iomodel->control_analysis){
-                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");
-        }
 
         /*Update elements: */
@@ -83 +78 @@
         xfree((void**)&iomodel->upperelements);
         xfree((void**)&iomodel->lowerelements);
-        if (iomodel->control_analysis){
-                xfree((void**)&iomodel->vx_obs);
-                xfree((void**)&iomodel->vy_obs);
-                xfree((void**)&iomodel->weights);
-        }
 }