Changeset 4540

Timestamp:

07/12/10 16:48:08 (15 years ago)

Author:

seroussi

Message:

some modifications in OptFunc and OptArgs

Location:

issm/trunk/src/c

Files:

• objects/OptArgs.h (modified) (1 diff)
• shared/Numerics/OptFunc.cpp (modified) (2 diffs)
• solutions/steadystateconvergence.cpp (modified) (1 diff)

issm/trunk/src/c/objects/OptArgs.h

@@ -13 +13 @@
 
         char* function_name;
-        mxArray* models;
-        mxArray* inputs;
-        mxArray* param_g;
-        mxArray* grad_g;
+        mxArray* femmodel;
         mxArray* n;
-        mxArray* analysis_type;
-        mxArray* sub_analysis_type;
 
 };

issm/trunk/src/c/shared/Numerics/OptFunc.cpp

@@ -20 +20 @@
         double J;
 
-        mxArray*   inputs[7];
+        mxArray*   inputs[3];
         mxArray*   psearch_scalar=NULL;
         mxArray*   mxJ=NULL;
@@ -26 +26 @@
         psearch_scalar=mxCreateDoubleScalar(scalar);
         inputs[0]=psearch_scalar;
-        inputs[1]=optargs->models;
-        inputs[3]=optargs->param_g;
-        inputs[4]=optargs->grad_g;
-        inputs[5]=optargs->n;
-        inputs[6]=optargs->analysis_type;
-        inputs[7]=optargs->sub_analysis_type;
+        inputs[1]=optargs->femmodel;
+        inputs[2]=optargs->n;
 
-        mexCallMATLAB( 1, &mxJ, 8, (mxArray**)inputs, optargs->function_name);
+        mexCallMATLAB( 1, &mxJ, 3, (mxArray**)inputs, optargs->function_name);
 
         /*extract misfit from mxArray*/

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

@@ -37 +37 @@
         temperature_converged=InputConvergencex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,&temperatureenums[0],2,&convergencecriterion[0],&convergencecriterionvalue[0],1);
 
-
         if(velocity_converged && temperature_converged)converged=1;
 
         /*return: */
         return converged;
-
 }