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

Timestamp:

08/19/11 18:04:03 (14 years ago)

Author:

Eric.Larour

Message:

Major rewrite of the code so that IoModel now has a parameters dataset, which gets
loaded with all the int,char and double objects in the input file.
This is a lot more flexible, as anyone can add a field to the model, and it will
automatically appear in the IoModel parameters dataset.

Not debugged with respect to nightly runs yet. Trying to get the whole change finished.

File:

• issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (2 diffs)

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

@@ -16 +16 @@
 void    UpdateElementsPrognostic(Elements* elements, IoModel* iomodel,int analysis_counter,int analysis_type){
 
+        int    dim;
+        int    numberofelements;
+        int    prognostic_DG;
+
         /*Fetch data needed: */
+        iomodel->parameters->FindParam(&dim,DimEnum);
         iomodel->FetchData(&iomodel->elements,NULL,NULL,ElementsEnum);
+        iomodel->parameters->FindParam(&numberofelements,NumberOfElementsEnum);
+        iomodel->parameters->FindParam(&prognostic_DG,PrognosticDGEnum);
 
         /*Update elements: */
         int counter=0;
-        for(int i=0;i<iomodel->numberofelements;i++){
+        for(int i=0;i<numberofelements;i++){
                 if(iomodel->my_elements[i]){
                         Element* element=(Element*)elements->GetObjectByOffset(counter);
@@ -42 +49 @@
         iomodel->FetchDataToInput(elements,VyEnum);
 
-        if(iomodel->prognostic_DG){
+        if(prognostic_DG){
                 iomodel->FetchDataToInput(elements,SpcthicknessEnum); //for DG, we need the spc in the element
         }
         
-        if (iomodel->dim==3){
+        if (dim==3){
                 iomodel->FetchDataToInput(elements,ElementOnBedEnum);
                 iomodel->FetchDataToInput(elements,ElementOnSurfaceEnum);