Merge branch 'newkick' into coarray_test_particles

MintonGroup · Mar 6, 2023 · b415f78 · b415f78
2 parents a4a8e0c + d04c449
commit b415f78
Show file tree

Hide file tree

Showing 130 changed files with 8,346 additions and 3,465 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 !*.sh
 !CMakeLists.txt
 !*.cmake
+!COPYING.txt
 !CHANGELOG 
 !README.md
 !README_figs/**
@@ -30,3 +31,4 @@ dump*
 
 bin/
 build/*
+disruption_headon/swiftest_driver.sh
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -44,6 +44,8 @@ INCLUDE(${CMAKE_MODULE_PATH}/SetMKL.cmake)
 # RELEASE, PROFILING, and TESTING.  
 INCLUDE(${CMAKE_MODULE_PATH}/SetFortranFlags.cmake) 
 
+INCLUDE_DIRECTORIES($ENV{NETCDF_FORTRAN_HOME}/include;$ENV{NETCDF_HOME}/include)
+
 
 # There is an error in CMAKE with this flag for pgf90.  Unset it
 GET_FILENAME_COMPONENT(FCNAME ${CMAKE_Fortran_COMPILER} NAME)

diff --git a/COPYING.txt b/COPYING.txt
diff --git a/README.md b/README.md
diff --git a/README_figs/.DS_Store b/README_figs/.DS_Store
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_tables/param_options.md b/README_tables/param_options.md
diff --git a/README_tables/save_kwargs.md b/README_tables/save_kwargs.md
@@ -0,0 +1,7 @@
+# swiftest.save(**kwargs)
+| Key Word Name   | Key Word Description                                                                                  | Options                                    |
+|-----------------|-------------------------------------------------------------------------------------------------------|--------------------------------------------|
+|```codename```   | Name of the N-body code to use. Default is ```Swiftest```.                                            | ```Swiftest```, ```Swifter```, ```Swift```  
+|```param_file``` | Alternative name of the parameter input file.                                                         | string (ex. ```myparam.in```)  
+|```param```      | Alternative parameter dictionary.                                                                     | dictionary  
+|```framenum```   | Time frame from which to generate initial conditions. Default is -1 or the last frame in the dataset. | integer (ex. ```10```)