Changeset 22828

Timestamp:

06/05/18 10:49:26 (7 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixing ID problem when we have multiple controls

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Element.cpp (modified) (2 diffs)
• classes/Elements/Element.h (modified) (2 diffs)
• classes/Elements/Penta.cpp (modified) (4 diffs)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Seg.h (modified) (1 diff)
• classes/Elements/Tetra.h (modified) (1 diff)
• classes/Elements/Tria.cpp (modified) (5 diffs)
• classes/Elements/Tria.h (modified) (1 diff)
• cores/controlm1qn3_core.cpp (modified) (1 diff)
• modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (modified) (9 diffs)
• modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h (modified) (1 diff)

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

@@ -1383 +1383 @@
         return z;
 }/*}}}*/
-void       Element::GradientIndexing(int* indexing,int control_index,bool onsid){/*{{{*/
+void       Element::GradientIndexing(int* indexing,int control_index){/*{{{*/
 
         /*Get number of controls*/
@@ -1415 +1415 @@
                 int M;
                 parameters->FindParam(&M,ControlInputSizeMEnum);
-        /*get gradient indices*/
-                if(onsid){
-                        for(int i=0;i<numvertices;i++){
-                                indexing[i]=this->vertices[i]->Sid() + (control_index)*M;
-                        }
-                }
-                else{
-                        for(int i=0;i<numvertices;i++){
-                                indexing[i]=this->vertices[i]->Pid() + (control_index)*M;
-                        }
+                /*get gradient indices*/
+                for(int i=0;i<numvertices;i++){
+                        indexing[i]=this->vertices[i]->Sid() + (control_index)*M;
                 }
         }

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -111 +111 @@
                 IssmDouble         GetYcoord(IssmDouble* xyz_list,Gauss* gauss);
                 IssmDouble         GetZcoord(IssmDouble* xyz_list,Gauss* gauss);
-                void               GradientIndexing(int* indexing,int control_index,bool onsid=false);
+                void               GradientIndexing(int* indexing,int control_index);
                 IssmDouble         GroundedArea(IssmDouble* mask, bool scaled);
                 bool               HasNodeOnBase();
@@ -225 +225 @@
                 virtual int        GetNumberOfNodes(int enum_type)=0;
                 virtual int        GetNumberOfVertices(void)=0;
-                virtual void       GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset, bool onsid)=0;
-                virtual void       GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data, bool onsid)=0;
+                virtual void       GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset)=0;
+                virtual void       GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data)=0;
                 virtual void       GetVerticesCoordinatesBase(IssmDouble** xyz_list)=0;
                 virtual void       GetVerticesCoordinatesTop(IssmDouble** xyz_list)=0;

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

@@ -1153 +1153 @@
 }
 /*}}}*/
-void       Penta::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data,bool onsid){/*{{{*/
+void       Penta::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data){/*{{{*/
 
         int vertexidlist[NUMVERTICES];
@@ -1161 +1161 @@
 
         /*Prepare index list*/
-        GradientIndexing(&vertexidlist[0],control_index,onsid);
+        GradientIndexing(&vertexidlist[0],control_index);
 
         /*Get input (either in element or material)*/
@@ -1176 +1176 @@
 }
 /*}}}*/
-void       Penta::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data,int offset,bool onsid){/*{{{*/
+void       Penta::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data,int offset){/*{{{*/
 
         int* idlist = NULL;
@@ -1217 +1217 @@
                                         idlist = xNew<int>(NUMVERTICES);
                                         values = xNew<IssmDouble>(NUMVERTICES);
-                                        GradientIndexing(&idlist[0],control_index,true);
+                                        GradientIndexing(&idlist[0],control_index);
                                         for(int i=0;i<NUMVERTICES;i++){
                                                 values[i] = pentainput->values[i];

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -86 +86 @@
                 Penta*         GetLowerPenta(void);
                 Penta*         GetUpperPenta(void);
-                void           GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,bool onsid);
-                void           GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset,bool onsid);
+                void           GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data);
+                void           GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset);
                 void           GetVerticesCoordinatesBase(IssmDouble** pxyz_list);
                 void           GetVerticesCoordinatesTop(IssmDouble** pxyz_list);

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -73 +73 @@
                 int         GetNumberOfNodes(int enum_type){_error_("not implemented yet");};
                 int         GetNumberOfVertices(void);
