Changeset 8926 for issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp

Timestamp:

07/12/11 16:28:11 (14 years ago)

Author:

Eric.Larour

Message:

marshall.m is now automatically feedding off of model template for each field.
this necessitated a rewrite of the ModelProcessorx, so that instead of processing
strings, it processes now enums.

File:

• issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp

@@ -24 +24 @@
 
         /*Fetch data needed: */
-        IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,"elements");
-        IoModelFetchData(&iomodel->thickness,NULL,NULL,iomodel_handle,"thickness");
-        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->elementonbed,NULL,NULL,iomodel_handle,"elementonbed");
-        IoModelFetchData(&iomodel->elementonsurface,NULL,NULL,iomodel_handle,"elementonsurface");
-        IoModelFetchData(&iomodel->elementonwater,NULL,NULL,iomodel_handle,"elementonwater");
-        IoModelFetchData(&iomodel->elements_type,NULL,NULL,iomodel_handle,"elements_type");
-        IoModelFetchData(&iomodel->rheology_B,NULL,NULL,iomodel_handle,"rheology_B");
-        IoModelFetchData(&iomodel->rheology_n,NULL,NULL,iomodel_handle,"rheology_n");
-        IoModelFetchData(&iomodel->pressure,NULL,NULL,iomodel_handle,"pressure");
-        IoModelFetchData(&iomodel->temperature,NULL,NULL,iomodel_handle,"temperature");
-        IoModelFetchData(&iomodel->geothermalflux,NULL,NULL,iomodel_handle,"geothermalflux");
-        IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,"vx");
-        IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,"vy");
-        IoModelFetchData(&iomodel->vz,NULL,NULL,iomodel_handle,"vz");
+        IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
+        IoModelFetchData(&iomodel->thickness,NULL,NULL,iomodel_handle,ThicknessEnum);
+        IoModelFetchData(&iomodel->surface,NULL,NULL,iomodel_handle,SurfaceEnum);
+        IoModelFetchData(&iomodel->bed,NULL,NULL,iomodel_handle,BedEnum);
+        IoModelFetchData(&iomodel->drag_coefficient,NULL,NULL,iomodel_handle,DragCoefficientEnum);
+        IoModelFetchData(&iomodel->drag_p,NULL,NULL,iomodel_handle,DragPEnum);
+        IoModelFetchData(&iomodel->drag_q,NULL,NULL,iomodel_handle,DragQEnum);
+        IoModelFetchData(&iomodel->elementoniceshelf,NULL,NULL,iomodel_handle,ElementOnIceShelfEnum);
+        IoModelFetchData(&iomodel->elementonbed,NULL,NULL,iomodel_handle,ElementOnBedEnum);
+        IoModelFetchData(&iomodel->elementonsurface,NULL,NULL,iomodel_handle,ElementOnSurfaceEnum);
+        IoModelFetchData(&iomodel->elementonwater,NULL,NULL,iomodel_handle,ElementOnWaterEnum);
+        IoModelFetchData(&iomodel->elements_type,NULL,NULL,iomodel_handle,ElementsTypeEnum);
+        IoModelFetchData(&iomodel->rheology_B,NULL,NULL,iomodel_handle,RheologyBEnum);
+        IoModelFetchData(&iomodel->rheology_n,NULL,NULL,iomodel_handle,RheologyNEnum);
+        IoModelFetchData(&iomodel->pressure,NULL,NULL,iomodel_handle,PressureEnum);
+        IoModelFetchData(&iomodel->temperature,NULL,NULL,iomodel_handle,TemperatureEnum);
+        IoModelFetchData(&iomodel->geothermalflux,NULL,NULL,iomodel_handle,GeothermalfluxEnum);
+        IoModelFetchData(&iomodel->vx,NULL,NULL,iomodel_handle,VxEnum);
+        IoModelFetchData(&iomodel->vy,NULL,NULL,iomodel_handle,VyEnum);
+        IoModelFetchData(&iomodel->vz,NULL,NULL,iomodel_handle,VzEnum);
 
         /*Update elements: */