Changeset 8331

Timestamp:

05/17/11 16:08:06 (14 years ago)

Author:

Eric.Larour

Message:

now deleted

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (1 diff)
• modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -1036 +1036 @@
                                         ./io/pfopen.cpp\
                                         ./io/pfclose.cpp\
-                                        ./io/ParsePetscOptions.cpp\
                                         ./EnumDefinitions/EnumDefinitions.h\
                                         ./EnumDefinitions/EnumToModelField.cpp\

issm/trunk/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp

@@ -22 +22 @@
         /*Ok, let's go through forcings: */
 
-        /*Fetch data needed: */
-        IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,"elements");
-        IoModelFetchData(&iomodel->elements_type,NULL,NULL,iomodel_handle,"elements_type");
-        IoModelFetchData(&iomodel->thickness,NULL,NULL,iomodel_handle,"thickness");
-        IoModelFetchData(&iomodel->thickness_coeff,NULL,NULL,iomodel_handle,"thickness_coeff");
-        IoModelFetchData(&iomodel->surface,NULL,NULL,iomodel_handle,"surface");
-        IoModelFetchData(&iomodel->bed,NULL,NULL,iomodel_handle,"bed");
-        IoModelFetchData(&iomodel->drag_coefficient,NULL,NULL,iomodel_handle,"drag_coefficient");
-        IoModelFetchData(&iomodel->drag_p,NULL,NULL,iomodel_handle,"drag_p");
-        IoModelFetchData(&iomodel->drag_q,NULL,NULL,iomodel_handle,"drag_q");
-        IoModelFetchData(&iomodel->elementoniceshelf,NULL,NULL,iomodel_handle,"elementoniceshelf");
-        IoModelFetchData(&iomodel->elementonwater,NULL,NULL,iomodel_handle,"elementonwater");
-        IoModelFetchData(&iomodel->rheology_B,NULL,NULL,iomodel_handle,"rheology_B");
-        IoModelFetchData(&iomodel->rheology_n,NULL,NULL,iomodel_handle,"rheology_n");
-        IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
-        IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy");
-        if(iomodel->gl_migration!=NoneEnum) IoModelFetchData(&iomodel->bathymetry,NULL,NULL,iomodel_handle,"bathymetry");
 
-        if (iomodel->dim==3){
-                IoModelFetchData(&iomodel->elementonbed,NULL,NULL,iomodel_handle,"elementonbed");
-                IoModelFetchData(&iomodel->elementonsurface,NULL,NULL,iomodel_handle,"elementonsurface");
-                IoModelFetchData(&iomodel->vz,NULL,NULL,iomodel_handle,"vz");
-                IoModelFetchData(&iomodel->accumulation_rate,NULL,NULL,iomodel_handle,"accumulation_rate");
-                IoModelFetchData(&iomodel->melting_rate,NULL,NULL,iomodel_handle,"melting_rate");
-                IoModelFetchData(&iomodel->nodeonstokes,NULL,NULL,iomodel_handle,"nodeonstokes");
-        }
-        if(iomodel->control_analysis){
-                IoModelFetchData(&iomodel->vx_obs,NULL,NULL,iomodel_handle,"vx_obs");
-                IoModelFetchData(&iomodel->vy_obs,NULL,NULL,iomodel_handle,"vy_obs");
-        }
-
-        /*Update elements: */
-        counter=0;
-        for (i=0;i<iomodel->numberofelements;i++){
-                if(iomodel->my_elements[i]){
-                        element=(Element*)elements->GetObjectByOffset(counter);
-                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
-                        counter++;
-                }
-        }
-cleanup_and_return:
-
-        /*Free data: */
-        xfree((void**)&iomodel->elements);
-        xfree((void**)&iomodel->elements_type);
-        xfree((void**)&iomodel->thickness);
-        xfree((void**)&iomodel->thickness_coeff);
-        xfree((void**)&iomodel->surface);
-        xfree((void**)&iomodel->bed);
-        xfree((void**)&iomodel->drag_coefficient);
-        xfree((void**)&iomodel->drag_p);
-        xfree((void**)&iomodel->drag_q);
-        xfree((void**)&iomodel->rheology_n);
-        xfree((void**)&iomodel->rheology_B);
-        xfree((void**)&iomodel->elementoniceshelf);
-        xfree((void**)&iomodel->elementonbed);
-        xfree((void**)&iomodel->elementonsurface);
-        xfree((void**)&iomodel->elementonwater);
-        xfree((void**)&iomodel->accumulation_rate);
-        xfree((void**)&iomodel->melting_rate);
-        xfree((void**)&iomodel->nodeonstokes);
-        xfree((void**)&iomodel->vx);
-        xfree((void**)&iomodel->vy);
-        xfree((void**)&iomodel->vz);
-        xfree((void**)&iomodel->vx_obs);
-        xfree((void**)&iomodel->vy_obs);
 }