Changeset 4095
- Timestamp:
- 06/21/10 16:10:44 (15 years ago)
- Location:
- issm/trunk/src/mex
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/mex/InputDepthAverage/InputDepthAverage.cpp
r4094 r4095 1 /*\file DepthAverageInput.c1 /*\file InputDepthAverage.c 2 2 *\brief: update elements properties using an input vector 3 3 */ 4 4 5 #include "./ DepthAverageInput.h"5 #include "./InputDepthAverage.h" 6 6 7 7 void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){ 8 8 9 9 /*diverse: */ 10 int noerr=1;10 int noerr = 1; 11 11 12 12 /*input datasets: */ 13 DataSet* elements=NULL; 14 DataSet* nodes=NULL; 15 DataSet* vertices=NULL; 16 DataSet* loads=NULL; 17 DataSet* materials=NULL; 18 Parameters* parameters=NULL; 19 int NameEnum; 13 DataSet *elements = NULL; 14 DataSet *nodes = NULL; 15 DataSet *vertices = NULL; 16 DataSet *loads = NULL; 17 DataSet *materials = NULL; 18 Parameters *parameters = NULL; 19 int enum_type; 20 int average_enum_type; 20 21 21 22 /*Boot module: */ … … 23 24 24 25 /*checks on arguments on the matlab side: */ 25 CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,& DepthAverageInputUsage);26 CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputDepthAverageUsage); 26 27 27 28 /*Input datasets: */ … … 32 33 FetchData(&materials,MATERIALSIN); 33 34 FetchParams(¶meters,PARAMETERSIN); 34 FetchData(&NameEnum,NAME); 35 FetchData(&enum_type,ENUMTYPE); 36 FetchData(&average_enum_type,AVERAGEENUMTYPE); 35 37 36 /* !Generate internal degree of freedom numbers:*/37 DepthAverageInputx(elements,nodes,vertices,loads, materials,parameters,NameEnum);38 /*call "x" code layer*/ 39 InputDepthAveragex(elements,nodes,vertices,loads, materials,parameters,enum_type,average_enum_type); 38 40 39 41 /*write output datasets: */ … … 57 59 } 58 60 59 void DepthAverageInputUsage(void)61 void InputDepthAverageUsage(void) 60 62 { 61 63 _printf_("\n"); -
issm/trunk/src/mex/InputDepthAverage/InputDepthAverage.h
r4094 r4095 1 1 /* 2 DepthAverageInput.h2 InputDepthAverage.h 3 3 */ 4 4 … … 7 7 8 8 /* local prototypes: */ 9 void DepthAverageInputUsage(void);9 void InputDepthAverageUsage(void); 10 10 11 11 #include "../../c/modules/modules.h" … … 15 15 16 16 #undef __FUNCT__ 17 #define __FUNCT__ " DepthAverageInput"17 #define __FUNCT__ "InputDepthAverage" 18 18 19 19 /* serial input macros: */ … … 24 24 #define MATERIALSIN (mxArray*)prhs[4] 25 25 #define PARAMETERSIN (mxArray*)prhs[5] 26 #define NAME (mxArray*)prhs[6] 26 #define ENUMTYPE(mxArray*)prhs[6] 27 #define AVERAGEENUMTYPE(mxArray*)prhs[7] 27 28 28 29 /* serial output macros: */ … … 38 39 #define NLHS 6 39 40 #undef NRHS 40 #define NRHS 741 #define NRHS 8 41 42 42 43 #endif /* _DEPTHAVERAGEINPUT_H */ -
issm/trunk/src/mex/Makefile.am
r4063 r4095 17 17 ControlConstrain \ 18 18 CostFunction \ 19 DepthAverageInput\19 InputDepthAverage\ 20 20 NodesDof\ 21 21 VerticesDof\ … … 126 126 CostFunction/CostFunction.h 127 127 128 DepthAverageInput_SOURCES = DepthAverageInput/DepthAverageInput.cpp\129 DepthAverageInput/DepthAverageInput.h128 InputDepthAverage_SOURCES = InputDepthAverage/InputDepthAverage.cpp\ 129 InputDepthAverage/InputDepthAverage.h 130 130 131 131 NodesDof_SOURCES = NodesDof/NodesDof.cpp\
Note:
See TracChangeset
for help on using the changeset viewer.