Changeset 25539 for issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp

Timestamp:

09/07/20 03:12:14 (5 years ago)

Author:

bdef

Message:

CHG:Modifying loop on elements towards for on iterator

File:

• issm/trunk-jpl/src/c/modules/SystemMatricesx/SystemMatricesx.cpp (modified) (6 diffs)

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

@@ -41 +41 @@
 
                 /*Get complete stiffness matrix without penalties*/
-                for (i=0;i<femmodel->elements->Size();i++){
-                        element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
+                for(Object* & object : femmodel->elements->objects){
+                        element = xDynamicCast<Element*>(object);
                         if(!element->AnyFSet() && analysisenum!=StressbalanceAnalysisEnum) continue;
                         ElementMatrix* Ke = analysis->CreateKMatrix(element);
@@ -52 +52 @@
                 }
 
-                for (i=0;i<femmodel->loads->Size();i++){
-                        load=xDynamicCast<Load*>(femmodel->loads->GetObjectByOffset(i));
+                for(Object* & object : femmodel->loads->objects){
+                        load = xDynamicCast<Load*>(object);
                         load->CreateKMatrix(Kff_temp,NULL);
                 }
@@ -83 +83 @@
 
         /*Fill stiffness matrix and load vector from elements*/
-        for (i=0;i<femmodel->elements->Size();i++){
-                element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
+        for(Object* & object : femmodel->elements->objects){
+      element = xDynamicCast<Element*>(object);
                 if(!element->AnyFSet() && analysisenum!=StressbalanceAnalysisEnum) continue;
                 ElementMatrix* Ke = analysis->CreateKMatrix(element);
@@ -98 +98 @@
 
         /*Fill stiffness matrix and load vector from loads*/
-        for(i=0;i<femmodel->loads->Size();i++){
-                load=xDynamicCast<Load*>(femmodel->loads->GetObjectByOffset(i));
+        for(Object* & object : femmodel->loads->objects){
+      load = xDynamicCast<Load*>(object);
                 load->CreateKMatrix(Kff,Kfs);
                 load->CreatePVector(pf);
@@ -106 +106 @@
         /*Now deal with penalties (only in loads)*/
         if(ispenalty){
-                for (i=0;i<femmodel->loads->Size();i++){
-                        load=xDynamicCast<Load*>(femmodel->loads->GetObjectByOffset(i));
+                for(Object* & object : femmodel->loads->objects){
+                        load = xDynamicCast<Load*>(object);
                         load->PenaltyCreateKMatrix(Kff,Kfs,kmax);
                         load->PenaltyCreatePVector(pf,kmax);
@@ -115 +115 @@
         /*Create dof vector for stiffness matrix preconditioning*/
         if(pdf){
-                for(i=0;i<femmodel->elements->Size();i++){
-                        element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
-                        ElementVector* de=analysis->CreateDVector(element);
-                        if(de) de->InsertIntoGlobal(df);
-                        delete de;
+        for(Object* & object : femmodel->elements->objects){
+      element = xDynamicCast<Element*>(object);
+                ElementVector* de=analysis->CreateDVector(element);
+                if(de) de->InsertIntoGlobal(df);
+                delete de;
                 }
         }