Changeset 25554 for issm/trunk-jpl/src/c/modules/ConstraintsStatex/RiftConstraintsState.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/modules/ConstraintsStatex/RiftConstraintsState.cpp (modified) (7 diffs)

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