diff --git a/src/main/begrun.cc b/src/main/begrun.cc index 916b06f3895d49e54a580fb66c478c40bc752d5b..486d581aba761a37bc274d0a05a06609f6b05c25 100644 --- a/src/main/begrun.cc +++ b/src/main/begrun.cc @@ -318,6 +318,10 @@ void sim::begrun2(void) All.FlushLast = Logs.CPUThisRun; #endif + // update All on shared memory handler, just to allow it to access its elements if needed + if(Shmem.Island_NTask != Shmem.World_NTask && Shmem.Island_ThisTask == 0) + MPI_Send(All.get_data_ptr(), All.get_data_size(), MPI_BYTE, Shmem.MyShmRankInGlobal, TAG_ALL_UPDATE, MPI_COMM_WORLD); + #if defined(FORCETEST) && defined(FORCETEST_TESTFORCELAW) gravity_forcetest_testforcelaw(); #endif diff --git a/src/mpi_utils/mpi_utils.h b/src/mpi_utils/mpi_utils.h index f62434cbba373cc094be7259984e94485485f4cb..f2051551b8888c60fba7f316cd77321a266caaf0 100644 --- a/src/mpi_utils/mpi_utils.h +++ b/src/mpi_utils/mpi_utils.h @@ -97,6 +97,7 @@ #define TAG_NODE_DATA 84 #define TAG_RESULTS 85 #define TAG_DRIFT_INIT 86 +#define TAG_ALL_UPDATE 87 #define TAG_METDATA 500 #define TAG_FETCH_GRAVTREE 1000 #define TAG_FETCH_SPH_DENSITY 2000 diff --git a/src/mpi_utils/shared_mem_handler.cc b/src/mpi_utils/shared_mem_handler.cc index ee9edfd377d3a88cbb9a1ff912bf83f4886b63ef..2bc5042691bda896e4b6c16e04155b939952e94a 100644 --- a/src/mpi_utils/shared_mem_handler.cc +++ b/src/mpi_utils/shared_mem_handler.cc @@ -200,6 +200,11 @@ void shmem::shared_memory_handler(void) Mem.myfree(message); Driftfac.init_drift_table(); } + else if(tag == TAG_ALL_UPDATE) // make the shared memory handler update the contents of the All structure + { + memcpy(All.get_data_ptr(), message, All.get_data_size()); + Mem.myfree(message); + } } }