From 0bed48342a3334b7982afb2f2b11cb888938cadd Mon Sep 17 00:00:00 2001
From: Bert Vandenbroucke <bert.vandenbroucke@gmail.com>
Date: Fri, 31 Mar 2017 10:22:08 +0100
Subject: [PATCH] Added missing SHADOWFAX_SPH and GIZMO_SPH files to
src/Makefile.am. Removed unused counter from riemann_solve_brent().
---
src/Makefile.am | 27 +++++++++++++++++++++++++--
src/riemann/riemann_exact.h | 3 ---
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index a29cf5521f..717077caed 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -77,8 +77,31 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h cycle.h error.h inline.h
hydro/Gadget2/hydro_debug.h hydro/Gadget2/hydro_part.h \
hydro/PressureEntropy/hydro.h hydro/PressureEntropy/hydro_iact.h hydro/PressureEntropy/hydro_io.h \
hydro/PressureEntropy/hydro_debug.h hydro/PressureEntropy/hydro_part.h \
- hydro/Gizmo/hydro.h hydro/Gizmo/hydro_iact.h hydro/Gizmo/hydro_io.h \
- hydro/Gizmo/hydro_debug.h hydro/Gizmo/hydro_part.h \
+ hydro/Gizmo/hydro.h hydro/Gizmo/hydro_iact.h \
+ hydro/Gizmo/hydro_io.h hydro/Gizmo/hydro_debug.h \
+ hydro/Gizmo/hydro_part.h \
+ hydro/Gizmo/hydro_gradients_gizmo.h \
+ hydro/Gizmo/hydro_gradients.h \
+ hydro/Gizmo/hydro_gradients_sph.h \
+ hydro/Gizmo/hydro_slope_limiters_cell.h \
+ hydro/Gizmo/hydro_slope_limiters_face.h \
+ hydro/Gizmo/hydro_slope_limiters.h \
+ hydro/Shadowswift/hydro_debug.h \
+ hydro/Shadowswift/hydro_gradients.h hydro/Shadowswift/hydro.h \
+ hydro/Shadowswift/hydro_iact.h \
+ hydro/Shadowswift/hydro_io.h \
+ hydro/Shadowswift/hydro_part.h \
+ hydro/Shadowswift/hydro_slope_limiters_cell.h \
+ hydro/Shadowswift/hydro_slope_limiters_face.h \
+ hydro/Shadowswift/hydro_slope_limiters.h \
+ hydro/Shadowswift/voronoi1d_algorithm.h \
+ hydro/Shadowswift/voronoi1d_cell.h \
+ hydro/Shadowswift/voronoi2d_algorithm.h \
+ hydro/Shadowswift/voronoi2d_cell.h \
+ hydro/Shadowswift/voronoi3d_algorithm.h \
+ hydro/Shadowswift/voronoi3d_cell.h \
+ hydro/Shadowswift/voronoi_algorithm.h \
+ hydro/Shadowswift/voronoi_cell.h \
riemann/riemann_hllc.h riemann/riemann_trrs.h \
riemann/riemann_exact.h riemann/riemann_vacuum.h \
stars.h stars_io.h \
diff --git a/src/riemann/riemann_exact.h b/src/riemann/riemann_exact.h
index 4a20561def..4a7b40ae78 100644
--- a/src/riemann/riemann_exact.h
+++ b/src/riemann/riemann_exact.h
@@ -206,7 +206,6 @@ __attribute__((always_inline)) INLINE static float riemann_solve_brent(
float fa, fb, fc, fs;
float tmp, tmp2;
int mflag;
- int i;
a = lower_limit;
b = upper_limit;
@@ -243,7 +242,6 @@ __attribute__((always_inline)) INLINE static float riemann_solve_brent(
c = a;
fc = fa;
mflag = 1;
- i = 0;
while (!(fb == 0.0f) && (fabs(a - b) > error_tol * 0.5f * (a + b))) {
if ((fa != fc) && (fb != fc)) /* Inverse quadratic interpolation */
@@ -286,7 +284,6 @@ __attribute__((always_inline)) INLINE static float riemann_solve_brent(
fa = fb;
fb = tmp;
}
- i++;
}
return b;
}
--
GitLab