Changeset 26277

Timestamp:

05/18/21 11:07:46 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing bad for loop variable repeating another one

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

@@ -196 +196 @@
                                                 } /*}}}*/
                                                 break;
-                                        case MatlithoEnum:
-                                                { /*{{{*/
+                                        case MatlithoEnum: { /*{{{*/
                                                         iomodel->FetchData(13,"md.materials.radius","md.materials.viscosity","md.materials.lame_lambda","md.materials.lame_mu","md.materials.burgers_viscosity","md.materials.burgers_mu","md.materials.ebm_alpha","md.materials.ebm_delta","md.materials.ebm_taul","md.materials.ebm_tauh","md.materials.rheologymodel","md.materials.issolid","md.materials.density");
                                                         materials->AddObject(new Matlitho(iomodel->numberofelements+1,iomodel));
@@ -204 +203 @@
                                                 /*}}}*/
                                                 break;
-                                        case MathydroEnum: /*{{{*/
-                                                { 
+                                        case MathydroEnum: {/*{{{*/
                                                         /*If we don't have any materials pointed to by elements (meaning, if we are running only litho or hydro), 
                                                          * then we need to zero out the hmaterial pointers inside the elements dataset so that it won't error out 
@@ -239 +237 @@
                                                 iomodel->FetchDataToInput(inputs,elements,"md.materials.rheology_n",MaterialsRheologyNEnum);
                                                 iomodel->FetchDataToInput(inputs,elements,"md.materials.rheology_E",MaterialsRheologyEEnum);
-                                                for (int i=0;i<iomodel->numberofelements;i++) if(iomodel->my_elements[i]) materials->AddObject(new Matice(i+1,i,MatenhancediceEnum));
+                                                for(int j=0;j<iomodel->numberofelements;j++) if(iomodel->my_elements[j]) materials->AddObject(new Matice(j+1,j,MatenhancediceEnum));
                                                 switch(iomodel->domaindim){
                                                         case 2:
@@ -256 +254 @@
                                                 iomodel->FetchDataToInput(inputs,elements,"md.materials.rheology_n",MaterialsRheologyNEnum);
                                                 iomodel->FetchDataToInput(inputs,elements,"md.damage.D",DamageDEnum);
-                                                for (int i=0;i<iomodel->numberofelements;i++) if(iomodel->my_elements[i]) materials->AddObject(new Matice(i+1,i,MatdamageiceEnum));
+                                                for (int j=0;j<iomodel->numberofelements;j++) if(iomodel->my_elements[j]) materials->AddObject(new Matice(j+1,j,MatdamageiceEnum));
                                                 switch(iomodel->domaindim){
                                                         case 2:
@@ -273 +271 @@
                                                 iomodel->FetchDataToInput(inputs,elements,"md.materials.rheology_Ec",MaterialsRheologyEcEnum);
                                                 iomodel->FetchDataToInput(inputs,elements,"md.materials.rheology_Es",MaterialsRheologyEsEnum);
-                                                for(int i=0;i<iomodel->numberofelements;i++) if(iomodel->my_elements[i]) materials->AddObject(new Matestar(i+1,i,iomodel));
+                                                for(int j=0;j<iomodel->numberofelements;j++) if(iomodel->my_elements[j]) materials->AddObject(new Matestar(j+1,j,iomodel));
                                                 switch(iomodel->domaindim){
                                                         case 2: