From 70e66d2b8e29d13b1855992f3fe480703d796250 Mon Sep 17 00:00:00 2001
From: Florian Atteneder <florian.atteneder@uni-jena.de>
Date: Tue, 13 Aug 2024 09:10:10 +0000
Subject: [PATCH] GRHD: fix another edge case where
 c2p_set_atmosphere_on_failure should overrule
 (https://git.tpi.uni-jena.de/dg/dg1d.jl/-/merge_requests/203)

---
 src/GRHD/cons2prim.jl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/GRHD/cons2prim.jl b/src/GRHD/cons2prim.jl
index 588d2680..07a708d6 100644
--- a/src/GRHD/cons2prim.jl
+++ b/src/GRHD/cons2prim.jl
@@ -166,7 +166,9 @@ end
   if !c2p_set_atmosphere_on_failure && (c2p_freeze_atm > 0.0 && c2p_reset_atm == 0.0 && D < ρmin)
     @warn "Require atmosphere but denied by mask" D ρmin xcoord zcoord c2p_freeze_atm c2p_reset_atm
     TODO("Upsi")
-  elseif (c2p_freeze_atm == 0.0 && D < ρmin) || (c2p_freeze_atm > 0.0 && c2p_reset_atm > 0.0)
+  elseif (c2p_set_atmosphere_on_failure && D < ρmin) ||
+         (c2p_freeze_atm == 0.0 && D < ρmin) ||
+         (c2p_freeze_atm > 0.0 && c2p_reset_atm > 0.0)
     if D < ρmin
       c2p_init_admissible = 0.0
     end
@@ -354,7 +356,9 @@ end
     if !c2p_set_atmosphere_on_failure && (c2p_freeze_atm > 0.0 && c2p_reset_atm == 0.0 && ρ < ρmin)
       @warn "Require atmosphere but denied by mask" D ρmin xcoord zcoord c2p_freeze_atm c2p_reset_atm
       TODO("Upsi")
-    elseif (c2p_freeze_atm == 0.0 && ρ < ρmin) || (c2p_freeze_atm > 0.0 && c2p_reset_atm > 0.0)
+    elseif (c2p_set_atmosphere_on_failure && ρ < ρmin) ||
+           (c2p_freeze_atm == 0.0 && ρ < ρmin) ||
+           (c2p_freeze_atm > 0.0 && c2p_reset_atm > 0.0)
       @goto impose_atmosphere
     end
     # compute thermodynamic vars
-- 
GitLab