Changeset 25554

Timestamp:

09/11/20 07:26:02 (5 years ago)

Author:

bdef

Message:

CHG: Some more iterator loop changes

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (22 diffs)
• analyses/StressbalanceSIAAnalysis.cpp (modified) (3 diffs)
• classes/Constraints/Constraints.cpp (modified) (1 diff)
• classes/Contours.cpp (modified) (2 diffs)
• classes/Elements/Elements.cpp (modified) (1 diff)
• classes/ExternalResults/Results.cpp (modified) (5 diffs)
• classes/FemModel.cpp (modified) (12 diffs)
• classes/Vertices.cpp (modified) (6 diffs)
• classes/kriging/Observations.cpp (modified) (8 diffs)
• cores/controladm1qn3_core.cpp (modified) (4 diffs)
• cores/controlvalidation_core.cpp (modified) (5 diffs)
• cores/love_core.cpp (modified) (3 diffs)
• cores/transient_core.cpp (modified) (3 diffs)
• main/kriging.cpp (modified) (3 diffs)
• modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp (modified) (2 diffs)
• modules/ConfigureObjectsx/ConfigureObjectsx.cpp (modified) (1 diff)
• modules/ConstraintsStatex/ConstraintsStatex.cpp (modified) (2 diffs)
• modules/ConstraintsStatex/RiftConstraintsState.cpp (modified) (7 diffs)
• modules/ContourToMeshx/ContourToMeshxt.cpp (modified) (2 diffs)
• modules/ContourToNodesx/ContourToNodesx.cpp (modified) (1 diff)
• modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp (modified) (1 diff)
• modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp (modified) (1 diff)
• modules/ExpToLevelSetx/ExpToLevelSetxt.cpp (modified) (3 diffs)
• modules/KillIcebergsx/KillIcebergsx.cpp (modified) (4 diffs)
• modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp (modified) (2 diffs)
• modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp (modified) (3 diffs)
• modules/Reducevectorgtofx/Reducevectorgtofx.cpp (modified) (2 diffs)
• modules/ResetConstraintsx/ResetConstraintsx.cpp (modified) (2 diffs)
• modules/SpcNodesx/SpcNodesx.cpp (modified) (1 diff)
• modules/Trianglex/Trianglex.cpp (modified) (6 diffs)
• modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp (modified) (1 diff)
• modules/VertexCoordinatesx/VertexCoordinatesx.cpp (modified) (2 diffs)
• solutionsequences/solutionsequence_fct.cpp (modified) (7 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp

@@ -575 +575 @@
                         xDelete<int>(approximations);
 
-                        for(int i=0;i<nodes->Size();i++){
-                                Node* node=xDynamicCast<Node*>(nodes->GetObjectByOffset(i));
+                        for(Object* & object: nodes->objects){
+                                Node* node=xDynamicCast<Node*>(object);
                                 int   sid = node->Sid();
                                 if(sid>=iomodel->numberofvertices+iomodel->numberofelements){
@@ -975 +975 @@
                 case 3:
                         parameters->AddObject(iomodel->CopyConstantObject("md.friction.coupling",FrictionCouplingEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));                  
+                        parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));
                         break;
                 case 4:
                         parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.friction.coupling",FrictionCouplingEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));                  
+                        parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));
                         break;
                 case 5:
@@ -996 +996 @@
                 case 9:
                         parameters->AddObject(iomodel->CopyConstantObject("md.friction.gamma",FrictionGammaEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));                  
+                        parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));
                         break;
                 case 10:
@@ -1008 +1008 @@
                 case 11:
                         parameters->AddObject(new IntParam(FrictionCouplingEnum,2));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));                  
+                        parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));
                         break;
                 case 12:
                         parameters->AddObject(new IntParam(FrictionCouplingEnum,2));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));                  
+                        parameters->AddObject(iomodel->CopyConstantObject("md.friction.effective_pressure_limit",FrictionEffectivePressureLimitEnum));
                         break;
                 default: _error_("Friction law "<<frictionlaw<<" not implemented yet");
@@ -1049 +1049 @@
                 #endif
 
-                
+
                 if(is_schur_cg_solver)
                  solutionsequence_schurcg(femmodel);
@@ -1187 +1187 @@
                         return;
                 default:
-                        _error_("Approximation "<<EnumToStringx(approximation)<<" not supported");
+                        _error_("Approximation "<<EnumToStringx(approximation)<<"("<<approximation<<") not supported");
         }
 }/*}}}*/
@@ -1721 +1721 @@
         IssmDouble fraction1,fraction2;
         IssmDouble phi=element->GetGroundedPortion(xyz_list);
-        if(phi>0.00000001 && phi<0.99999999) partly_floating=true; 
+        if(phi>0.00000001 && phi<0.99999999) partly_floating=true;
 
         int ig=-1;// needed for driving stress parameterization
@@ -1748 +1748 @@
                         /*Compute the discontinuous surface slope for this gauss point/subelement*/
                         this->ComputeSurfaceSlope(&slope[0],gauss_subelem,gauss,point1,fraction1,fraction2,ig,dim,element);
-                }               
+                }
                 #endif
 
@@ -2130 +2130 @@
                         default:
                                 _error_("index "<<point1<<" not supported yet");
-                }//}}}  
+                }//}}}
         }
         if(ig>3 && ig<8){ // GREEN element
@@ -2151 +2151 @@
                         default:
                                 _error_("index "<<point1<<" not supported yet");
-                }//}}}  
+                }//}}}
         }
         if(ig>7){ // RED element
@@ -2172 +2172 @@
                         default:
                                 _error_("index "<<point1<<" not supported yet");
-                }//}}}  
+                }//}}}
         }
 
@@ -2198 +2198 @@
 }/*}}}*/
 void StressbalanceAnalysis::NodalFunctionsDerivativesRGB(IssmDouble* dbasis_subelem,Gauss* gauss_DG,Gauss* gauss_CG,int point1,IssmDouble fraction1,IssmDouble fraction2,int ig,int dim,Element* element){/*{{{*/
-        
+
         /*Fetch number of nodes for this finite element*/
    int numnodes = element->GetNumberOfNodes();
@@ -2337 +2337 @@
    /*Get Jacobian*/
         tria->GetJacobianInvert(&Jinv[0][0],xyz_list_RGB,gauss_CG); // gauss is not used here
-        
+
         /*Build dbasis CG in the subelement*/
         for(int i=0;i<numnodes;i++){
@@ -3435 +3435 @@
         /*Get type of algorithm*/
         int fe_FS;
-        bool isNitsche; 
+        bool isNitsche;
 
         element->FindParam(&fe_FS,FlowequationFeFSEnum);
@@ -3760 +3760 @@
         Input* vz_input = NULL;
         if(dim==3){vz_input=element->GetInput(VzEnum); _assert_(vz_input);}
-        
+
         /* prepare viscosity gradient for GLS */
         IssmDouble NodalViscosity[6];
@@ -3914 +3914 @@
         IssmDouble SU[3*(3+1)*6];
     Gauss* vert = element->NewGauss();
-        
+
         element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum);
         /* Compute the nodal values of the viscosity */
@@ -3922 +3922 @@
         }
         delete vert;
