Changeset 27452

Timestamp:

12/05/22 12:40:40 (2 years ago)

Author:

Mathieu Morlighem

Message:

CHG: resolved problem of scope with for(ae=0

File:

• issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (modified) (9 diffs)

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

@@ -7590 +7590 @@
                 b=i*nt;
                 c=av*nel;
-                for (int ae=0;ae<loads->nactiveloads;ae++){
+                for(ae=0;ae<loads->nactiveloads;ae++){
                         e=loads->combined_loads_index[ae];
                         a=AlphaIndex[c+e]*viscousnumsteps;
@@ -7695 +7695 @@
                 //get projection
                 if (spatial_component==1){ //north
-                        for (int ae=0;ae<loads->nactiveloads;ae++){
+                        for(ae=0;ae<loads->nactiveloads;ae++){
                                 e=loads->combined_loads_index[ae];
                                 horiz_projection[ae]=cos(2.0*M_PI*reCast<IssmDouble,int>(AzimIndex[av*nel+e])/65535.0); // 65535=2^16-1 = max value of 16 bits unsigned int
@@ -7701 +7701 @@
                         for(l=0;l<SLGEOM_NUMLOADS;l++){
                                 nbar=slgeom->nbar[l];
-                                for (ae=0;ae<loads->nactivesubloads[l];ae++){
+                                for(ae=0;ae<loads->nactivesubloads[l];ae++){
                                         e=loads->combined_subloads_index[l][ae];
                                         horiz_projectionsub[l][ae]=cos(2.0*M_PI*reCast<IssmDouble,int>(AzimIndexsub[l][av*nbar+e])/65535.0);
@@ -7708 +7708 @@
                 }
                 else if (spatial_component==2){ //east
-                        for (int ae=0;ae<loads->nactiveloads;ae++){
+                        for(ae=0;ae<loads->nactiveloads;ae++){
                                 e=loads->combined_loads_index[ae];
                                 horiz_projection[ae]=sin(2.0*M_PI*reCast<IssmDouble,int>(AzimIndex[av*nel+e])/65535.0);
@@ -7714 +7714 @@
                         for(l=0;l<SLGEOM_NUMLOADS;l++){
                                 nbar=slgeom->nbar[l];
-                                for (ae=0;ae<loads->nactivesubloads[l];ae++){
+                                for(ae=0;ae<loads->nactivesubloads[l];ae++){
                                         e=loads->combined_subloads_index[l][ae];
                                         horiz_projectionsub[l][ae]=sin(2.0*M_PI*reCast<IssmDouble,int>(AzimIndexsub[l][av*nbar+e])/65535.0);
@@ -7722 +7722 @@
 
                 //project load in the right direction 
-                for (int ae=0;ae<loads->nactiveloads;ae++){
+                for (ae=0;ae<loads->nactiveloads;ae++){
                         projected_loads[ae]=loads->combined_loads[ae]*horiz_projection[ae];
                 }
                 for(l=0;l<SLGEOM_NUMLOADS;l++){
                         nbar=slgeom->nbar[l];
-                        for (ae=0;ae<loads->nactivesubloads[l];ae++){
+                        for(ae=0;ae<loads->nactivesubloads[l];ae++){
                                 projected_subloads[l][ae]=loads->combined_subloads[l][ae]*horiz_projectionsub[l][ae];
                         }
@@ -7734 +7734 @@
                 //do the convolution
                 c=av*nel;
-                for (int ae=0;ae<loads->nactiveloads;ae++){
+                for(ae=0;ae<loads->nactiveloads;ae++){
                         e=loads->combined_loads_index[ae];
                         a=AlphaIndex[c+e]*viscousnumsteps;
@@ -7744 +7744 @@
                         nbar=slgeom->nbar[l];
                         c=av*nbar;
-                        for (ae=0;ae<loads->nactivesubloads[l];ae++){
+                        for(ae=0;ae<loads->nactivesubloads[l];ae++){
                                 e=loads->combined_subloads_index[l][ae];
                                 a=AlphaIndexsub[l][c+e]*viscousnumsteps;
@@ -7757 +7757 @@
 
         //free resources
-
         xDelete<IssmDouble>(horiz_projection);
         xDelete<IssmDouble>(projected_loads);