From f3a36ec276b6bf04ced33dba22716164ef2b5408 Mon Sep 17 00:00:00 2001 From: Miikka Vaisala Date: Mon, 2 Sep 2019 18:29:16 +0800 Subject: [PATCH] Moved definition location of AC_nx_min etc. Otherwide DSL does not compile the code correctly!!! --- acc/mhd_solver/stencil_definition.sdh | 8 ++++++++ acc/mhd_solver/stencil_process.sps | 2 +- include/astaroth_defines.h | 6 ------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/acc/mhd_solver/stencil_definition.sdh b/acc/mhd_solver/stencil_definition.sdh index 39a9e10..3b945d9 100644 --- a/acc/mhd_solver/stencil_definition.sdh +++ b/acc/mhd_solver/stencil_definition.sdh @@ -15,6 +15,14 @@ uniform int AC_save_steps; uniform int AC_bin_steps; uniform int AC_bc_type; +// Added these here. Otherwise DSL does not recognize them +uniform int AC_nx_min; +uniform int AC_ny_min; +uniform int AC_nz_min; +uniform int AC_nx_max; +uniform int AC_ny_max; +uniform int AC_nz_max; + // Real params uniform Scalar AC_dt; // Spacing diff --git a/acc/mhd_solver/stencil_process.sps b/acc/mhd_solver/stencil_process.sps index 1cd336b..5be7c66 100644 --- a/acc/mhd_solver/stencil_process.sps +++ b/acc/mhd_solver/stencil_process.sps @@ -26,7 +26,7 @@ gradients(in VectorField uu) #if LSINK Vector sink_gravity(int3 globalVertexIdx){ - int accretion_switch = AC_switch_accretion; + int accretion_switch = int(AC_switch_accretion); if (accretion_switch == 1){ Vector force_gravity; const Vector grid_pos = (Vector){(globalVertexIdx.x - AC_nx_min) * AC_dsx, diff --git a/include/astaroth_defines.h b/include/astaroth_defines.h index 58525ba..02fbeef 100644 --- a/include/astaroth_defines.h +++ b/include/astaroth_defines.h @@ -78,12 +78,6 @@ typedef struct { FUNC(AC_mx), \ FUNC(AC_my), \ FUNC(AC_mz), \ - FUNC(AC_nx_min), \ - FUNC(AC_ny_min), \ - FUNC(AC_nz_min), \ - FUNC(AC_nx_max), \ - FUNC(AC_ny_max), \ - FUNC(AC_nz_max), \ FUNC(AC_mxy),\ FUNC(AC_nxy),\ FUNC(AC_nxyz),\