Merge branch 'OOPSymba' into OOPTides

MintonGroup · Aug 5, 2021 · cf94bf9 · cf94bf9
2 parents a82da3e + ee7bdec
commit cf94bf9
Show file tree

Hide file tree

Showing 15 changed files with 2,808 additions and 278 deletions.
diff --git a/Makefile b/Makefile
@@ -45,13 +45,13 @@
 #******************************************************************************
 
 SWIFTEST_MODULES =   swiftest_globals.f90 \
+							lambda_function.f90\
                      swiftest_classes.f90 \
                      swiftest_operators.f90 \
                      whm_classes.f90 \
                      rmvs_classes.f90 \
                      helio_classes.f90 \
                      symba_classes.f90 \
-							lambda_function.f90\
                      swiftest.f90 
 
 
@@ -96,6 +96,11 @@ lib:
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
 	  ln -s $(SWIFTEST_HOME)/Makefile .; \
 	  make libdir
+	cd $(SWIFTEST_HOME)/src/fragmentation; \
+	  rm -f Makefile.Defines Makefile; \
+	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
+	  ln -s $(SWIFTEST_HOME)/Makefile .; \
+	  make libdir
 	cd $(SWIFTEST_HOME)/src/gr; \
 	  rm -f Makefile.Defines Makefile; \
 	  ln -s $(SWIFTEST_HOME)/Makefile.Defines .; \
@@ -189,6 +194,7 @@ clean:
 	cd $(SWIFTEST_HOME)/src/discard; rm -f Makefile.Defines Makefile *.gc*
 	cd $(SWIFTEST_HOME)/src/drift;   rm -f Makefile.Defines Makefile *.gc*
 	cd $(SWIFTEST_HOME)/src/eucl;   rm -f Makefile.Defines Makefile *.gc*
+	cd $(SWIFTEST_HOME)/src/fragmentation;   rm -f Makefile.Defines Makefile *.gc*
 	cd $(SWIFTEST_HOME)/src/gr;          rm -f Makefile.Defines Makefile *.gc*
 	cd $(SWIFTEST_HOME)/src/helio;    rm -f Makefile.Defines Makefile *.gc*
 	cd $(SWIFTEST_HOME)/src/io;      rm -f Makefile.Defines Makefile *.gc*

diff --git a/examples/symba_swifter_comparison/1pl_1pl_encounter/init_cond.py b/examples/symba_swifter_comparison/1pl_1pl_encounter/init_cond.py
@@ -174,6 +174,7 @@
 print(f'BIG_DISCARD    no')
 print(f'DISCARD_OUT    discard.swiftest.out')
 print(f'ROTATION       no')
+print(f'ENERGY         yes')
 print(f'GR             no')
 print(f'MU2KG          {MU2KG}')
 print(f'DU2M           {DU2M}')

diff --git a/examples/symba_swifter_comparison/1pl_1pl_encounter/param.swiftest.in b/examples/symba_swifter_comparison/1pl_1pl_encounter/param.swiftest.in
@@ -24,6 +24,7 @@ EXTRA_FORCE    no
 BIG_DISCARD    no
 DISCARD_OUT    discard.swiftest.out
 ROTATION       no
+ENERGY         yes
 GR             no
 MU2KG          1.988409870698051e+30
 DU2M           149597870700.0