Changeset 22827

Timestamp:

06/05/18 09:53:08 (7 years ago)

Author:

erobo

Message:

FIX: change to fix gradient indexing problems

File:

• issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/cores/controlm1qn3_core.cpp

@@ -88 +88 @@
         G = xNew<double>(n);
 
+        for(int i=0;i<intn;i++)_printf_(X[i]<<"\n");
         /*Scale control for M1QN3*/
-        for(int i=0;i<numberofvertices;i++){
-                for(int c=0;c<num_controls;c++){
-                        int index = num_controls*i+c;
+        for(int c=0;c<num_controls;c++){
+                for(int i=0;i<numberofvertices;i++){
+                        int index = numberofvertices*c+i;
+                        _printf_("Before "<<X[index]<<"\n");
                         X[index] = X[index]/scaling_factors[c];
+                        _printf_("After "<<X[index]<<"\n");
                 }
         }
@@ -144 +147 @@
         GetVectorFromControlInputsx(&XL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound");
         GetVectorFromControlInputsx(&XU,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound");
-        for(int i=0;i<numberofvertices;i++){
-                for(int c=0;c<num_controls;c++){
-                        int index = num_controls*i+c;
+        for(int c=0;c<num_controls;c++){
+                for(int i=0;i<numberofvertices;i++){
+                        int index = numberofvertices*c+i;
                         X[index] = X[index]*scaling_factors[c];
                         if(X[index]>XU[index]) X[index]=XU[index];
@@ -200 +203 @@
         GetVectorFromControlInputsx(&XL,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"lowerbound");
         GetVectorFromControlInputsx(&XU,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"upperbound");
-        for(int i=0;i<numberofvertices;i++){
-                for(int c=0;c<num_controls;c++){
-                        int index = num_controls*i+c;
+        for(int c=0;c<num_controls;c++){
+                for(int i=0;i<numberofvertices;i++){
+                        int index = numberofvertices*c+i;
                         X[index] = X[index]*scaling_factors[c];
                         if(X[index]>XU[index]) X[index]=XU[index];
@@ -256 +259 @@
         /*Constrain Gradient*/
         IssmDouble  Gnorm = 0.;
-        for(int i=0;i<numberofvertices;i++){
-                for(int c=0;c<num_controls;c++){
-                        int index = num_controls*i+c;
+        for(int c=0;c<num_controls;c++){
+                for(int i=0;i<numberofvertices;i++){
+                        int index = numberofvertices*c+i;
                         if(X[index]>=XU[index]) G[index]=0.;
                         if(X[index]<=XL[index]) G[index]=0.;