Merge pull request #1223 from LourensVeen/issue_1194_galaxia_import

Update Galaxia names and fix examples

Author: LourensVeen

src/amuse/community/galaxia/__init__.py

@@ -1 +1 @@
-from .interface import Galaxia
+from .interface import BarAndSpirals3D, Barandspirals3d, Galaxia

src/amuse/community/galaxia/interface.py

@@ -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

src/amuse_galaxia/Makefile

@@ -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) $<
@@ -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