Changeset 25826

Timestamp:

12/04/20 13:24:46 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: reverting back to original for loop

File:

• issm/trunk-jpl/src/c/main/esmfbinders.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/main/esmfbinders.cpp

@@ -65 +65 @@
                         int forcing_type=GCMForcingTerms[f];
 
-                        for(Object* & object : femmodel->elements->objects){
-                                Element* element=dynamic_cast<Element*>(object);
+                        for (int i=0;i<femmodel->elements->Size();i++){
+                                Element* element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
 
                                 switch(forcing_type){
@@ -79 +79 @@
 
                                                 /*Recover smb forcing from the gcm forcings: */
-                                                _error_("not implemented yet, line below may not work");
-                                                IssmDouble smbforcing=gcmforcings[f*numberofelements+element->Sid()];
+                                                IssmDouble smbforcing=*(gcmforcings+f*numberofelements+i); 
 
                                                 /*Convert to SI. The smbforcing from GEOS-5 in kg/s, and we transform it into m/s: */
@@ -104 +103 @@
                         int output_type=ISSMOutputTerms[f];
 
-                        for(Object* & object : femmodel->elements->objects){
-                                Element* element=dynamic_cast<Element*>(object);
+                        for (int i=0;i<femmodel->elements->Size();i++){
+                                Element* element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
 
                                 switch(output_type){
@@ -117 +116 @@
                                                 Input* surface_input = element->GetInput(SurfaceEnum); _assert_(surface_input);
                                                 surface_input->GetInputAverage(&surface);
-                                                issmoutputs[f*numberofelements+element->Sid()] = surface;
+                        
+                                                *(issmoutputs+f*numberofelements+i) = surface;
 
                                                 }
@@ -140 +140 @@
 
                 /*For the next time around, save the final time as start time */
-                femmodel->parameters->SetParam(final_time,TimeEnum);
+                femmodel->parameters->SetParam(final_time,TimesteppingStartTimeEnum);
         } /*}}}*/
         void FinalizeISSM(){ /*{{{*/