-        
+
         /* Start  looping on the number of gaussian points: */
         Gauss* gauss=element->NewGauss(5);
@@ -3973 +3973 @@
                         pe->values[i*dim+0] += +rho_ice*forcex *Jdet*gauss->weight*vbasis[i];
                         pe->values[i*dim+1] += +rho_ice*forcey *Jdet*gauss->weight*vbasis[i];
-                        if(dim==3) pe->values[i*dim+2] += +rho_ice*forcez*Jdet*gauss->weight*vbasis[i]; 
+                        if(dim==3) pe->values[i*dim+2] += +rho_ice*forcez*Jdet*gauss->weight*vbasis[i];
 
                         pe->values[i*dim+dim-1] += -rho_ice*gravity*Jdet*gauss->weight*vbasis[i];
@@ -4668 +4668 @@
                         pe->values[i*dim+0] += +rho_ice*forcex *Jdet*gauss->weight*vbasis[i];
                         pe->values[i*dim+1] += +rho_ice*forcey *Jdet*gauss->weight*vbasis[i];
-                        if(dim==3) pe->values[i*dim+2] += +rho_ice*forcez*Jdet*gauss->weight*vbasis[i]; 
+                        if(dim==3) pe->values[i*dim+2] += +rho_ice*forcez*Jdet*gauss->weight*vbasis[i];
 
                         pe->values[i*dim+dim-1] += -rho_ice*gravity*Jdet*gauss->weight*vbasis[i];
@@ -4795 +4795 @@
                                 }
                         }
-                }       
+                }
                 /* -------- Nitsche terms -------- */
                 /* n\cdot\nabla\phi*/
@@ -4814 +4814 @@
                         }
                 }
-                for(int i=0;i<pnumnodes;i++){   
+                for(int i=0;i<pnumnodes;i++){
                         nsigma[dim*vnumnodes+i] = -FSreconditioning*pbasis[i];
                 }
@@ -4832 +4832 @@
                                 }
                         }
-                }       
+                }
 
                 /* pressure x velocity  component A12 */

issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp

@@ -95 +95 @@
 
         ::CreateNodes(nodes,iomodel,StressbalanceSIAAnalysisEnum,P1Enum,SIAApproximationEnum);
