fix primitivefromconservative issue

jyoo1042 · Sep 26, 2023 · b2e08ca · b2e08ca
1 parent fb1f216
commit b2e08ca
Showing 1 changed file with 21 additions and 5 deletions.
diff --git a/src/Evolution/Systems/GrMhd/ValenciaDivClean/PrimitiveFromConservative.cpp b/src/Evolution/Systems/GrMhd/ValenciaDivClean/PrimitiveFromConservative.cpp
@@ -208,12 +208,16 @@ bool PrimitiveFromConservative<OrderedListOfPrimitiveRecoverySchemes,
       }
       get(*lorentz_factor)[s] = primitive_data.value().lorentz_factor;
       get(*pressure)[s] = primitive_data.value().pressure;
-      get(*specific_internal_energy)[s] =
+      if constexpr (ThermodynamicDim == 3) {
+        get(*specific_internal_energy)[s] =
           primitive_data.value().specific_internal_energy;
-      get(*specific_enthalpy)[s] = primitive_data.value().rho_h_w_squared /
-                                   (primitive_data.value().rest_mass_density *
-                                    primitive_data.value().lorentz_factor *
-                                    primitive_data.value().lorentz_factor);
+        get(*specific_enthalpy)[s] = primitive_data.value().rho_h_w_squared /
+                                     (primitive_data.value().lorentz_factor *
+                                      primitive_data.value().lorentz_factor *
+                                      primitive_data.value().rest_mass_density);
+      }
+      }
+
     } else {
       if constexpr (ErrorOnFailure) {
         ERROR("All primitive inversion schemes failed at s = "
@@ -242,9 +246,21 @@ bool PrimitiveFromConservative<OrderedListOfPrimitiveRecoverySchemes,
   if constexpr (ThermodynamicDim == 1) {
     *temperature =
         equation_of_state.temperature_from_density(*rest_mass_density);
+    *specific_internal_energy =
+        equation_of_state.specific_internal_energy_from_density(
+            *rest_mass_density);
+    *specific_enthalpy = hydro::relativistic_specific_enthalpy(
+        *rest_mass_density, *specific_internal_energy, *pressure);
+
   } else if constexpr (ThermodynamicDim == 2) {
     *temperature = equation_of_state.temperature_from_density_and_energy(
         *rest_mass_density, *specific_internal_energy);
+    *specific_internal_energy =
+        equation_of_state.specific_internal_energy_from_density_and_pressure(
+            *rest_mass_density, *pressure);
+    *specific_enthalpy = hydro::relativistic_specific_enthalpy(
+        *rest_mass_density, *specific_internal_energy, *pressure);
+
   } else if constexpr (ThermodynamicDim == 3) {
     *temperature = equation_of_state.temperature_from_density_and_energy(
         *rest_mass_density, *specific_internal_energy, *electron_fraction);