Merge branch 'main' into amr

jaykalinani · Apr 17, 2024 · ce5e853 · ce5e853
2 parents c1910d0 + ba5d0c2
commit ce5e853
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Con2PrimFactory/src/c2p_1DPalenzuela.hxx b/Con2PrimFactory/src/c2p_1DPalenzuela.hxx
@@ -361,7 +361,7 @@ c2p_1DPalenzuela::solve(EOSType &eos_th, prim_vars &pv, prim_vars &pv_seeds,
         pv.eps, rgeps.min);
     printf(" Not adjusting cons.. \n");
     */
-    rep.set_range_eps(pv.eps); // sets adjust_cons to false by default
+    rep.set_range_eps(rgeps.min); // sets adjust_cons to true
   }
 
   // TODO: check validity for Ye

diff --git a/Con2PrimFactory/src/c2p_2DNoble.hxx b/Con2PrimFactory/src/c2p_2DNoble.hxx
@@ -414,7 +414,7 @@ c2p_2DNoble::solve(EOSType &eos_th, prim_vars &pv, prim_vars &pv_seeds,
         pv.eps, rgeps.min);
     printf(" Not adjusting cons.. \n");
     */
-    rep.set_range_eps(pv.eps); // sets adjust_cons to false by default
+    rep.set_range_eps(rgeps.min); // sets adjust_cons to true by default
   }
 
   // TODO: check validity for Ye

diff --git a/Con2PrimFactory/src/c2p_report.hxx b/Con2PrimFactory/src/c2p_report.hxx
@@ -149,7 +149,7 @@ public:
   set_range_eps(CCTK_REAL eps_) {
     status = RANGE_EPS;
     set_atmo = false;
-    adjust_cons = false; // we do not adjust cons in this case!
+    adjust_cons = true; // we adjust cons in this case!
     eps = eps_;
   }
 
@@ -233,7 +233,7 @@ public:
       printf("Density out of range, dens = %16.8e, rho = %16.8e \n", dens, rho);
       break;
     case RANGE_EPS:
-      printf("Specific energy out of range, eps = %16.8e \n", eps);
+      printf("Specific energy was out of range! eps readjusted to = %16.8e \n", eps);
       break;
     case SPEED_LIMIT:
       printf("Speed limit exceeded, vx, vy, vz = %16.8e, %16.8e, %16.8e \n",