conformal variables in InitialFluidData fixed

dinatraykova · Apr 6, 2024 · 90c9a3e · 90c9a3e
1 parent a483a4e
commit 90c9a3e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 13 deletions.
diff --git a/Examples/Fluid_Kerr/ConservedQuantities.hpp b/Examples/Fluid_Kerr/ConservedQuantities.hpp
@@ -31,7 +31,7 @@ void PtoC(const data_t P_over_rho, vars_t<data_t> &vars)
     data_t WW = 1. / (1. - v2);
     data_t hh = 1. + vars.eps + P_over_rho;
 
-    data_t rho_conformal = vars.rho / pow(vars.chi, 1.5);
+    data_t rho_conformal = vars.rho / pow(chi_regularised, 1.5);
 
     vars.D = rho_conformal * sqrt(WW);
     vars.tau = rho_conformal * (hh * WW - P_over_rho) - vars.D;

diff --git a/Examples/Fluid_Kerr/InitialFluidData.hpp b/Examples/Fluid_Kerr/InitialFluidData.hpp
@@ -69,18 +69,20 @@ class InitialFluidData
         data_t v2 = 0.;
         FOR(i, j) v2 += metric_vars.h[i][j] * vi[i] * vi[j] / chi_regularised;
         data_t eps = 0.;
-        data_t P = rho * (1. + eps) / 3.;
+        data_t P_over_rho = (1. + eps) / 3.;
         data_t WW = 1. / (1. - v2);
-        data_t hh = 1. + eps + P / rho;
+        data_t hh = 1. + eps + P_over_rho;
 
-        data_t D = rho * sqrt(WW);
-        data_t tau = rho * hh * WW - P - D;
+	data_t rho_conformal = rho / pow(chi_regularised, 1.5);
+
+        data_t D = rho_conformal * sqrt(WW);
+        data_t tau = rho_conformal * (hh * WW - P_over_rho) - D;
         FOR(i)
         {
             Sj[i] = 0.;
             FOR(j)
             Sj[i] +=
-                rho * hh * WW * metric_vars.h[i][j] * vi[j] / chi_regularised;
+                rho_conformal * hh * WW * metric_vars.h[i][j] * vi[j] / chi_regularised;
         }
 
         // store the vars

diff --git a/Examples/Fluid_Kerr/PositiveDensity.hpp b/Examples/Fluid_Kerr/PositiveDensity.hpp
@@ -35,9 +35,9 @@ class PositiveDensity
         vi[2] = current_cell.load_vars(c_vi3);
 
         auto make_zero = simd_compare_lt(D, m_min_D);
-        D = simd_conditional(make_zero, m_min_D, D);
+        D = simd_conditional(make_zero, D, m_min_D);
         // tau = simd_conditional(make_zero, tau, 1e-4);
-        FOR(i) vi[i] = simd_conditional(make_zero, m_min_v, vi[i]);
+        FOR(i) vi[i] = simd_conditional(make_zero, vi[i], m_min_v);
 
         // current_cell.store_vars(D, c_D);
         //  current_cell.store_vars(rho, c_rho);

diff --git a/Examples/Fluid_Kerr/Sources.hpp b/Examples/Fluid_Kerr/Sources.hpp
@@ -29,7 +29,7 @@ vars_t<data_t> compute_source(const data_t P_over_rho,
     data_t WW = 1. / (1. - v2);
     data_t hh = 1. + vars.eps + P_over_rho;
 
-    data_t rho_conformal = vars.rho / pow(vars.chi, 1.5);
+    data_t rho_conformal = vars.rho / pow(chi_regularised, 1.5);
 
     out.D = 0.;
     FOR(j)
@@ -43,19 +43,19 @@ vars_t<data_t> compute_source(const data_t P_over_rho,
                 out.Sj[j] += vars.lapse / 2. *
                              (d1.h[i][k][j] -
                               vars.h[i][k] * d1.chi[j] / chi_regularised) *
-                             (rho_conformal * hh * WW * vars.vi[i] *
+                             (rho_conformal * (hh * WW * vars.vi[i] *
                                   vars.vi[k] / chi_regularised +
-                              P_over_rho * h_UU[i][k]);
+                              P_over_rho * h_UU[i][k]));
             }
         }
     }
     out.tau = 0.;
     FOR(i, j)
     {
         out.tau += vars.lapse * (vars.A[i][j] + vars.h[i][j] / 3. * vars.K) *
-                       (rho_conformal * hh * WW * vars.vi[i] * vars.vi[j] /
+                       (rho_conformal * (hh * WW * vars.vi[i] * vars.vi[j] /
                             chi_regularised +
-                        P_over_rho * h_UU[i][j]) -
+                        P_over_rho * h_UU[i][j])) -
                    vars.chi * h_UU[i][j] * vars.Sj[i] * d1.lapse[j];
     }