Bump version to 12.1 and small fixes for #494

amusecode · Oct 1, 2019 · ef79f04 · ef79f04
1 parent fc35db3
commit ef79f04
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 27 deletions.
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for amuse 12.0.3.
+# Generated by GNU Autoconf 2.69 for amuse 12.1.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -637,8 +637,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='amuse'
 PACKAGE_TARNAME='amuse'
-PACKAGE_VERSION='12.0.3'
-PACKAGE_STRING='amuse 12.0.3'
+PACKAGE_VERSION='12.1.0'
+PACKAGE_STRING='amuse 12.1.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1443,7 +1443,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures amuse 12.0.3 to adapt to many kinds of systems.
+\`configure' configures amuse 12.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1504,7 +1504,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of amuse 12.0.3:";;
+     short | recursive ) echo "Configuration of amuse 12.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1649,7 +1649,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-amuse configure 12.0.3
+amuse configure 12.1.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2249,7 +2249,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by amuse $as_me 12.0.3, which was
+It was created by amuse $as_me 12.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -10083,7 +10083,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by amuse $as_me 12.0.3, which was
+This file was extended by amuse $as_me 12.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10136,7 +10136,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-amuse config.status 12.0.3
+amuse config.status 12.1.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/packages/amuse-hermite/setup.py b/packages/amuse-hermite/setup.py
@@ -32,7 +32,10 @@
 
 all_data_files = []
 
-packages = ['amuse.community.hermite0']
+packages = [
+    'amuse.community.hermite',
+    'amuse.community.hermite0',
+]
 
 package_data = {
 }
@@ -53,7 +56,10 @@
     install_requires=install_requires,
     cmdclass=mapping_from_command_name_to_command_class,
     ext_modules=extensions,
-    package_dir={'amuse.community.hermite0': 'src/amuse/community/hermite0'},
+    package_dir={
+        'amuse.community.hermite': 'src/amuse/community/hermite',
+        'amuse.community.hermite0': 'src/amuse/community/hermite0'
+    },
     packages=packages,
     package_data=package_data,
     data_files=all_data_files,

diff --git a/src/amuse/community/hermite/Makefile b/src/amuse/community/hermite/Makefile
@@ -21,33 +21,33 @@ CODE_GENERATOR = $(PYTHON) $(AMUSE_DIR)/build.py
 
 #PROFLIBS ?= -L$(AMUSE_DIR)/lib/ibis/src/profiling -libisprofiling -lmpi
 
-all: hermite0_worker
+all: hermite_worker
 
 cleanall: clean 
-	$(RM) hermite0_worker *~ worker_code hermite0_worker_sockets
+	$(RM) hermite_worker *~ worker_code hermite_worker_sockets
 
 worker_code.cc: interface.py
 	$(CODE_GENERATOR) --type=c interface.py HermiteInterface -o $@
 
 worker_code.h: interface.py
 	$(CODE_GENERATOR) --type=h -i amuse.support.codes.stopping_conditions.StoppingConditionInterface interface.py HermiteInterface -o $@
 
-hermite0_worker:	worker_code.cc worker_code.h $(A_OBJS)
+hermite_worker:	worker_code.cc worker_code.h $(A_OBJS)
 	$(MPICXX) $(CXXFLAGS) $(SC_FLAGS) $(AM_CFLAGS) $(LDFLAGS) $< $(A_OBJS) -o $@ $(SC_MPI_CLIBS)  $(LIBS)  $(AM_LIBS)
 
-hermite0_worker_cython: hermite0_cython.so
-	$(CODE_GENERATOR) --type=cython -m script -x amuse.community.hermite0.interface HermiteInterface -o $@ --cython-import hermite0_cython
+hermite_worker_cython: hermite_cython.so
+	$(CODE_GENERATOR) --type=cython -m script -x amuse.community.hermite.interface HermiteInterface -o $@ --cython-import hermite_cython
 
-hermite0_cython.so: hermite0_cython.o worker_code.h  $(CODELIB) $(A_OBJS)
-	$(MPICXX) -shared $(CFLAGS) $(PYTHONDEV_LDFLAGS) $(AM_CFLAGS) $(SC_FLAGS) $(LDFLAGS) hermite0_cython.o $(A_OBJS) $(CODELIB) -o $@ $(SC_CLIBS) $(AM_LIBS)
+hermite_cython.so: hermite_cython.o worker_code.h  $(CODELIB) $(A_OBJS)
+	$(MPICXX) -shared $(CFLAGS) $(PYTHONDEV_LDFLAGS) $(AM_CFLAGS) $(SC_FLAGS) $(LDFLAGS) hermite_cython.o $(A_OBJS) $(CODELIB) -o $@ $(SC_CLIBS) $(AM_LIBS)
 
-hermite0_cython.o: hermite0_cython.c worker_code.h
+hermite_cython.o: hermite_cython.c worker_code.h
 	$(MPICC) $(CFLAGS) $(SC_FLAGS) $(AM_CFLAGS) $(PYTHONDEV_CFLAGS) -c -o $@ $< 
 
-hermite0_cython.c: hermite0_cython.pyx
+hermite_cython.c: hermite_cython.pyx
 	$(CYTHON) $< -o $@
 
-hermite0_cython.pyx: interface.py
+hermite_cython.pyx: interface.py
 	$(CODE_GENERATOR) --type=cython -m mpi interface.py HermiteInterface -o $@
 
 
@@ -59,6 +59,6 @@ hermite0_cython.pyx: interface.py
 
 clean:
 	rm -f *.so *.o *.pyc worker_code.cc worker_code.h
-	rm -f hermite0_worker hermite_worker worker_code-sockets.cc hermite0_worker_sockets
+	rm -f hermite_worker hermite_worker worker_code-sockets.cc hermite_worker_sockets
 	rm -rf *.dSYM
-	rm -f hermite0_cython.* hermite0_worker_cython hermite0_worker_cython.*
+	rm -f hermite_cython.* hermite_worker_cython hermite_worker_cython.*
diff --git a/src/amuse/community/hermite/interface.py b/src/amuse/community/hermite/interface.py
@@ -18,10 +18,10 @@ class HermiteInterface(CodeInterface,
     .. [#] Hut, P., Makino, J. & McMillan, S., *Astrophysical Journal Letters* , **443**, L93-L96 (1995)
     """
     include_headers = ['worker_code.h', 'stopcond.h']
-    __so_module__ = 'hermite0_cython'
+    __so_module__ = 'hermite_cython'
 
     def __init__(self, **options):
-        CodeInterface.__init__(self, name_of_the_worker="hermite0_worker",
+        CodeInterface.__init__(self, name_of_the_worker="hermite_worker",
                                  **options)
         LiteratureReferencesMixIn.__init__(self)
 

diff --git a/src/amuse/community/ph4/interface.py b/src/amuse/community/ph4/interface.py
@@ -11,6 +11,7 @@
 # *** MAKE SURE TO SAVE IT SOMEWHERE, as build.py can overwrite it!
 
 class ph4Interface(CodeInterface,
+                   LiteratureReferencesMixIn,
                    GravitationalDynamicsInterface,
                    StoppingConditionInterface,
                    GravityFieldInterface):
@@ -32,6 +33,7 @@ def __init__(self, mode = MODE_CPU, **options):
             name_of_the_worker=self.name_of_the_muse_worker(mode),
             **options
         )
+        LiteratureReferencesMixIn.__init__(self)
 
     # Interface functions:
     @legacy_function

diff --git a/support/version.py b/support/version.py
@@ -1,6 +1,6 @@
 major_version = 12
-minor_version = 0
-micro_version = 3
+minor_version = 1
+micro_version = 0
 patch_version = ""
 post_version = ""
 version = "%i.%i.%i" % (major_version, minor_version, micro_version)