Commit 1c8b3ec6 authored by Bert Vandenbroucke's avatar Bert Vandenbroucke
Browse files

Started fixing compilation errors for SHADOWFAX_SPH. Still many more to go.

parent 06f24b9c
...@@ -582,7 +582,7 @@ fi ...@@ -582,7 +582,7 @@ fi
# Hydro scheme. # Hydro scheme.
AC_ARG_WITH([hydro], AC_ARG_WITH([hydro],
[AS_HELP_STRING([--with-hydro=<scheme>], [AS_HELP_STRING([--with-hydro=<scheme>],
[Hydro dynamics to use @<:@gadget2, minimal, hopkins, default, gizmo default: gadget2@:>@] [Hydro dynamics to use @<:@gadget2, minimal, hopkins, default, gizmo, shadowfax default: gadget2@:>@]
)], )],
[with_hydro="$withval"], [with_hydro="$withval"],
[with_hydro="gadget2"] [with_hydro="gadget2"]
...@@ -603,6 +603,9 @@ case "$with_hydro" in ...@@ -603,6 +603,9 @@ case "$with_hydro" in
gizmo) gizmo)
AC_DEFINE([GIZMO_SPH], [1], [GIZMO SPH]) AC_DEFINE([GIZMO_SPH], [1], [GIZMO SPH])
;; ;;
shadowfax)
AC_DEFINE([SHADOWFAX_SPH], [1], [Shadowfax SPH])
;;
*) *)
AC_MSG_ERROR([Unknown hydrodynamics scheme: $with_hydro]) AC_MSG_ERROR([Unknown hydrodynamics scheme: $with_hydro])
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#include "./hydro/Gizmo/hydro.h" #include "./hydro/Gizmo/hydro.h"
#include "./hydro/Gizmo/hydro_iact.h" #include "./hydro/Gizmo/hydro_iact.h"
#define SPH_IMPLEMENTATION "GIZMO (Hopkins 2015)" #define SPH_IMPLEMENTATION "GIZMO (Hopkins 2015)"
#elif defined(SHADOWSWIFT) #elif defined(SHADOWFAX_SPH)
#include "./hydro/Shadowswift/hydro.h" #include "./hydro/Shadowswift/hydro.h"
#include "./hydro/Shadowswift/hydro_iact.h" #include "./hydro/Shadowswift/hydro_iact.h"
#define SPH_IMPLEMENTATION \ #define SPH_IMPLEMENTATION \
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
* *
******************************************************************************/ ******************************************************************************/
#include "cooling_struct.h"
#include "voronoi_cell.h" #include "voronoi_cell.h"
/* Extra particle data not needed during the computation. */ /* Extra particle data not needed during the computation. */
...@@ -33,6 +34,9 @@ struct xpart { ...@@ -33,6 +34,9 @@ struct xpart {
/* Old density. */ /* Old density. */
float omega; float omega;
/* Additional data used to record cooling information */
struct cooling_xpart_data cooling_data;
} __attribute__((aligned(xpart_align))); } __attribute__((aligned(xpart_align)));
/* Data of a single particle. */ /* Data of a single particle. */
...@@ -174,7 +178,20 @@ struct part { ...@@ -174,7 +178,20 @@ struct part {
/* Variables needed for the code to compile (should be removed/replaced). */ /* Variables needed for the code to compile (should be removed/replaced). */
float rho; float rho;
/* Time-step length */
timebin_t time_bin;
#ifdef SWIFT_DEBUG_CHECKS
/* Time of the last drift */
integertime_t ti_drift;
/* Time of the last kick */
integertime_t ti_kick;
#endif
/* Voronoi cell. */ /* Voronoi cell. */
struct voronoi_cell cell; struct voronoi_cell cell;
} __attribute__((aligned(part_align))); } SWIFT_STRUCT_ALIGN;
...@@ -58,8 +58,9 @@ ...@@ -58,8 +58,9 @@
#include "./hydro/Gizmo/hydro_part.h" #include "./hydro/Gizmo/hydro_part.h"
#define hydro_need_extra_init_loop 0 #define hydro_need_extra_init_loop 0
#define EXTRA_HYDRO_LOOP #define EXTRA_HYDRO_LOOP
#elif defined(SHADOWSWIFT) #elif defined(SHADOWFAX_SPH)
#include "./hydro/Shadowswift/hydro_part.h" #include "./hydro/Shadowswift/hydro_part.h"
#define hydro_need_extra_init_loop 0
#define EXTRA_HYDRO_LOOP #define EXTRA_HYDRO_LOOP
#else #else
#error "Invalid choice of SPH variant" #error "Invalid choice of SPH variant"
......
Supports Markdown
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