yohai/phigrape
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added .gitignore and fixed a restart bug

Browse source
This commit is contained in:
Yohai Meiron 2019-10-02 13:22:11 -04:00
parent aaf40315c8
commit c9c63fe613
2 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.gitignore vendored Normal file
View file

@ -0,0 +1,8 @@
*.out
*.err
*.dat
*.con
*.exe
*.cfg
*.inp
*.mask

8
phi-GRAPE.c
View file

@ -61,7 +61,7 @@
//#define GMC // add the GMC's to the run //#define GMC // add the GMC's to the run
//#define GMC2 // 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 // Stellar evolution Do not tuch! Defined inside the Makefiles !!!
//#define STEVOL_SSE // Stellar evolution with SSE 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 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_BH // BH - usually NB units
//#define EXTPOT_GAL // Galactic B+D+H PK - usually physical units //#define EXTPOT_GAL // Galactic B+D+H PK - usually physical units
//#define EXTPOT_GAL_DEH // Dehnen Galactic - 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 EXTPOT_SC // SC extra POT for Bek test runs...
//#define DATAFILE eff0.05.tsf10.00.tab //#define DATAFILE eff0.05.tsf10.00.tab
@ -1237,7 +1237,7 @@ void write_snap_data()
void write_cont_data() void write_cont_data()
{ {
out = fopen("data.con","w"); out = fopen("data.con","w");
fprintf(out,"%06d \n", diskstep); fprintf(out,"%06d \n", (time_cur>=t_disk)?diskstep+1:diskstep);
//#ifdef STEVOL //#ifdef STEVOL
// fprintf(out,"%06d \n", N); // fprintf(out,"%06d \n", N);