Changeset 11310 for issm/trunk-jpl/src/mex/Gradj/Gradj.cpp

Timestamp:

02/02/12 13:59:41 (13 years ago)

Author:

Mathieu Morlighem

Message:

Simplifying gradient call in CM

File:

• issm/trunk-jpl/src/mex/Gradj/Gradj.cpp (modified) (3 diffs)

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

@@ -8 +8 @@
 
         /*input datasets: */
-        int         control_type;
+        int         control_index;
+        double      grad_norm;
         Elements   *elements     = NULL;
         Nodes      *nodes        = NULL;
@@ -32 +33 @@
         FetchMatlabData((DataSet**)&materials,MATERIALS);
         FetchMatlabData(&parameters,PARAMETERS);
-        FetchMatlabData(&control_type,CONTROLTYPE);
+        FetchMatlabData(&control_index,CONTROLINDEX);
 
         /*configure: */
@@ -40 +41 @@
 
         /*!Call core code: */
-        Gradjx(&gradient, elements,nodes, vertices,loads, materials,parameters, control_type);
+        Gradjx(&gradient,&grad_norm,elements,nodes, vertices,loads, materials,parameters, control_index);
 
         /*write output : */
+        WriteMatlabData(GRADNORM,grad_norm);
         WriteMatlabData(GRADG,gradient);