Changeset 11313 for issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp

Timestamp:

02/03/12 07:55:52 (13 years ago)

Author:

Mathieu Morlighem

Message:

Objective function gradient is now ONE unique vector

File:

• issm/trunk-jpl/src/c/modules/ControlInputScaleGradientx/ControlInputScaleGradientx.cpp (modified) (1 diff)

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

@@ -9 +9 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name,double scale){
+void ControlInputScaleGradientx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* norm_list,int step){
 
-        for(int i=0;i<elements->Size();i++){
-                Element* element=(Element*)elements->GetObjectByOffset(i);
-                element->ControlInputScaleGradient(name,scale);
+        /*Intermediaries*/
+        int     i,j,num_controls;
+        int    *control_type = NULL;
+        double *scalar_list = NULL;
+        double  scalar;
+
+
+        /*Retrieve some parameters*/
+        parameters->FindParam(&num_controls,InversionNumControlParametersEnum);
+        parameters->FindParam(&control_type,NULL,InversionControlParametersEnum);
+        parameters->FindParam(&scalar_list,NULL,NULL,InversionGradientScalingEnum);
+
+        /*Compute scaling factor*/
+        scalar=scalar_list[0]/norm_list[0];
+        for(i=0;i<num_controls;i++){
+                scalar=min(scalar,scalar_list[num_controls*step+i]/norm_list[i]);
         }
 
+        for(i=0;i<num_controls;i++){
+                for(j=0;j<elements->Size();j++){
+                        Element* element=(Element*)elements->GetObjectByOffset(j);
+                        element->ControlInputScaleGradient(control_type[i],scalar);
+                }
+        }
+
+        /*Clean up and return*/
+        xfree((void**)&control_type);
+        xfree((void**)&scalar_list);
 }