From 99d80f7175af3beb128632a9f2700cbfa4330dbf Mon Sep 17 00:00:00 2001 From: Miikka Vaisala Date: Thu, 1 Aug 2019 18:06:57 +0800 Subject: [PATCH] Renaming for bug correction. Use now AC_M_sink_Msun in astaroth.conf instead of AC_M_sink! --- config/astaroth.conf | 2 +- src/standalone/config_loader.cc | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/astaroth.conf b/config/astaroth.conf index 7c19a64..b06a4da 100644 --- a/config/astaroth.conf +++ b/config/astaroth.conf @@ -53,7 +53,7 @@ AC_lnrho0 = 1.3 AC_sink_pos_x = 3.14 AC_sink_pos_y = 3.14 AC_sink_pos_z = 3.14 -AC_M_sink = 1.0 +AC_M_sink_Msun = 1.0 AC_soft = 0.12 // Physical properties of the domain diff --git a/src/standalone/config_loader.cc b/src/standalone/config_loader.cc index abda35a..e7885a3 100644 --- a/src/standalone/config_loader.cc +++ b/src/standalone/config_loader.cc @@ -137,11 +137,11 @@ update_config(AcMeshInfo* config) 6.674e-8); // g/cm3/s GGS definition //TODO define in a separate module AcReal M_sun = AcReal(1.989e33); // g solar mass - config->real_params[AC_M_sink_Msun] = config->real_params[AC_M_sink] * M_sun / - ((config->real_params[AC_unit_length] * - config->real_params[AC_unit_length] * - config->real_params[AC_unit_length]) * - config->real_params[AC_unit_density]); + config->real_params[AC_M_sink] = config->real_params[AC_M_sink_Msun] * M_sun / + ((config->real_params[AC_unit_length] * + config->real_params[AC_unit_length] * + config->real_params[AC_unit_length]) * + config->real_params[AC_unit_density]); config->real_params[AC_G_const] = G_CONST_CGS / ((config->real_params[AC_unit_velocity] * config->real_params[AC_unit_velocity]) /