Changeset 9343 for issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

Timestamp:

08/12/11 18:45:12 (14 years ago)

Author:

Eric.Larour

Message:

Folded IoModelToInputsx into IoModel class

File:

• issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

@@ -29 +29 @@
         }
 
-        IoModelToInputsx(elements,iomodel,ThicknessEnum);
-        IoModelToInputsx(elements,iomodel,SurfaceEnum);
-        IoModelToInputsx(elements,iomodel,BedEnum);
-        IoModelToInputsx(elements,iomodel,ElementOnIceShelfEnum);
-        IoModelToInputsx(elements,iomodel,ElementOnWaterEnum);
-        IoModelToInputsx(elements,iomodel,SurfaceAccumulationRateEnum);
-        IoModelToInputsx(elements,iomodel,SurfaceAblationRateEnum);
-        IoModelToInputsx(elements,iomodel,SurfaceMassBalanceEnum);
-        IoModelToInputsx(elements,iomodel,BasalMeltingRateEnum);
-        IoModelToInputsx(elements,iomodel,BasalMeltingRateCorrectionEnum);
-        IoModelToInputsx(elements,iomodel,VxEnum);
-        IoModelToInputsx(elements,iomodel,VyEnum);
+        iomodel->FetchDataToInput(elements,ThicknessEnum);
+        iomodel->FetchDataToInput(elements,SurfaceEnum);
+        iomodel->FetchDataToInput(elements,BedEnum);
+        iomodel->FetchDataToInput(elements,ElementOnIceShelfEnum);
+        iomodel->FetchDataToInput(elements,ElementOnWaterEnum);
+        iomodel->FetchDataToInput(elements,SurfaceAccumulationRateEnum);
+        iomodel->FetchDataToInput(elements,SurfaceAblationRateEnum);
+        iomodel->FetchDataToInput(elements,SurfaceMassBalanceEnum);
+        iomodel->FetchDataToInput(elements,BasalMeltingRateEnum);
+        iomodel->FetchDataToInput(elements,BasalMeltingRateCorrectionEnum);
+        iomodel->FetchDataToInput(elements,VxEnum);
+        iomodel->FetchDataToInput(elements,VyEnum);
 
         if(iomodel->prognostic_DG){
-                IoModelToInputsx(elements,iomodel,SpcthicknessEnum); //for DG, we need the spc in the element
+                iomodel->FetchDataToInput(elements,SpcthicknessEnum); //for DG, we need the spc in the element
         }
         
         if (iomodel->dim==3){
-                IoModelToInputsx(elements,iomodel,ElementOnBedEnum);
-                IoModelToInputsx(elements,iomodel,ElementOnSurfaceEnum);
-                IoModelToInputsx(elements,iomodel,PressureEnum);
-                IoModelToInputsx(elements,iomodel,TemperatureEnum);
+                iomodel->FetchDataToInput(elements,ElementOnBedEnum);
+                iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);
+                iomodel->FetchDataToInput(elements,PressureEnum);
+                iomodel->FetchDataToInput(elements,TemperatureEnum);
         }