Changeset 25599

Timestamp:

09/28/20 11:35:48 (5 years ago)

Author:

Eric.Larour

Message:

CHG: diverse

Location:

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

Files:

• QmuStatisticsx.cpp (modified) (6 diffs)
• QmuStatisticsx.h (modified) (1 diff)

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

@@ -669 +669 @@
         int nfields;
         int range,lower_row,upper_row;
+        int nfilesperdirectory;
         
         /*intermediary:*/
@@ -688 +689 @@
         int*         meansize=NULL;
 
+        /*only work on the statistical communicator: */
+        if (color==MPI_UNDEFINED)return 0;
+
         /*Retrieve parameters:*/
+        parameters->FindParam(&nfilesperdirectory,QmuNfilesPerDirectoryEnum);
         parameters->FindParam(&nsamples,QmuNsampleEnum);
         parameters->FindParam(&directory,DirectoryNameEnum);
@@ -695 +700 @@
         parameters->FindParam(&steps,&nsteps,StepsEnum);
 
-        /*Get rank:*/
+        /*Get rank from the stat comm communicator:*/
+        IssmComm::SetComm(statcomm);
         int my_rank=IssmComm::GetRank();
 
@@ -983 +989 @@
         }
 
+        _printf0_("Done with MeanVariance :\n");
+        IssmComm::SetComm(ISSM_MPI_COMM_WORLD);
 
 } /*}}}*/
@@ -1139 +1147 @@
 
 } /*}}}*/
-int OutputStatistics(Parameters* parameters,Results* results){ /*{{{*/
-        
+int OutputStatistics(Parameters* parameters,Results* results,int color,ISSM_MPI_Comm statcomm){ /*{{{*/
+
         char   outputfilename[1000];
         char* directory=NULL;
@@ -1149 +1157 @@
         int nsteps;
 
+        /*only work on the statistical communicator: */
+        if (color==MPI_UNDEFINED)return 0;
+
         FemModel* femmodel=new FemModel();
         

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

@@ -9 +9 @@
 int ComputeMeanVariance(Parameters* parameters,Results* results,int color, ISSM_MPI_Comm statcomm);
 int ComputeSampleSeries(Parameters* parameters,Results* results,int color, ISSM_MPI_Comm statcomm);
-int OutputStatistics(Parameters* parameters,Results* results);
+int OutputStatistics(Parameters* parameters,Results* results,int color,ISSM_MPI_Comm statcomm);
 int ComputeHistogram(Parameters* parameters,Results* results,int color, ISSM_MPI_Comm statcomm);
 int readdata(IssmDouble** pdoublemat, int* pdoublematsize, IssmDouble* pdouble, FILE* fid,char* field,int step);