c2p_set_atmosphere_on_failure=true should ignore c2p_freeze_atm

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