Changeset 25600

Timestamp:

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

Author:

Eric.Larour

Message:

CHG: diverse

Location:

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

Files:

• issm_dakota.cpp (modified) (3 diffs)
• issm_post.cpp (modified) (4 diffs)

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

@@ -223 +223 @@
                 results   = new Results();
                 parameters=new Parameters();
+                
+                //solution type: 
+                parameters->AddObject(new IntParam(SolutionTypeEnum,StatisticsSolutionEnum));
         
                 //root  directory
@@ -269 +272 @@
 
                         sprintf(string,"md.qmu.statistics.method(%i).steps",i);
-                        iomodel->FetchData(&steps,&nsteps,&dummy,string);
+                        iomodel->FetchData(&steps,&dummy,&nsteps,string);
                         parameters->AddObject(new IntVecParam(StepsEnum,steps,nsteps));
 
@@ -297 +300 @@
 
         /*output results:*/
+        OutputStatistics(parameters,results,color,statcomm);
+        
+        /*all meet here: */
         ISSM_MPI_Barrier(ISSM_MPI_COMM_WORLD); _printf0_("Output file.\n");
-        OutputStatistics(parameters,results);
 
         /*Delete ressources:*/

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

@@ -96 +96 @@
         if(strcmp(method,"MeanVariance")==0){
 
-                ComputeMeanVariance(parameters,results);
+                ComputeMeanVariance(parameters,results,0,ISSM_MPI_COMM_WORLD);
         }
         else if(strcmp(method,"Histogram")==0){
@@ -104 +104 @@
                 parameters->AddObject(new IntParam(NbinsEnum,nbins));
                 
-                ComputeHistogram(parameters,results);
+                ComputeHistogram(parameters,results,0,ISSM_MPI_COMM_WORLD);
 
         }
@@ -120 +120 @@
                 xDelete<int>(indices);
                 
-                ComputeSampleSeries(parameters,results);
+                ComputeSampleSeries(parameters,results,0,ISSM_MPI_COMM_WORLD);
         }
 
@@ -127 +127 @@
         /*output results:*/
         ISSM_MPI_Barrier(ISSM_MPI_COMM_WORLD); _printf0_("Output file.\n");
-        OutputStatistics(parameters,results);
+        OutputStatistics(parameters,results,0,ISSM_MPI_COMM_WORLD);
 
         /*Delete ressources:*/