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

Moved definition location of AC_nx_min etc. Otherwide DSL does not compile the code correctly!!!

Browse Source
This commit is contained in:
Miikka Vaisala
2019-09-02 18:29:16 +08:00
parent b4cd92da0c
commit f3a36ec276
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
acc/mhd_solver/stencil_definition.sdh
View File

@@ -15,6 +15,14 @@ uniform int AC_save_steps;
uniform int AC_bin_steps; uniform int AC_bin_steps;
uniform int AC_bc_type; 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 // Real params
uniform Scalar AC_dt; uniform Scalar AC_dt;
// Spacing // Spacing

2
acc/mhd_solver/stencil_process.sps
View File

@@ -26,7 +26,7 @@ gradients(in VectorField uu)
#if LSINK #if LSINK
Vector Vector
sink_gravity(int3 globalVertexIdx){ sink_gravity(int3 globalVertexIdx){
int accretion_switch = AC_switch_accretion; int accretion_switch = int(AC_switch_accretion);
if (accretion_switch == 1){ if (accretion_switch == 1){
Vector force_gravity; Vector force_gravity;
const Vector grid_pos = (Vector){(globalVertexIdx.x - AC_nx_min) * AC_dsx, const Vector grid_pos = (Vector){(globalVertexIdx.x - AC_nx_min) * AC_dsx,

6
include/astaroth_defines.h
View File

@@ -78,12 +78,6 @@ typedef struct {
FUNC(AC_mx), \ FUNC(AC_mx), \
FUNC(AC_my), \ FUNC(AC_my), \
FUNC(AC_mz), \ 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_mxy),\
FUNC(AC_nxy),\ FUNC(AC_nxy),\
FUNC(AC_nxyz),\ FUNC(AC_nxyz),\