Changeset 6213 for issm/trunk/src/c/solutions/gradient_core.cpp

Timestamp:

10/08/10 16:49:12 (14 years ago)

Author:

Mathieu Morlighem

Message:

Prepared ISSM for multivariable CM, Added modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp

File:

• issm/trunk/src/c/solutions/gradient_core.cpp (modified) (2 diffs)

issm/trunk/src/c/solutions/gradient_core.cpp

@@ -17 +17 @@
         /*parameters: */
         bool control_steady;
-        int  control_type;
+        int  num_controls;
+        int* control_type=NULL;
         int  verbose;
 
@@ -27 +28 @@
         /*retrieve parameters:*/
         femmodel->parameters->FindParam(&control_steady,ControlSteadyEnum);
-        femmodel->parameters->FindParam(&control_type,ControlTypeEnum);
+        femmodel->parameters->FindParam(&num_controls,NumControlsEnum);
+        femmodel->parameters->FindParam(&control_type,NULL,ControlTypeEnum);
         femmodel->parameters->FindParam(&verbose,VerboseEnum);
 
-        if(verbose)_printf_("%s\n","      compute gradient:");
-        Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, control_type);
+        for (int i=0;i<num_controls;i++){
 
-        if(control_steady)diagnostic_core(femmodel);
-        
-        if (step>0 && search_scalar==0){
-                _printf_("%s","      orthogonalization...\n");
-                if(verbose)_printf_("%s\n","      retrieve old gradient:");
-                ControlInputGetGradientx(&old_gradient,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,control_type);
-                Orthx(&new_gradient,gradient,old_gradient);
-                VecFree(&old_gradient);
+                if(verbose)_printf_("      compute gradient of J with respect to %s\n",EnumToString(control_type[i]));
+                Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, control_type[i]);
+
+                if(control_steady)diagnostic_core(femmodel);
+
+                if (step>0 && search_scalar==0){
+                        _printf_("%s","      orthogonalization...\n");
+                        ControlInputGetGradientx(&old_gradient,femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters,control_type[i]);
+                        Orthx(&new_gradient,gradient,old_gradient);
+                        VecFree(&old_gradient);
+                }
+                else{ 
+                        _printf_("%s","      normalizing directions...\n");
+                        Orthx(&new_gradient,gradient,NULL);
+                }
+                VecFree(&gradient);
+
+                /*plug back into inputs: */
+                ControlInputSetGradientx(femmodel-> elements,femmodel-> nodes, femmodel-> vertices,femmodel-> loads, femmodel-> materials,  femmodel->parameters,control_type[i],new_gradient);
+
+                /*Free ressources and return:*/
+                VecFree(&new_gradient);
         }
-        else{ 
-                _printf_("%s","      normalizing directions...\n");
-                Orthx(&new_gradient,gradient,NULL);
-        }
-        VecFree(&gradient);
 
-        /*plug back into inputs: */
-        ControlInputSetGradientx(femmodel-> elements,femmodel-> nodes, femmodel-> vertices,femmodel-> loads, femmodel-> materials,  femmodel->parameters,control_type,new_gradient);
-
-        /*Free ressources and return:*/
-        VecFree(&new_gradient);
+        /*Clean up and return*/
+        xfree((void**)&control_type);
 }