Changeset 11318

Timestamp:

02/03/12 14:13:19 (13 years ago)

Author:

Mathieu Morlighem

Message:

Added support for bounds on control parameters for TAO

Location:

issm/trunk-jpl/src/c

Files:

• modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.cpp (modified) (4 diffs)
• modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h (modified) (1 diff)
• objects/Elements/Element.h (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (2 diffs)
• objects/Elements/Penta.h (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (2 diffs)
• objects/Elements/Tria.h (modified) (1 diff)
• objects/Inputs/ControlInput.cpp (modified) (1 diff)
• objects/Inputs/ControlInput.h (modified) (1 diff)
• solutions/controltao_core.cpp (modified) (1 diff)

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

@@ -9 +9 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void GetVectorFromControlInputsx(Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){
+void GetVectorFromControlInputsx(Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data){
 
         int  num_controls;
@@ -25 +25 @@
                 for(int j=0;j<elements->Size();j++){
                         Element* element=(Element*)elements->GetObjectByOffset(j);
-                        element->GetVectorFromControlInputs(vector,control_type[i],i);
+                        element->GetVectorFromControlInputs(vector,control_type[i],i,data);
                 }
         }
@@ -37 +37 @@
 }
 
-void GetVectorFromControlInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){
+void GetVectorFromControlInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, const char* data){
         
         /*output: */
@@ -45 +45 @@
         Vec vec_vector=NULL;
 
-        GetVectorFromControlInputsx( &vec_vector, elements,nodes, vertices, loads, materials, parameters);
+        GetVectorFromControlInputsx( &vec_vector, elements,nodes, vertices, loads, materials, parameters,data);
         VecToMPISerial(&vector,vec_vector);
 

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

@@ -9 +9 @@
 
 /* local prototypes: */
-void    GetVectorFromControlInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters);
-void    GetVectorFromControlInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters);
+void    GetVectorFromControlInputsx( Vec* pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value");
+void    GetVectorFromControlInputsx( double** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value");
 
 #endif  /* _GETVECTORFROMCONTROLINPUTSXX_H */

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

@@ -103 +103 @@
                 virtual void   ControlInputSetGradient(double* gradient,int enum_type,int control_index)=0;
                 virtual void   ControlInputScaleGradient(int enum_type, double scale)=0;
-                virtual void   GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index)=0;
+                virtual void   GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index,const char* data)=0;
                 virtual void   SetControlInputsFromVector(double* vector,int control_enum,int control_index)=0;
                 virtual void   InputControlUpdate(double scalar,bool save_parameter)=0;

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

@@ -5132 +5132 @@
 /*}}}*/
 /*FUNCTION Penta::GetVectorFromControlInputs{{{1*/
-void  Penta::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index){
+void  Penta::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index,const char* data){
 
         int doflist1[NUMVERTICES];
@@ -5146 +5146 @@
         if(!input) _error_("Input %s not found in element",EnumToStringx(control_enum));
 
-        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
-        input->GetVectorFromInputs(vector,&doflist1[0]);
+        /*Check that it is a ControlInput*/
+        if (input->ObjectEnum()!=ControlInputEnum){
+                _error_("input %s is not a ControlInput",EnumToStringx(control_enum));
+        }
+
+        ((ControlInput*)input)->GetVectorFromInputs(vector,&doflist1[0],data);
 }
 /*}}}*/

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

@@ -149 +149 @@
                 void   GradjBbarPattyn(Vec gradient,int control_index);
                 void   GradjBbarStokes(Vec gradient,int control_index);
-                void   GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index);
+                void   GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index,const char* data);
                 void   SetControlInputsFromVector(double* vector,int control_enum,int control_index);
                 void   ControlInputGetGradient(Vec gradient,int enum_type,int control_index);

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

@@ -4731 +4731 @@
 /*}}}*/
 /*FUNCTION Tria::GetVectorFromControlInputs{{{1*/
