Changeset 6375
- Timestamp:
- 10/21/10 13:40:52 (14 years ago)
- Location:
- issm/trunk/src
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp
r6372 r6375 73 73 parameters->AddObject(new BoolParam(KffEnum,iomodel->kff)); 74 74 parameters->AddObject(new BoolParam(IoGatherEnum,iomodel->io_gather)); 75 parameters->AddObject(new BoolParam(IoSplitEnum,iomodel->io_split));76 75 77 76 /*Deal with more complex parameters*/ -
issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp
r6372 r6375 27 27 char cpu_outputfilename[100]; //easier to convert an integer with sprintf 28 28 bool io_gather; 29 bool io_split;30 29 int solutiontype; 31 30 Results *results = NULL; … … 59 58 /*What strategy? : */ 60 59 parameters->FindParam(&io_gather,IoGatherEnum); 61 parameters->FindParam(&io_split,IoSplitEnum);62 60 63 61 … … 66 64 if(my_rank==0) fid=pfopen(outputfilename ,"wb"); 67 65 } 68 if(io_split){66 else{ 69 67 /*We are opening different files for output on all cpus. Append the rank to the filename, and open: */ 70 68 sprintf(cpu_outputfilename,"%s.%i",outputfilename,my_rank); -
issm/trunk/src/c/objects/IoModel.cpp
r6372 r6375 213 213 /*i/o: */ 214 214 IoModelFetchData(&this->io_gather,iomodel_handle,"io_gather"); 215 IoModelFetchData(&this->io_split,iomodel_handle,"io_split");216 215 217 216 /*parameter output : */ … … 251 250 this->gridonpattyn=NULL; 252 251 this->io_gather=1; 253 this->io_split=0;254 252 255 253 this->vx_obs=NULL; -
issm/trunk/src/c/objects/IoModel.h
r6372 r6375 58 58 /*i/o: */ 59 59 int io_gather; 60 int io_split;61 60 62 61 /*observations: */ -
issm/trunk/src/m/classes/@model/model.m
r6372 r6375 44 44 %I/O 45 45 md.io_gather=NaN; 46 md.io_split=NaN;47 46 48 47 %Initial 2d mesh -
issm/trunk/src/m/classes/@model/setdefaultparameters.m
r6372 r6375 248 248 %i/o: 249 249 md.io_gather=1; 250 md.io_split=0; -
issm/trunk/src/m/model/marshall.m
r6372 r6375 184 184 %i/o: 185 185 WriteData(fid,md.io_gather,'Integer','io_gather'); 186 WriteData(fid,md.io_split,'Integer','io_split');187 186 188 187
Note:
See TracChangeset
for help on using the changeset viewer.