From f0329b64dca75e76e936f1df60d8edf221e46646 Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durham.ac.uk>
Date: Wed, 30 May 2018 09:40:37 +0200
Subject: [PATCH] Apply the same bug fix to the other hydro schemes.
---
src/hydro/Default/hydro.h | 4 ++--
src/hydro/Gadget2/hydro.h | 2 +-
src/hydro/GizmoMFM/hydro.h | 2 +-
src/hydro/GizmoMFV/hydro.h | 2 +-
src/hydro/PressureEnergy/hydro.h | 4 ++--
src/hydro/PressureEntropy/hydro.h | 4 ++--
src/hydro/Shadowswift/hydro.h | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/hydro/Default/hydro.h b/src/hydro/Default/hydro.h
index b1a999b631..2c3a9c46f0 100644
--- a/src/hydro/Default/hydro.h
+++ b/src/hydro/Default/hydro.h
@@ -339,7 +339,7 @@ __attribute__((always_inline)) INLINE static void hydro_part_has_no_neighbours(
/* Re-set problematic values */
p->rho = p->mass * kernel_root * h_inv_dim;
- p->density.wcount = kernel_root * kernel_norm * h_inv_dim;
+ p->density.wcount = kernel_root * h_inv_dim;
p->rho_dh = 0.f;
p->density.wcount_dh = 0.f;
p->density.div_v = 0.f;
@@ -423,7 +423,7 @@ __attribute__((always_inline)) INLINE static void hydro_reset_acceleration(
/* Reset the time derivatives. */
p->force.u_dt = 0.0f;
p->force.h_dt = 0.0f;
- p->force.v_sig = 0.0f;
+ p->force.v_sig = p->force.soundspeed;
}
/**
diff --git a/src/hydro/Gadget2/hydro.h b/src/hydro/Gadget2/hydro.h
index bc06a24e2a..26e3bf97dd 100644
--- a/src/hydro/Gadget2/hydro.h
+++ b/src/hydro/Gadget2/hydro.h
@@ -349,7 +349,7 @@ __attribute__((always_inline)) INLINE static void hydro_part_has_no_neighbours(
/* Re-set problematic values */
p->rho = p->mass * kernel_root * h_inv_dim;
- p->density.wcount = kernel_root * kernel_norm * h_inv_dim;
+ p->density.wcount = kernel_root * h_inv_dim;
p->density.rho_dh = 0.f;
p->density.wcount_dh = 0.f;
p->density.div_v = 0.f;
diff --git a/src/hydro/GizmoMFM/hydro.h b/src/hydro/GizmoMFM/hydro.h
index 9c4be6af35..ae0fe13bc1 100644
--- a/src/hydro/GizmoMFM/hydro.h
+++ b/src/hydro/GizmoMFM/hydro.h
@@ -398,7 +398,7 @@ __attribute__((always_inline)) INLINE static void hydro_part_has_no_neighbours(
const float h_inv_dim = pow_dimension(h_inv); /* 1/h^d */
/* Re-set problematic values */
- p->density.wcount = kernel_root * kernel_norm * h_inv_dim;
+ p->density.wcount = kernel_root * h_inv_dim;
p->density.wcount_dh = 0.f;
p->geometry.volume = 1.0f;
p->geometry.matrix_E[0][0] = 1.0f;
diff --git a/src/hydro/GizmoMFV/hydro.h b/src/hydro/GizmoMFV/hydro.h
index 1d5abeaaf6..e94a87408e 100644
--- a/src/hydro/GizmoMFV/hydro.h
+++ b/src/hydro/GizmoMFV/hydro.h
@@ -398,7 +398,7 @@ __attribute__((always_inline)) INLINE static void hydro_part_has_no_neighbours(
const float h_inv_dim = pow_dimension(h_inv); /* 1/h^d */
/* Re-set problematic values */
- p->density.wcount = kernel_root * kernel_norm * h_inv_dim;
+ p->density.wcount = kernel_root * h_inv_dim;
p->density.wcount_dh = 0.f;
p->geometry.volume = 1.0f;
p->geometry.matrix_E[0][0] = 1.0f;
diff --git a/src/hydro/PressureEnergy/hydro.h b/src/hydro/PressureEnergy/hydro.h
index 1e0d8208e8..ea086daeeb 100644
--- a/src/hydro/PressureEnergy/hydro.h
+++ b/src/hydro/PressureEnergy/hydro.h
@@ -403,7 +403,7 @@ __attribute__((always_inline)) INLINE static void hydro_part_has_no_neighbours(
p->rho = p->mass * kernel_root * h_inv_dim;
p->pressure_bar =
p->mass * p->u * hydro_gamma_minus_one * kernel_root * h_inv_dim;
- p->density.wcount = kernel_root * kernel_norm * h_inv_dim;
+ p->density.wcount = kernel_root * h_inv_dim;
p->density.rho_dh = 0.f;
p->density.wcount_dh = 0.f;
p->density.pressure_bar_dh = 0.f;
@@ -480,7 +480,7 @@ __attribute__((always_inline)) INLINE static void hydro_reset_acceleration(
/* Reset the time derivatives. */
p->u_dt = 0.0f;
p->force.h_dt = 0.0f;
- p->force.v_sig = 0.0f;
+ p->force.v_sig = p->force.soundspeed;
}
/**
diff --git a/src/hydro/PressureEntropy/hydro.h b/src/hydro/PressureEntropy/hydro.h
index 87d46c6d43..e4b7cf06e0 100644
--- a/src/hydro/PressureEntropy/hydro.h
+++ b/src/hydro/PressureEntropy/hydro.h
@@ -357,7 +357,7 @@ __attribute__((always_inline)) INLINE static void hydro_part_has_no_neighbours(
/* Re-set problematic values */
p->rho = p->mass * kernel_root * h_inv_dim;
p->rho_bar = p->mass * kernel_root * h_inv_dim;
- p->density.wcount = kernel_root * kernel_norm * h_inv_dim;
+ p->density.wcount = kernel_root * h_inv_dim;
p->density.rho_dh = 0.f;
p->density.wcount_dh = 0.f;
p->density.pressure_dh = 0.f;
@@ -441,7 +441,7 @@ __attribute__((always_inline)) INLINE static void hydro_reset_acceleration(
p->force.h_dt = 0.0f;
/* Reset maximal signal velocity */
- p->force.v_sig = 0.0f;
+ p->force.v_sig = p->force.soundspeed;
}
/**
diff --git a/src/hydro/Shadowswift/hydro.h b/src/hydro/Shadowswift/hydro.h
index 36078798cd..025779f174 100644
--- a/src/hydro/Shadowswift/hydro.h
+++ b/src/hydro/Shadowswift/hydro.h
@@ -257,7 +257,7 @@ __attribute__((always_inline)) INLINE static void hydro_part_has_no_neighbours(
const float h_inv_dim = pow_dimension(h_inv); /* 1/h^d */
/* Re-set problematic values */
- p->density.wcount = kernel_root * kernel_norm * h_inv_dim;
+ p->density.wcount = kernel_root * h_inv_dim;
p->density.wcount_dh = 0.f;
}
--
GitLab