-                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset,bool onsid){_error_("not implemented yet");};
-                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,bool onsid){_error_("not implemented yet");};
+                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset){_error_("not implemented yet");};
+                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data){_error_("not implemented yet");};
                 void        GetVerticesCoordinates(IssmDouble** pxyz_list);
                 void        GetVerticesCoordinatesBase(IssmDouble** pxyz_list){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tetra.h

@@ -79 +79 @@
                 int         GetNumberOfNodes(int enum_type){_error_("not implemented yet");};
                 int         GetNumberOfVertices(void);
-                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset,bool onsid){_error_("not implemented yet");};
-                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,bool onsid){_error_("not implemented yet");};
+                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset){_error_("not implemented yet");};
+                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data){_error_("not implemented yet");};
                 void        GetVerticesCoordinatesBase(IssmDouble** pxyz_list);
                 void        GetVerticesCoordinatesTop(IssmDouble** pxyz_list);

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

@@ -753 +753 @@
         if (input->ObjectEnum()!=ControlInputEnum) _error_("Input " << EnumToStringx(enum_type) << " is not a ControlInput");
 
-        GradientIndexing(&gradidlist[0],control_index,true);
+        GradientIndexing(&gradidlist[0],control_index);
 
         for(int n=0;n<N;n++){
@@ -1689 +1689 @@
 }
 /*}}}*/
-void       Tria::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data,bool onsid){/*{{{*/
+void       Tria::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data){/*{{{*/
 
         int vertexidlist[NUMVERTICES];
@@ -1698 +1698 @@
 
         /*Prepare index list*/
-        GradientIndexing(&vertexidlist[0],control_index,onsid);
+        GradientIndexing(&vertexidlist[0],control_index);
 
         /*Get input (either in element or material)*/
@@ -1711 +1711 @@
 }
 /*}}}*/
-void       Tria::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data,int offset, bool onsid){/*{{{*/
+void       Tria::GetVectorFromControlInputs(Vector<IssmDouble>* vector,int control_enum,int control_index,const char* data,int offset){/*{{{*/
 
         int* idlist = NULL;
@@ -1753 +1753 @@
                                 idlist = xNew<int>(NUMVERTICES);
                                 values = xNew<IssmDouble>(NUMVERTICES);
-                                GradientIndexing(&idlist[0],control_index,true);
+                                GradientIndexing(&idlist[0],control_index);
                                 for(int i=0;i<NUMVERTICES;i++){
                                         values[i] = triainput->values[i];

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

@@ -86 +86 @@
                 int         GetNumberOfNodes(int enum_type);
                 int         GetNumberOfVertices(void);
-                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset,bool onsid);
-                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,bool onsid);
+                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data,int offset);
+                void        GetVectorFromControlInputs(Vector<IssmDouble>* gradient,int control_enum,int control_index,const char* data);
                 void        GetVerticesCoordinatesBase(IssmDouble** pxyz_list);
                 void        GetVerticesCoordinatesTop(IssmDouble** pxyz_list);

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 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");
                 }
         }

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

@@ -7 +7 @@
 #include "../../toolkits/toolkits.h"
 
-void GetVectorFromControlInputsx(Vector<IssmDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data,bool onsid){/*{{{*/
+void GetVectorFromControlInputsx(Vector<IssmDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data){/*{{{*/
 
         bool isautodiff;
@@ -37 +37 @@
                         for(int j=0;j<elements->Size();j++){
                                 Element* element=(Element*)elements->GetObjectByOffset(j);
-                                element->GetVectorFromControlInputs(vector,control_type[i],i,data,offset,onsid);
+                                element->GetVectorFromControlInputs(vector,control_type[i],i,data,offset);
                         }
                         offset += M[i]*N[i];
@@ -69 +69 @@
                         for(int j=0;j<elements->Size();j++){
                                 Element* element=(Element*)elements->GetObjectByOffset(j);
-                                element->GetVectorFromControlInputs(vector,control_type[i],i,data,onsid);
+                                element->GetVectorFromControlInputs(vector,control_type[i],i,data);
                         }
                 }
@@ -80 +80 @@
 
 }/*}}}*/
