diff --git a/source/disk_init.c b/source/disk_init.c index 643ab9001..4b41a29ad 100644 --- a/source/disk_init.c +++ b/source/disk_init.c @@ -509,7 +509,7 @@ qdisk_save (diskfile, ichoice) ttot = pow (qdisk.t[n], 4) + pow (theat, 4); ttot = pow (ttot, 0.25); fprintf (qptr, - "%9.4e %9.4e %0.4e %8.3e %8.3e %8.3e %10ld %8.3e %10ld %8.3e %8.3e %8.3e %10.3e %8.3e\n", + "%9.4e %9.4e %0.4e %8.3e %8.3e %8.3e %10d %8.3e %10d %8.3e %8.3e %8.3e %10.3e %8.3e\n", qdisk.r[n], qdisk.v[n], zdisk (qdisk.r[n]), qdisk.t[n], qdisk.g[n], qdisk.emit[n], qdisk.nphot[n], qdisk.heat[n], qdisk.nhit[n], ratio[n], theat, qdisk.t_hit[n], qdisk.w[n], ttot); } diff --git a/source/disk_photon_gen.c b/source/disk_photon_gen.c index 5c9d88291..826f3d51d 100644 --- a/source/disk_photon_gen.c +++ b/source/disk_photon_gen.c @@ -277,7 +277,7 @@ disk_photon_summary (filename, mode) x = 0; else x = disk.nphot[n] / (disk.r[n] - disk.r[n - 1]); - fprintf (ptr, "%d %8.2e %8.2e %8ld %8.2e %8ld\n", n, disk.r[n], disk.t[n], disk.nphot[n], x, disk.nhit[n]); + fprintf (ptr, "%d %8.2e %8.2e %8d %8.2e %8d\n", n, disk.r[n], disk.t[n], disk.nphot[n], x, disk.nhit[n]); } fclose (ptr); diff --git a/source/python.h b/source/python.h index 3f4598060..84bdb9bef 100644 --- a/source/python.h +++ b/source/python.h @@ -760,8 +760,8 @@ struct xdisk double ave_freq[NRINGS]; /**< The flux weighted average of frequency of photons hitting each annulus */ double w[NRINGS]; /**< The weight relative to a BB of the photons that hit the disk */ double t_hit[NRINGS]; /**< The effective T of photons hitting the disk, based on the average frequency */ - int64_t nphot[NRINGS]; /**< The number of disk photons created in each annulus */ - int64_t nhit[NRINGS]; /**< The number of photons which hit each annulus */ + int nphot[NRINGS]; /**< The number of disk photons created in each annulus */ + int nhit[NRINGS]; /**< The number of photons which hit each annulus */ }; extern struct xdisk disk, qdisk; /**< disk defines zones in the disk which in a specified frequency band emit equal amounts of radiation. disk gets reinitialized whenever the frequency interval of interest