Merge branch 'OOPrestructure'

.gitignore

@@ -2,28 +2,77 @@
 *
 # Now, whitelist anything that's a directory
 !*/
+!*/python
 # whitelist only the files that ever need to be tracked
 !*.f90
+!*.sh
 !CHANGELOG 
 !README.md
 !README.swifter 
-!Makefile.Defines_example
+!*.in
+!example/cleanup
+!example/swifter_symba_omp
+!Makefile
+src/*/Makefile
+!Makefile.Defines
+src/*/Makefile.Defines
+!.gitignore
+!*.py
+!*.ipynb
+*ipynb_checkpoints
+
+#fxdr library
 !fxdr*/*.c
 !fxdr*/*.F
 !fxdr*/*.3f
 !fxdr*/*.h
 !fxdr*/*.inc
 !fxdr*/cxdrreal64
 !fxdr*/test.orig.xdr
+!fxdr*/test_read_only.xdr
 !fxdr*/configure/
 !fxdr*/README*
 !fxdr*/Makefile.bak
 !fxdr*/Makefile.fxdr
 !fxdr*/Makefile.tmpl
 !fxdr*/Defines.*
-!example/*.in
-!example/cleanup
-!example/swifter_symba_omp
-!Makefile
-*/Makefile
-!.gitignore
+
+#collresolve
+!collresolve/*.c
+!collresolve/*.h
+!collresolve/*.py
+!collresolve/Makefile.am
+!collresolve/configure.ac
+!collresolve/cambioni2019/*.h
+!collresolve/cambioni2019/*.c
+collresolve/config.h
+
+
+
+#Documentation
+#Disable for now
+docs/
+#!docs/*
+#!docs/*/*
+#!docs/*/*/*
+
+
+python/swiftest/tests/convert_code_type/swift2swifter/pl.swift2swifter.in
+
+python/swiftest/tests/convert_code_type/swift2swifter/tp.swift2swifter.in
+
+python/swiftest/tests/convert_code_type/swift2swiftest/cb.swift2swiftest.in
+
+python/swiftest/tests/convert_code_type/swift2swiftest/pl.swift2swiftest.in
+
+python/swiftest/tests/convert_code_type/swift2swiftest/tp.swift2swiftest.in
+
+python/swiftest/tests/convert_code_type/swifter2swiftest/cb.swifter2swiftest.in
+
+python/swiftest/tests/convert_code_type/cb.swifter2swiftest.in
+
+python/swiftest/tests/convert_code_type/swifter2swiftest/pl.swifter2swiftest.in
+
+python/swiftest/tests/convert_code_type/swifter2swiftest/tp.swifter2swiftest.in
+
+!python/swiftest/requirements.txt