Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Do not merge yet] Add 'Mizuki', an SPH/Nbody code based on FDPS #942

Open
wants to merge 21 commits into
base: main
Choose a base branch
from
Open

[Do not merge yet] Add 'Mizuki', an SPH/Nbody code based on FDPS #942

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
ebf686e
Add initial version of Sui
rieder Jan 6, 2022
c42bfac
add download script to get FDPS
rieder Jan 6, 2022
ab25229
update Makefile
rieder Jan 7, 2022
13080ea
add import
rieder Jan 7, 2022
08a24b5
work towards also supporting non-hydro particles
rieder Jan 11, 2022
e7d123c
Rename Sui -> Mizuki
rieder Mar 10, 2022
f86799f
Merge branch 'main' into add_sui
rieder Mar 10, 2022
43b532c
add get_time
rieder Mar 10, 2022
981bb64
move remaining files
rieder Mar 10, 2022
15df640
add set_time_step
rieder Mar 10, 2022
077679f
Change name
rieder Mar 15, 2022
3325963
Merge branch 'main' into add_mizuki
rieder May 20, 2022
3b98f08
updates
rieder Jun 23, 2022
37e35f7
Merge branch 'main' into add_mizuki
rieder Jun 27, 2022
03937d8
let Mizuki work in adiabatic mode by default
rieder Jun 30, 2022
fdb6f34
important fix for Mizuki (particle ids were offset by 1)
rieder Jun 30, 2022
c75264f
Merge branch 'amusecode:main' into add_mizuki
rieder Apr 4, 2023
8c40488
Merge branch 'main' into add_mizuki
rieder Apr 25, 2023
178c459
Merge branch 'amusecode:main' into add_mizuki
rieder Apr 25, 2023
006c77c
Merge remote-tracking branch 'rieder/add_mizuki' into add_mizuki
rieder Apr 25, 2023
4259931
Merge commit '19e0b287e5a4f91521670b28583043a0c1d5f48c' into add_mizuki
rieder Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update Makefile
  • Loading branch information
@rieder
rieder committed Jan 7, 2022
commit ab25229c903ca55be846811dff3c3e978bc555a7
6 changes: 3 additions & 3 deletions src/amuse/community/sui/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AMUSE_DIR := $(shell amusifier --get-amuse-dir)

MPICXX ?= mpicxx

use_phantom_grape_x86 = no
use_phantom_grape_x86 = no # speedup from ~1M particles or so?

FDPS_PATH = src/FDPS/src
SUI_PATH = src/sui
Expand All @@ -33,8 +33,8 @@ ifeq ($(use_phantom_grape_x86),yes)
CXXFLAGS += -I $(PG_ROOT)
CXXFLAGS += -DENABLE_PHANTOM_GRAPE_X86
CXXFLAGS += -L$(PG_ROOT) -lpg5
PG_BUILD = cd $(PG_ROOT) && $(MAKE) distclean libpg5.a
PG_CLEAN = cd $(PG_ROOT) && $(MAKE) distclean
PG_BUILD = make -C $(PG_ROOT) distclean libpg5.a
PG_CLEAN = make -C $(PG_ROOT) distclean
else
PG_BUILD =
PG_CLEAN =
Expand Down