Merge branch 'development' into BenWibking/new-shock-cloud

quokka-astro · Feb 4, 2024 · 59b61c2 · 59b61c2
2 parents d3fa3a8 + ae42169
commit 59b61c2
Show file tree

Hide file tree

Showing 11 changed files with 675 additions and 78 deletions.
diff --git a/.ci/azure-pipelines-aarch64-debug.yml b/.ci/azure-pipelines-aarch64-debug.yml
@@ -30,7 +30,7 @@ jobs:
   - task: CMake@1
     displayName: 'Run CTest'
     inputs:
-      cmakeArgs: '-E chdir . ctest -j 2 -T Test --output-on-failure'
+      cmakeArgs: '-E chdir . ctest -j 2 -T Test -E "RadhydroPulseMG*" --output-on-failure'
 
   - task: PublishTestResults@2
     inputs:

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -172,6 +172,7 @@ add_subdirectory(RadhydroShockCGS)
 add_subdirectory(RadhydroShockMultigroup)
 add_subdirectory(RadhydroUniformAdvecting)
 add_subdirectory(RadhydroPulse)
+add_subdirectory(RadhydroPulseMG)
 
 add_subdirectory(ODEIntegration)
 add_subdirectory(Cooling)

diff --git a/src/RadShadow/test_radiation_shadow.cpp b/src/RadShadow/test_radiation_shadow.cpp
@@ -18,6 +18,7 @@
 #include "AMReX_Print.H"
 #include "AMReX_REAL.H"
 
+#include "physics_info.hpp"
 #include "radiation_system.hpp"
 #include "test_radiation_shadow.hpp"
 
@@ -47,6 +48,15 @@ template <> struct RadSystem_Traits<ShadowProblem> {
 	static constexpr bool compute_v_over_c_terms = true;
 };
 
+template <> struct Physics_Traits<ShadowProblem> {
+	static constexpr bool is_hydro_enabled = false;
+	static constexpr int numMassScalars = 0;		     // number of mass scalars
+	static constexpr int numPassiveScalars = numMassScalars + 0; // number of passive scalars
+	static constexpr bool is_radiation_enabled = true;
+	static constexpr bool is_mhd_enabled = false;
+	static constexpr int nGroups = 1;
+};
+
 template <>
 AMREX_GPU_HOST_DEVICE auto RadSystem<ShadowProblem>::ComputePlanckOpacity(const double rho, const double /*Tgas*/) -> quokka::valarray<double, nGroups_>
 {
@@ -212,9 +222,8 @@ auto problem_main() -> int
 		return false;
 	};
 
-	constexpr int nvars = 9;
-	amrex::Vector<amrex::BCRec> BCs_cc(nvars);
-	for (int n = 0; n < nvars; ++n) {
+	amrex::Vector<amrex::BCRec> BCs_cc(Physics_Indices<ShadowProblem>::nvarTotal_cc);
+	for (int n = 0; n < Physics_Indices<ShadowProblem>::nvarTotal_cc; ++n) {
 		BCs_cc[n].setLo(0, amrex::BCType::ext_dir);  // left x1 -- streaming
 		BCs_cc[n].setHi(0, amrex::BCType::foextrap); // right x1 -- extrapolate
 		for (int i = 1; i < AMREX_SPACEDIM; ++i) {

diff --git a/src/RadhydroPulse/CMakeLists.txt b/src/RadhydroPulse/CMakeLists.txt
@@ -6,4 +6,4 @@ if (AMReX_SPACEDIM EQUAL 1)
   endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
   add_test(NAME RadhydroPulse COMMAND test_radhydro_pulse RadhydroPulse.in WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
-endif()
+endif()
diff --git a/src/RadhydroPulseMG/CMakeLists.txt b/src/RadhydroPulseMG/CMakeLists.txt
@@ -0,0 +1,9 @@
+if (AMReX_SPACEDIM EQUAL 1)
+  add_executable(test_radhydro_pulse_MG test_radhydro_pulse_MG.cpp ../fextract.cpp ${QuokkaObjSources})
+
+  if(AMReX_GPU_BACKEND MATCHES "CUDA")
+      setup_target_for_cuda_compilation(test_radhydro_pulse_MG)
+  endif(AMReX_GPU_BACKEND MATCHES "CUDA")
+
+  add_test(NAME RadhydroPulseMG COMMAND test_radhydro_pulse_MG RadhydroPulse.in WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+endif()