Merge branch 'development' into update-setonix-config-new

quokka-astro · Sep 9, 2023 · 37aa2d5 · 37aa2d5
2 parents f52c66c + 7ffd65f
commit 37aa2d5
Show file tree

Hide file tree

Showing 3 changed files with 268 additions and 9 deletions.
diff --git a/src/AdvectionSimulation.hpp b/src/AdvectionSimulation.hpp
@@ -81,6 +81,8 @@ template <typename problem_t> class AdvectionSimulation : public AMRSimulation<p
 
 	// compute derived variables
 	void ComputeDerivedVar(int lev, std::string const &dname, amrex::MultiFab &mf, int ncomp) const override;
+	// compute projected vars
+  	[[nodiscard]] auto ComputeProjections(int dir) const -> std::unordered_map<std::string, amrex::BaseFab<amrex::Real>> override;
 
 	// compute statistics
   	auto ComputeStatistics() -> std::map<std::string, amrex::Real> override;
@@ -155,6 +157,13 @@ template <typename problem_t> void AdvectionSimulation<problem_t>::ComputeDerive
 	// user should implement
 }
 
+template <typename problem_t>
+auto AdvectionSimulation<problem_t>::ComputeProjections(int /*dir*/) const -> std::unordered_map<std::string, amrex::BaseFab<amrex::Real>>
+{
+	// user should implement
+	return std::unordered_map<std::string, amrex::BaseFab<amrex::Real>>{};
+}
+
 template <typename problem_t>
 auto AdvectionSimulation<problem_t>::ComputeStatistics() -> std::map<std::string, amrex::Real>
 {

diff --git a/src/RadhydroSimulation.hpp b/src/RadhydroSimulation.hpp
@@ -15,6 +15,7 @@
 #include <limits>
 #include <string>
 #include <tuple>
+#include <unordered_map>
 #include <utility>
 
 #include "AMReX.H"
@@ -191,8 +192,11 @@ template <typename problem_t> class RadhydroSimulation : public AMRSimulation<pr
 	// compute derived variables
 	void ComputeDerivedVar(int lev, std::string const &dname, amrex::MultiFab &mf, int ncomp) const override;
 
-	// compute statistics
-  	auto ComputeStatistics() -> std::map<std::string, amrex::Real> override;
+	// compute projected vars
+  [[nodiscard]] auto ComputeProjections(int dir) const -> std::unordered_map<std::string, amrex::BaseFab<amrex::Real>> override;
+
+  // compute statistics
+  auto ComputeStatistics() -> std::map<std::string, amrex::Real> override;
 
 	// fix-up states
 	void FixupState(int level) override;
@@ -497,6 +501,13 @@ void RadhydroSimulation<problem_t>::ComputeDerivedVar(int lev, std::string const
 	// compute derived variables and save in 'mf' -- user should implement
 }
 
+template <typename problem_t>
+auto RadhydroSimulation<problem_t>::ComputeProjections(int /*dir*/) const -> std::unordered_map<std::string, amrex::BaseFab<amrex::Real>>
+{
+	// compute projections and return as unordered_map -- user should implement
+	return std::unordered_map<std::string, amrex::BaseFab<amrex::Real>>{};
+}
+
 template <typename problem_t>
 auto RadhydroSimulation<problem_t>::ComputeStatistics() -> std::map<std::string, amrex::Real> 
 {