Changeset 25605

Timestamp:

09/28/20 17:32:06 (5 years ago)

Author:

Eric.Larour

Message:

CHG: diverse

Location:

issm/branches/trunk-larour-SLPS2020/src/c

Files:

• main/issm_dakota.cpp (modified) (8 diffs)
• modules/OutputResultsx/OutputResultsx.cpp (modified) (1 diff)
• modules/QmuStatisticsx/QmuStatisticsx.cpp (modified) (4 diffs)

issm/branches/trunk-larour-SLPS2020/src/c/main/issm_dakota.cpp

@@ -16 +16 @@
 
 /*prototypes:*/
-int dirstructure(int argc,char** argv);
+bool dirstructure(int argc,char** argv);
 int issm_dakota_statistics(int argc,char** argv);
 
@@ -27 +27 @@
         char* dakota_output_file = NULL;
         char* dakota_error_file = NULL;
+        bool statistics=false;
 
         /*Define MPI_DEBUG in dakota_global_defs.cpp to cause a hold here*/
@@ -45 +46 @@
 
         /*Create directory structure for model outputs:*/
-        dirstructure(argc,argv);
+        statistics=dirstructure(argc,argv);
 
         /* Parse input and construct Dakota LibraryEnvironment, performing input data checks*/
@@ -92 +93 @@
 
         /* Run statistics if requested:*/
-        issm_dakota_statistics(argc,argv);
+        if(statistics)issm_dakota_statistics(argc,argv);
 
         /*free allocations:*/
@@ -107 +108 @@
 
 } /*}}}*/
-int dirstructure(int argc,char** argv){ /*{{{*/
+bool dirstructure(int argc,char** argv){ /*{{{*/
 
         char* input_file; 
@@ -141 +142 @@
                 delete iomodel;
                 fclose(fid); 
-                return 0;
+                return false; //important return value!
         }
 
@@ -159 +160 @@
         //close model file: 
         fclose(fid);
+
+        //return value: 
+        return true; //statistics computation on!
 } /*}}}*/
 int issm_dakota_statistics(int argc,char** argv){ /*{{{*/
@@ -285 +289 @@
                                 /*fetch indices: */
                                 sprintf(string,"md.qmu.statistics.method(%i).indices",i);
-                                iomodel->FetchData(&indices,&nindices,&dummy,string);
+                                iomodel->FetchData(&indices,&dummy,&nindices,string);
                                 parameters->AddObject(new IntVecParam(IndicesEnum,indices,nindices));
                 

issm/branches/trunk-larour-SLPS2020/src/c/modules/OutputResultsx/OutputResultsx.cpp

@@ -74 +74 @@
                                 femmodel->parameters->FindParam(&currEvalId,QmuCurrEvalIdEnum);
                                 femmodel->parameters->FindParam(&statistics,QmuStatisticsEnum);
-                                femmodel->parameters->FindParam(&nfilesperdirectory,QmuNfilesPerDirectoryEnum);
 
                                 if(statistics){
+                                        femmodel->parameters->FindParam(&nfilesperdirectory,QmuNfilesPerDirectoryEnum);
                                         femmodel->parameters->FindParam(&root,RootPathEnum);
                                         femmodel->parameters->FindParam(&modelname,ModelnameEnum);

issm/branches/trunk-larour-SLPS2020/src/c/modules/QmuStatisticsx/QmuStatisticsx.cpp

@@ -1003 +1003 @@
         int nfields;
         int range,lower_row,upper_row;
+        int nfilesperdirectory;
         int* indices=NULL;
         int  nindices;
@@ -1018 +1019 @@
         int*         xsize=NULL;
 
+        /*only work on the statistical communicator: */
+        if (color==MPI_UNDEFINED)return 0;
+
         /*Retrieve parameters:*/
         parameters->FindParam(&nsamples,QmuNsampleEnum);
@@ -1026 +1030 @@
         parameters->FindParam(&indices,&nindices,IndicesEnum);
 
-        /*Get rank:*/
+        /*Get rank from the stat comm communicator:*/
+        IssmComm::SetComm(statcomm);
         int my_rank=IssmComm::GetRank();
 
@@ -1144 +1149 @@
                 }
         }
-
+        _printf0_("Done with SampleSeries :\n");
+        IssmComm::SetComm(ISSM_MPI_COMM_WORLD);
 
 } /*}}}*/