Changeset 6375

Timestamp:

10/21/10 13:40:52 (14 years ago)

Author:

Eric.Larour

Message:

No need for IoSplitEnum anymore

Location:

issm/trunk/src

Files:

• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/OutputResultsx/OutputResultsx.cpp (modified) (3 diffs)
• c/objects/IoModel.cpp (modified) (2 diffs)
• c/objects/IoModel.h (modified) (1 diff)
• m/classes/@model/model.m (modified) (1 diff)
• m/classes/@model/setdefaultparameters.m (modified) (1 diff)
• m/model/marshall.m (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -73 +73 @@
         parameters->AddObject(new BoolParam(KffEnum,iomodel->kff));
         parameters->AddObject(new BoolParam(IoGatherEnum,iomodel->io_gather));
-        parameters->AddObject(new BoolParam(IoSplitEnum,iomodel->io_split));
 
         /*Deal with more complex parameters*/

issm/trunk/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -27 +27 @@
         char        cpu_outputfilename[100];        //easier to convert an integer with sprintf
         bool        io_gather;
-        bool        io_split;
         int         solutiontype;
         Results    *results                 = NULL;
@@ -59 +58 @@
                 /*What strategy? : */
                 parameters->FindParam(&io_gather,IoGatherEnum);
-                parameters->FindParam(&io_split,IoSplitEnum);
                 
 
@@ -66 +64 @@
                         if(my_rank==0) fid=pfopen(outputfilename ,"wb");
                 }
-                if(io_split){
+                else{
                         /*We are opening different  files for output on all cpus. Append the  rank to the filename, and open: */
                         sprintf(cpu_outputfilename,"%s.%i",outputfilename,my_rank);

issm/trunk/src/c/objects/IoModel.cpp

@@ -213 +213 @@
         /*i/o: */
         IoModelFetchData(&this->io_gather,iomodel_handle,"io_gather");
-        IoModelFetchData(&this->io_split,iomodel_handle,"io_split");
         
         /*parameter output : */
@@ -251 +250 @@
         this->gridonpattyn=NULL;
         this->io_gather=1;
-        this->io_split=0;
         
         this->vx_obs=NULL;

issm/trunk/src/c/objects/IoModel.h

@@ -58 +58 @@
                 /*i/o: */
                 int    io_gather;
-                int    io_split;
 
                 /*observations: */

issm/trunk/src/m/classes/@model/model.m

@@ -44 +44 @@
         %I/O
         md.io_gather=NaN;
-        md.io_split=NaN;
 
         %Initial 2d mesh 

issm/trunk/src/m/classes/@model/setdefaultparameters.m

@@ -248 +248 @@
 %i/o:
 md.io_gather=1;
-md.io_split=0;

issm/trunk/src/m/model/marshall.m

@@ -184 +184 @@
 %i/o: 
 WriteData(fid,md.io_gather,'Integer','io_gather');
-WriteData(fid,md.io_split,'Integer','io_split');