cwpearson/astaroth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into forcing

Browse Source
This commit is contained in:
Miikka Vaisala
2019-07-02 16:43:10 +08:00
parent d0eb308f17 9a87053f26
commit 03689709df
17 changed files with 152 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/standalone/config_loader.cc
View File

@@ -152,7 +152,7 @@ update_config(AcMeshInfo* config)
config->real_params[AC_G_CONST];
config->real_params[AC_sq2GM_star] = AcReal(sqrt(AcReal(2) * config->real_params[AC_GM_star]));
#if VERBOSE_PRINTING
#if VERBOSE_PRINTING // Defined in astaroth.h
printf("###############################################################\n");
printf("Config dimensions recalculated:\n");
print(*config);

2
src/standalone/model/model_rk3.cc
View File

@@ -745,7 +745,7 @@ solve_alpha_step(const int step_number, const ModelScalar dt, const int i, const
ModelScalar rate_of_change[NUM_VTXBUF_HANDLES] = {0};
rate_of_change[VTXBUF_LNRHO] = continuity(uu, lnrho);
#if LINDUCTION
#if LMAGNETIC
const ModelVectorData aa = read_data(i, j, k, in.vertex_buffer,
(int3){VTXBUF_AX, VTXBUF_AY, VTXBUF_AZ});
const ModelVector aa_res = induction(uu, aa);