From 8e19356b524f865c7d104a19f98a98adc5154592 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 30 Jan 2020 13:50:18 +0100 Subject: teukolsky_data: rename TD_FAMILY_SIMPLE_TIME_ANTISYM ->TD_FAMILY_TIME_ANTISYM_LINEAR For consistency with previous commit. --- td_constraints.c | 16 ++++++++-------- teukolsky_data.h | 5 +++-- teukolsky_data.py | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/td_constraints.c b/td_constraints.c index 73d48a7..25adde1 100644 --- a/td_constraints.c +++ b/td_constraints.c @@ -191,31 +191,31 @@ static const TDFamilyDef time_antisym_cubic = { .constraint_eval = constraint_funcs_confflat, }; -static double k_rtheta_eval_simple_time_antisym(TDConstraintEvalContext *ctx, +static double k_rtheta_eval_time_antisym_linear(TDConstraintEvalContext *ctx, double r, double theta) { const double r2 = SQR(r); return ctx->amplitude * r * exp(-r2) * sin(2.0 * theta); } -static double k_rtheta_eval_dr_simple_time_antisym(TDConstraintEvalContext *ctx, +static double k_rtheta_eval_dr_time_antisym_linear(TDConstraintEvalContext *ctx, double r, double theta) { const double r2 = SQR(r); return ctx->amplitude * (1.0 - 2.0 * r2) * exp(-r2) * sin(2.0 * theta); } -static double k_rtheta_eval_dt_simple_time_antisym(TDConstraintEvalContext *ctx, +static double k_rtheta_eval_dt_time_antisym_linear(TDConstraintEvalContext *ctx, double r, double theta) { const double r2 = SQR(r); return 2.0 * ctx->amplitude * r * exp(-r2) * cos(2.0 * theta); } -static const TDFamilyDef simple_time_antisym = { - .eval_krt = k_rtheta_eval_simple_time_antisym, - .eval_krt_dr = k_rtheta_eval_dr_simple_time_antisym, - .eval_krt_dt = k_rtheta_eval_dt_simple_time_antisym, +static const TDFamilyDef time_antisym_linear = { + .eval_krt = k_rtheta_eval_time_antisym_linear, + .eval_krt_dr = k_rtheta_eval_dr_time_antisym_linear, + .eval_krt_dt = k_rtheta_eval_dt_time_antisym_linear, //.a_converge = 1.018918628476058, .a_converge = 1.0189186, .a_diverge = 1.018918628476968, @@ -224,7 +224,7 @@ static const TDFamilyDef simple_time_antisym = { static const TDFamilyDef *td_families[] = { [TD_FAMILY_TIME_ANTISYM_CUBIC] = &time_antisym_cubic, - [TD_FAMILY_SIMPLE_TIME_ANTISYM] = &simple_time_antisym, + [TD_FAMILY_TIME_ANTISYM_LINEAR] = &time_antisym_linear, }; double tdi_constraint_eval_k_rtheta(TDConstraintEvalContext *ctx, double r, double theta) diff --git a/teukolsky_data.h b/teukolsky_data.h index 943407b..0394260 100644 --- a/teukolsky_data.h +++ b/teukolsky_data.h @@ -51,13 +51,14 @@ enum TDFamily { */ TD_FAMILY_TIME_ANTISYM_CUBIC = 0, /** - * Simpler time-antisymmetric initial data. + * Time-antisymmetric initial data with a linear radial term multiplied by + * an exponential and a quadrupole angular term. * Conformally flat spatial metric. * r x / x 2 \ * K = a --- exp| - (---) | sin(2θ) * θ L \ L / */ - TD_FAMILY_SIMPLE_TIME_ANTISYM, + TD_FAMILY_TIME_ANTISYM_LINEAR, }; typedef struct TDContext { diff --git a/teukolsky_data.py b/teukolsky_data.py index 2b6198e..a819e5c 100644 --- a/teukolsky_data.py +++ b/teukolsky_data.py @@ -22,7 +22,7 @@ import numpy as np class TeukolskyData(object): TD_FAMILY_TIME_ANTISYM_CUBIC = 0 - TD_FAMILY_SIMPLE_TIME_ANTISYM = 1 + TD_FAMILY_TIME_ANTISYM_LINEAR = 1 coeffs = None -- cgit v1.2.3