Changeset 8985

Timestamp:

07/14/11 09:19:36 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added Update elements for all analyses

Location:

issm/trunk/src/c/modules/ModelProcessorx

Files:

• Balancethickness/UpdateElementsBalancethickness.cpp (modified) (1 diff)
• Balancevelocities/UpdateElementsBalancevelocities.cpp (modified) (1 diff)
• BedSlope/UpdateElementsBedSlope.cpp (modified) (1 diff)
• DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp (modified) (3 diffs)
• DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp (modified) (1 diff)
• DiagnosticVert/UpdateElementsDiagnosticVert.cpp (modified) (1 diff)
• Enthalpy/UpdateElementsEnthalpy.cpp (modified) (1 diff)
• Hydrology/UpdateElementsHydrology.cpp (modified) (1 diff)
• Melting/UpdateElementsMelting.cpp (modified) (1 diff)
• Prognostic/UpdateElementsPrognostic.cpp (modified) (1 diff)
• SurfaceSlope/UpdateElementsSurfaceSlope.cpp (modified) (1 diff)
• Thermal/UpdateElementsThermal.cpp (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp

@@ -18 +18 @@
         /*Fetch data needed: */
         IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
+
+        /*Update elements: */
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
+                if(iomodel->my_elements[i]){
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
+                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        counter++;
+                }
+        }
 
         IoModelToInputsx(elements,iomodel,iomodel_handle,ThicknessEnum);

issm/trunk/src/c/modules/ModelProcessorx/Balancevelocities/UpdateElementsBalancevelocities.cpp

@@ -18 +18 @@
         /*Fetch data needed: */
         IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
+
+        /*Update elements: */
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
+                if(iomodel->my_elements[i]){
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
+                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        counter++;
+                }
+        }
 
         IoModelToInputsx(elements,iomodel,iomodel_handle,ThicknessEnum);

issm/trunk/src/c/modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp

@@ -19 +19 @@
         IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
 
+        /*Update elements: */
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
+                if(iomodel->my_elements[i]){
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
+                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        counter++;
+                }
+        }
+
         IoModelToInputsx(elements,iomodel,iomodel_handle,SurfaceEnum);
         IoModelToInputsx(elements,iomodel,iomodel_handle,BedEnum);

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

@@ -16 +16 @@
 void    UpdateElementsDiagnosticHoriz(Elements* elements, IoModel* iomodel,FILE* iomodel_handle,int analysis_counter,int analysis_type){
 
-        /*Intermediary*/
-        int      i;
-        int      counter;
-        Element *element = NULL;
-
         /*Now, is the flag macayaealpattyn on? otherwise, do nothing: */
-        if (!iomodel->ismacayealpattyn & !iomodel->isstokes)goto cleanup_and_return;
+        if (!iomodel->ismacayealpattyn & !iomodel->isstokes) return;
 
         /*Fetch data needed: */
@@ -29 +24 @@
 
         /*Update elements: */
-        counter=0;
-        for (i=0;i<iomodel->numberofelements;i++){
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
                 if(iomodel->my_elements[i]){
-                        element=(Element*)elements->GetObjectByOffset(counter);
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
                         element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
                         counter++;
@@ -86 +81 @@
                 if(iomodel->qmu_analysis)elements->InputDuplicate(VzEnum,QmuVzEnum);
         }
-
         
-        cleanup_and_return:
         /*Free data: */
         xfree((void**)&iomodel->elements);

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp

@@ -21 +21 @@
         /*Fetch data needed: */
         IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
+
+        /*Update elements: */
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
+                if(iomodel->my_elements[i]){
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
+                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        counter++;
+                }
+        }
         
         IoModelToInputsx(elements,iomodel,iomodel_handle,NodeOnHutterEnum);

issm/trunk/src/c/modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp

@@ -22 +22 @@
         IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
 
+        /*Update elements: */
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
+                if(iomodel->my_elements[i]){
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
+                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        counter++;
+                }
+        }
+
         IoModelToInputsx(elements,iomodel,iomodel_handle,ThicknessEnum);
         IoModelToInputsx(elements,iomodel,iomodel_handle,ThicknessCoeffEnum);

issm/trunk/src/c/modules/ModelProcessorx/Enthalpy/UpdateElementsEnthalpy.cpp

@@ -21 +21 @@
         /*Fetch data needed: */
         IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
+
+        /*Update elements: */
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
+                if(iomodel->my_elements[i]){
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
+                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        counter++;
+                }
+        }
 
         IoModelToInputsx(elements,iomodel,iomodel_handle,ThicknessEnum);

issm/trunk/src/c/modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp

@@ -18 +18 @@
         /*Fetch data needed: */
         IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
+
+        /*Update elements: */
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
+                if(iomodel->my_elements[i]){
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
+                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        counter++;
+                }
+        }
 
         IoModelToInputsx(elements,iomodel,iomodel_handle,ThicknessEnum);

issm/trunk/src/c/modules/ModelProcessorx/Melting/UpdateElementsMelting.cpp

@@ -21 +21 @@
         /*Fetch data needed: */
         IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
+
+        /*Update elements: */
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
+                if(iomodel->my_elements[i]){
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
+                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        counter++;
+                }
+        }
 
         /*Create inputs: */

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

@@ -18 +18 @@
         /*Fetch data needed: */
         IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
+
+        /*Update elements: */
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
+                if(iomodel->my_elements[i]){
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
+                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        counter++;
+                }
+        }
 
         IoModelToInputsx(elements,iomodel,iomodel_handle,ThicknessEnum);

issm/trunk/src/c/modules/ModelProcessorx/SurfaceSlope/UpdateElementsSurfaceSlope.cpp

@@ -19 +19 @@
         IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
 
+        /*Update elements: */
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
+                if(iomodel->my_elements[i]){
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
+                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        counter++;
+                }
+        }
+
         IoModelToInputsx(elements,iomodel,iomodel_handle,SurfaceEnum);
         IoModelToInputsx(elements,iomodel,iomodel_handle,BedEnum);

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

@@ -21 +21 @@
         /*Fetch data needed: */
         IoModelFetchData(&iomodel->elements,NULL,NULL,iomodel_handle,ElementsEnum);
+
+        /*Update elements: */
+        int counter=0;
+        for(int i=0;i<iomodel->numberofelements;i++){
+                if(iomodel->my_elements[i]){
+                        Element* element=(Element*)elements->GetObjectByOffset(counter);
+                        element->Update(i,iomodel,analysis_counter,analysis_type); //we need i to index into elements.
+                        counter++;
+                }
+        }
 
         IoModelToInputsx(elements,iomodel,iomodel_handle,ThicknessEnum);