Changeset 11198
- Timestamp:
- 01/25/12 08:47:57 (13 years ago)
- Location:
- issm/trunk-jpl/src/c
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/objects/Loads/Friction.cpp
r10135 r11198 28 28 } 29 29 /*}}}*/ 30 /*FUNCTION Friction::Friction(c har* element_type, Inputs* inputs,Matpar* matpar,int analysis_type){{{1*/31 Friction::Friction(c har* element_type_in,Inputs* inputs_in,Matpar* matpar_in, int in_analysis_type){30 /*FUNCTION Friction::Friction(const char* element_type, Inputs* inputs,Matpar* matpar,int analysis_type){{{1*/ 31 Friction::Friction(const char* element_type_in,Inputs* inputs_in,Matpar* matpar_in, int in_analysis_type){ 32 32 33 33 this->analysis_type=in_analysis_type; … … 37 37 38 38 this->matpar=matpar_in; 39 40 39 } 41 40 /*}}}*/ -
issm/trunk-jpl/src/c/objects/Loads/Friction.h
r10135 r11198 23 23 /*methods: */ 24 24 Friction(); 25 Friction(c har* element_type, Inputs* inputs,Matpar* matpar, int analysis_type);25 Friction(const char* element_type, Inputs* inputs,Matpar* matpar, int analysis_type); 26 26 ~Friction(); 27 27 -
issm/trunk-jpl/src/c/shared/Matlab/CheckNumMatlabArguments.cpp
r6412 r11198 9 9 #include "mex.h" 10 10 11 int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, c har* __FUNCT__, void (*function)( void )){11 int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* __FUNCT__, void (*function)( void )){ 12 12 13 13 /*checks on arguments on the matlab side: */ -
issm/trunk-jpl/src/c/shared/Matlab/matlabshared.h
r10189 r11198 13 13 int ModuleBoot(void); 14 14 int ModuleEnd(void); 15 mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, c har* field);16 int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, c har* THISFUNCTION, void (*function)( void ));15 mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, const char* field); 16 int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* THISFUNCTION, void (*function)( void )); 17 17 #endif 18 18 -
issm/trunk-jpl/src/c/shared/Matlab/mxGetAssignedField.cpp
r1 r11198 13 13 #include "mex.h" 14 14 15 mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, char* field){15 mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number,const char* field){ 16 16 17 17 //output … … 19 19 20 20 //input 21 mxArray *inputs[2];22 mxArray * pindex=NULL;23 const char*fnames[2];24 mwSize ndim=2;25 mwSize 21 mxArray *inputs[2]; 22 mxArray *pindex = NULL; 23 const char *fnames[2]; 24 mwSize ndim = 2; 25 mwSize onebyone[2] = {1,1}; 26 26 27 27 //We want to call the subsasgn method, and get the returned array.This ensures that if we are running
Note:
See TracChangeset
for help on using the changeset viewer.