From 6331e2fbe121c95066580c9126ce2c113601ad08 Mon Sep 17 00:00:00 2001 From: HPC user Date: Thu, 14 Dec 2023 00:08:02 +0100 Subject: [PATCH] Formating --- CMakeLists.txt | 3 ++- src/eos/adiabatic_glmmhd.cpp | 6 ------ src/eos/adiabatic_glmmhd.hpp | 14 +++++++------- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8dfc61c5..479a5d8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -86,4 +86,5 @@ add_subdirectory(src) if (AthenaPK_ENABLE_TESTING) include(CTest) add_subdirectory(tst/regression) -endif() \ No newline at end of file +endif() + diff --git a/src/eos/adiabatic_glmmhd.cpp b/src/eos/adiabatic_glmmhd.cpp index a2e843da..24b8a155 100644 --- a/src/eos/adiabatic_glmmhd.cpp +++ b/src/eos/adiabatic_glmmhd.cpp @@ -51,12 +51,6 @@ void AdiabaticGLMMHDEOS::ConservedToPrimitive(MeshData *md) const { auto &prim = prim_pack(b); // auto &nu = entropy_pack(b); - // Getting the global indexing - - auto pmb = md->GetBlockData(b)->GetBlockPointer(); - auto pm = pmb->pmy_mesh; - auto hydro_pkg = pmb->packages.Get("Hydro"); - return this_on_device.ConsToPrim(cons, prim, nhydro, nscalars, k, j, i); }); } diff --git a/src/eos/adiabatic_glmmhd.hpp b/src/eos/adiabatic_glmmhd.hpp index 93e48c6a..9be13527 100644 --- a/src/eos/adiabatic_glmmhd.hpp +++ b/src/eos/adiabatic_glmmhd.hpp @@ -93,9 +93,9 @@ class AdiabaticGLMMHDEOS : public EquationOfState { // Let's apply floors explicitly, i.e., by default floor will be disabled (<=0) // and the code will fail if a negative density is encountered. - // PARTHENON_REQUIRE(u_d > 0.0 || density_floor_ > 0.0, - // "Got negative density. Consider enabling first-order flux " - // "correction or setting a reasonable density floor."); + PARTHENON_REQUIRE(u_d > 0.0 || density_floor_ > 0.0, + "Got negative density. Consider enabling first-order flux " + "correction or setting a reasonable density floor."); // apply density floor, without changing momentum or energy u_d = (u_d > density_floor_) ? u_d : density_floor_; @@ -134,10 +134,10 @@ class AdiabaticGLMMHDEOS : public EquationOfState { // Let's apply floors explicitly, i.e., by default floor will be disabled (<=0) // and the code will fail if a negative pressure is encountered. - // PARTHENON_REQUIRE(w_p > 0.0 || pressure_floor_ > 0.0 || e_floor_ > 0.0, - // "Got negative pressure. Consider enabling first-order flux " - // "correction or setting a reasonable pressure or temperature - // floor."); + PARTHENON_REQUIRE( + w_p > 0.0 || pressure_floor_ > 0.0 || e_floor_ > 0.0, + "Got negative pressure. Consider enabling first-order flux " + "correction or setting a reasonable pressure or temperature floor."); // Pressure floor (if present) takes precedence over temperature floor if ((pressure_floor_ > 0.0) && (w_p < pressure_floor_)) {