Call FillTracer every cycle

parthenon-hpc-lab · Mar 6, 2024 · 13505df · 13505df
1 parent db3c876
commit 13505df
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/src/hydro/hydro_driver.cpp b/src/hydro/hydro_driver.cpp
@@ -12,6 +12,7 @@
 
 // Parthenon headers
 #include "amr_criteria/refinement_package.hpp"
+#include "basic_types.hpp"
 #include "bvals/comms/bvals_in_one.hpp"
 #include "prolong_restrict/prolong_restrict.hpp"
 #include <parthenon/parthenon.hpp>
@@ -411,6 +412,8 @@ TaskCollection HydroDriver::MakeTaskCollection(BlockList_t &blocks, int stage) {
 
       auto receive =
           tl.AddTask(send, &SwarmContainer::Receive, sd.get(), BoundaryCommSubset::all);
+
+      auto fill = tl.AddTask(receive, Tracers::FillTracers, mbd0.get(), tm);
     }
   }
 

diff --git a/src/pgen/turbulence.cpp b/src/pgen/turbulence.cpp
@@ -535,13 +535,6 @@ void UserWorkBeforeOutput(MeshBlock *pmb, ParameterInput *pin) {
   // store state of distribution
   auto state_dist = few_modes_ft.GetDistState();
   pin->SetString("problem/turbulence", "state_dist", state_dist);
-
-  // TODO(pgrete) move this to a more central location in the driver
-  auto tracer_pkg = pmb->packages.Get("tracers");
-  if (tracer_pkg->Param<bool>("enabled")) {
-    auto &mbd = pmb->meshblock_data.Get();
-    Tracers::FillTracers(mbd.get());
-  }
 }
 
 } // namespace turbulence
diff --git a/src/tracers/tracers.cpp b/src/tracers/tracers.cpp
@@ -20,6 +20,7 @@
 
 #include "tracers.hpp"
 #include "../main.hpp"
+#include "basic_types.hpp"
 #include "utils/error_checking.hpp"
 
 namespace Tracers {
@@ -126,7 +127,7 @@ TaskStatus AdvectTracers(MeshBlockData<Real> *mbd, const Real dt) {
  * Registered Quantities (in addition to t, x, y, z):
  * rho, vel, B
  **/
-void FillTracers(MeshBlockData<Real> *mbd) {
+TaskStatus FillTracers(MeshBlockData<Real> *mbd, parthenon::SimTime &tm) {
 
   auto *pmb = mbd->GetParentPointer();
   auto hydro_pkg = pmb->packages.Get("Hydro");
@@ -184,6 +185,7 @@ void FillTracers(MeshBlockData<Real> *mbd) {
           swarm_d.GetNeighborBlockIndex(n, x(n), y(n), z(n), unsed_tmp);
         }
       });
+  return TaskStatus::complete;
 
 } // FillTracers
 

diff --git a/src/tracers/tracers.hpp b/src/tracers/tracers.hpp
@@ -39,7 +39,7 @@ std::shared_ptr<StateDescriptor> Initialize(ParameterInput *pin);
 
 TaskStatus AdvectTracers(MeshBlockData<Real> *mbd, const Real dt);
 
-void FillTracers(MeshBlockData<Real> *rc);
+TaskStatus FillTracers(MeshBlockData<Real> *mbd, parthenon::SimTime &tm);
 
 } // namespace Tracers