Commit 82d9cdb8 authored by Bert Vandenbroucke's avatar Bert Vandenbroucke
Browse files

Moved Gizmo to GizmoMFV, and changed gizmo configuration option to gizmo-mfv....

Moved Gizmo to GizmoMFV, and changed gizmo configuration option to gizmo-mfv. Made sure all unit tests compile again with gizmo-mfv.
parent 59635df1
......@@ -855,7 +855,7 @@ fi
# Hydro scheme.
AC_ARG_WITH([hydro],
[AS_HELP_STRING([--with-hydro=<scheme>],
[Hydro dynamics to use @<:@gadget2, minimal, hopkins, default, gizmo, shadowfax, minimal-multi-mat, debug default: gadget2@:>@]
[Hydro dynamics to use @<:@gadget2, minimal, hopkins, default, gizmo-mfv, shadowfax, minimal-multi-mat, debug default: gadget2@:>@]
)],
[with_hydro="$withval"],
[with_hydro="gadget2"]
......@@ -882,8 +882,8 @@ case "$with_hydro" in
default)
AC_DEFINE([DEFAULT_SPH], [1], [Default SPH])
;;
gizmo)
AC_DEFINE([GIZMO_SPH], [1], [GIZMO SPH])
gizmo-mfv)
AC_DEFINE([GIZMO_MFV_SPH], [1], [GIZMO MFV SPH])
;;
shadowfax)
AC_DEFINE([SHADOWFAX_SPH], [1], [Shadowfax SPH])
......
......@@ -81,17 +81,17 @@ nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.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_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/Gizmo/hydro_unphysical.h \
hydro/Gizmo/hydro_velocities.h \
hydro/GizmoMFV/hydro.h hydro/GizmoMFV/hydro_iact.h \
hydro/GizmoMFV/hydro_io.h hydro/GizmoMFV/hydro_debug.h \
hydro/GizmoMFV/hydro_part.h \
hydro/GizmoMFV/hydro_gradients_gizmo.h \
hydro/GizmoMFV/hydro_gradients.h \
hydro/GizmoMFV/hydro_gradients_sph.h \
hydro/GizmoMFV/hydro_slope_limiters_cell.h \
hydro/GizmoMFV/hydro_slope_limiters_face.h \
hydro/GizmoMFV/hydro_slope_limiters.h \
hydro/GizmoMFV/hydro_unphysical.h \
hydro/GizmoMFV/hydro_velocities.h \
hydro/Shadowswift/hydro_debug.h \
hydro/Shadowswift/hydro_gradients.h hydro/Shadowswift/hydro.h \
hydro/Shadowswift/hydro_iact.h \
......
......@@ -55,7 +55,7 @@
/* Try to keep cells regular by adding a correction velocity. */
//#define GIZMO_STEER_MOTION
/* Use a meshless finite mass method. */
#define GIZMO_MFM
//#define GIZMO_MFM
/* Use the total energy instead of the thermal energy as conserved variable. */
//#define GIZMO_TOTAL_ENERGY
......
......@@ -48,8 +48,8 @@
#include "./hydro/PressureEntropy/hydro_debug.h"
#elif defined(DEFAULT_SPH)
#include "./hydro/Default/hydro_debug.h"
#elif defined(GIZMO_SPH)
#include "./hydro/Gizmo/hydro_debug.h"
#elif defined(GIZMO_MFV_SPH)
#include "./hydro/GizmoMFV/hydro_debug.h"
#elif defined(SHADOWFAX_SPH)
#include "./hydro/Shadowswift/hydro_debug.h"
#elif defined(MINIMAL_MULTI_MAT_SPH)
......
......@@ -45,10 +45,10 @@
#include "./hydro/Default/hydro.h"
#include "./hydro/Default/hydro_iact.h"
#define SPH_IMPLEMENTATION "Default version of SPH"
#elif defined(GIZMO_SPH)
#include "./hydro/Gizmo/hydro.h"
#include "./hydro/Gizmo/hydro_iact.h"
#define SPH_IMPLEMENTATION "GIZMO (Hopkins 2015)"
#elif defined(GIZMO_MFV_SPH)
#include "./hydro/GizmoMFV/hydro.h"
#include "./hydro/GizmoMFV/hydro_iact.h"
#define SPH_IMPLEMENTATION "GIZMO MFV (Hopkins 2015)"
#elif defined(SHADOWFAX_SPH)
#include "./hydro/Shadowswift/hydro.h"
#include "./hydro/Shadowswift/hydro_iact.h"
......
......@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
******************************************************************************/
#ifndef SWIFT_GIZMO_HYDRO_H
#define SWIFT_GIZMO_HYDRO_H
#ifndef SWIFT_GIZMO_MFV_HYDRO_H
#define SWIFT_GIZMO_MFV_HYDRO_H
#include "adiabatic_index.h"
#include "approx_math.h"
......@@ -972,4 +972,4 @@ hydro_set_init_internal_energy(struct part* p, float u_init) {
p->primitives.P = hydro_gamma_minus_one * p->primitives.rho * u_init;
}
#endif /* SWIFT_GIZMO_HYDRO_H */
#endif /* SWIFT_GIZMO_MFV_HYDRO_H */
......@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
******************************************************************************/
#ifndef SWIFT_GIZMO_HYDRO_DEBUG_H
#define SWIFT_GIZMO_HYDRO_DEBUG_H
#ifndef SWIFT_GIZMO_MFV_HYDRO_DEBUG_H
#define SWIFT_GIZMO_MFV_HYDRO_DEBUG_H
__attribute__((always_inline)) INLINE static void hydro_debug_particle(
const struct part* p, const struct xpart* xp) {
......@@ -78,4 +78,4 @@ __attribute__((always_inline)) INLINE static void hydro_debug_particle(
p->timestepvars.vmax, p->density.wcount_dh, p->density.wcount);
}
#endif /* SWIFT_GIZMO_HYDRO_DEBUG_H */
#endif /* SWIFT_GIZMO_MFV_HYDRO_DEBUG_H */
......@@ -17,8 +17,8 @@
*
******************************************************************************/
#ifndef SWIFT_HYDRO_GIZMO_GRADIENTS_H
#define SWIFT_HYDRO_GIZMO_GRADIENTS_H
#ifndef SWIFT_HYDRO_GIZMO_MFV_GRADIENTS_H
#define SWIFT_HYDRO_GIZMO_MFV_GRADIENTS_H
#include "hydro_slope_limiters.h"
#include "hydro_unphysical.h"
......@@ -156,4 +156,4 @@ __attribute__((always_inline)) INLINE static void hydro_gradients_predict(
Wj[3], Wj[4]);
}
#endif /* SWIFT_HYDRO_GIZMO_GRADIENTS_H */
#endif /* SWIFT_HYDRO_GIZMO_MFV_GRADIENTS_H */
......@@ -22,8 +22,8 @@
*
* @param p Particle.
*/
#ifndef SWIFT_GIZMO_HYDRO_GRADIENTS_H
#define SWIFT_GIZMO_HYDRO_GRADIENTS_H
#ifndef SWIFT_GIZMO_MFV_HYDRO_GRADIENTS_H
#define SWIFT_GIZMO_MFV_HYDRO_GRADIENTS_H
__attribute__((always_inline)) INLINE static void hydro_gradients_init(
struct part *p) {
......@@ -485,4 +485,4 @@ __attribute__((always_inline)) INLINE static void hydro_gradients_finalize(
hydro_slope_limit_cell(p);
}
#endif /* SWIFT_GIZMO_HYDRO_GRADIENTS_H */
#endif /* SWIFT_GIZMO_MFV_HYDRO_GRADIENTS_H */
......@@ -22,8 +22,8 @@
*
* @param p Particle.
*/
#ifndef SWIFT_GIZMO_HYDRO_SPH_GRADIENTS_H
#define SWIFT_GIZMO_HYDRO_SPH_GRADIENTS_H
#ifndef SWIFT_GIZMO_MFV_HYDRO_SPH_GRADIENTS_H
#define SWIFT_GIZMO_MFV_HYDRO_SPH_GRADIENTS_H
__attribute__((always_inline)) INLINE static void hydro_gradients_init(
struct part *p) {
......@@ -253,4 +253,4 @@ __attribute__((always_inline)) INLINE static void hydro_gradients_finalize(
hydro_slope_limit_cell(p);
}
#endif /* SWIFT_GIZMO_HYDRO_SPH_GRADIENTS_H */
#endif /* SWIFT_GIZMO_MFV_HYDRO_SPH_GRADIENTS_H */
......@@ -18,8 +18,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
******************************************************************************/
#ifndef SWIFT_GIZMO_HYDRO_IACT_H
#define SWIFT_GIZMO_HYDRO_IACT_H
#ifndef SWIFT_GIZMO_MFV_HYDRO_IACT_H
#define SWIFT_GIZMO_MFV_HYDRO_IACT_H
#include "adiabatic_index.h"
#include "hydro_gradients.h"
......@@ -514,4 +514,4 @@ __attribute__((always_inline)) INLINE static void runner_iact_nonsym_force(
runner_iact_fluxes_common(r2, dx, hi, hj, pi, pj, 0, a, H);
}
#endif /* SWIFT_GIZMO_HYDRO_IACT_H */
#endif /* SWIFT_GIZMO_MFV_HYDRO_IACT_H */
......@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
******************************************************************************/
#ifndef SWIFT_GIZMO_HYDRO_IO_H
#define SWIFT_GIZMO_HYDRO_IO_H
#ifndef SWIFT_GIZMO_MFV_HYDRO_IO_H
#define SWIFT_GIZMO_MFV_HYDRO_IO_H
#include "adiabatic_index.h"
#include "hydro.h"
......@@ -241,4 +241,4 @@ void hydro_write_flavour(hid_t h_grpsph) {
*/
int writeEntropyFlag() { return 0; }
#endif /* SWIFT_GIZMO_HYDRO_IO_H */
#endif /* SWIFT_GIZMO_MFV_HYDRO_IO_H */
......@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
******************************************************************************/
#ifndef SWIFT_GIZMO_HYDRO_PART_H
#define SWIFT_GIZMO_HYDRO_PART_H
#ifndef SWIFT_GIZMO_MFV_HYDRO_PART_H
#define SWIFT_GIZMO_MFV_HYDRO_PART_H
#include "chemistry_struct.h"
#include "cooling_struct.h"
......@@ -210,4 +210,4 @@ struct part {
} SWIFT_STRUCT_ALIGN;
#endif /* SWIFT_GIZMO_HYDRO_PART_H */
#endif /* SWIFT_GIZMO_MFV_HYDRO_PART_H */
......@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
******************************************************************************/
#ifndef SWIFT_GIZMO_SLOPE_LIMITER_CELL_H
#define SWIFT_GIZMO_SLOPE_LIMITER_CELL_H
#ifndef SWIFT_GIZMO_MFV_SLOPE_LIMITER_CELL_H
#define SWIFT_GIZMO_MFV_SLOPE_LIMITER_CELL_H
#include <float.h>
......@@ -183,4 +183,4 @@ __attribute__((always_inline)) INLINE static void hydro_slope_limit_cell(
}
}
#endif /* SWIFT_GIZMO_SLOPE_LIMITER_CELL_H */
#endif /* SWIFT_GIZMO_MFV_SLOPE_LIMITER_CELL_H */
......@@ -29,8 +29,8 @@
* @return The slope limited difference between the quantity at the particle
* position and the quantity at the interface position.
*/
#ifndef SWIFT_GIZMO_SLOPE_LIMITER_FACE_H
#define SWIFT_GIZMO_SLOPE_LIMITER_FACE_H
#ifndef SWIFT_GIZMO_MFV_SLOPE_LIMITER_FACE_H
#define SWIFT_GIZMO_MFV_SLOPE_LIMITER_FACE_H
/* Some standard headers. */
#include <float.h>
......@@ -125,4 +125,4 @@ __attribute__((always_inline)) INLINE static void hydro_slope_limit_face(
xij_j_norm, r_inv);
}
#endif /* SWIFT_GIZMO_SLOPE_LIMITER_FACE_H */
#endif /* SWIFT_GIZMO_MFV_SLOPE_LIMITER_FACE_H */
......@@ -31,8 +31,8 @@
#include "./hydro/PressureEntropy/hydro_io.h"
#elif defined(DEFAULT_SPH)
#include "./hydro/Default/hydro_io.h"
#elif defined(GIZMO_SPH)
#include "./hydro/Gizmo/hydro_io.h"
#elif defined(GIZMO_MFV_SPH)
#include "./hydro/GizmoMFV/hydro_io.h"
#elif defined(SHADOWFAX_SPH)
#include "./hydro/Shadowswift/hydro_io.h"
#elif defined(MINIMAL_MULTI_MAT_SPH)
......
......@@ -54,8 +54,8 @@
#elif defined(DEFAULT_SPH)
#include "./hydro/Default/hydro_part.h"
#define hydro_need_extra_init_loop 0
#elif defined(GIZMO_SPH)
#include "./hydro/Gizmo/hydro_part.h"
#elif defined(GIZMO_MFV_SPH)
#include "./hydro/GizmoMFV/hydro_part.h"
#define hydro_need_extra_init_loop 0
#define EXTRA_HYDRO_LOOP
#elif defined(SHADOWFAX_SPH)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment