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

Removed grid_n in astaroth.cu and replaced it with the new acNodeQueryDeviceConfiguration call

Browse Source
This commit is contained in:
jpekkila
2019-08-12 13:25:47 +03:00
parent 3369d8efec
commit e027f7e548
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/astaroth.cu
View File

@@ -36,13 +36,10 @@ const char* vtxbuf_names[] = {AC_FOR_VTXBUF_HANDLES(AC_GEN_STR)};
static const int num_nodes = 1; static const int num_nodes = 1;
static Node nodes[num_nodes]; static Node nodes[num_nodes];
static int3 grid_n;
AcResult AcResult
acInit(const AcMeshInfo mesh_info) acInit(const AcMeshInfo mesh_info)
{ {
grid_n = (int3){mesh_info.int_params[AC_nx], mesh_info.int_params[AC_ny],
mesh_info.int_params[AC_nz]};
return acNodeCreate(0, mesh_info, &nodes[0]); return acNodeCreate(0, mesh_info, &nodes[0]);
} }
@@ -106,8 +103,11 @@ acIntegrate(const AcReal dt)
AcResult AcResult
acIntegrateStep(const int isubstep, const AcReal dt) acIntegrateStep(const int isubstep, const AcReal dt)
{ {
DeviceConfiguration config;
acNodeQueryDeviceConfiguration(nodes[0], &config);
const int3 start = (int3){NGHOST, NGHOST, NGHOST}; const int3 start = (int3){NGHOST, NGHOST, NGHOST};
const int3 end = start + grid_n; const int3 end = start + config.grid.n;
return acNodeIntegrateSubstep(nodes[0], STREAM_DEFAULT, isubstep, start, end, dt); return acNodeIntegrateSubstep(nodes[0], STREAM_DEFAULT, isubstep, start, end, dt);
} }