From 2aa2f00aad6d41960f0d480f2d6e64301e614ce6 Mon Sep 17 00:00:00 2001
From: Josh Borrow <joshua.borrow@durham.ac.uk>
Date: Tue, 8 May 2018 14:50:20 +0100
Subject: [PATCH] Added P-U variables required for the test
---
tests/testActivePair.c | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/tests/testActivePair.c b/tests/testActivePair.c
index 038d40a44a..4b0b63d976 100644
--- a/tests/testActivePair.c
+++ b/tests/testActivePair.c
@@ -110,7 +110,7 @@ struct cell *make_cell(size_t n, double *offset, double size, double h,
/* Set the thermodynamic variable */
#if defined(GADGET2_SPH)
part->entropy = 1.f;
-#elif defined(MINIMAL_SPH)
+#elif defined(MINIMAL_SPH) || defined(HOPKINS_PU_SPH)
part->u = 1.f;
#elif defined(HOPKINS_PE_SPH)
part->entropy = 1.f;
@@ -194,13 +194,13 @@ void zero_particle_fields_force(struct cell *c, const struct cosmology *cosmo) {
p->density.rot_v[1] = 0.f;
p->density.rot_v[2] = 0.f;
p->density.div_v = 0.f;
-#endif
+#endif /* GADGET-2 */
#ifdef MINIMAL_SPH
p->rho = 1.f;
p->density.rho_dh = 0.f;
p->density.wcount = 48.f / (kernel_norm * pow_dimension(p->h));
p->density.wcount_dh = 0.f;
-#endif
+#endif /* MINIMAL */
#ifdef HOPKINS_PE_SPH
p->rho = 1.f;
p->rho_bar = 1.f;
@@ -208,7 +208,15 @@ void zero_particle_fields_force(struct cell *c, const struct cosmology *cosmo) {
p->density.pressure_dh = 0.f;
p->density.wcount = 48.f / (kernel_norm * pow_dimension(p->h));
p->density.wcount_dh = 0.f;
-#endif
+#endif /* PRESSURE-ENTROPY */
+#ifdef HOPKINS_PU_SPH
+ p->rho = 1.f;
+ p->pressure_bar = 0.6666666;
+ p->density.rho_dh = 0.f;
+ p->density.pressure_bar_dh = 0.f;
+ p->density.wcount = 48.f / (kernel_norm * pow_dimension(p->h));
+ p->density.wcount_dh = 0.f;
+#endif /* PRESSURE-ENERGY */
/* And prepare for a round of force tasks. */
hydro_prepare_force(p, xp, cosmo);
--
GitLab