Merge pull request #2 from JPGlaser/EncounterLogging-dev

Encounter Logger Added
JPGlaser · Jul 5, 2017 · 27812dd · 27812dd
2 parents 086e1be + 76ad979
commit 27812dd
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 2 deletions.
diff --git a/src/tycho/__init__.py b/src/tycho/__init__.py
@@ -4,3 +4,4 @@
 from util import *
 from read import *
 from write import *
+from encounter_db import *
diff --git a/src/tycho/__init__.pyc b/src/tycho/__init__.pyc
diff --git a/src/tycho/analysis.pyc b/src/tycho/analysis.pyc
diff --git a/src/tycho/create.pyc b/src/tycho/create.pyc
diff --git a/src/tycho/encounter_db.pyc b/src/tycho/encounter_db.pyc
diff --git a/src/tycho/read.py b/src/tycho/read.py
@@ -4,6 +4,8 @@
 #        Python Package Importing       #
 # ------------------------------------- #
 
+# TO-DO: Add time back to the read state function for Tyler's code
+
 # Importing Necessary System Packages
 import math
 import io
@@ -119,9 +121,9 @@ def recover_crash(restart_file, gravity_code, kep, SMALLN):
     for root in stars:
         if hasattr(root, 'components') and not root.components is None:
             root_to_tree[root] = datamodel.trees.BinaryTreeOnParticle(root.components[0])
-    gravity_code.particles.add_particles(stars)
+    #gravity_code.particles.add_particles(stars)
     #print bookkeeping['model_time']
-    #gravity_code.set_begin_time = bookkeeping['model_time']
+    gravity_code.set_begin_time = bookkeeping['model_time']
 
 
     multiples_code = multiples.Multiples(gravity_code, SMALLN, kep)

diff --git a/src/tycho/read.pyc b/src/tycho/read.pyc
diff --git a/src/tycho/util.pyc b/src/tycho/util.pyc
diff --git a/src/tycho/write.py b/src/tycho/write.py
@@ -4,6 +4,9 @@
 #        Python Package Importing       #
 # ------------------------------------- #
 
+# TO-DO: Add time back to bookkeeping becasue of Tyler's code
+
+
 # Importing Necessary System Packages
 import os, io
 import numpy as np

diff --git a/src/tycho/write.pyc b/src/tycho/write.pyc