Merge branch 'master' into debug

MintonGroup · Nov 1, 2022 · 12aecbc · 12aecbc
2 parents 79a6e83 + 87dd80c
commit 12aecbc
Show file tree

Hide file tree

Showing 1,347 changed files with 3,748 additions and 1,005,469 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,8 @@
 !*.cmake
 !CHANGELOG 
 !README.md
+!paper/paper.md
+!paper/paper.bib
 !README.swifter 
 !*.in
 dump*
@@ -56,7 +58,7 @@ collresolve/config.h
 !docs/*
 !docs/*/*
 !docs/*/*/*
-
+!README_figs/*
 
 python/swiftest/tests/convert_code_type/swift2swifter/pl.swift2swifter.in
 

diff --git a/CHANGELOG b/CHANGELOG
diff --git a/README.md b/README.md
diff --git a/README_figs/performance.png b/README_figs/performance.png
diff --git a/README_figs/swifter_swiftest_comp.png b/README_figs/swifter_swiftest_comp.png
diff --git a/README_figs/symba_gr.png b/README_figs/symba_gr.png
diff --git a/collresolve/.gitignore b/collresolve/.gitignore
diff --git a/collresolve/Makefile.am b/collresolve/Makefile.am
diff --git a/collresolve/README.md b/collresolve/README.md
diff --git a/collresolve/cambioni2019/accretion_efficiency.c b/collresolve/cambioni2019/accretion_efficiency.c
diff --git a/collresolve/cambioni2019/accretion_efficiency.h b/collresolve/cambioni2019/accretion_efficiency.h