Changeset 25554 for issm/trunk-jpl/src/c/classes/FemModel.cpp

Timestamp:

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

Author:

bdef

Message:

CHG: Some more iterator loop changes

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (12 diffs)

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);