Changeset 4560

Timestamp:

07/13/10 14:39:32 (15 years ago)

Author:

Mathieu Morlighem

Message:

some fixinf in control method (wrong Enum in AXPY)

Location:

issm/trunk/src/c/solutions

Files:

• control_core.cpp (modified) (1 diff)
• objectivefunctionC.cpp (modified) (1 diff)

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

@@ -91 +91 @@
 
                 _printf_("%s\n","      updating parameter using optimized search scalar...");
-                InputAXPYx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,search_scalar*optscal[n],ControlParameterEnum);
+                InputAXPYx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,search_scalar*optscal[n],GradientEnum);
 
                 _printf_("%s\n","      constraining the new distribution...");    

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

@@ -63 +63 @@
         
         /*Use search scalar to shoot parameter in the gradient direction: */
-        InputAXPYx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,search_scalar*optscal[n],ControlParameterEnum);
+        InputAXPYx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,control_type,search_scalar*optscal[n],GradientEnum);
 
         /*Constrain:*/