Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
1c8b3ec6
Commit
1c8b3ec6
authored
Mar 08, 2017
by
Bert Vandenbroucke
Browse files
Started fixing compilation errors for SHADOWFAX_SPH. Still many more to go.
parent
06f24b9c
Changes
4
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
1c8b3ec6
...
...
@@ -582,7 +582,7 @@ fi
# Hydro scheme.
AC_ARG_WITH([hydro],
[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="gadget2"]
...
...
@@ -603,6 +603,9 @@ case "$with_hydro" in
gizmo)
AC_DEFINE([GIZMO_SPH], [1], [GIZMO SPH])
;;
shadowfax)
AC_DEFINE([SHADOWFAX_SPH], [1], [Shadowfax SPH])
;;
*)
AC_MSG_ERROR([Unknown hydrodynamics scheme: $with_hydro])
...
...
src/hydro.h
View file @
1c8b3ec6
...
...
@@ -47,7 +47,7 @@
#include
"./hydro/Gizmo/hydro.h"
#include
"./hydro/Gizmo/hydro_iact.h"
#define SPH_IMPLEMENTATION "GIZMO (Hopkins 2015)"
#elif defined(SHADOW
SWIFT
)
#elif defined(SHADOW
FAX_SPH
)
#include
"./hydro/Shadowswift/hydro.h"
#include
"./hydro/Shadowswift/hydro_iact.h"
#define SPH_IMPLEMENTATION \
...
...
src/hydro/Shadowswift/hydro_part.h
View file @
1c8b3ec6
...
...
@@ -19,6 +19,7 @@
*
******************************************************************************/
#include
"cooling_struct.h"
#include
"voronoi_cell.h"
/* Extra particle data not needed during the computation. */
...
...
@@ -33,6 +34,9 @@ struct xpart {
/* Old density. */
float
omega
;
/* Additional data used to record cooling information */
struct
cooling_xpart_data
cooling_data
;
}
__attribute__
((
aligned
(
xpart_align
)));
/* Data of a single particle. */
...
...
@@ -174,7 +178,20 @@ struct part {
/* Variables needed for the code to compile (should be removed/replaced). */
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. */
struct
voronoi_cell
cell
;
}
__attribute__
((
aligned
(
part_align
)))
;
}
SWIFT_STRUCT_ALIGN
;
src/part.h
View file @
1c8b3ec6
...
...
@@ -58,8 +58,9 @@
#include
"./hydro/Gizmo/hydro_part.h"
#define hydro_need_extra_init_loop 0
#define EXTRA_HYDRO_LOOP
#elif defined(SHADOW
SWIFT
)
#elif defined(SHADOW
FAX_SPH
)
#include
"./hydro/Shadowswift/hydro_part.h"
#define hydro_need_extra_init_loop 0
#define EXTRA_HYDRO_LOOP
#else
#error "Invalid choice of SPH variant"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment