squash commits

quokka-astro · Jun 11, 2024 · ba80826 · ba80826
1 parent 1b07ade
commit ba80826
Show file tree

Hide file tree

Showing 11 changed files with 1,789 additions and 341 deletions.
diff --git a/src/NSCBC_inflow.hpp b/src/NSCBC_inflow.hpp
@@ -166,8 +166,6 @@ AMREX_GPU_DEVICE AMREX_FORCE_INLINE void setInflowX1LowerLowOrder(const amrex::I
 	amrex::Box const &box = geom.Domain();
 	const auto &domain_lo = box.loVect3d();
 	const int ilo = domain_lo[0];
-	const Real dx = geom.CellSize(0);
-	const Real Lx = geom.prob_domain.length(0);
 	constexpr int N = HydroSystem<problem_t>::nvar_;
 
 	/// x1 lower boundary -- subsonic inflow

diff --git a/src/NSCBC_outflow.hpp b/src/NSCBC_outflow.hpp
@@ -370,7 +370,6 @@ AMREX_GPU_DEVICE AMREX_FORCE_INLINE void setOutflowBoundaryLowOrder(const amrex:
 	const int im1 = (SIDE == BoundarySide::Lower) ? ibr + 1 : ibr - 1;
 	const int im2 = (SIDE == BoundarySide::Lower) ? ibr + 2 : ibr - 2;
 	const int im3 = (SIDE == BoundarySide::Lower) ? ibr + 3 : ibr - 3;
-	const Real dx = geom.CellSize(static_cast<int>(DIR));
 
 	// compute primitive vars
 	quokka::valarray<amrex::Real, N> Q_i{};

diff --git a/src/ODEIntegrate.hpp b/src/ODEIntegrate.hpp
@@ -135,8 +135,7 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void rk_adaptive_integrate(F &&rhs, Rea
 	quokka::valarray<Real, N> ydot0{};
 	rhs(t0, y0, ydot0, user_data);
 	const Real dt_guess = 0.1 * min(abs(y0 / ydot0));
-
-	AMREX_ALWAYS_ASSERT(dt_guess > 0.);
+	AMREX_ASSERT(dt_guess > 0.0);
 
 	// adaptive timestep controller
 	const int maxRetries = 7;
@@ -208,9 +207,6 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void rk_adaptive_integrate(F &&rhs, Rea
 
 		if (!step_success) {
 			success = false;
-			printf("ODE integrator failed to reach accuracy tolerance after "
-			       "maximum step-size re-tries reached! dt = %g\n",
-			       dt);
 			break;
 		}
 
@@ -224,7 +220,6 @@ AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void rk_adaptive_integrate(F &&rhs, Rea
 
 	if (!success) {
 		steps_taken = maxStepsODEIntegrate;
-		printf("ODE integration exceeded maxStepsODEIntegrate! steps_taken = %d\n", steps_taken);
 	}
 }
 

diff --git a/src/ShockCloud/CMakeLists.txt b/src/ShockCloud/CMakeLists.txt
@@ -1,10 +1,8 @@
 if (AMReX_SPACEDIM GREATER_EQUAL 3)
     add_executable(shock_cloud cloud.cpp ${QuokkaObjSources})
-    add_executable(test_grackle_cooling test_grackle_cooling.cpp ${QuokkaObjSources})
 
     if(AMReX_GPU_BACKEND MATCHES "CUDA")
         setup_target_for_cuda_compilation(shock_cloud)
-        setup_target_for_cuda_compilation(test_grackle_cooling)
     endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
 endif(AMReX_SPACEDIM GREATER_EQUAL 3)
diff --git a/src/ShockCloud/boundary_conditions.ipynb b/src/ShockCloud/boundary_conditions.ipynb