mirror of
https://git.gfz-potsdam.de/naaice/poet.git
synced 2025-12-16 12:54:50 +01:00
formatting MasterFunctions.cpp
This commit is contained in:
parent
35f95430a8
commit
0d22cc2056
@ -8,8 +8,7 @@
|
||||
#include <vector>
|
||||
|
||||
std::vector<uint32_t>
|
||||
poet::ChemistryModule::MasterGatherWorkerMetrics(int type) const
|
||||
{
|
||||
poet::ChemistryModule::MasterGatherWorkerMetrics(int type) const {
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
|
||||
uint32_t dummy;
|
||||
@ -23,8 +22,7 @@ poet::ChemistryModule::MasterGatherWorkerMetrics(int type) const
|
||||
}
|
||||
|
||||
std::vector<double>
|
||||
poet::ChemistryModule::MasterGatherWorkerTimings(int type) const
|
||||
{
|
||||
poet::ChemistryModule::MasterGatherWorkerTimings(int type) const {
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
|
||||
double dummy;
|
||||
@ -37,36 +35,31 @@ poet::ChemistryModule::MasterGatherWorkerTimings(int type) const
|
||||
return timings;
|
||||
}
|
||||
|
||||
std::vector<double> poet::ChemistryModule::GetWorkerPhreeqcTimings() const
|
||||
{
|
||||
std::vector<double> poet::ChemistryModule::GetWorkerPhreeqcTimings() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
return MasterGatherWorkerTimings(WORKER_PHREEQC);
|
||||
}
|
||||
|
||||
std::vector<double> poet::ChemistryModule::GetWorkerDHTGetTimings() const
|
||||
{
|
||||
std::vector<double> poet::ChemistryModule::GetWorkerDHTGetTimings() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
return MasterGatherWorkerTimings(WORKER_DHT_GET);
|
||||
}
|
||||
|
||||
std::vector<double> poet::ChemistryModule::GetWorkerDHTFillTimings() const
|
||||
{
|
||||
std::vector<double> poet::ChemistryModule::GetWorkerDHTFillTimings() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
return MasterGatherWorkerTimings(WORKER_DHT_FILL);
|
||||
}
|
||||
|
||||
std::vector<double> poet::ChemistryModule::GetWorkerIdleTimings() const
|
||||
{
|
||||
std::vector<double> poet::ChemistryModule::GetWorkerIdleTimings() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
return MasterGatherWorkerTimings(WORKER_IDLE);
|
||||
}
|
||||
|
||||
std::vector<uint32_t> poet::ChemistryModule::GetWorkerDHTHits() const
|
||||
{
|
||||
std::vector<uint32_t> poet::ChemistryModule::GetWorkerDHTHits() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
type = WORKER_DHT_HITS;
|
||||
@ -84,8 +77,7 @@ std::vector<uint32_t> poet::ChemistryModule::GetWorkerDHTHits() const
|
||||
return ret;
|
||||
}
|
||||
|
||||
std::vector<uint32_t> poet::ChemistryModule::GetWorkerDHTEvictions() const
|
||||
{
|
||||
std::vector<uint32_t> poet::ChemistryModule::GetWorkerDHTEvictions() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
type = WORKER_DHT_EVICTIONS;
|
||||
@ -104,40 +96,35 @@ std::vector<uint32_t> poet::ChemistryModule::GetWorkerDHTEvictions() const
|
||||
}
|
||||
|
||||
std::vector<double>
|
||||
poet::ChemistryModule::GetWorkerInterpolationWriteTimings() const
|
||||
{
|
||||
poet::ChemistryModule::GetWorkerInterpolationWriteTimings() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
return MasterGatherWorkerTimings(WORKER_IP_WRITE);
|
||||
}
|
||||
|
||||
std::vector<double>
|
||||
poet::ChemistryModule::GetWorkerInterpolationReadTimings() const
|
||||
{
|
||||
poet::ChemistryModule::GetWorkerInterpolationReadTimings() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
return MasterGatherWorkerTimings(WORKER_IP_READ);
|
||||
}
|
||||
|
||||
std::vector<double>
|
||||
poet::ChemistryModule::GetWorkerInterpolationGatherTimings() const
|
||||
{
|
||||
poet::ChemistryModule::GetWorkerInterpolationGatherTimings() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
return MasterGatherWorkerTimings(WORKER_IP_GATHER);
|
||||
}
|
||||
|
||||
std::vector<double>
|
||||
poet::ChemistryModule::GetWorkerInterpolationFunctionCallTimings() const
|
||||
{
|
||||
poet::ChemistryModule::GetWorkerInterpolationFunctionCallTimings() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
return MasterGatherWorkerTimings(WORKER_IP_FC);
|
||||
}
|
||||
|
||||
std::vector<uint32_t>
|
||||
poet::ChemistryModule::GetWorkerInterpolationCalls() const
|
||||
{
|
||||
poet::ChemistryModule::GetWorkerInterpolationCalls() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
type = WORKER_IP_CALLS;
|
||||
@ -155,8 +142,7 @@ poet::ChemistryModule::GetWorkerInterpolationCalls() const
|
||||
return ret;
|
||||
}
|
||||
|
||||
std::vector<uint32_t> poet::ChemistryModule::GetWorkerPHTCacheHits() const
|
||||
{
|
||||
std::vector<uint32_t> poet::ChemistryModule::GetWorkerPHTCacheHits() const {
|
||||
int type = CHEM_PERF;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
type = WORKER_PHT_CACHE_HITS;
|
||||
@ -175,16 +161,14 @@ std::vector<uint32_t> poet::ChemistryModule::GetWorkerPHTCacheHits() const
|
||||
}
|
||||
void poet::ChemistryModule::computeStats(const std::vector<double> &pqc_vector,
|
||||
const std::vector<double> &sur_vector,
|
||||
uint32_t size_per_prop, uint32_t species_count,
|
||||
error_stats &stats)
|
||||
{
|
||||
for (uint32_t i = 0; i < species_count; i++)
|
||||
{
|
||||
uint32_t size_per_prop,
|
||||
uint32_t species_count,
|
||||
error_stats &stats) {
|
||||
for (uint32_t i = 0; i < species_count; i++) {
|
||||
double err_sum = 0.0;
|
||||
double sqr_err_sum = 0.0;
|
||||
|
||||
for (uint32_t j = 0; j < size_per_prop; j++)
|
||||
{
|
||||
for (uint32_t j = 0; j < size_per_prop; j++) {
|
||||
|
||||
const double &pqc_value = pqc_vector[i * size_per_prop + j];
|
||||
const double &sur_value = sur_vector[i * size_per_prop + j];
|
||||
@ -192,11 +176,12 @@ void poet::ChemistryModule::computeStats(const std::vector<double> &pqc_vector,
|
||||
if (pqc_value == 0 && sur_value == 0) {
|
||||
//
|
||||
} else if (pqc_value == 0 && sur_value != 0) {
|
||||
std::cout << "NOOOO! pqc = " << pqc_value << ", sur = " << sur_value << "\n";
|
||||
std::cout << "NOOOO! pqc = " << pqc_value << ", sur = " << sur_value
|
||||
<< "\n";
|
||||
err_sum += 1.;
|
||||
sqr_err_sum += 1.;
|
||||
} else {
|
||||
const double alpha = 1 - (sur_value/pqc_value);
|
||||
} else {
|
||||
const double alpha = 1 - (sur_value / pqc_value);
|
||||
err_sum += std::abs(alpha);
|
||||
sqr_err_sum += alpha * alpha;
|
||||
}
|
||||
@ -217,27 +202,24 @@ void poet::ChemistryModule::computeStats(const std::vector<double> &pqc_vector,
|
||||
std::cout << "pqc = " << pqc_value << ", sur = " << sur_value << "\n";
|
||||
}
|
||||
}
|
||||
if (i == 0)
|
||||
{
|
||||
if (i == 0) {
|
||||
std::cout << "computeStats, i==0, err_sum: " << err_sum << std::endl;
|
||||
std::cout << "computeStats, i==0, sqr_err_sum: " << sqr_err_sum << std::endl;
|
||||
std::cout << "computeStats, i==0, sqr_err_sum: " << sqr_err_sum
|
||||
<< std::endl;
|
||||
}
|
||||
stats.mape[i] = 100.0 * (err_sum / size_per_prop);
|
||||
stats.rrsme[i] = (size_per_prop > 0) ? std::sqrt(sqr_err_sum / size_per_prop) : 0.0;
|
||||
stats.mape[i] = 100.0 * (err_sum / size_per_prop);
|
||||
stats.rrsme[i] =
|
||||
(size_per_prop > 0) ? std::sqrt(sqr_err_sum / size_per_prop) : 0.0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
inline std::vector<int> shuffleVector(const std::vector<int> &in_vector,
|
||||
uint32_t size_per_prop,
|
||||
uint32_t wp_count)
|
||||
{
|
||||
uint32_t wp_count) {
|
||||
std::vector<int> out_buffer(in_vector.size());
|
||||
uint32_t write_i = 0;
|
||||
for (uint32_t i = 0; i < wp_count; i++)
|
||||
{
|
||||
for (uint32_t j = i; j < size_per_prop; j += wp_count)
|
||||
{
|
||||
for (uint32_t i = 0; i < wp_count; i++) {
|
||||
for (uint32_t j = i; j < size_per_prop; j += wp_count) {
|
||||
out_buffer[write_i] = in_vector[j];
|
||||
write_i++;
|
||||
}
|
||||
@ -248,16 +230,12 @@ inline std::vector<int> shuffleVector(const std::vector<int> &in_vector,
|
||||
inline std::vector<double> shuffleField(const std::vector<double> &in_field,
|
||||
uint32_t size_per_prop,
|
||||
uint32_t species_count,
|
||||
uint32_t wp_count)
|
||||
{
|
||||
uint32_t wp_count) {
|
||||
std::vector<double> out_buffer(in_field.size());
|
||||
uint32_t write_i = 0;
|
||||
for (uint32_t i = 0; i < wp_count; i++)
|
||||
{
|
||||
for (uint32_t j = i; j < size_per_prop; j += wp_count)
|
||||
{
|
||||
for (uint32_t k = 0; k < species_count; k++)
|
||||
{
|
||||
for (uint32_t i = 0; i < wp_count; i++) {
|
||||
for (uint32_t j = i; j < size_per_prop; j += wp_count) {
|
||||
for (uint32_t k = 0; k < species_count; k++) {
|
||||
out_buffer[(write_i * species_count) + k] =
|
||||
in_field[(k * size_per_prop) + j];
|
||||
}
|
||||
@ -269,16 +247,12 @@ inline std::vector<double> shuffleField(const std::vector<double> &in_field,
|
||||
|
||||
inline void unshuffleField(const std::vector<double> &in_buffer,
|
||||
uint32_t size_per_prop, uint32_t species_count,
|
||||
uint32_t wp_count, std::vector<double> &out_field)
|
||||
{
|
||||
uint32_t wp_count, std::vector<double> &out_field) {
|
||||
uint32_t read_i = 0;
|
||||
|
||||
for (uint32_t i = 0; i < wp_count; i++)
|
||||
{
|
||||
for (uint32_t j = i; j < size_per_prop; j += wp_count)
|
||||
{
|
||||
for (uint32_t k = 0; k < species_count; k++)
|
||||
{
|
||||
for (uint32_t i = 0; i < wp_count; i++) {
|
||||
for (uint32_t j = i; j < size_per_prop; j += wp_count) {
|
||||
for (uint32_t k = 0; k < species_count; k++) {
|
||||
out_field[(k * size_per_prop) + j] =
|
||||
in_buffer[(read_i * species_count) + k];
|
||||
}
|
||||
@ -287,15 +261,13 @@ inline void unshuffleField(const std::vector<double> &in_buffer,
|
||||
}
|
||||
}
|
||||
|
||||
inline void printProgressbar(int count_pkgs, int n_wp, int barWidth = 70)
|
||||
{
|
||||
inline void printProgressbar(int count_pkgs, int n_wp, int barWidth = 70) {
|
||||
/* visual progress */
|
||||
double progress = (float)(count_pkgs + 1) / n_wp;
|
||||
|
||||
std::cout << "[";
|
||||
int pos = barWidth * progress;
|
||||
for (int iprog = 0; iprog < barWidth; ++iprog)
|
||||
{
|
||||
for (int iprog = 0; iprog < barWidth; ++iprog) {
|
||||
if (iprog < pos)
|
||||
std::cout << "=";
|
||||
else if (iprog == pos)
|
||||
@ -310,15 +282,13 @@ inline void printProgressbar(int count_pkgs, int n_wp, int barWidth = 70)
|
||||
|
||||
inline void poet::ChemistryModule::MasterSendPkgs(
|
||||
worker_list_t &w_list, workpointer_t &work_pointer, int &pkg_to_send,
|
||||
int &count_pkgs, int &free_workers, double dt, uint32_t iteration, uint32_t control_iteration,
|
||||
const std::vector<uint32_t> &wp_sizes_vector)
|
||||
{
|
||||
int &count_pkgs, int &free_workers, double dt, uint32_t iteration,
|
||||
uint32_t control_iteration, const std::vector<uint32_t> &wp_sizes_vector) {
|
||||
/* declare variables */
|
||||
int local_work_package_size;
|
||||
|
||||
/* search for free workers and send work */
|
||||
for (int p = 0; p < this->comm_size - 1; p++)
|
||||
{
|
||||
for (int p = 0; p < this->comm_size - 1; p++) {
|
||||
if (w_list[p].has_work == 0 && pkg_to_send > 0) /* worker is free */
|
||||
{
|
||||
/* to enable different work_package_size, set local copy of
|
||||
@ -347,7 +317,9 @@ inline void poet::ChemistryModule::MasterSendPkgs(
|
||||
// current time of simulation (age) in seconds
|
||||
send_buffer[end_of_wp + 3] = this->simtime;
|
||||
// current work package start location in field
|
||||
uint32_t wp_start_index = std::accumulate(wp_sizes_vector.begin(), std::next(wp_sizes_vector.begin(), count_pkgs), 0);
|
||||
uint32_t wp_start_index =
|
||||
std::accumulate(wp_sizes_vector.begin(),
|
||||
std::next(wp_sizes_vector.begin(), count_pkgs), 0);
|
||||
send_buffer[end_of_wp + 4] = wp_start_index;
|
||||
// whether this iteration is a control iteration
|
||||
send_buffer[end_of_wp + 5] = control_iteration;
|
||||
@ -369,8 +341,7 @@ inline void poet::ChemistryModule::MasterSendPkgs(
|
||||
inline void poet::ChemistryModule::MasterRecvPkgs(worker_list_t &w_list,
|
||||
int &pkg_to_recv,
|
||||
bool to_send,
|
||||
int &free_workers)
|
||||
{
|
||||
int &free_workers) {
|
||||
/* declare most of the variables here */
|
||||
int need_to_receive = 1;
|
||||
double idle_a, idle_b;
|
||||
@ -380,15 +351,13 @@ inline void poet::ChemistryModule::MasterRecvPkgs(worker_list_t &w_list,
|
||||
// master_recv_a = MPI_Wtime();
|
||||
/* start to loop as long there are packages to recv and the need to receive
|
||||
*/
|
||||
while (need_to_receive && pkg_to_recv > 0)
|
||||
{
|
||||
while (need_to_receive && pkg_to_recv > 0) {
|
||||
// only of there are still packages to send and free workers are available
|
||||
if (to_send && free_workers > 0)
|
||||
// non blocking probing
|
||||
MPI_Iprobe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &need_to_receive,
|
||||
&probe_status);
|
||||
else
|
||||
{
|
||||
else {
|
||||
idle_a = MPI_Wtime();
|
||||
// blocking probing
|
||||
MPI_Probe(MPI_ANY_SOURCE, MPI_ANY_TAG, MPI_COMM_WORLD, &probe_status);
|
||||
@ -398,11 +367,9 @@ inline void poet::ChemistryModule::MasterRecvPkgs(worker_list_t &w_list,
|
||||
|
||||
/* if need_to_receive was set to true above, so there is a message to
|
||||
* receive */
|
||||
if (need_to_receive)
|
||||
{
|
||||
if (need_to_receive) {
|
||||
p = probe_status.MPI_SOURCE;
|
||||
if (probe_status.MPI_TAG == LOOP_WORK)
|
||||
{
|
||||
if (probe_status.MPI_TAG == LOOP_WORK) {
|
||||
MPI_Get_count(&probe_status, MPI_DOUBLE, &size);
|
||||
MPI_Recv(w_list[p - 1].send_addr, size, MPI_DOUBLE, p, LOOP_WORK,
|
||||
this->group_comm, MPI_STATUS_IGNORE);
|
||||
@ -410,8 +377,7 @@ inline void poet::ChemistryModule::MasterRecvPkgs(worker_list_t &w_list,
|
||||
pkg_to_recv -= 1;
|
||||
free_workers++;
|
||||
}
|
||||
if (probe_status.MPI_TAG == LOOP_CTRL)
|
||||
{
|
||||
if (probe_status.MPI_TAG == LOOP_CTRL) {
|
||||
MPI_Get_count(&probe_status, MPI_DOUBLE, &size);
|
||||
|
||||
// layout of buffer is [phreeqc][surrogate]
|
||||
@ -423,7 +389,8 @@ inline void poet::ChemistryModule::MasterRecvPkgs(worker_list_t &w_list,
|
||||
std::copy(recv_buffer.begin(), recv_buffer.begin() + (size / 2),
|
||||
w_list[p - 1].send_addr);
|
||||
|
||||
sur_shuffled.insert(sur_shuffled.end(), recv_buffer.begin() + (size / 2),
|
||||
sur_shuffled.insert(sur_shuffled.end(),
|
||||
recv_buffer.begin() + (size / 2),
|
||||
recv_buffer.begin() + size);
|
||||
|
||||
w_list[p - 1].has_work = 0;
|
||||
@ -434,11 +401,9 @@ inline void poet::ChemistryModule::MasterRecvPkgs(worker_list_t &w_list,
|
||||
}
|
||||
}
|
||||
|
||||
void poet::ChemistryModule::simulate(double dt)
|
||||
{
|
||||
void poet::ChemistryModule::simulate(double dt) {
|
||||
double start_t{MPI_Wtime()};
|
||||
if (this->is_sequential)
|
||||
{
|
||||
if (this->is_sequential) {
|
||||
MasterRunSequential();
|
||||
return;
|
||||
}
|
||||
@ -448,8 +413,7 @@ void poet::ChemistryModule::simulate(double dt)
|
||||
this->chem_t += end_t - start_t;
|
||||
}
|
||||
|
||||
void poet::ChemistryModule::MasterRunSequential()
|
||||
{
|
||||
void poet::ChemistryModule::MasterRunSequential() {
|
||||
// std::vector<double> shuffled_field =
|
||||
// shuffleField(chem_field.AsVector(), n_cells, prop_count, 1);
|
||||
|
||||
@ -476,8 +440,7 @@ void poet::ChemistryModule::MasterRunSequential()
|
||||
// chem_field = out_vec;
|
||||
}
|
||||
|
||||
void poet::ChemistryModule::MasterRunParallel(double dt)
|
||||
{
|
||||
void poet::ChemistryModule::MasterRunParallel(double dt) {
|
||||
/* declare most of the needed variables here */
|
||||
double seq_a, seq_b, seq_c, seq_d;
|
||||
double worker_chemistry_a, worker_chemistry_b;
|
||||
@ -490,14 +453,14 @@ void poet::ChemistryModule::MasterRunParallel(double dt)
|
||||
const std::vector<uint32_t> wp_sizes_vector =
|
||||
CalculateWPSizesVector(this->n_cells, this->wp_size);
|
||||
|
||||
if (this->ai_surrogate_enabled)
|
||||
{
|
||||
if (this->ai_surrogate_enabled) {
|
||||
ftype = CHEM_AI_BCAST_VALIDITY;
|
||||
PropagateFunctionType(ftype);
|
||||
this->ai_surrogate_validity_vector = shuffleVector(this->ai_surrogate_validity_vector,
|
||||
this->n_cells,
|
||||
wp_sizes_vector.size());
|
||||
ChemBCast(&this->ai_surrogate_validity_vector.front(), this->n_cells, MPI_INT);
|
||||
this->ai_surrogate_validity_vector =
|
||||
shuffleVector(this->ai_surrogate_validity_vector, this->n_cells,
|
||||
wp_sizes_vector.size());
|
||||
ChemBCast(&this->ai_surrogate_validity_vector.front(), this->n_cells,
|
||||
MPI_INT);
|
||||
}
|
||||
|
||||
ftype = CHEM_WORK_LOOP;
|
||||
@ -506,9 +469,9 @@ void poet::ChemistryModule::MasterRunParallel(double dt)
|
||||
MPI_Barrier(this->group_comm);
|
||||
|
||||
static uint32_t iteration = 0;
|
||||
uint32_t control_iteration = static_cast<uint32_t>(this->runtime_params->control_iteration_active ? 1 : 0);
|
||||
if (control_iteration)
|
||||
{
|
||||
uint32_t control_iteration = static_cast<uint32_t>(
|
||||
this->runtime_params->control_iteration_active ? 1 : 0);
|
||||
if (control_iteration) {
|
||||
sur_shuffled.clear();
|
||||
sur_shuffled.reserve(this->n_cells * this->prop_count);
|
||||
}
|
||||
@ -542,19 +505,17 @@ void poet::ChemistryModule::MasterRunParallel(double dt)
|
||||
|
||||
/* start send/recv loop */
|
||||
// while there are still packages to recv
|
||||
while (pkg_to_recv > 0)
|
||||
{
|
||||
while (pkg_to_recv > 0) {
|
||||
// print a progressbar to stdout
|
||||
if (print_progessbar)
|
||||
{
|
||||
if (print_progessbar) {
|
||||
printProgressbar((int)i_pkgs, (int)wp_sizes_vector.size());
|
||||
}
|
||||
// while there are still packages to send
|
||||
if (pkg_to_send > 0)
|
||||
{
|
||||
if (pkg_to_send > 0) {
|
||||
// send packages to all free workers ...
|
||||
MasterSendPkgs(worker_list, work_pointer, pkg_to_send, i_pkgs,
|
||||
free_workers, dt, iteration, control_iteration, wp_sizes_vector);
|
||||
free_workers, dt, iteration, control_iteration,
|
||||
wp_sizes_vector);
|
||||
}
|
||||
// ... and try to receive them from workers who has finished their work
|
||||
MasterRecvPkgs(worker_list, pkg_to_recv, pkg_to_send > 0, free_workers);
|
||||
@ -579,8 +540,7 @@ void poet::ChemistryModule::MasterRunParallel(double dt)
|
||||
|
||||
/* do master stuff */
|
||||
|
||||
if (control_iteration)
|
||||
{
|
||||
if (control_iteration) {
|
||||
control_iteration_counter++;
|
||||
|
||||
std::vector<double> sur_unshuffled{sur_shuffled};
|
||||
@ -588,9 +548,11 @@ void poet::ChemistryModule::MasterRunParallel(double dt)
|
||||
unshuffleField(sur_shuffled, this->n_cells, this->prop_count,
|
||||
wp_sizes_vector.size(), sur_unshuffled);
|
||||
|
||||
error_stats stats(this->prop_count, control_iteration_counter * runtime_params->control_iteration);
|
||||
error_stats stats(this->prop_count, control_iteration_counter *
|
||||
runtime_params->control_iteration);
|
||||
|
||||
computeStats(out_vec, sur_unshuffled, this->n_cells, this->prop_count, stats);
|
||||
computeStats(out_vec, sur_unshuffled, this->n_cells, this->prop_count,
|
||||
stats);
|
||||
error_stats_history.push_back(stats);
|
||||
|
||||
// to do: control values to epsilon
|
||||
@ -606,8 +568,7 @@ void poet::ChemistryModule::MasterRunParallel(double dt)
|
||||
/* end time measurement of whole chemistry simulation */
|
||||
|
||||
/* advise workers to end chemistry iteration */
|
||||
for (int i = 1; i < this->comm_size; i++)
|
||||
{
|
||||
for (int i = 1; i < this->comm_size; i++) {
|
||||
MPI_Send(NULL, 0, MPI_DOUBLE, i, LOOP_END, this->group_comm);
|
||||
}
|
||||
|
||||
@ -615,32 +576,28 @@ void poet::ChemistryModule::MasterRunParallel(double dt)
|
||||
iteration++;
|
||||
}
|
||||
|
||||
void poet::ChemistryModule::MasterLoopBreak()
|
||||
{
|
||||
void poet::ChemistryModule::MasterLoopBreak() {
|
||||
int type = CHEM_BREAK_MAIN_LOOP;
|
||||
MPI_Bcast(&type, 1, MPI_INT, 0, this->group_comm);
|
||||
}
|
||||
|
||||
std::vector<uint32_t>
|
||||
poet::ChemistryModule::CalculateWPSizesVector(uint32_t n_cells,
|
||||
uint32_t wp_size) const
|
||||
{
|
||||
uint32_t wp_size) const {
|
||||
bool mod_pkgs = (n_cells % wp_size) != 0;
|
||||
uint32_t n_packages =
|
||||
(uint32_t)(n_cells / wp_size) + static_cast<int>(mod_pkgs);
|
||||
|
||||
std::vector<uint32_t> wp_sizes_vector(n_packages, 0);
|
||||
|
||||
for (int i = 0; i < n_cells; i++)
|
||||
{
|
||||
for (int i = 0; i < n_cells; i++) {
|
||||
wp_sizes_vector[i % n_packages] += 1;
|
||||
}
|
||||
|
||||
return wp_sizes_vector;
|
||||
}
|
||||
|
||||
void poet::ChemistryModule::masterSetField(Field field)
|
||||
{
|
||||
void poet::ChemistryModule::masterSetField(Field field) {
|
||||
this->chem_field = field;
|
||||
this->prop_count = field.GetProps().size();
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user