Changeset 27703

Timestamp:

04/24/23 08:10:27 (3 years ago)

Author:

Mathieu Morlighem

Message:

CHG: making input averaging work

Location:

issm/trunk-jpl/src/c/classes/Inputs

Files:

• ControlInput.cpp (modified) (1 diff)
• ControlInput.h (modified) (1 diff)
• TriaInput.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Inputs/ControlInput.cpp

@@ -227 +227 @@
 }
 /*}}}*/
+void ControlInput::AverageAndReplace(void){/*{{{*/
+        this->values->AverageAndReplace();
+}
+/*}}}*/
 TriaInput* ControlInput::GetTriaInput(){/*{{{*/
 

issm/trunk-jpl/src/c/classes/Inputs/ControlInput.h

@@ -48 +48 @@
                 TriaInput* GetTriaInput();
                 PentaInput* GetPentaInput();
+                void AverageAndReplace(void);
 };
 #endif  /* _CONTROLINPUT_H */

issm/trunk-jpl/src/c/classes/Inputs/TriaInput.cpp

@@ -408 +408 @@
 void TriaInput::AverageAndReplace(void){/*{{{*/
 
+        if(this->M!=this->numberofelements_local) _error_("not implemented for P1");
+
         /*Get local sum and local size*/
         IssmDouble sum  = 0.;
+        int        weight;
         for(int i=0;i<this->M*this->N;i++) sum += this->values[i];
-        sum = sum/(this->M*this->N);
+        weight = this->M*this->N;
 
         /*Get sum across all procs*/
         IssmDouble all_sum;
+        int        all_weight;
         ISSM_MPI_Allreduce((void*)&sum,(void*)&all_sum,1,ISSM_MPI_DOUBLE,ISSM_MPI_SUM,IssmComm::GetComm());
+        ISSM_MPI_Allreduce((void*)&weight,(void*)&all_weight,1,ISSM_MPI_INT,ISSM_MPI_SUM,IssmComm::GetComm());
 
         /*Divide by number of procs*/
-        int        num_procs = IssmComm::GetSize();
-        IssmDouble newvalue = all_sum/num_procs;
+        IssmDouble newvalue = all_sum/reCast<IssmPDouble>(all_weight);
 
         /*Now replace existing input*/