From c9c63fe613cbdfbe4b3cbc2c2d1af5ae0855a2ed Mon Sep 17 00:00:00 2001
From: Yohai Meiron <sahmes@gmail.com>
Date: Wed, 2 Oct 2019 13:22:11 -0400
Subject: [PATCH] added .gitignore and fixed a restart bug

---
 .gitignore  | 8 ++++++++
 phi-GRAPE.c | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..9f184f3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+*.out
+*.err
+*.dat
+*.con
+*.exe
+*.cfg
+*.inp
+*.mask
diff --git a/phi-GRAPE.c b/phi-GRAPE.c
index ed0139a..0c6cedf 100644
--- a/phi-GRAPE.c
+++ b/phi-GRAPE.c
@@ -61,7 +61,7 @@
 //#define GMC			// add the GMC's to the run
 //#define GMC2			// add the GMC's to the run
 
-#define NORM			// Physical normalization
+//#define NORM			// Physical normalization
 //#define STEVOL		// Stellar evolution		Do not tuch! Defined inside the Makefiles !!!
 //#define STEVOL_SSE		// Stellar evolution with SSE	Do not tuch! Defined inside the Makefiles !!!
 
@@ -103,13 +103,13 @@
 
 //#define SPH_GAS		// SPH gas disk around BH + drag; experimental stuff !!!
 
-#define EXTPOT			// external potential (BH? or galactic?)
+//#define EXTPOT			// external potential (BH? or galactic?)
 //#define EXTPOT_BH		// BH - usually NB units
 
 //#define EXTPOT_GAL		// Galactic B+D+H PK - usually physical units
 
 //#define EXTPOT_GAL_DEH  	// Dehnen Galactic - usually physical units
-#define EXTPOT_GAL_LOG  	// Log Galactic - usually physical units
+//#define EXTPOT_GAL_LOG  	// Log Galactic - usually physical units
 
 //#define EXTPOT_SC		// SC extra POT for Bek test runs...
 //#define DATAFILE		eff0.05.tsf10.00.tab
@@ -1237,7 +1237,7 @@ void write_snap_data()
 void write_cont_data()
 {
   out = fopen("data.con","w");
-  fprintf(out,"%06d \n", diskstep);
+  fprintf(out,"%06d \n", (time_cur>=t_disk)?diskstep+1:diskstep);
 
 //#ifdef STEVOL
 //  fprintf(out,"%06d \n", N);