- Timestamp:
- 09/07/10 12:02:39 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/mex/Mergesolutionfromftog/Mergesolutionfromftog.cpp
r5057 r5689 8 8 9 9 /*input datasets: */ 10 bool flag_ys0; 11 Vec uf=NULL; 12 Vec ys=NULL; 13 NodeSets* nodesets=NULL; 10 bool flag_ys0; 11 Vec uf = NULL; 12 Vec ys = NULL; 13 NodeSets *nodesets = NULL; 14 Parameters *parameters = NULL; 14 15 15 16 /* output datasets: */ … … 20 21 21 22 /*checks on arguments on the matlab side: */ 22 if((nlhs!=NLHS) || (nrhs!= 3 && nrhs!=4)){23 if((nlhs!=NLHS) || (nrhs!=4 && nrhs!=5)){ 23 24 MergesolutionfromftogUsage(); 24 25 ISSMERROR(" usage. See above"); … … 29 30 FetchData(&ys,YS); 30 31 FetchNodeSets(&nodesets,NODESETS); 32 FetchParams(¶meters,PARAMETERS); 31 33 32 34 /*!Reduce vector: */ 33 if (nrhs== 3){34 Mergesolutionfromftogx(&ug, uf,ys,nodesets );35 if (nrhs==4){ 36 Mergesolutionfromftogx(&ug, uf,ys,nodesets,parameters); 35 37 } 36 38 else{ 37 39 FetchData(&flag_ys0,YSFLAG); 38 Mergesolutionfromftogx(&ug, uf,ys,nodesets, flag_ys0);40 Mergesolutionfromftogx(&ug, uf,ys,nodesets,parameters,flag_ys0); 39 41 } 40 42 … … 44 46 /*Free ressources: */ 45 47 VecFree(&uf); 48 VecFree(&ug); 46 49 VecFree(&ys); 47 50 delete nodesets; 48 VecFree(&ug);51 delete parameters; 49 52 50 53 /*end module: */ … … 55 58 { 56 59 _printf_("\n"); 57 _printf_(" usage: [ug] = %s(uf,ys,nodesets );\n",__FUNCT__);60 _printf_(" usage: [ug] = %s(uf,ys,nodesets,parameters);\n",__FUNCT__); 58 61 _printf_("\n"); 59 62 }
Note:
See TracChangeset
for help on using the changeset viewer.