Changeset 465 for issm/trunk/src/mex/Misfit/Misfit.cpp

Timestamp:

05/18/09 09:43:19 (16 years ago)

Author:

Eric.Larour

Message:

New sub analysis type field in all solutions. New thermal solution sequence

File:

• issm/trunk/src/mex/Misfit/Misfit.cpp (modified) (4 diffs)

issm/trunk/src/mex/Misfit/Misfit.cpp

@@ -15 +15 @@
         DataSet* loads=NULL;
         DataSet* materials=NULL;
-        int      analysis_type;
         double*  u_g=NULL;
         double*  u_g_obs=NULL;
         ParameterInputs* inputs=NULL;
+        char*             analysis_type_string=NULL;
+        int               analysis_type;
+        char*             sub_analysis_type_string=NULL;
+        int               sub_analysis_type;
 
         /* output datasets: */
@@ -34 +37 @@
         FetchData((void**)&loads,NULL,NULL,LOADS,"DataSet",NULL);
         FetchData((void**)&materials,NULL,NULL,MATERIALS,"DataSet",NULL);
-        FetchData((void**)&analysis_type,NULL,NULL,mxGetField(PARAMETERS,0,"analysis_type"),"Integer",NULL);
         FetchData((void**)&u_g,NULL,NULL,UG,"Vector","Vec");
         FetchData((void**)&u_g_obs,NULL,NULL,UGOBS,"Vector","Vec");
+        FetchData((void**)&analysis_type_string,NULL,NULL,ANALYSIS,"String",NULL);
+        analysis_type=AnalysisTypeAsEnum(analysis_type_string);
+        FetchData((void**)&sub_analysis_type_string,NULL,NULL,SUBANALYSIS,"String",NULL);
+        sub_analysis_type=AnalysisTypeAsEnum(sub_analysis_type_string);
 
         /*Fetch inputs: */
@@ -43 +49 @@
 
         /*!Call core code: */
-        Misfitx(&J, elements,nodes,loads,materials,u_g,u_g_obs,inputs,analysis_type);
+        Misfitx(&J, elements,nodes,loads,materials,u_g,u_g_obs,inputs,analysis_type,sub_analysis_type);
 
         /*write output : */
@@ -55 +61 @@
         xfree((void**)&u_g);
         xfree((void**)&u_g_obs);
-        delete inputs
+        delete inputs;
+        xfree((void**)&analysis_type_string);
+        xfree((void**)&sub_analysis_type_string);
 
         /*end module: */