Changeset 4108

Timestamp:

06/21/10 16:57:57 (15 years ago)

Author:

Eric.Larour

Message:

done moving

Location:

issm/trunk/src/mex

Files:

• InputUpdateFromSolution/InputUpdateFromSolution.cpp (modified) (5 diffs)
• InputUpdateFromSolution/InputUpdateFromSolution.h (modified) (5 diffs)
• Makefile.am (modified) (2 diffs)

issm/trunk/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.cpp

@@ -1 @@
-/*\file UpdateInputsFromSolution.c
+/*\file InputUpdateFromSolution.c
 *\brief: update elements properties using a solution vector
 */
 
-#include "./UpdateInputsFromSolution.h"
+#include "./InputUpdateFromSolution.h"
 
 void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){
@@ -18 +18 @@
 Parameters* parameters=NULL;
 Vec      solution=NULL;
-int      analysis_type;
-int      sub_analysis_type;
 
 /*Boot module: */
@@ -25 +23 @@
 
 /*checks on arguments on the matlab side: */
-CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&UpdateInputsFromSolutionUsage);
+CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputUpdateFromSolutionUsage);
 
 /*Input datasets: */
@@ -35 +33 @@
 FetchParams(&parameters,PARAMETERSIN);
 FetchData(&solution,SOLUTION);
-FetchData(&analysis_type,ANALYSIS);
-FetchData(&sub_analysis_type,SUBANALYSIS);
 
 /*!Generate internal degree of freedom numbers: */
-UpdateInputsFromSolutionx(elements,nodes,vertices,loads, materials,parameters,solution,analysis_type,sub_analysis_type);
+InputUpdateFromSolutionx(elements,nodes,vertices,loads, materials,parameters,solution);
 
 /*write output datasets: */
@@ -57 +53 @@
 }
 
-void UpdateInputsFromSolutionUsage(void)
+void InputUpdateFromSolutionUsage(void)
 {
         _printf_("\n");
-        _printf_("   usage: [elements] = %s(elements,nodes,vertices,loads,materials,parameters,solution,analysis_type,sub_analysis_type);\n",__FUNCT__);
+        _printf_("   usage: [elements] = %s(elements,nodes,vertices,loads,materials,parameters,solution);\n",__FUNCT__);
         _printf_("\n");
 }

issm/trunk/src/mex/InputUpdateFromSolution/InputUpdateFromSolution.h

@@ -1 +1 @@
 /*
-        UpdateInputsFromSolution.h
+        InputUpdateFromSolution.h
 */
 
@@ -7 +7 @@
 
 /* local prototypes: */
-void UpdateInputsFromSolutionUsage(void);
+void InputUpdateFromSolutionUsage(void);
 
 #include "../../c/modules/modules.h"
@@ -14 +14 @@
 
 #undef __FUNCT__ 
-#define __FUNCT__  "UpdateInputsFromSolution"
+#define __FUNCT__  "InputUpdateFromSolution"
 
 /* serial input macros: */
@@ -24 +24 @@
 #define PARAMETERSIN (mxArray*)prhs[5]
 #define SOLUTION (mxArray*)prhs[6]
-#define ANALYSIS (mxArray*)prhs[7]
-#define SUBANALYSIS (mxArray*)prhs[8]
 
 /* serial output macros: */
@@ -34 +32 @@
 #define NLHS  1
 #undef NRHS
-#define NRHS  9
+#define NRHS  7
 
 #endif  /* _UPDATEINPUTSFROMSOLUTION_H */

issm/trunk/src/mex/Makefile.am

@@ -64 +64 @@
                                 TriMeshRefine\
                                 InputUpdateFromConstant\
-                                UpdateInputsFromSolution\
+                                InputUpdateFromSolution\
                                 UpdateInputsFromVector\
                                 UpdateVertexPositions\
@@ -269 +269 @@
                           InputUpdateFromConstant/InputUpdateFromConstant.h
 
-UpdateInputsFromSolution_SOURCES = UpdateInputsFromSolution/UpdateInputsFromSolution.cpp\
-                          UpdateInputsFromSolution/UpdateInputsFromSolution.h
+InputUpdateFromSolution_SOURCES = InputUpdateFromSolution/InputUpdateFromSolution.cpp\
+                          InputUpdateFromSolution/InputUpdateFromSolution.h
 
 UpdateInputsFromVector_SOURCES = UpdateInputsFromVector/UpdateInputsFromVector.cpp\