From 0a599aa1ea9b9e324eb0088f9d54e033e9c8dd49 Mon Sep 17 00:00:00 2001 From: Philipp Grete Date: Wed, 22 May 2024 18:13:12 +0200 Subject: [PATCH] bump parth incl refactor restart --- external/parthenon | 2 +- src/pgen/cluster.cpp | 3 ++- src/pgen/pgen.hpp | 6 ++++-- src/pgen/turbulence.cpp | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/external/parthenon b/external/parthenon index 22424395..ba4d14c9 160000 --- a/external/parthenon +++ b/external/parthenon @@ -1 +1 @@ -Subproject commit 22424395d802082df7634f7647f53b4bb072ffca +Subproject commit ba4d14c9a81d47d1cc50b338d6d162a4d932a64a diff --git a/src/pgen/cluster.cpp b/src/pgen/cluster.cpp index 291d51bc..89516e17 100644 --- a/src/pgen/cluster.cpp +++ b/src/pgen/cluster.cpp @@ -807,7 +807,8 @@ void ProblemGenerator(Mesh *pmesh, ParameterInput *pin, MeshData *md) { } } -void UserWorkBeforeOutput(MeshBlock *pmb, ParameterInput *pin) { +void UserWorkBeforeOutput(MeshBlock *pmb, ParameterInput *pin, + const parthenon::SimTime &) { // get hydro auto pkg = pmb->packages.Get("Hydro"); const Real gam = pin->GetReal("hydro", "gamma"); diff --git a/src/pgen/pgen.hpp b/src/pgen/pgen.hpp index 182d8497..964b193f 100644 --- a/src/pgen/pgen.hpp +++ b/src/pgen/pgen.hpp @@ -99,7 +99,8 @@ using namespace parthenon::driver::prelude; void ProblemInitPackageData(ParameterInput *pin, parthenon::StateDescriptor *pkg); void InitUserMeshData(ParameterInput *pin); void ProblemGenerator(Mesh *pmesh, ParameterInput *pin, MeshData *md); -void UserWorkBeforeOutput(MeshBlock *pmb, ParameterInput *pin); +void UserWorkBeforeOutput(MeshBlock *pmb, ParameterInput *pin, + const parthenon::SimTime &); void ClusterUnsplitSrcTerm(MeshData *md, const parthenon::SimTime &tm, const Real beta_dt); void ClusterSplitSrcTerm(MeshData *md, const parthenon::SimTime &tm, @@ -120,7 +121,8 @@ void ProblemGenerator(Mesh *pm, parthenon::ParameterInput *pin, MeshData * void ProblemInitPackageData(ParameterInput *pin, parthenon::StateDescriptor *pkg); void Driving(MeshData *md, const parthenon::SimTime &tm, const Real dt); void SetPhases(MeshBlock *pmb, ParameterInput *pin); -void UserWorkBeforeOutput(MeshBlock *pmb, ParameterInput *pin); +void UserWorkBeforeOutput(MeshBlock *pmb, ParameterInput *pin, + const parthenon::SimTime &); void Cleanup(); } // namespace turbulence diff --git a/src/pgen/turbulence.cpp b/src/pgen/turbulence.cpp index 7d804cc0..cf983498 100644 --- a/src/pgen/turbulence.cpp +++ b/src/pgen/turbulence.cpp @@ -755,7 +755,8 @@ void Driving(MeshData *md, const parthenon::SimTime &tm, const Real dt) { InjectBlob(md, tm, dt); } -void UserWorkBeforeOutput(MeshBlock *pmb, ParameterInput *pin) { +void UserWorkBeforeOutput(MeshBlock *pmb, ParameterInput *pin, + const parthenon::SimTime &) { auto hydro_pkg = pmb->packages.Get("Hydro"); // Store (common) acceleration field in spectral space