-        for(int i=0;i<nodes->Size();i++){
-                Node* node=xDynamicCast<Node*>(nodes->GetObjectByOffset(i));
+        for(Object* & object: nodes->objects){
+                Node* node=xDynamicCast<Node*>(object);
                 int   sid = node->Sid();
                 int approximation=IoCodeToEnumVertexEquation(reCast<int>(iomodel->Data("md.flowequation.vertex_equation")[sid]));
@@ -602 +602 @@
         for(i=0;i<numnodes;i++) vel[i]=sqrt(vx[i]*vx[i] + vy[i]*vy[i] + vz[i]*vz[i]);
 
-        /*For pressure: we have not computed pressure in this analysis, for this element. We are in 2D, 
+        /*For pressure: we have not computed pressure in this analysis, for this element. We are in 2D,
          *so the pressure is just the pressure at the bedrock: */
         rho_ice  = element->FindParam(MaterialsRhoIceEnum);
@@ -612 +612 @@
                         for(i=0;i<numnodes;i++) pressure[i]=rho_ice*g*thickness[i];
                         break;
-                case Domain3DEnum:   
+                case Domain3DEnum:
                         element->GetVerticesCoordinates(&xyz_list);
                         element->GetInputListOnNodes(&surface[0],SurfaceEnum);

issm/trunk-jpl/src/c/classes/Constraints/Constraints.cpp

@@ -22 +22 @@
 void Constraints::ActivatePenaltyMethod(int in_analysis){/*{{{*/
 
-        for(int i=0;i<this->Size();i++){
-                Constraint* constraint=(Constraint*)this->GetObjectByOffset(i);
+        for(Object* & object: this->objects){
+                Constraint* constraint=(Constraint*)object;
                 constraint->ActivatePenaltyMethod();
         }

issm/trunk-jpl/src/c/classes/Contours.cpp

@@ -37 +37 @@
 
         /*open domain outline file for writing: */
-        if((fid=fopen(domainname,"w"))==NULL) _error_("could not open domain file " << domainname); 
-
-        for(int counter=0;counter<contours->Size();counter++){
-                contour=(Contour<double>*)contours->GetObjectByOffset(counter);
+        if((fid=fopen(domainname,"w"))==NULL) _error_("could not open domain file " << domainname);
+        int counter = 0;
+        for(Object* & object : contours->objects){
+                contour=(Contour<double>*)object;
 
                 /*Write header: */
@@ -56 +56 @@
                 /*Write blank line: */
                 if(counter<contours->Size()-1) fprintf(fid,"\n");
+                counter++;
         }
 

issm/trunk-jpl/src/c/classes/Elements/Elements.cpp

@@ -51 +51 @@
 
         /*Now go through all elements, and get how many nodes they own, unless they are clone nodes: */
-        for(int i=0;i<this->Size();i++){
-
-                Element* element=xDynamicCast<Element*>(this->GetObjectByOffset(i));
+        for(Object* & object : this->objects){
+                Element* element = xDynamicCast<Element*>(object);
                 numnodes=element->GetNumberOfNodes();
                 if(numnodes>max)max=numnodes;

issm/trunk-jpl/src/c/classes/ExternalResults/Results.cpp

@@ -33 +33 @@
 int Results::AddResult(ExternalResult* in_result){/*{{{*/
 
-        /*First, go through dataset of inputs and check whether any input 
-         * with the same name is already in. If so, erase the corresponding 
+        /*First, go through dataset of inputs and check whether any input
+         * with the same name is already in. If so, erase the corresponding
          * object before adding this new one: */
 
@@ -40 +40 @@
         _assert_(in_result);
 
-        for(int i=0;i<this->Size();i++){
-                ExternalResult* result=xDynamicCast<ExternalResult*>(this->GetObjectByOffset(i));
+        for(Object* &object : this->objects){
+                ExternalResult* result=xDynamicCast<ExternalResult*>(object);
 
                 if(result->GetStep()==in_result->GetStep()){
@@ -64 +64 @@
 int Results::DeleteResult(int result_enum,int result_step){/*{{{*/
 
-        for(int i=0;i<this->Size();i++){
-                ExternalResult* result=xDynamicCast<ExternalResult*>(this->GetObjectByOffset(i));
-
+        for(Object* &object : this->objects){
+                ExternalResult* result=xDynamicCast<ExternalResult*>(object);
                 if(result->GetStep()==result_step){
                         if(strcmp(result->GetResultName(),EnumToStringx(result_enum))==0){
@@ -80 +79 @@
 ExternalResult* Results::FindResult(int result_enum){/*{{{*/
 
-        for(int i=0;i<this->Size();i++){
-                ExternalResult* result=xDynamicCast<ExternalResult*>(this->GetObjectByOffset(i));
-
+        for(Object* &object : this->objects){
+                ExternalResult* result=xDynamicCast<ExternalResult*>(object);
                 if(result->GetResultEnum()==result_enum){
                         return result;
@@ -99 +97 @@
         parameters->FindParam(&io_gather,SettingsIoGatherEnum);
 
-        for(int i=0;i<this->Size();i++){
-                ExternalResult* result=xDynamicCast<ExternalResult*>(this->GetObjectByOffset(i));
+        for(Object* &object : this->objects){
+                ExternalResult* result=xDynamicCast<ExternalResult*>(object);
                 result->WriteData(fid,io_gather);
         }

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -108 +108 @@
                 this->parameters->FindParam(&isSSA,FlowequationIsSSAEnum);
                 this->parameters->FindParam(&domaintype,DomainTypeEnum);
-                for(int i=0;i<this->nummodels;i++) if(this->analysis_type_list[i]==StressbalanceAnalysisEnum){analysis_counter=i;break;}
+                for(int i=0;i<this->nummodels;i++) {
+                        if(this->analysis_type_list[i]==StressbalanceAnalysisEnum){
+                                analysis_counter=i;
+                                break;
+                        }
+                }
                 if(analysis_counter==-1) _error_("Could not find alias for analysis_type StressbalanceAnalysisEnum in list of FemModel analyses\n");
                 for(Object* & object : this->elements->objects){
@@ -1182 +1187 @@
         IssmDouble* segmentlist    = xNewZeroInit<IssmDouble>(4*numseg);
         IssmDouble* allsegmentlist = xNewZeroInit<IssmDouble>(4*numseg);
-        for(int i=0;i<segments->Size();i++){
-                Contour<IssmDouble>* segment=(Contour<IssmDouble>*)segments->GetObjectByOffset(i);
+        int i=0;
+        for(Object* & object : segments->objects){
+                Contour<IssmDouble>* segment=(Contour<IssmDouble>*)object;
                 _assert_(segment->nods == 2);
                 segmentlist[(numseg_offset+i)*4 + 0] = segment->x[0];
@@ -1189 +1195 @@
                 segmentlist[(numseg_offset+i)*4 + 2] = segment->x[1];
                 segmentlist[(numseg_offset+i)*4 + 3] = segment->y[1];
+                i++;
         }
 
@@ -2295 +2302 @@
 
                         /*Go through our dependent variables, and compute the response:*/
-                        for(int i=0;i<dependent_objects->Size();i++){
-                                DependentObject* dep=(DependentObject*)dependent_objects->GetObjectByOffset(i);
+                        int i = 0;
+                        for(Object* & object : dependent_objects->objects){
+                                DependentObject* dep=(DependentObject*)object;
                                 dep->Responsex(&output_value,this);
                                 if (my_rank==0) {
@@ -2307 +2315 @@
                                         #endif
                                 }
+                                i++;
                         }
                 }
@@ -2437 +2446 @@
 
                                                         /*Fill-in vector*/
-                                                        for(int j=0;j<this->loads->Size();j++){
-                                                                if(this->loads->GetEnum(j)==ChannelEnum){
-                                                                        Channel* channel=(Channel*)this->loads->GetObjectByOffset(j);
+                                                        for(Object* & object : this->loads->objects){
+                                                                if(object->ObjectEnum()==ChannelEnum){
+                                                                        Channel* channel=(Channel*)object;
                                                                         channel->WriteChannelCrossSection(values);
                                                                 }
@@ -3200 +3209 @@
         CreateNumberNodeToElementConnectivity(iomodel);
         ::CreateVertices(new_elements,new_vertices,iomodel,TransientSolutionEnum,true);
-        for(int i=0;i<new_vertices->Size();i++){
-                Vertex *vertex=(Vertex*)new_vertices->GetObjectByOffset(i);
+        for(Object* & object : new_vertices->objects){
+                Vertex *vertex=(Vertex*)object;
                 int     sid = vertex->Sid();
                 vertex->x=newx[sid];
@@ -3798 +3807 @@
 
         /*Go through elements, and for each element, get vertices*/
-   for(int i=0;i<femmodel_elements->Size();i++){
-        Element* element=xDynamicCast<Element*>(femmodel_elements->GetObjectByOffset(i));
+   for(Object* & object : femmodel_elements->objects){
+        Element* element=xDynamicCast<Element*>(object);
         element->GetVerticesSidList(elem_vertices);
         vid1->SetValue(element->sid,elem_vertices[0],INS_VAL);
@@ -3972 +3981 @@
 
         /*Get spcvx and spcvy of old mesh*/
-        for(int i=0;i<this->constraints_list[analysis_index]->Size();i++){
-
-                Constraint* constraint=(Constraint*)this->constraints_list[analysis_index]->GetObjectByOffset(i);
-
+        for(Object* & object : this->constraints_list[analysis_index]->objects){
+                Constraint* constraint=(Constraint*)object;
                 SpcStatic* spcstatic = xDynamicCast<SpcStatic*>(constraint);
                 int dof                                 = spcstatic->GetDof();
@@ -4890 +4897 @@
          * all DONE in Geographic coordinates: theta \in [-90,90], lambda \in [-180 180]
          */
-        for(int i=0;i<vertices->Size();i++){
-                int sid;
-                //Vertex* vertex=(Vertex*)vertices->GetObjectByOffset(i);
-                Vertex* vertex=xDynamicCast<Vertex*>(vertices->GetObjectByOffset(i));
-                sid=vertex->Sid();
-
-                lati=latitude[sid]/180*PI;      longi=longitude[sid]/180*PI; radi=radius[sid];
+        for(Object* & object : vertices->objects){
+                Vertex* vertex=xDynamicCast<Vertex*>(object);
+                int sid=vertex->Sid();
+
+                lati=latitude[sid]/180*PI;
+                longi=longitude[sid]/180*PI;
+                radi=radius[sid];
 
                 /*only first order terms are considered now: */
@@ -5315 +5322 @@
                 }
                 else{
-                        int j=-1;
                         for(Object* & object : this->elements->objects){
                                 /*Get the right transient input*/
                                 Element* element = xDynamicCast<Element*>(object);
-                                j+=1;
                                 /*Get basal element*/
                                 switch(domaintype){
@@ -5343 +5348 @@
                                                 element->GetInputListOnVertices(&values[0],input_enum[i]); //this is the enum to stack
                                                 element->GetVerticesLidList(vertexlids);
-                                                Penta* penta=xDynamicCast<Penta*>(elements->GetObjectByOffset(j));
+                                                Penta* penta=xDynamicCast<Penta*>(object);
                                                 for(;;){
                                                         transientinput->AddPentaTimeInput(subtime,numvertices,vertexlids,values,P1Enum);

issm/trunk-jpl/src/c/classes/Vertices.cpp

@@ -70 +70 @@
         output->sorted_ids=NULL;
         int objsize = this->numsorted;
-        if(this->sorted && objsize>0 && this->id_offsets){      
+        if(this->sorted && objsize>0 && this->id_offsets){
                 output->id_offsets=xNew<int>(objsize);
                 xMemCpy<int>(output->id_offsets,this->id_offsets,objsize);
@@ -154 +154 @@
 
         /*Go through vertices, and for each vertex, object, report it cpu: */
-        for(int i=0;i<this->Size();i++){
-                Vertex* vertex=xDynamicCast<Vertex*>(this->GetObjectByOffset(i));
+        for(Object* & object : this->objects){
+      Vertex* vertex = xDynamicCast<Vertex*>(object);
                 lat->SetValue(vertex->sid,vertex->GetLatitude() ,INS_VAL);
                 lon->SetValue(vertex->sid,vertex->GetLongitude(),INS_VAL);
@@ -193 +193 @@
         this->numberofvertices_local=this->Size();
         this->numberofmasters_local=0;
-        for(int i=0;i<this->Size();i++){
-                Vertex* vertex=xDynamicCast<Vertex*>(this->GetObjectByOffset(i));
+        for(Object* & object : this->objects){
+      Vertex* vertex = xDynamicCast<Vertex*>(object);
                 if(!vertex->clone) this->numberofmasters_local++;
         }
@@ -204 +204 @@
 
         int lid = 0;
-        for(int i=0;i<this->Size();i++){
-                Vertex* vertex=xDynamicCast<Vertex*>(this->GetObjectByOffset(i));
+        for(Object* & object : this->objects){
+      Vertex* vertex = xDynamicCast<Vertex*>(object);
                 if(!vertex->clone){
                         vertex->lid=lid;
@@ -212 +212 @@
                 }
         }
-        for(int i=0;i<this->Size();i++){
-                Vertex* vertex=xDynamicCast<Vertex*>(this->GetObjectByOffset(i));
+        for(Object* & object : this->objects){
+      Vertex* vertex = xDynamicCast<Vertex*>(object);
                 if(vertex->clone){
                         vertex->lid=lid;
@@ -229 +229 @@
         xDelete<int>(all_num_masters);
 
-        for(int i=0;i<this->Size();i++){
-                Vertex* vertex=xDynamicCast<Vertex*>(this->GetObjectByOffset(i));
+        for(Object* & object : this->objects){
+      Vertex* vertex = xDynamicCast<Vertex*>(object);
                 vertex->pid = vertex->lid+offset;
         }

issm/trunk-jpl/src/c/classes/kriging/Observations.cpp

@@ -283 +283 @@
                         }
                 }
-        }  
+        }
 
         /*Assign output pointer*/
@@ -329 +329 @@
                 y   = xNew<IssmPDouble>(nobs);
                 obs = xNew<IssmPDouble>(nobs);
-                for(int i=0;i<this->Size();i++){
-                        observation=xDynamicCast<Observation*>(this->GetObjectByOffset(i));
+                int i=0;
+                for(Object* & object: this->objects){
+                        observation=xDynamicCast<Observation*>(object);
                         observation->WriteXYObs(&x[i],&y[i],&obs[i]);
+                        i++;
                 }
         }
@@ -455 +457 @@
                         if(stop) break;
                 }
-        }  
+        }
         xDelete<IssmPDouble>(dists);
         xDelete<int>(tempindices);
@@ -499 +501 @@
         /*If we have less observations than mindata, return UNDEF*/
         if(n_obs<mindata){
-                prediction = UNDEF; 
+                prediction = UNDEF;
         }
         else{
@@ -515 +517 @@
                         denominator += weight;
                 }
-                prediction = numerator/denominator; 
+                prediction = numerator/denominator;
         }
 
@@ -543 +545 @@
         /*If we have less observations than mindata, return UNDEF*/
         if(n_obs<mindata){
-                *pprediction = -999.0; 
-                *perror      = -999.0; 
+                *pprediction = -999.0;
+                *perror      = -999.0;
                 return;
         }
@@ -633 +635 @@
         /*If we have less observations than mindata, return UNDEF*/
         if(n_obs<mindata || n_obs<2){
-                prediction = UNDEF; 
+                prediction = UNDEF;
         }
         else{
@@ -714 +716 @@
         for(j=0;j<n;j++) gamma[j]   = 0.0;
 
-        for(i=0;i<this->Size();i++){
-                observation1=xDynamicCast<Observation*>(this->GetObjectByOffset(i));
-
-                for(j=i+1;j<this->Size();j++){
-                        observation2=xDynamicCast<Observation*>(this->GetObjectByOffset(j));
+        for(Object* & object : this->objects){
+                observation1=xDynamicCast<Observation*>(object);
+
+                for(Object* & object : this->objects){
+                        observation2=xDynamicCast<Observation*>(object);
 
                         distance=sqrt(pow(observation1->x - observation2->x,2) + pow(observation1->y - observation2->y,2));

issm/trunk-jpl/src/c/cores/controladm1qn3_core.cpp

@@ -1 +1 @@
 /*!\file: controladm1qn3_core.cpp
- * \brief: core of the control solution 
- */ 
+ * \brief: core of the control solution
+ */
 #include <ctime>
 #include <config.h>
@@ -281 +281 @@
         codi_global.output_indices.clear();
         #endif
-        for(int i=0;i<dependent_objects->Size();i++){
-                DependentObject* dep=(DependentObject*)dependent_objects->GetObjectByOffset(i);
+        for(Object* & object:dependent_objects->objects){
+                DependentObject* dep=(DependentObject*)object
                 if(solution_type==TransientSolutionEnum) output_value = dep->GetValue();
                 if(solution_type!=TransientSolutionEnum) dep->Responsex(&output_value,femmodel);
@@ -476 +476 @@
         long         omode;
         double           f;
-        double           dxmin,gttol; 
+        double           dxmin,gttol;
         int          maxsteps,maxiter;
         int          intn,num_controls,num_cost_functions,solution_type;
@@ -596 +596 @@
 
         for(int i=0;i<intn;i++) {
-                aX[i] = reCast<IssmDouble>(X[i]); 
+                aX[i] = reCast<IssmDouble>(X[i]);
                 aG[i] = reCast<IssmDouble>(G[i]);
         }

issm/trunk-jpl/src/c/cores/controlvalidation_core.cpp

@@ -1 +1 @@
 /*!\file: controlvalidation_core.cpp
- * \brief: core of the control solution 
- */ 
+ * \brief: core of the control solution
+ */
 
 #include "./cores.h"
@@ -217 +217 @@
         dependents=xNew<IssmPDouble>(num_dependents);
         codi_global.output_indices.clear();
-        for(int i=0;i<dependent_objects->Size();i++){
-                DependentObject* dep=(DependentObject*)dependent_objects->GetObjectByOffset(i);
+        for(Object* & object:dependent_objects->objects){
+                DependentObject* dep=(DependentObject*)object
                 if(solution_type==TransientSolutionEnum){
                         output_value = dep->GetValue();
@@ -235 +235 @@
         j0 = J;
         _printf0_("Initial cost function J(x) = "<<setw(12)<<setprecision(7)<<j0<<"\n");
-        _assert_(j0>0.); 
+        _assert_(j0>0.);
         simul_stoptrace2();
         /*initialize direction index in the weights vector: */
@@ -292 +292 @@
                 #if defined(_HAVE_CODIPACK_)
                 j=0.;
-                for(int i=0;i<dependent_objects->Size();i++){
-                        DependentObject* dep=(DependentObject*)dependent_objects->GetObjectByOffset(i);
+                for(Object* & object:dependent_objects->objects){
+                        DependentObject* dep=(DependentObject*)object
                         if(solution_type==TransientSolutionEnum){
                                 output_value = dep->GetValue();
@@ -309 +309 @@
                 for(int i=0;i<n;i++) Den += alpha* G[i] * scaling_factors[0];
                 Ialpha = fabs((j - j0)/Den - 1.);
-                _assert_(fabs(Den)>0.); 
+                _assert_(fabs(Den)>0.);
 
                 _printf0_(" " << setw(11) << setprecision (5)<<alpha<<" " << setw(11) << setprecision (5)<<Ialpha<<"\n");

issm/trunk-jpl/src/c/cores/love_core.cpp

@@ -1 +1 @@
 /*!\file: love_core.cpp
- * \brief: core of the LOVE numbers solution 
- */ 
+ * \brief: core of the LOVE numbers solution
+ */
 
 #include "./cores.h"
@@ -48 +48 @@
         /*recover materials parameters: there is only one Matlitho, chase it down the hard way:*/
         Matlitho* matlitho=NULL;
-        for (int i=femmodel->materials->Size()-1;i>=0;i--){
-                Material* material=xDynamicCast<Material*>(femmodel->materials->GetObjectByOffset(i));
+        for (Object* & object: femmodel->materials->objects){
+                Material* material=xDynamicCast<Material*>(object);
                 if (material->ObjectEnum()==MatlithoEnum)matlitho=xDynamicCast<Matlitho*>(material);
         }
@@ -69 +69 @@
         FourierLoveCorex(LoveKr,LoveKi,LoveHr,LoveHi,LoveLr,LoveLi,LoveKernelsReal,LoveKernelsImag,  //output
                         nfreq,frequencies,sh_nmax,sh_nmin,g0,r0,mu0,allow_layer_deletion,forcing_type,verbosemod, //parameter inputs
-                        matlitho->numlayers, matlitho->radius, matlitho->viscosity, matlitho->lame_lambda, matlitho->lame_mu, 
+                        matlitho->numlayers, matlitho->radius, matlitho->viscosity, matlitho->lame_lambda, matlitho->lame_mu,
                         matlitho->burgers_viscosity, matlitho->burgers_mu, matlitho->density, matlitho->isburgers, matlitho->issolid //matlitho inputs
-                        ); 
+                        );
 
         /*Add love matrices to results:*/

issm/trunk-jpl/src/c/cores/transient_core.cpp

@@ -128 +128 @@
                 if(iscontrol && isautodiff){
                         /*Go through our dependent variables, and compute the response:*/
-                        for(int i=0;i<dependent_objects->Size();i++){
-                                DependentObject* dep=(DependentObject*)dependent_objects->GetObjectByOffset(i);
+                        for(Object* & object:dependent_objects->objects){
+                                DependentObject* dep=(DependentObject*)object;
                                 IssmDouble  output_value;
                                 dep->Responsex(&output_value,femmodel);
@@ -321 +321 @@
 
                 /*Go through our dependent variables, and compute the response:*/
-                for(int i=0;i<dependent_objects->Size();i++){
-                        DependentObject* dep=(DependentObject*)dependent_objects->GetObjectByOffset(i);
+                for(Object* & object:dependent_objects->objects){
+                        DependentObject* dep=(DependentObject*)object;
                         dep->Responsex(&output_value,femmodel);
                         dep->AddValue(output_value);
@@ -357 +357 @@
 
         SetControlInputsFromVectorx(femmodel,X);
+
         IssmDouble J = 0.;
         if(0){
-                for(int i=0;i<dependent_objects->Size();i++){
-                        DependentObject* dep=(DependentObject*)dependent_objects->GetObjectByOffset(i);
+                for(Object* & object:dependent_objects->objects){
+                        DependentObject* dep=(DependentObject*)object;
                         J += dep->GetValue();
                 }

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

@@ -1 +1 @@
 /*!\file:  kriging.cpp
  * \brief: kriging main parallel program
- */ 
+ */
 
 #include "./issm.h"
@@ -57 +57 @@
                 results->AddObject(new GenericExternalResult<double*>(results->Size()+1,"predictions",predictions,ninterp,1,1,0));
                 results->AddObject(new GenericExternalResult<double*>(results->Size()+1,"error",error,ninterp,1,1,0));
-                for(int i=0;i<results->Size();i++){
-                        ExternalResult* result=xDynamicCast<ExternalResult*>(results->GetObjectByOffset(i));
+                for(Object* & object :results->objects){
+                        ExternalResult* result=xDynamicCast<ExternalResult*>(object);
                         result->WriteData(output_fid,1);
                 }
@@ -104 +104 @@
 
         rootpatharg=argv[1];
-        if(strcmp(strstr(rootpatharg,"/"),"/")!=0){ 
+        if(strcmp(strstr(rootpatharg,"/"),"/")!=0){
                 rootpath       = xNew<char>(strlen(rootpatharg)+2); sprintf(rootpath,"%s/",rootpatharg);
-        }  
+        }
         else{
                 rootpath       = xNew<char>(strlen(rootpatharg)+1); sprintf(rootpath,"%s",rootpatharg);
-        } 
+        }
 
         modelname=argv[2];

issm/trunk-jpl/src/c/modules/AllocateSystemMatricesx/AllocateSystemMatricesx.cpp

@@ -111 +111 @@
         int localnumnodes       = femmodel->nodes->Size();
         int numberofdofspernode = femmodel->nodes->MaxNumDofs(GsetEnum);
-        int M                   = femmodel->nodes->NumberOfDofs(set1enum);
+        //int M                   = femmodel->nodes->NumberOfDofs(set1enum);
         int N                   = femmodel->nodes->NumberOfDofs(set2enum);
         int m                   = femmodel->nodes->NumberOfDofsLocal(set1enum);
@@ -117 +117 @@
         int numnodesperelement  = femmodel->elements->MaxNumNodes();
         int numnodesperload     = femmodel->loads->MaxNumNodes();
-
         int elementssize        = femmodel->elements->Size();
         int loadssize           = femmodel->loads->Size();

issm/trunk-jpl/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp

@@ -21 +21 @@
         }
         if(VerboseMProcessor()) _printf0_("      Configuring loads...\n");
-        for(int i=0;i<loads->Size();i++){
-                Load* load=(Load*)loads->GetObjectByOffset(i);
+        for(Object* object : loads->objects){
+                Load* load=(Load*)object;
                 load->Configure(elements,loads,nodes,vertices,materials,parameters);
         }
         if(VerboseMProcessor()) _printf0_("      Configuring materials...\n");
-        for(int i=0;i<materials->Size();i++){
-                Material* material=(Material*)materials->GetObjectByOffset(i);
+        for(Object* & object : materials->objects){
+                Material* material=(Material*)object;
                 material->Configure(elements);
         }

issm/trunk-jpl/src/c/modules/ConstraintsStatex/ConstraintsStatex.cpp

@@ -39 +39 @@
         /*Deal with pengrid*/
         if(femmodel->loads->numpenalties){
-                for(int i=0;i<femmodel->loads->Size();i++){
-                        Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
+                for(Object* & object : femmodel->loads->objects){
+                        Load* load=(Load*)object;
                         if(load->ObjectEnum()==PengridEnum){
                                 Pengrid* pengrid=(Pengrid*)load;
@@ -50 +50 @@
 
         ISSM_MPI_Reduce(&num_unstable_constraints,&sum_num_unstable_constraints,1,ISSM_MPI_INT,ISSM_MPI_SUM,0,IssmComm::GetComm() );
-        ISSM_MPI_Bcast(&sum_num_unstable_constraints,1,ISSM_MPI_INT,0,IssmComm::GetComm());                
+        ISSM_MPI_Bcast(&sum_num_unstable_constraints,1,ISSM_MPI_INT,0,IssmComm::GetComm());
         num_unstable_constraints=sum_num_unstable_constraints;
 

issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.cpp

@@ -1 +1 @@
 /*!\file RiftConstraintsState.cpp
- * \brief: manage penalties for rifts 
+ * \brief: manage penalties for rifts
  */
 #include "./ConstraintsStateLocal.h"
@@ -32 +32 @@
 void RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){
 
-        int                     i;
-
         /* generic object pointer: */
         Riftfront* riftfront=NULL;
@@ -40 +38 @@
         int unstable;
         int sum_num_unstable_constraints;
-        int num_unstable_constraints=0; 
+        int num_unstable_constraints=0;
 
         /*Enforce constraints: */
-        for (i=0;i<loads->Size();i++){
-
-                if (RiftfrontEnum==loads->GetEnum(i)){
-
-                        load=(Load*)loads->GetObjectByOffset(i);
+        for (Object* & object : loads->objects){
+                if (RiftfrontEnum==object->ObjectEnum()){
+                        load=(Load*)object;
                         riftfront=(Riftfront*)load;
                         riftfront->Constrain(&unstable);
@@ -55 +51 @@
 
         ISSM_MPI_Reduce (&num_unstable_constraints,&sum_num_unstable_constraints,1,ISSM_MPI_INT,ISSM_MPI_SUM,0,IssmComm::GetComm() );
-        ISSM_MPI_Bcast(&sum_num_unstable_constraints,1,ISSM_MPI_INT,0,IssmComm::GetComm());                
+        ISSM_MPI_Bcast(&sum_num_unstable_constraints,1,ISSM_MPI_INT,0,IssmComm::GetComm());
         num_unstable_constraints=sum_num_unstable_constraints;
 
@@ -75 +71 @@
 
         /*Enforce constraints: */
-        for (i=0;i<loads->Size();i++){
-
-                if (RiftfrontEnum==loads->GetEnum(i)){
-
-                        load=(Load*)loads->GetObjectByOffset(i);
+        for (Object* & object : loads->objects){
+                if (RiftfrontEnum==object->ObjectEnum()){
+                        load=(Load*)object;
                         riftfront=(Riftfront*)load;
                         if (riftfront->IsFrozen()){
@@ -90 +84 @@
         /*Is there just one found? that would mean we have frozen! : */
         ISSM_MPI_Reduce (&found,&mpi_found,1,ISSM_MPI_INT,ISSM_MPI_MAX,0,IssmComm::GetComm() );
-        ISSM_MPI_Bcast(&mpi_found,1,ISSM_MPI_INT,0,IssmComm::GetComm());                
+        ISSM_MPI_Bcast(&mpi_found,1,ISSM_MPI_INT,0,IssmComm::GetComm());
         found=mpi_found;
 
@@ -106 +100 @@
 
         /*Enforce constraints: */
-        for (i=0;i<loads->Size();i++){
-
-                if (RiftfrontEnum==loads->GetEnum(i)){
-                        load=(Load*)loads->GetObjectByOffset(i);
+        for (Object* & object : loads->objects){
+                if (RiftfrontEnum==object->ObjectEnum()){
+                        load=(Load*)object;
                         riftfront=(Riftfront*)load;
                         riftfront->FreezeConstraints();

issm/trunk-jpl/src/c/modules/ContourToMeshx/ContourToMeshxt.cpp

@@ -1 +1 @@
 /*!\file:  ContourToMeshxt.cpp
  * \brief  "thread" core code for interpolating values from a structured grid.
- */ 
+ */
 
 #ifdef HAVE_CONFIG_H
@@ -36 +36 @@
 
         /*Loop through all contours: */
-        for (i=0;i<contours->Size();i++){
-                Contour<double>* contour=(Contour<double>*)contours->GetObjectByOffset(i);
+        for (Object* & object : contours->objects){
+                Contour<double>* contour=(Contour<double>*)object;
                 IsInPoly(in_nod,contour->x,contour->y,contour->nods,x,y,i0,i1,edgevalue);
         }

issm/trunk-jpl/src/c/modules/ContourToNodesx/ContourToNodesx.cpp

@@ -40 +40 @@
         /*Loop through all contours: */
         if(contours){
-                for(int i=0;i<contours->Size();i++){
-                        Contour<IssmPDouble>* contour=(Contour<IssmPDouble>*)contours->GetObjectByOffset(i);
+                for(Object* & object:contours->objects){
+                        Contour<IssmPDouble>* contour=(Contour<IssmPDouble>*)object;
                         IsInPoly(flags,contour->x,contour->y,contour->nods,x,y,0,nods,edgevalue);
                 }

issm/trunk-jpl/src/c/modules/CreateJacobianMatrixx/CreateJacobianMatrixx.cpp

@@ -33 +33 @@
                 delete Je;
         }
-        for (int i=0;i<femmodel->loads->Size();i++){
-                load=(Load*)femmodel->loads->GetObjectByOffset(i);
+        for (Object* & object : femmodel->loads->objects){
+                load=(Load*)object;
                 load->CreateJacobianMatrix(Jff);
                 load->PenaltyCreateJacobianMatrix(Jff,kmax);

issm/trunk-jpl/src/c/modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp

@@ -29 +29 @@
          ys=new Vector<IssmDouble>(slocalsize,ssize);
 
-        /*go through all nodes, and for the ones corresponding to this configuration_type, fill the 
+        /*go through all nodes, and for the ones corresponding to this configuration_type, fill the
          * constraints vector with the constraint values: */
-        for(int i=0;i<nodes->Size();i++){
-                Node* node=(Node*)nodes->GetObjectByOffset(i);
+        for(Object* & object: nodes->objects){
+                Node* node=xDynamicCast<Node*>(object);
                 node->CreateNodalConstraints(ys);
         }

issm/trunk-jpl/src/c/modules/ExpToLevelSetx/ExpToLevelSetxt.cpp

@@ -1 +1 @@
 /*!\file:  ExpToLevelSetxt.cpp
  * \brief  "thread" core code for figuring out level set value from a contour and a cloud of points.
- */ 
+ */
 
 #ifdef HAVE_CONFIG_H
@@ -38 +38 @@
 
         /*Loop through all contours: */
-        for(i=0;i<contours->Size();i++){
-                Contour<double>* contour=(Contour<double>*)contours->GetObjectByOffset(i);
+        for(Object* & object : contours->objects){
+                Contour<double>* contour=(Contour<double>*)object;
                 ContourToLevelSet(distance,contour->x,contour->y,contour->nods,x,y,i0,i1);
         }
@@ -73 +73 @@
          * We use the following notations:
          * segment: v=(x1,y1), w=(x2,y2)
-         * point:   p=(x0,y0) 
+         * point:   p=(x0,y0)
          */
 
    /*Get segment length square (avoid sqrt) |w-v|^2*/
-        double l2 = pow(x2-x1,2)+pow(y2-y1,2); 
+        double l2 = pow(x2-x1,2)+pow(y2-y1,2);
 
    /*segment is single point: v == w*/

issm/trunk-jpl/src/c/modules/KillIcebergsx/KillIcebergsx.cpp

@@ -20 +20 @@
 
         /*Step 1, go through all elements and put 1 in local_mask if the element is grounded*/
-        for(int i=0;i<femmodel->elements->Size();i++){
-                Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
+        int i=0;
+        for(Object* & object : femmodel->elements->objects){
+                Element* element=xDynamicCast<Element*>(object);
                 if(!element->IsIceInElement()){
                         /*Nothing to do, just flag element to speed up the computation*/
@@ -32 +33 @@
                         }
                 }
+                i++;
         }
 
@@ -53 +55 @@
                         keepgoing    = false;
                         didsomething = 0;
-                        for(int i=0;i<femmodel->elements->Size();i++){
-                                Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
+                        int i=0;
+                        for(Object* & object : femmodel->elements->objects){
+                                Element* element=xDynamicCast<Element*>(object);
 
                                 if(!element_flag[i]){
@@ -78 +81 @@
                                         }
                                 }
+                                i++;
                         }
                         iter++;

issm/trunk-jpl/src/c/modules/Mergesolutionfromftogx/Mergesolutionfromftogx.cpp

@@ -17 +17 @@
         int ssize=nodes->NumberOfDofs(SsetEnum);
 
-        /*serialize uf and ys: those two vectors will be indexed by the nodes, who are the only ones 
+        /*serialize uf and ys: those two vectors will be indexed by the nodes, who are the only ones
          *that know which values should be plugged into ug and where: */
         if(ssize) if(flag_ys0) ys->Set(0.0);
@@ -33 +33 @@
 
         /*Let nodes figure it out*/
-        for(int i=0;i<nodes->Size();i++){
-                Node* node=(Node*)nodes->GetObjectByOffset(i);
+        for(Object* & object: nodes->objects){
+                Node* node=xDynamicCast<Node*>(object);
                 node->VecMerge(ug,local_uf,indices_uf,local_ys,indices_ys);
         }

issm/trunk-jpl/src/c/modules/OutputDefinitionsResponsex/OutputDefinitionsResponsex.cpp

@@ -14 +14 @@
 
         /*Now, go through the output definitions, and retrieve the object which corresponds to our requested response, output_string: */
-        for(int i=0;i<output_definitions->Size();i++){
-                Definition* definition=dynamic_cast<Definition*>(output_definitions->GetObjectByOffset(i));
+        for(Object* & object : output_definitions->objects){
+                Definition* definition=dynamic_cast<Definition*>(object);
 
                 char* name = definition->Name();
@@ -42 +42 @@
 
         /*Now, go through the output definitions, and retrieve the object which corresponds to our requested response, output_enum: */
-        for(int i=0;i<output_definitions->Size();i++){
-
-                //Definition* definition=xDynamicCast<Definition*>(output_definitions->GetObjectByOffset(i));
-                Definition* definition=dynamic_cast<Definition*>(output_definitions->GetObjectByOffset(i));
+        for(Object* & object : output_definitions->objects){
+                Definition* definition=dynamic_cast<Definition*>(object);
 
                 int en = definition->DefinitionEnum();
@@ -59 +57 @@
 
         /*If we are here, did not find the definition for this response, not good!: */
-        _error_("Could not find the response for output definition " << EnumToStringx(output_enum) 
+        _error_("Could not find the response for output definition " << EnumToStringx(output_enum)
                                 <<" ("<<output_enum<<")"
                                 << " because could not find the definition itself!");

issm/trunk-jpl/src/c/modules/Reducevectorgtofx/Reducevectorgtofx.cpp

@@ -1 +1 @@
 /*!\file Reducevectorgtofx
- * \brief reduce petsc vector from g set to s set (free dofs), using the nodeset partitioning 
+ * \brief reduce petsc vector from g set to s set (free dofs), using the nodeset partitioning
  * vectors.
  */
@@ -29 +29 @@
 
         /*Let nodes figure it out*/
-        for(int i=0;i<nodes->Size();i++){
-                Node* node=(Node*)nodes->GetObjectByOffset(i);
+        for(Object* & object : nodes->objects){
+                Node* node=(Node*)object;
                 node->VecReduce(uf,local_ug,indices_ug);
         }

issm/trunk-jpl/src/c/modules/ResetConstraintsx/ResetConstraintsx.cpp

@@ -29 +29 @@
 
         /*Reset pengrid to inactive mode*/
-        for(int i=0;i<femmodel->loads->Size();i++){
-                Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
+        for(Object* & object : femmodel->loads->objects){
+                Load* load=(Load*)object;
                 if(load->ObjectEnum()==PengridEnum){
                         Pengrid* pengrid=(Pengrid*)load;
@@ -48 +48 @@
 
         /*Reset pengrid to inactive mode*/
-        for(int i=0;i<femmodel->loads->Size();i++){
-                Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
+        for(Object* & object: femmodel->loads->objects){
+                Load* load=(Load*)object;
                 if(load->ObjectEnum()==PengridEnum){
                         Pengrid* pengrid=(Pengrid*)load;

issm/trunk-jpl/src/c/modules/SpcNodesx/SpcNodesx.cpp

@@ -10 +10 @@
 void SpcNodesx(Nodes* nodes,Constraints* constraints,Parameters* parameters){
 
-        for(int i=0;i<constraints->Size();i++){
-                Constraint* constraint=(Constraint*)constraints->GetObjectByOffset(i);
+        for(Object* & object: constraints->objects){
+                Constraint* constraint=xDynamicCast<Constraint*>(object);
                 constraint->ConstrainNode(nodes,parameters);
         }

issm/trunk-jpl/src/c/modules/Trianglex/Trianglex.cpp

@@ -42 +42 @@
         /*Create initial triangulation to call triangulate(). First number of points:*/
         in.numberofpoints=0;
-        for (i=0;i<domain->Size();i++){
-                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
+        for (Object* & object : domain->objects){
+                contour=(Contour<IssmPDouble>*)object;
                 in.numberofpoints+=contour->nods-1;
         }
-        for (i=0;i<rifts->Size();i++){
-                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
+        for (Object* & object : rifts->objects){
+                contour=(Contour<IssmPDouble>*)object;
                 in.numberofpoints+=contour->nods;
         }
@@ -58 +58 @@
 
         counter=0;
-        for (i=0;i<domain->Size();i++){
-                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
+        for (Object* & object : domain->objects){
+                contour=(Contour<IssmPDouble>*)object;
                 for (j=0;j<contour->nods-1;j++){
                         in.pointlist[2*counter+0]=contour->x[j];
@@ -66 +66 @@
                 }
         }
-        for (i=0;i<rifts->Size();i++){
-                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
+        for (Object* & object : rifts->objects){
+                contour=(Contour<IssmPDouble>*)object;
                 for (j=0;j<contour->nods;j++){
                         in.pointlist[2*counter+0]=contour->x[j];
@@ -85 +85 @@
         /*Build segments. First figure out number of segments: holes and closed outlines have as many segments as vertices: */
         in.numberofsegments=0;
-        for (i=0;i<domain->Size();i++){
-                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
+        for (Object* & object : domain->objects){
+                contour=(Contour<IssmPDouble>*)object;
                 in.numberofsegments+=contour->nods-1;
         }
-        for(i=0;i<rifts->Size();i++){
-                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
+        for (Object* & object : rifts->objects){
+                contour=(Contour<IssmPDouble>*)object;
                 /*for rifts, we have one less segment as we have vertices*/
                 in.numberofsegments+=contour->nods-1;
@@ -99 +99 @@
         counter=0;
         backcounter=0;
-        for (i=0;i<domain->Size();i++){
-                contour=(Contour<IssmPDouble>*)domain->GetObjectByOffset(i);
+        for (Object* & object : domain->objects){
+                contour=(Contour<IssmPDouble>*)object;
                 for (j=0;j<contour->nods-2;j++){
                         in.segmentlist[2*counter+0]=counter;
@@ -115 +115 @@
         }
         counter2=counter;
-        for (i=0;i<rifts->Size();i++){
-                contour=(Contour<IssmPDouble>*)rifts->GetObjectByOffset(i);
+        for (Object* & object : rifts->objects){
+                contour=(Contour<IssmPDouble>*)object;
                 for (j=0;j<(contour->nods-1);j++){
                         in.segmentlist[2*counter2+0]=counter;

issm/trunk-jpl/src/c/modules/UpdateDynamicConstraintsx/UpdateDynamicConstraintsx.cpp

@@ -19 +19 @@
         yg_serial=yg->ToMPISerial();
 
-        for(int i=0;i<constraints->Size();i++){
-                Constraint* constraint=(Constraint*)constraints->GetObjectByOffset(i);
-                if(constraint->ObjectEnum()==SpcDynamicEnum){ 
+        for(Object* & object : constraints->objects){
+                Constraint* constraint=(Constraint*)object;
+                if(constraint->ObjectEnum()==SpcDynamicEnum){
                         ((SpcDynamic*)constraint)->SetDynamicConstraint(nodes,yg_serial);
                 }

issm/trunk-jpl/src/c/modules/VertexCoordinatesx/VertexCoordinatesx.cpp

@@ -1 +1 @@
 /*!\file VertexCoordinatesx
- * \brief: compute a vector x,y and z of vertex coordinates by 
- * marching through all our vertices. 
+ * \brief: compute a vector x,y and z of vertex coordinates by
+ * marching through all our vertices.
  */
 
@@ -32 +32 @@
 
         /*march through our vertices: */
-        for(i=0;i<vertices->Size();i++){
-                Vertex* vertex=(Vertex*)vertices->GetObjectByOffset(i);
+        for(Object* & object : vertices->objects){
+                Vertex* vertex=(Vertex*)object;
                 vertex->VertexCoordinates(vx,vy,vz,spherical);
         }

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_fct.cpp

@@ -1 +1 @@
 /*!\file: solutionsequence_fct.cpp
  * \brief: numerical core of flux corrected transport solution
- */ 
+ */
 
 #include "../toolkits/toolkits.h"
@@ -109 +109 @@
 
                 dmax = dmax * 1.e+3;
-                for(int i=0;i<femmodel->constraints->Size();i++){
-                        Constraint* constraint=(Constraint*)femmodel->constraints->GetObjectByOffset(i);
+                for(Object* & object: femmodel->constraints->objects){
+                        Constraint* constraint=xDynamicCast<Constraint*>(object);
                         constraint->PenaltyDofAndValue(&dof,&d,femmodel->nodes,femmodel->parameters);
                         if(dof!=-1){
@@ -125 +125 @@
 
                 dmax = dmax * 1.e+3;
-                for(int i=0;i<femmodel->constraints->Size();i++){
-                        Constraint* constraint=(Constraint*)femmodel->constraints->GetObjectByOffset(i);
+                for(Object* & object: femmodel->constraints->objects){
+                        Constraint* constraint=xDynamicCast<Constraint*>(object);
                         constraint->PenaltyDofAndValue(&dof,&d,femmodel->nodes,femmodel->parameters);
                         if(dof!=-1){
@@ -180 +180 @@
         if(USEPENALTYMETHOD){
                 /*Option 1: Penalty method*/
-                for(int i=0;i<femmodel->constraints->Size();i++){
-                        Constraint* constraint=(Constraint*)femmodel->constraints->GetObjectByOffset(i);
+                for(Object* & object: femmodel->constraints->objects){
+                        Constraint* constraint=xDynamicCast<Constraint*>(object);
                         constraint->PenaltyDofAndValue(&dof,&d,femmodel->nodes,femmodel->parameters);
                         d = d*dmax;
@@ -195 +195 @@
                 IssmDouble* rows_spc = xNew<IssmDouble>(numrows);
                 numrows = 0;
-                for(int i=0;i<femmodel->constraints->Size();i++){
-                        Constraint* constraint=(Constraint*)femmodel->constraints->GetObjectByOffset(i);
+                for(Object* & object: femmodel->constraints->objects){
+                        Constraint* constraint=xDynamicCast<Constraint*>(object);
                         constraint->PenaltyDofAndValue(&dof,&d,femmodel->nodes,femmodel->parameters);
                         if(dof!=-1){
@@ -459 +459 @@
         /*Go solve lower order solution*/
         femmodel->profiler->Start(SOLVER);
-        SolverxPetsc(&u,LHS,RHS,NULL,NULL, femmodel->parameters); 
+        SolverxPetsc(&u,LHS,RHS,NULL,NULL, femmodel->parameters);
         femmodel->profiler->Stop(SOLVER);
         MatFree(&LHS);
@@ -506 +506 @@
 
         /*Update Element inputs*/
-        InputUpdateFromSolutionx(femmodel,uf); 
+        InputUpdateFromSolutionx(femmodel,uf);
         delete uf;