Changeset 5280

Timestamp:

08/16/10 11:35:46 (15 years ago)

Author:

Mathieu Morlighem

Message:

moved md.fit to md.cm_responses and 0-4 to enums

Location:

issm/trunk/src/mex/CostFunction

Files:

• CostFunction.cpp (modified) (4 diffs)
• CostFunction.h (modified) (2 diffs)

issm/trunk/src/mex/CostFunction/CostFunction.cpp

@@ -8 +8 @@
 
         /*input datasets: */
-        Elements* elements=NULL;
-        Loads* loads=NULL;
-        Nodes* nodes=NULL;
-        Vertices* vertices=NULL;
-        Materials* materials=NULL;
-        Parameters* parameters=NULL;
-        bool process_units=false;
+        Elements   *elements   = NULL;
+        Loads      *loads      = NULL;
+        Nodes      *nodes      = NULL;
+        Vertices   *vertices   = NULL;
+        Materials  *materials  = NULL;
+        Parameters *parameters = NULL;
+        int         response;
 
         /* output datasets: */
@@ -32 +32 @@
         FetchData((DataSet**)&materials,MATERIALS);
         FetchParams(&parameters,PARAMETERS);
+        FetchData(&response,RESPONSE);
 
         /*configure: */
@@ -39 +40 @@
 
         /*!Call core code: */
-        CostFunctionx(&J, elements,nodes,vertices, loads,materials,parameters,process_units);
+        CostFunctionx(&J, elements,nodes,vertices, loads,materials,parameters,response);
 
         /*write output : */
@@ -59 +60 @@
 {
         _printf_("\n");
-        _printf_("   usage: [J] = %s(elements,nodes,vertices,loads, materials, parameters);\n",__FUNCT__);
+        _printf_("   usage: [J] = %s(elements,nodes,vertices,loads, materials, parameters,response);\n",__FUNCT__);
         _printf_("\n");
 }

issm/trunk/src/mex/CostFunction/CostFunction.h

@@ -23 +23 @@
 #define MATERIALS (mxArray*)prhs[4]
 #define PARAMETERS (mxArray*)prhs[5]
+#define RESPONSE (mxArray*)prhs[6]
 
 /* serial output macros: */
@@ -31 +32 @@
 #define NLHS  1
 #undef NRHS
-#define NRHS  6
+#define NRHS  7
 
 #endif  /* _COSTFUNCTION_H */