-void GetVectorFromControlInputsx( IssmDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, const char* data,bool onsid){/*{{{*/
+void GetVectorFromControlInputsx( IssmDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, const char* data){/*{{{*/
 
         /*intermediary: */
         Vector<IssmDouble>* vec_vector=NULL;
 
-        GetVectorFromControlInputsx( &vec_vector, elements,nodes, vertices, loads, materials, parameters,data,onsid);
+        GetVectorFromControlInputsx( &vec_vector, elements,nodes, vertices, loads, materials, parameters,data);
         IssmDouble* vector=vec_vector->ToMPISerial();
 
@@ -97 +97 @@
 /*For autodiff, we sometimes need to cast our vectors to passive*/
 #ifdef _HAVE_ADOLC_
-void GetPassiveVectorFromControlInputsx(Vector<IssmPDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data,bool onsid){/*{{{*/
+void GetPassiveVectorFromControlInputsx(Vector<IssmPDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data){/*{{{*/
 
         /*Get active vector first*/
@@ -105 +105 @@
 
         /*Retrieve some parameters*/
-        GetVectorFromControlInputsx(&activevector, elements,nodes, vertices, loads, materials, parameters,data,onsid);
+        GetVectorFromControlInputsx(&activevector, elements,nodes, vertices, loads, materials, parameters,data);
 
         /*Serialize vector*/
@@ -124 +124 @@
 
 }/*}}}*/
-void GetPassiveVectorFromControlInputsx(IssmPDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, const char* data,bool onsid){/*{{{*/
+void GetPassiveVectorFromControlInputsx(IssmPDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, const char* data){/*{{{*/
 
         /*Get active vector first*/
@@ -132 +132 @@
 
         /*Retrieve some parameters*/
-        GetVectorFromControlInputsx(&activevector, elements,nodes, vertices, loads, materials, parameters,data,onsid);
+        GetVectorFromControlInputsx(&activevector, elements,nodes, vertices, loads, materials, parameters,data);
 
         /*Serialize vector*/
@@ -149 +149 @@
 }/*}}}*/
 #else
-void GetPassiveVectorFromControlInputsx(Vector<IssmPDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data,bool onsid){/*{{{*/
+void GetPassiveVectorFromControlInputsx(Vector<IssmPDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data){/*{{{*/
 
-        GetVectorFromControlInputsx(pvector, elements,nodes, vertices, loads, materials, parameters,data,onsid);
+        GetVectorFromControlInputsx(pvector, elements,nodes, vertices, loads, materials, parameters,data);
 
 }/*}}}*/
-void GetPassiveVectorFromControlInputsx(IssmPDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, const char* data,bool onsid){/*{{{*/
+void GetPassiveVectorFromControlInputsx(IssmPDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, const char* data){/*{{{*/
 
-        GetVectorFromControlInputsx(pvector, elements,nodes, vertices, loads, materials, parameters,data,onsid);
+        GetVectorFromControlInputsx(pvector, elements,nodes, vertices, loads, materials, parameters,data);
 }/*}}}*/
 #endif

issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h

@@ -8 +8 @@
 
 /* local prototypes: */
-void    GetVectorFromControlInputsx( Vector<IssmDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value",bool onsid=false);
-void    GetVectorFromControlInputsx( IssmDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value",bool onsid=false);
+void    GetVectorFromControlInputsx( Vector<IssmDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value");
+void    GetVectorFromControlInputsx( IssmDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value");
 
-void    GetPassiveVectorFromControlInputsx(Vector<double>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value",bool onsid=false);
-void    GetPassiveVectorFromControlInputsx(double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value",bool onsid=false);
+void    GetPassiveVectorFromControlInputsx(Vector<double>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value");
+void    GetPassiveVectorFromControlInputsx(double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value");
 
 #endif  /* _GETVECTORFROMCONTROLINPUTSXX_H */