Changeset 4228
- Timestamp:
- 06/25/10 08:23:39 (15 years ago)
- Location:
- issm/trunk/src/mex/InputToResult
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/mex/InputToResult/InputToResult.cpp
r4218 r4228 24 24 25 25 /*checks on arguments on the matlab side: */ 26 CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&InputToResultUsage); 26 //CheckNumMatlabArguments(nlhs,NLHS,nrhs,NRHS,__FUNCT__,&ContourToMeshUsage); Cant' use it here, as we have variable inputs. 27 if((nlhs!=NLHS) || (nrhs!=7 && nrhs!=9)){ 28 InputToResultUsage(); 29 ISSMERROR(" usage. See above"); 30 } 27 31 28 32 /*Input datasets: */ … … 35 39 36 40 FetchData(&enum_type,ENUMTYPE); 37 FetchData(&step,STEP);38 FetchData(&time,TIME);39 41 40 /*!Call core code: */ 41 InputToResultx( elements, nodes, vertices, loads, materials,parameters,enum_type, step,time); 42 if(nrhs==9){ 43 FetchData(&step,STEP); 44 FetchData(&time,TIME); 45 46 /*!Call core code: */ 47 InputToResultx( elements, nodes, vertices, loads, materials,parameters,enum_type, step,time); 48 } 49 else{ 50 51 /*!Call core code: */ 52 InputToResultx( elements, nodes, vertices, loads, materials,parameters,enum_type); 53 } 42 54 43 55 /*write output : */ … … 61 73 _printf_("\n"); 62 74 _printf_(" usage: [elements] = %s(elements, nodes, vertices, loads, materials, parameters, enum_type,step,time);\n",__FUNCT__); 75 _printf_(" usage: [elements] = %s(elements, nodes, vertices, loads, materials, parameters, enum_type);\n",__FUNCT__); 63 76 _printf_("\n"); 64 77 } -
issm/trunk/src/mex/InputToResult/InputToResult.h
r4138 r4228 33 33 #undef NLHS 34 34 #define NLHS 1 35 #undef NRHS36 #define NRHS 937 35 38 36 #endif /* _INPUTTORESULT_H */
Note:
See TracChangeset
for help on using the changeset viewer.