Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/amuse/community/galaxia/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
from .interface import Galaxia
from .interface import BarAndSpirals3D, Barandspirals3d, Galaxia
8 changes: 4 additions & 4 deletions src/amuse/community/galaxia/interface.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
from amuse.support.import_helper import load_code

GalaxiaInterface = load_code("galaxia", "GalaxiaInterface")
Galaxia = load_code("galaxia", "Galaxia")

BarAndSpiralsInterface = load_code("galaxia", "BarAndSpiralsInterface")
BarAndSpirals3D = load_code("galaxia", "BarAndSpirals3D")

Barandspirals3d = BarAndSpirals3D
Barandspirals3d = Galaxia
BarAndSpirals3D = Galaxia
4 changes: 2 additions & 2 deletions src/amuse_galaxia/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface.o: interface.f90
$(FC) $(FFLAGS) $(LDLIBS) -c -o $@ $<

galaxia_worker.f90: interface.py
amusifier --type=f90 interface.py BarAndSpiralsInterface -o $@
amusifier --type=f90 interface.py GalaxiaInterface -o $@

galaxia_worker.o: galaxia_worker.f90 interface.o
$(MPIFC) -c $(FFLAGS) $<
Expand Down Expand Up @@ -54,4 +54,4 @@ clean:
.PHONY: distclean
distclean: clean
rm -f support/config.mk support/config.log support/config.status
rm -rf support/autom4te.cache
rm -rf support/autom4te.cache
Loading
Loading