-void  Tria::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index){
+void  Tria::GetVectorFromControlInputs(Vec vector,int control_enum,int control_index,const char* data){
 
         int doflist1[NUMVERTICES];
@@ -4745 +4745 @@
         if(!input) _error_("Input %s not found in element",EnumToStringx(control_enum));
 
-        /*We found the enum.  Use its values to fill into the vector, using the vertices ids: */
-        input->GetVectorFromInputs(vector,&doflist1[0]);
+        /*Check that it is a ControlInput*/
+        if (input->ObjectEnum()!=ControlInputEnum){
+                _error_("input %s is not a ControlInput",EnumToStringx(control_enum));
+        }
+
+        ((ControlInput*)input)->GetVectorFromInputs(vector,&doflist1[0],data);
 }
 /*}}}*/

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

@@ -150 +150 @@
                 void   GradjVxBalancedthickness(Vec gradient,int control_index);
                 void   GradjVyBalancedthickness(Vec gradient,int control_index);
-                void   GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index);
+                void   GetVectorFromControlInputs(Vec gradient,int control_enum,int control_index,const char* data);
                 void   SetControlInputsFromVector(double* vector,int control_enum,int control_index);
                 void   ControlInputGetGradient(Vec gradient,int enum_type,int control_index);

issm/trunk-jpl/src/c/objects/Inputs/ControlInput.cpp

@@ -406 +406 @@
         return gradient->SpawnResult(step,time);
 }/*}}}*/
-/*FUNCTION ControlInput::GetInputValue(bool* pvalue){{{1*/
+/*FUNCTION ControlInput::GetVectorFromInputs(Vec vector,int* doflist){{{1*/
 void ControlInput::GetVectorFromInputs(Vec vector,int* doflist){
         values->GetVectorFromInputs(vector,doflist);
+}/*}}}*/
+/*FUNCTION ControlInput::GetVectorFromInputs(Vec vector,int* doflist,const char* data){{{1*/
+void ControlInput::GetVectorFromInputs(Vec vector,int* doflist,const char* data){
+         if(strcmp(data,"value")==0){
+                 _assert_(values);
+                 values->GetVectorFromInputs(vector,doflist);
+         }
+         else if (strcmp(data,"lowerbound")==0){
+                 _assert_(minvalues);
+                 minvalues->GetVectorFromInputs(vector,doflist);
+         }
+         else if (strcmp(data,"upperbound")==0){
+                 _assert_(maxvalues);
+                 maxvalues->GetVectorFromInputs(vector,doflist);
+         }
+         else if (strcmp(data,"gradient")==0){
+                 _assert_(gradient);
+                 gradient->GetVectorFromInputs(vector,doflist);
+         }
+         else{
+                 _error_("Data %s not supported yet",data);
+         }
 }/*}}}*/
 /*FUNCTION ControlInput::GetInputAverage(double* pvalue){{{1*/

issm/trunk-jpl/src/c/objects/Inputs/ControlInput.h

@@ -87 +87 @@
                 void Extrude(void);
                 void VerticallyIntegrate(Input* thickness_input);
+                void GetVectorFromInputs(Vec vector,int* doflist,const char* data);
                 void GetVectorFromInputs(Vec vector,int* doflist);
                 void GetValuesPtr(double** pvalues,int* pnum_values){_error_("not implemented yet");};

issm/trunk-jpl/src/c/solutions/controltao_core.cpp

@@ -58 +58 @@
         XL=NewVec(numberofvertices); VecSet(XL,1.);
         XU=NewVec(numberofvertices); VecSet(XU,200.);
-        //TaoSetVariableBounds(tao,XL,XU); VecFree(&XL); VecFree(&XU);
 
-        GetVectorFromControlInputsx(&X,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+        GetVectorFromControlInputsx(&X, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,"value");
+        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");
         TaoSetInitialVector(tao,X);
+        TaoSetVariableBounds(tao,XL,XU);
+        VecFree(&XL);
+        VecFree(&XU);
 
         user.femmodel=femmodel;