Changeset 4561

Timestamp:

07/13/10 14:41:12 (15 years ago)

Author:

Mathieu Morlighem

Message:

some fixinf in control method (wrong Enum in AXPY)

Location:

issm/trunk/src/m/solutions

Files:

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

issm/trunk/src/m/solutions/control_core.m

@@ -56 +56 @@
                 displaystring('\n%s',['      updating parameter using optimized search scalar:']);
                 scalar=search_scalar*optscal(n);
-                femmodel.elements=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,ControlParameterEnum);
+                femmodel.elements=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);
 
                 displaystring('\n%s',['      constraning the new distribution...']);

issm/trunk/src/m/solutions/objectivefunctionC.m

@@ -25 +25 @@
 %Use search scalar to shoot parameter in the gradient direction:
 scalar=search_scalar*optscal;
-femmodel.elements=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,ControlParameterEnum);
+femmodel.elements=InputAXPY(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type,scalar,GradientEnum);
 
 %Constrain: