Changeset 11313 for issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.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/mex/ControlInputSetGradient/ControlInputSetGradient.cpp (modified) (4 diffs)

issm/trunk-jpl/src/mex/ControlInputSetGradient/ControlInputSetGradient.cpp

@@ -14 +14 @@
 Materials  *materials  = NULL;
 Parameters *parameters = NULL;
-int         control_type;
 double     *gradient   = NULL;
 
@@ -30 +29 @@
 FetchMatlabData((DataSet**)&materials,MATERIALSIN);
 FetchMatlabData(&parameters,PARAMETERSIN);
-FetchMatlabData(&control_type,CONTROLTYPE);
 FetchMatlabData(&gradient,NULL,GRADIENT);
 
@@ -39 +37 @@
 
 /*call "x" code layer*/
-ControlInputSetGradientx(elements,nodes,vertices,loads, materials,parameters,control_type,gradient);
+ControlInputSetGradientx(elements,nodes,vertices,loads, materials,parameters,gradient);
 
 /*write output datasets: */
@@ -64 +62 @@
 {
         _printf_(true,"\n");
-        _printf_(true,"   usage: [elements,nodes,vertices,loads,materials,parameters] = %s(elements,nodes,vertices,loads,materials,control_type,gradient);\n",__FUNCT__);
+        _printf_(true,"   usage: [elements,nodes,vertices,loads,materials,parameters] = %s(elements,nodes,vertices,loads,materials,gradient);\n",__FUNCT__);
         _printf_(true,"\n");
 }