Skip to content
Snippets Groups Projects
Commit da40ef0e authored by Izzard, Robert Dr (Maths & Physics)'s avatar Izzard, Robert Dr (Maths & Physics)
Browse files

update logging for discs

parent 8bbfac9a
No related branches found
No related tags found
No related merge requests found
...@@ -196,7 +196,7 @@ void disc_logging(struct stardata_t * const stardata, ...@@ -196,7 +196,7 @@ void disc_logging(struct stardata_t * const stardata,
double Revap_in = disc->Revap_in; double Revap_in = disc->Revap_in;
/* output */ /* output */
Printf("DISC_EV %20.10e %20.10e %d %d %u %d %d %d %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g\n", Printf("DISC_EV %20.10e %20.10e %d %d %u %d %d %d %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g %g\n",
dtp, // 1 dtp, // 1
disc->lifetime/YEAR_LENGTH_IN_SECONDS, disc->lifetime/YEAR_LENGTH_IN_SECONDS,
stardata->star[0].stellar_type, stardata->star[0].stellar_type,
...@@ -248,7 +248,10 @@ void disc_logging(struct stardata_t * const stardata, ...@@ -248,7 +248,10 @@ void disc_logging(struct stardata_t * const stardata,
disc_total_gravitational_potential_energy(disc,b), disc_total_gravitational_potential_energy(disc,b),
disc_total_kinetic_energy(disc,b), disc_total_kinetic_energy(disc,b),
disc->sigma0, // 51 disc->sigma0, // 51
disc->Tvisc0 disc->Tvisc0,
disc->Rout / disc->Rin,
disc->Rin / Max(1e-50,b->separation),
disc->Rout / Max(1e-50,b->separation)
); );
} }
......
#include "../binary_c.h" #include "../binary_c.h"
#include <gsl/gsl_integration.h> #include <gsl/gsl_integration.h>
double GSL_integrator(double lower, double GSL_integrator(const double lower,
double upper, const double upper,
double relative_tolerance, const double relative_tolerance,
double * error, double * const error,
int integrator, const int integrator,
double func(double x,void *params), double func(double x,void *params),
...) ...)
{ {
......
...@@ -156,11 +156,11 @@ double polyalgorithm(const int s, ...@@ -156,11 +156,11 @@ double polyalgorithm(const int s,
Boolean inverse3( const double theMatrix [/*Y=*/3] [/*X=*/3], Boolean inverse3( const double theMatrix [/*Y=*/3] [/*X=*/3],
double theOutput [/*Y=*/3] [/*X=*/3] ); double theOutput [/*Y=*/3] [/*X=*/3] );
double GSL_integrator(double lower, double GSL_integrator(const double lower,
double upper, const double upper,
double tolerance, const double tolerance,
double * error, double * const error,
int integrator, const int integrator,
double func(double x,void *params), double func(double x,void *params),
...); ...);
void setup_GSL_handlers(struct stardata_t * RESTRICT const stardata); void setup_GSL_handlers(struct stardata_t * RESTRICT const stardata);
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment