Changeset 3891

Timestamp:

05/21/10 16:00:03 (15 years ago)

Author:

seroussi

Message:

problem with mex/UpdateInputsFromConstant

Location:

issm/trunk/src/mex/UpdateInputsFromConstant

Files:

• UpdateInputsFromConstant.cpp (modified) (3 diffs)
• UpdateInputsFromConstant.h (modified) (1 diff)

issm/trunk/src/mex/UpdateInputsFromConstant/UpdateInputsFromConstant.cpp

@@ -17 +17 @@
 DataSet* materials=NULL;
 Parameters* parameters=NULL;
-int      constant;
-int      analysis_type;
-int      sub_analysis_type;
+double   constant;
+int      name;
 
 /*Boot module: */
@@ -35 +34 @@
 FetchParams(&parameters,PARAMETERSIN);
 FetchData(&constant,CONSTANT);
-FetchData(&analysis_type,ANALYSIS);
-FetchData(&sub_analysis_type,SUBANALYSIS);
+FetchData(&name,NAME);
 
 /*!Generate internal degree of freedom numbers: */
-UpdateInputsFromConstantx(elements,nodes,vertices,loads, materials,parameters,constant,analysis_type,sub_analysis_type);
+UpdateInputsFromConstantx(elements,nodes,vertices,loads, materials,parameters,constant,name);
 
 /*write output datasets: */
 WriteData(ELEMENTS,elements);
+WriteData(LOADS,loads);
 
 /*Free ressources: */
@@ -59 +58 @@
 {
         _printf_("\n");
-        _printf_("   usage: [elements] = %s(elements,nodes,vertices,loads,materials,parameters,constant,analysis_type,sub_analysis_type);\n",__FUNCT__);
+        _printf_("   usage: [elements loads] = %s(elements,nodes,vertices,loads,materials,parameters,constant,name);\n",__FUNCT__);
         _printf_("\n");
 }

issm/trunk/src/mex/UpdateInputsFromConstant/UpdateInputsFromConstant.h

@@ -25 +25 @@
 #define PARAMETERSIN (mxArray*)prhs[5]
 #define CONSTANT (mxArray*)prhs[6]
-#define ANALYSIS (mxArray*)prhs[7]
-#define SUBANALYSIS (mxArray*)prhs[8]
+#define NAME (mxArray*)prhs[7]
 
 /* serial output macros: */
 #define ELEMENTS (mxArray**)&plhs[0]
+#define LOADS (mxArray**)&plhs[1]
 
 /* serial arg counts: */
 #undef NLHS
-#define NLHS  1
+#define NLHS  2
 #undef NRHS
-#define NRHS  9
+#define NRHS  8
 
 #endif  /* _UPDATEINPUTSFROMCONSTANT_H */