Changeset 4095

Timestamp:

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

Author:

Eric.Larour

Message:

Moved DepthAverageInput to InputDepthAverage

Location:

issm/trunk/src/mex

Files:

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

issm/trunk/src/mex/InputDepthAverage/InputDepthAverage.cpp

@@ -1 @@
-/*\file DepthAverageInput.c
+/*\file InputDepthAverage.c
 *\brief: update elements properties using an input  vector
 */
 
-#include "./DepthAverageInput.h"
+#include "./InputDepthAverage.h"
 
 void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){
 
 /*diverse: */
-int   noerr=1;
+int         noerr             = 1;
 
 /*input datasets: */
-DataSet* elements=NULL;
-DataSet* nodes=NULL;
-DataSet* vertices=NULL;
-DataSet* loads=NULL;
-DataSet* materials=NULL;
-Parameters* parameters=NULL;
-int      NameEnum;
+DataSet    *elements          = NULL;
+DataSet    *nodes             = NULL;
+DataSet    *vertices          = NULL;
+DataSet    *loads             = NULL;
+DataSet    *materials         = NULL;
+Parameters *parameters        = NULL;
+int         enum_type;
+int         average_enum_type;
 
 /*Boot module: */
@@ -23 +24 @@
 
 /*checks on arguments on the matlab side: */
-CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&DepthAverageInputUsage);
+CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputDepthAverageUsage);
 
 /*Input datasets: */
@@ -32 +33 @@
 FetchData(&materials,MATERIALSIN);
 FetchParams(&parameters,PARAMETERSIN);
-FetchData(&NameEnum,NAME);
+FetchData(&enum_type,ENUMTYPE);
+FetchData(&average_enum_type,AVERAGEENUMTYPE);
 
-/*!Generate internal degree of freedom numbers: */
-DepthAverageInputx(elements,nodes,vertices,loads, materials,parameters,NameEnum);
+/*call "x" code layer*/
+InputDepthAveragex(elements,nodes,vertices,loads, materials,parameters,enum_type,average_enum_type);
 
 /*write output datasets: */
@@ -57 +59 @@
 }
 
-void DepthAverageInputUsage(void)
+void InputDepthAverageUsage(void)
 {
         _printf_("\n");

issm/trunk/src/mex/InputDepthAverage/InputDepthAverage.h

@@ -1 +1 @@
 /*
-        DepthAverageInput.h
+        InputDepthAverage.h
 */
 
@@ -7 +7 @@
 
 /* local prototypes: */
-void DepthAverageInputUsage(void);
+void InputDepthAverageUsage(void);
 
 #include "../../c/modules/modules.h"
@@ -15 +15 @@
 
 #undef __FUNCT__ 
-#define __FUNCT__  "DepthAverageInput"
+#define __FUNCT__  "InputDepthAverage"
 
 /* serial input macros: */
@@ -24 +24 @@
 #define MATERIALSIN (mxArray*)prhs[4]
 #define PARAMETERSIN (mxArray*)prhs[5]
-#define NAME (mxArray*)prhs[6]
+#define ENUMTYPE(mxArray*)prhs[6]
+#define AVERAGEENUMTYPE(mxArray*)prhs[7]
 
 /* serial output macros: */
@@ -38 +39 @@
 #define NLHS  6
 #undef NRHS
-#define NRHS  7
+#define NRHS  8
 
 #endif  /* _DEPTHAVERAGEINPUT_H */

issm/trunk/src/mex/Makefile.am

@@ -17 +17 @@
                                 ControlConstrain \
                                 CostFunction \
-                                DepthAverageInput\
+                                InputDepthAverage\
                                 NodesDof\
                                 VerticesDof\
@@ -126 +126 @@
                                                 CostFunction/CostFunction.h
 
-DepthAverageInput_SOURCES = DepthAverageInput/DepthAverageInput.cpp\
-                          DepthAverageInput/DepthAverageInput.h
+InputDepthAverage_SOURCES = InputDepthAverage/InputDepthAverage.cpp\
+                          InputDepthAverage/InputDepthAverage.h
 
 NodesDof_SOURCES = NodesDof/NodesDof.cpp\