From 323d4e3b3181dcac7abc6bee6488cc6be68b8809 Mon Sep 17 00:00:00 2001 From: jpekkila Date: Tue, 23 Jul 2019 14:37:28 +0300 Subject: [PATCH] Replaced all calls to AC_VTXBUF_IDX to acVertexBufferIdx etc in all files --- acc/samples/common_header.h | 14 +-- doc/manual/manual.md | 4 +- include/astaroth_defines.h | 17 --- src/core/astaroth.cu | 4 +- src/core/device.cu | 16 +-- src/standalone/autotest.cc | 10 +- src/standalone/model/host_memory.cc | 12 +- src/standalone/model/model_boundconds.cc | 8 +- src/standalone/model/model_diff.h | 148 +++++++++++------------ src/standalone/model/model_reduce.cc | 8 +- src/standalone/model/model_rk3.cc | 6 +- src/standalone/renderer.cc | 4 +- src/standalone/simulation.cc | 2 +- 13 files changed, 118 insertions(+), 135 deletions(-) diff --git a/acc/samples/common_header.h b/acc/samples/common_header.h index a5b46d4..4701348 100644 --- a/acc/samples/common_header.h +++ b/acc/samples/common_header.h @@ -316,21 +316,21 @@ typedef struct { AcMeshInfo info; } AcMesh; -#define AC_VTXBUF_SIZE(mesh_info) \ +#define acVertexBufferSize(mesh_info) \ ((size_t)(mesh_info.int_params[AC_mx] * mesh_info.int_params[AC_my] * \ mesh_info.int_params[AC_mz])) -#define AC_VTXBUF_SIZE_BYTES(mesh_info) \ - (sizeof(AcReal) * AC_VTXBUF_SIZE(mesh_info)) +#define acVertexBufferSizeBytes(mesh_info) \ + (sizeof(AcReal) * acVertexBufferSize(mesh_info)) -#define AC_VTXBUF_COMPDOMAIN_SIZE(mesh_info) \ +#define acVertexBufferCompdomainSize(mesh_info) \ (mesh_info.int_params[AC_nx] * mesh_info.int_params[AC_ny] * \ mesh_info.int_params[AC_nz]) -#define AC_VTXBUF_COMPDOMAIN_SIZE_BYTES(mesh_info) \ - (sizeof(AcReal) * AC_VTXBUF_COMPDOMAIN_SIZE(mesh_info)) +#define acVertexBufferCompdomainSizeBytes(mesh_info) \ + (sizeof(AcReal) * acVertexBufferCompdomainSize(mesh_info)) -#define AC_VTXBUF_IDX(i, j, k, mesh_info) \ +#define acVertexBufferIdx(i, j, k, mesh_info) \ ((i) + (j)*mesh_info.int_params[AC_mx] + \ (k)*mesh_info.int_params[AC_mx] * mesh_info.int_params[AC_my]) diff --git a/doc/manual/manual.md b/doc/manual/manual.md index 007b1bc..97eac88 100644 --- a/doc/manual/manual.md +++ b/doc/manual/manual.md @@ -56,7 +56,7 @@ Saving output binaries is not enabled yet. - All essential tructs, macros and enumerators are found in astaroth.h for better reference. -- In the case there is changes in the data layout, better use macro `AC_VTXBUF_IDX(i, j, k, mesh_info)`which transform indices from 3D to 1D. Therefore no need to start writing `i + j * mesh_info.int_params[AC_mx] + ...` which would affect the code readability. +- In the case there is changes in the data layout, better use macro `acVertexBufferIdx(i, j, k, mesh_info)`which transform indices from 3D to 1D. Therefore no need to start writing `i + j * mesh_info.int_params[AC_mx] + ...` which would affect the code readability. - AcReal on generic floating point real number type used everywhere in the code. Currently can be either `float` or `double`. Possibly in the future also `half` or `long double` could become available. @@ -96,7 +96,7 @@ printf("nx: %d, dsx %f\n", mesh->info.int_params[AC_nx], double(mesh->info.real_params[AC_dsx])); printf("First vertex of the computational domain: %f\n", -double(mesh->vertex_buffer[VTXBUF_LNRHO][AC_VTXBUF_IDX(3, 3, 3, mesh_info)])); +double(mesh->vertex_buffer[VTXBUF_LNRHO][acVertexBufferIdx(3, 3, 3, mesh_info)])); ``` diff --git a/include/astaroth_defines.h b/include/astaroth_defines.h index 9cbf3ca..89808c9 100644 --- a/include/astaroth_defines.h +++ b/include/astaroth_defines.h @@ -107,20 +107,3 @@ extern const char* int3param_names[]; extern const char* realparam_names[]; extern const char* real3param_names[]; extern const char* vtxbuf_names[]; - -// Deprecated -#define AC_VTXBUF_SIZE(mesh_info) \ - ((size_t)(mesh_info.int_params[AC_mx] * mesh_info.int_params[AC_my] * \ - mesh_info.int_params[AC_mz])) - -#define AC_VTXBUF_SIZE_BYTES(mesh_info) (sizeof(AcReal) * AC_VTXBUF_SIZE(mesh_info)) - -#define AC_VTXBUF_COMPDOMAIN_SIZE(mesh_info) \ - (mesh_info.int_params[AC_nx] * mesh_info.int_params[AC_ny] * mesh_info.int_params[AC_nz]) - -#define AC_VTXBUF_COMPDOMAIN_SIZE_BYTES(mesh_info) \ - (sizeof(AcReal) * AC_VTXBUF_COMPDOMAIN_SIZE(mesh_info)) - -#define AC_VTXBUF_IDX(i, j, k, mesh_info) \ - ((i) + (j)*mesh_info.int_params[AC_mx] + \ - (k)*mesh_info.int_params[AC_mx] * mesh_info.int_params[AC_my]) diff --git a/src/core/astaroth.cu b/src/core/astaroth.cu index 427e82f..fadf4c0 100644 --- a/src/core/astaroth.cu +++ b/src/core/astaroth.cu @@ -566,7 +566,7 @@ acLoadWithOffset(const AcMesh& host_mesh, const int3& src, const int num_vertice AcResult acLoad(const AcMesh& host_mesh) { - acLoadWithOffset(host_mesh, (int3){0, 0, 0}, AC_VTXBUF_SIZE(host_mesh.info)); + acLoadWithOffset(host_mesh, (int3){0, 0, 0}, acVertexBufferSize(host_mesh.info)); acSynchronizeStream(STREAM_ALL); return AC_SUCCESS; } @@ -605,7 +605,7 @@ acStoreWithOffset(const int3& src, const int num_vertices, AcMesh* host_mesh) AcResult acStore(AcMesh* host_mesh) { - acStoreWithOffset((int3){0, 0, 0}, AC_VTXBUF_SIZE(host_mesh->info), host_mesh); + acStoreWithOffset((int3){0, 0, 0}, acVertexBufferSize(host_mesh->info), host_mesh); acSynchronizeStream(STREAM_ALL); return AC_SUCCESS; } diff --git a/src/core/device.cu b/src/core/device.cu index f73c19a..7b624e3 100644 --- a/src/core/device.cu +++ b/src/core/device.cu @@ -165,13 +165,13 @@ createDevice(const int id, const AcMeshInfo device_config, Device* device_handle } // Memory - const size_t vba_size_bytes = AC_VTXBUF_SIZE_BYTES(device_config); + const size_t vba_size_bytes = acVertexBufferSizeBytes(device_config); for (int i = 0; i < NUM_VTXBUF_HANDLES; ++i) { ERRCHK_CUDA_ALWAYS(cudaMalloc(&device->vba.in[i], vba_size_bytes)); ERRCHK_CUDA_ALWAYS(cudaMalloc(&device->vba.out[i], vba_size_bytes)); } ERRCHK_CUDA_ALWAYS( - cudaMalloc(&device->reduce_scratchpad, AC_VTXBUF_COMPDOMAIN_SIZE_BYTES(device_config))); + cudaMalloc(&device->reduce_scratchpad, acVertexBufferCompdomainSizeBytes(device_config))); ERRCHK_CUDA_ALWAYS(cudaMalloc(&device->reduce_result, sizeof(AcReal))); #if PACKED_DATA_TRANSFERS @@ -341,8 +341,8 @@ AcResult copyMeshToDevice(const Device device, const StreamType stream_type, const AcMesh& host_mesh, const int3& src, const int3& dst, const int num_vertices) { - const size_t src_idx = AC_VTXBUF_IDX(src.x, src.y, src.z, host_mesh.info); - const size_t dst_idx = AC_VTXBUF_IDX(dst.x, dst.y, dst.z, device->local_config); + const size_t src_idx = acVertexBufferIdx(src.x, src.y, src.z, host_mesh.info); + const size_t dst_idx = acVertexBufferIdx(dst.x, dst.y, dst.z, device->local_config); for (int i = 0; i < NUM_VTXBUF_HANDLES; ++i) { loadWithOffset(device, stream_type, &host_mesh.vertex_buffer[i][src_idx], num_vertices * sizeof(AcReal), &device->vba.in[i][dst_idx]); @@ -354,8 +354,8 @@ AcResult copyMeshToHost(const Device device, const StreamType stream_type, const int3& src, const int3& dst, const int num_vertices, AcMesh* host_mesh) { - const size_t src_idx = AC_VTXBUF_IDX(src.x, src.y, src.z, device->local_config); - const size_t dst_idx = AC_VTXBUF_IDX(dst.x, dst.y, dst.z, host_mesh->info); + const size_t src_idx = acVertexBufferIdx(src.x, src.y, src.z, device->local_config); + const size_t dst_idx = acVertexBufferIdx(dst.x, dst.y, dst.z, host_mesh->info); for (int i = 0; i < NUM_VTXBUF_HANDLES; ++i) { storeWithOffset(device, stream_type, &device->vba.in[i][src_idx], num_vertices * sizeof(AcReal), &host_mesh->vertex_buffer[i][dst_idx]); @@ -368,8 +368,8 @@ copyMeshDeviceToDevice(const Device src_device, const StreamType stream_type, co Device dst_device, const int3& dst, const int num_vertices) { cudaSetDevice(src_device->id); - const size_t src_idx = AC_VTXBUF_IDX(src.x, src.y, src.z, src_device->local_config); - const size_t dst_idx = AC_VTXBUF_IDX(dst.x, dst.y, dst.z, dst_device->local_config); + const size_t src_idx = acVertexBufferIdx(src.x, src.y, src.z, src_device->local_config); + const size_t dst_idx = acVertexBufferIdx(dst.x, dst.y, dst.z, dst_device->local_config); for (int i = 0; i < NUM_VTXBUF_HANDLES; ++i) { ERRCHK_CUDA(cudaMemcpyPeerAsync(&dst_device->vba.in[i][dst_idx], dst_device->id, diff --git a/src/standalone/autotest.cc b/src/standalone/autotest.cc index bb8b55f..c7aec10 100644 --- a/src/standalone/autotest.cc +++ b/src/standalone/autotest.cc @@ -318,7 +318,7 @@ verify_meshes(const ModelMesh& model, const AcMesh& candidate) const ModelScalar range = get_data_range(model); for (int w = 0; w < NUM_VTXBUF_HANDLES; ++w) { - const size_t n = AC_VTXBUF_SIZE(model.info); + const size_t n = acVertexBufferSize(model.info); // Maximum errors ErrorInfo max_abs_error = ErrorInfo(); @@ -555,7 +555,7 @@ get_max_abs_error_mesh(const ModelMesh& model_mesh, const AcMesh& candidate_mesh error.abs_error = -1; for (size_t j = 0; j < NUM_VTXBUF_HANDLES; ++j) { - for (size_t i = 0; i < AC_VTXBUF_SIZE(model_mesh.info); ++i) { + for (size_t i = 0; i < acVertexBufferSize(model_mesh.info); ++i) { Error curr_error = get_error(model_mesh.vertex_buffer[j][i], candidate_mesh.vertex_buffer[j][i]); if (curr_error.abs_error > error.abs_error) @@ -574,7 +574,7 @@ get_maximum_magnitude(const ModelScalar* field, const AcMeshInfo info) { ModelScalar maximum = -INFINITY; - for (size_t i = 0; i < AC_VTXBUF_SIZE(info); ++i) + for (size_t i = 0; i < acVertexBufferSize(info); ++i) maximum = max(maximum, fabsl(field[i])); return maximum; @@ -585,7 +585,7 @@ get_minimum_magnitude(const ModelScalar* field, const AcMeshInfo info) { ModelScalar minimum = INFINITY; - for (size_t i = 0; i < AC_VTXBUF_SIZE(info); ++i) + for (size_t i = 0; i < acVertexBufferSize(info); ++i) minimum = min(minimum, fabsl(field[i])); return minimum; @@ -601,7 +601,7 @@ get_max_abs_error_vtxbuf(const VertexBufferHandle vtxbuf_handle, const ModelMesh Error error; error.abs_error = -1; - for (size_t i = 0; i < AC_VTXBUF_SIZE(model_mesh.info); ++i) { + for (size_t i = 0; i < acVertexBufferSize(model_mesh.info); ++i) { Error curr_error = get_error(model_vtxbuf[i], candidate_vtxbuf[i]); diff --git a/src/standalone/model/host_memory.cc b/src/standalone/model/host_memory.cc index 2a51065..5cda923 100644 --- a/src/standalone/model/host_memory.cc +++ b/src/standalone/model/host_memory.cc @@ -62,7 +62,7 @@ acmesh_create(const AcMeshInfo& mesh_info) AcMesh* mesh = (AcMesh*)malloc(sizeof(*mesh)); mesh->info = mesh_info; - const size_t bytes = AC_VTXBUF_SIZE_BYTES(mesh->info); + const size_t bytes = acVertexBufferSizeBytes(mesh->info); for (int i = 0; i < NUM_VTXBUF_HANDLES; ++i) { mesh->vertex_buffer[VertexBufferHandle(i)] = (AcReal*)malloc(bytes); ERRCHK(mesh->vertex_buffer[VertexBufferHandle(i)] != NULL); @@ -74,7 +74,7 @@ acmesh_create(const AcMeshInfo& mesh_info) static void vertex_buffer_set(const VertexBufferHandle& key, const AcReal& val, AcMesh* mesh) { - const int n = AC_VTXBUF_SIZE(mesh->info); + const int n = acVertexBufferSize(mesh->info); for (int i = 0; i < n; ++i) mesh->vertex_buffer[key][i] = val; } @@ -539,7 +539,7 @@ acmesh_init_to(const InitType& init_type, AcMesh* mesh) { srand(123456789); - const int n = AC_VTXBUF_SIZE(mesh->info); + const int n = acVertexBufferSize(mesh->info); const int mx = mesh->info.int_params[AC_mx]; const int my = mesh->info.int_params[AC_my]; @@ -705,7 +705,7 @@ modelmesh_create(const AcMeshInfo& mesh_info) ModelMesh* mesh = (ModelMesh*)malloc(sizeof(*mesh)); mesh->info = mesh_info; - const size_t bytes = AC_VTXBUF_SIZE(mesh->info) * sizeof(mesh->vertex_buffer[0][0]); + const size_t bytes = acVertexBufferSize(mesh->info) * sizeof(mesh->vertex_buffer[0][0]); for (int i = 0; i < NUM_VTXBUF_HANDLES; ++i) { mesh->vertex_buffer[VertexBufferHandle(i)] = (ModelScalar*)malloc(bytes); ERRCHK(mesh->vertex_buffer[VertexBufferHandle(i)] != NULL); @@ -731,7 +731,7 @@ acmesh_to_modelmesh(const AcMesh& acmesh, ModelMesh* modelmesh) memcpy(&modelmesh->info, &acmesh.info, sizeof(acmesh.info)); for (int i = 0; i < NUM_VTXBUF_HANDLES; ++i) - for (size_t j = 0; j < AC_VTXBUF_SIZE(acmesh.info); ++j) + for (size_t j = 0; j < acVertexBufferSize(acmesh.info); ++j) modelmesh->vertex_buffer[i][j] = (ModelScalar)acmesh.vertex_buffer[i][j]; } @@ -742,6 +742,6 @@ modelmesh_to_acmesh(const ModelMesh& modelmesh, AcMesh* acmesh) memcpy(&acmesh->info, &modelmesh.info, sizeof(modelmesh.info)); for (int i = 0; i < NUM_VTXBUF_HANDLES; ++i) - for (size_t j = 0; j < AC_VTXBUF_SIZE(modelmesh.info); ++j) + for (size_t j = 0; j < acVertexBufferSize(modelmesh.info); ++j) acmesh->vertex_buffer[i][j] = (AcReal)modelmesh.vertex_buffer[i][j]; } diff --git a/src/standalone/model/model_boundconds.cc b/src/standalone/model/model_boundconds.cc index 5d107ae..188b97e 100644 --- a/src/standalone/model/model_boundconds.cc +++ b/src/standalone/model/model_boundconds.cc @@ -86,10 +86,10 @@ boundconds(const AcMeshInfo& mesh_info, ModelMesh* mesh) j_src += ny_min; k_src += nz_min; - const size_t src_idx = AC_VTXBUF_IDX(i_src, j_src, k_src, mesh_info); - const size_t dst_idx = AC_VTXBUF_IDX(i_dst, j_dst, k_dst, mesh_info); - ERRCHK(src_idx < AC_VTXBUF_SIZE(mesh_info)); - ERRCHK(dst_idx < AC_VTXBUF_SIZE(mesh_info)); + const size_t src_idx = acVertexBufferIdx(i_src, j_src, k_src, mesh_info); + const size_t dst_idx = acVertexBufferIdx(i_dst, j_dst, k_dst, mesh_info); + ERRCHK(src_idx < acVertexBufferSize(mesh_info)); + ERRCHK(dst_idx < acVertexBufferSize(mesh_info)); mesh->vertex_buffer[w][dst_idx] = mesh->vertex_buffer[w][src_idx]; } } diff --git a/src/standalone/model/model_diff.h b/src/standalone/model/model_diff.h index 186c984..20678bf 100644 --- a/src/standalone/model/model_diff.h +++ b/src/standalone/model/model_diff.h @@ -41,30 +41,30 @@ der_scal(const int& i, const int& j, const int& k, const AcMeshInfo& mesh_info, switch (axis) { case AXIS_X: - f0 = scal[AC_VTXBUF_IDX(i - 3, j, k, mesh_info)]; - f1 = scal[AC_VTXBUF_IDX(i - 2, j, k, mesh_info)]; - f2 = scal[AC_VTXBUF_IDX(i - 1, j, k, mesh_info)]; - f4 = scal[AC_VTXBUF_IDX(i + 1, j, k, mesh_info)]; - f5 = scal[AC_VTXBUF_IDX(i + 2, j, k, mesh_info)]; - f6 = scal[AC_VTXBUF_IDX(i + 3, j, k, mesh_info)]; + f0 = scal[acVertexBufferIdx(i - 3, j, k, mesh_info)]; + f1 = scal[acVertexBufferIdx(i - 2, j, k, mesh_info)]; + f2 = scal[acVertexBufferIdx(i - 1, j, k, mesh_info)]; + f4 = scal[acVertexBufferIdx(i + 1, j, k, mesh_info)]; + f5 = scal[acVertexBufferIdx(i + 2, j, k, mesh_info)]; + f6 = scal[acVertexBufferIdx(i + 3, j, k, mesh_info)]; ds = mesh_info.real_params[AC_dsx]; break; case AXIS_Y: - f0 = scal[AC_VTXBUF_IDX(i, j - 3, k, mesh_info)]; - f1 = scal[AC_VTXBUF_IDX(i, j - 2, k, mesh_info)]; - f2 = scal[AC_VTXBUF_IDX(i, j - 1, k, mesh_info)]; - f4 = scal[AC_VTXBUF_IDX(i, j + 1, k, mesh_info)]; - f5 = scal[AC_VTXBUF_IDX(i, j + 2, k, mesh_info)]; - f6 = scal[AC_VTXBUF_IDX(i, j + 3, k, mesh_info)]; + f0 = scal[acVertexBufferIdx(i, j - 3, k, mesh_info)]; + f1 = scal[acVertexBufferIdx(i, j - 2, k, mesh_info)]; + f2 = scal[acVertexBufferIdx(i, j - 1, k, mesh_info)]; + f4 = scal[acVertexBufferIdx(i, j + 1, k, mesh_info)]; + f5 = scal[acVertexBufferIdx(i, j + 2, k, mesh_info)]; + f6 = scal[acVertexBufferIdx(i, j + 3, k, mesh_info)]; ds = mesh_info.real_params[AC_dsy]; break; case AXIS_Z: - f0 = scal[AC_VTXBUF_IDX(i, j, k - 3, mesh_info)]; - f1 = scal[AC_VTXBUF_IDX(i, j, k - 2, mesh_info)]; - f2 = scal[AC_VTXBUF_IDX(i, j, k - 1, mesh_info)]; - f4 = scal[AC_VTXBUF_IDX(i, j, k + 1, mesh_info)]; - f5 = scal[AC_VTXBUF_IDX(i, j, k + 2, mesh_info)]; - f6 = scal[AC_VTXBUF_IDX(i, j, k + 3, mesh_info)]; + f0 = scal[acVertexBufferIdx(i, j, k - 3, mesh_info)]; + f1 = scal[acVertexBufferIdx(i, j, k - 2, mesh_info)]; + f2 = scal[acVertexBufferIdx(i, j, k - 1, mesh_info)]; + f4 = scal[acVertexBufferIdx(i, j, k + 1, mesh_info)]; + f5 = scal[acVertexBufferIdx(i, j, k + 2, mesh_info)]; + f6 = scal[acVertexBufferIdx(i, j, k + 3, mesh_info)]; ds = mesh_info.real_params[AC_dsz]; break; default: @@ -82,34 +82,34 @@ der2_scal(const int& i, const int& j, const int& k, const AcMeshInfo& mesh_info, MODEL_REAL f0, f1, f2, f3, f4, f5, f6; MODEL_REAL ds; - f3 = scal[AC_VTXBUF_IDX(i, j, k, mesh_info)]; + f3 = scal[acVertexBufferIdx(i, j, k, mesh_info)]; switch (axis) { case AXIS_X: - f0 = scal[AC_VTXBUF_IDX(i - 3, j, k, mesh_info)]; - f1 = scal[AC_VTXBUF_IDX(i - 2, j, k, mesh_info)]; - f2 = scal[AC_VTXBUF_IDX(i - 1, j, k, mesh_info)]; - f4 = scal[AC_VTXBUF_IDX(i + 1, j, k, mesh_info)]; - f5 = scal[AC_VTXBUF_IDX(i + 2, j, k, mesh_info)]; - f6 = scal[AC_VTXBUF_IDX(i + 3, j, k, mesh_info)]; + f0 = scal[acVertexBufferIdx(i - 3, j, k, mesh_info)]; + f1 = scal[acVertexBufferIdx(i - 2, j, k, mesh_info)]; + f2 = scal[acVertexBufferIdx(i - 1, j, k, mesh_info)]; + f4 = scal[acVertexBufferIdx(i + 1, j, k, mesh_info)]; + f5 = scal[acVertexBufferIdx(i + 2, j, k, mesh_info)]; + f6 = scal[acVertexBufferIdx(i + 3, j, k, mesh_info)]; ds = mesh_info.real_params[AC_dsx]; break; case AXIS_Y: - f0 = scal[AC_VTXBUF_IDX(i, j - 3, k, mesh_info)]; - f1 = scal[AC_VTXBUF_IDX(i, j - 2, k, mesh_info)]; - f2 = scal[AC_VTXBUF_IDX(i, j - 1, k, mesh_info)]; - f4 = scal[AC_VTXBUF_IDX(i, j + 1, k, mesh_info)]; - f5 = scal[AC_VTXBUF_IDX(i, j + 2, k, mesh_info)]; - f6 = scal[AC_VTXBUF_IDX(i, j + 3, k, mesh_info)]; + f0 = scal[acVertexBufferIdx(i, j - 3, k, mesh_info)]; + f1 = scal[acVertexBufferIdx(i, j - 2, k, mesh_info)]; + f2 = scal[acVertexBufferIdx(i, j - 1, k, mesh_info)]; + f4 = scal[acVertexBufferIdx(i, j + 1, k, mesh_info)]; + f5 = scal[acVertexBufferIdx(i, j + 2, k, mesh_info)]; + f6 = scal[acVertexBufferIdx(i, j + 3, k, mesh_info)]; ds = mesh_info.real_params[AC_dsy]; break; case AXIS_Z: - f0 = scal[AC_VTXBUF_IDX(i, j, k - 3, mesh_info)]; - f1 = scal[AC_VTXBUF_IDX(i, j, k - 2, mesh_info)]; - f2 = scal[AC_VTXBUF_IDX(i, j, k - 1, mesh_info)]; - f4 = scal[AC_VTXBUF_IDX(i, j, k + 1, mesh_info)]; - f5 = scal[AC_VTXBUF_IDX(i, j, k + 2, mesh_info)]; - f6 = scal[AC_VTXBUF_IDX(i, j, k + 3, mesh_info)]; + f0 = scal[acVertexBufferIdx(i, j, k - 3, mesh_info)]; + f1 = scal[acVertexBufferIdx(i, j, k - 2, mesh_info)]; + f2 = scal[acVertexBufferIdx(i, j, k - 1, mesh_info)]; + f4 = scal[acVertexBufferIdx(i, j, k + 1, mesh_info)]; + f5 = scal[acVertexBufferIdx(i, j, k + 2, mesh_info)]; + f6 = scal[acVertexBufferIdx(i, j, k + 3, mesh_info)]; ds = mesh_info.real_params[AC_dsz]; break; default: @@ -163,7 +163,7 @@ vec_dot_nabla_scal(const int& i, const int& j, const int& k, const AcMeshInfo& mesh_info, const MODEL_REAL* vec_x, const MODEL_REAL* vec_y, const MODEL_REAL* vec_z, const MODEL_REAL* scal) { - const int idx = AC_VTXBUF_IDX(i, j, k, mesh_info); + const int idx = acVertexBufferIdx(i, j, k, mesh_info); MODEL_REAL ddx_scal, ddy_scal, ddz_scal; grad(i, j, k, mesh_info, scal, &ddx_scal, &ddy_scal, &ddz_scal); return vec_x[idx] * ddx_scal + vec_y[idx] * ddy_scal + @@ -196,56 +196,56 @@ dernm_scal(const int& i, const int& j, const int& k, switch (dernm) { case DERNM_XY: fac = MODEL_REAL(1. / 720.) * (MODEL_REAL(1.) / dsx) * (MODEL_REAL(1.) / dsy); - f_p1_p1 = scal[AC_VTXBUF_IDX(i + 1, j + 1, k, mesh_info)]; - f_m1_p1 = scal[AC_VTXBUF_IDX(i - 1, j + 1, k, mesh_info)]; - f_m1_m1 = scal[AC_VTXBUF_IDX(i - 1, j - 1, k, mesh_info)]; - f_p1_m1 = scal[AC_VTXBUF_IDX(i + 1, j - 1, k, mesh_info)]; + f_p1_p1 = scal[acVertexBufferIdx(i + 1, j + 1, k, mesh_info)]; + f_m1_p1 = scal[acVertexBufferIdx(i - 1, j + 1, k, mesh_info)]; + f_m1_m1 = scal[acVertexBufferIdx(i - 1, j - 1, k, mesh_info)]; + f_p1_m1 = scal[acVertexBufferIdx(i + 1, j - 1, k, mesh_info)]; - f_p2_p2 = scal[AC_VTXBUF_IDX(i + 2, j + 2, k, mesh_info)]; - f_m2_p2 = scal[AC_VTXBUF_IDX(i - 2, j + 2, k, mesh_info)]; - f_m2_m2 = scal[AC_VTXBUF_IDX(i - 2, j - 2, k, mesh_info)]; - f_p2_m2 = scal[AC_VTXBUF_IDX(i + 2, j - 2, k, mesh_info)]; + f_p2_p2 = scal[acVertexBufferIdx(i + 2, j + 2, k, mesh_info)]; + f_m2_p2 = scal[acVertexBufferIdx(i - 2, j + 2, k, mesh_info)]; + f_m2_m2 = scal[acVertexBufferIdx(i - 2, j - 2, k, mesh_info)]; + f_p2_m2 = scal[acVertexBufferIdx(i + 2, j - 2, k, mesh_info)]; - f_p3_p3 = scal[AC_VTXBUF_IDX(i + 3, j + 3, k, mesh_info)]; - f_m3_p3 = scal[AC_VTXBUF_IDX(i - 3, j + 3, k, mesh_info)]; - f_m3_m3 = scal[AC_VTXBUF_IDX(i - 3, j - 3, k, mesh_info)]; - f_p3_m3 = scal[AC_VTXBUF_IDX(i + 3, j - 3, k, mesh_info)]; + f_p3_p3 = scal[acVertexBufferIdx(i + 3, j + 3, k, mesh_info)]; + f_m3_p3 = scal[acVertexBufferIdx(i - 3, j + 3, k, mesh_info)]; + f_m3_m3 = scal[acVertexBufferIdx(i - 3, j - 3, k, mesh_info)]; + f_p3_m3 = scal[acVertexBufferIdx(i + 3, j - 3, k, mesh_info)]; break; case DERNM_YZ: // NOTE this is a bit different from the old one, second is j+1k-1 // instead of j-1,k+1 fac = MODEL_REAL(1. / 720.) * (MODEL_REAL(1.) / dsy) * (MODEL_REAL(1.) / dsz); - f_p1_p1 = scal[AC_VTXBUF_IDX(i, j + 1, k + 1, mesh_info)]; - f_m1_p1 = scal[AC_VTXBUF_IDX(i, j - 1, k + 1, mesh_info)]; - f_m1_m1 = scal[AC_VTXBUF_IDX(i, j - 1, k - 1, mesh_info)]; - f_p1_m1 = scal[AC_VTXBUF_IDX(i, j + 1, k - 1, mesh_info)]; + f_p1_p1 = scal[acVertexBufferIdx(i, j + 1, k + 1, mesh_info)]; + f_m1_p1 = scal[acVertexBufferIdx(i, j - 1, k + 1, mesh_info)]; + f_m1_m1 = scal[acVertexBufferIdx(i, j - 1, k - 1, mesh_info)]; + f_p1_m1 = scal[acVertexBufferIdx(i, j + 1, k - 1, mesh_info)]; - f_p2_p2 = scal[AC_VTXBUF_IDX(i, j + 2, k + 2, mesh_info)]; - f_m2_p2 = scal[AC_VTXBUF_IDX(i, j - 2, k + 2, mesh_info)]; - f_m2_m2 = scal[AC_VTXBUF_IDX(i, j - 2, k - 2, mesh_info)]; - f_p2_m2 = scal[AC_VTXBUF_IDX(i, j + 2, k - 2, mesh_info)]; + f_p2_p2 = scal[acVertexBufferIdx(i, j + 2, k + 2, mesh_info)]; + f_m2_p2 = scal[acVertexBufferIdx(i, j - 2, k + 2, mesh_info)]; + f_m2_m2 = scal[acVertexBufferIdx(i, j - 2, k - 2, mesh_info)]; + f_p2_m2 = scal[acVertexBufferIdx(i, j + 2, k - 2, mesh_info)]; - f_p3_p3 = scal[AC_VTXBUF_IDX(i, j + 3, k + 3, mesh_info)]; - f_m3_p3 = scal[AC_VTXBUF_IDX(i, j - 3, k + 3, mesh_info)]; - f_m3_m3 = scal[AC_VTXBUF_IDX(i, j - 3, k - 3, mesh_info)]; - f_p3_m3 = scal[AC_VTXBUF_IDX(i, j + 3, k - 3, mesh_info)]; + f_p3_p3 = scal[acVertexBufferIdx(i, j + 3, k + 3, mesh_info)]; + f_m3_p3 = scal[acVertexBufferIdx(i, j - 3, k + 3, mesh_info)]; + f_m3_m3 = scal[acVertexBufferIdx(i, j - 3, k - 3, mesh_info)]; + f_p3_m3 = scal[acVertexBufferIdx(i, j + 3, k - 3, mesh_info)]; break; case DERNM_XZ: fac = MODEL_REAL(1. / 720.) * (MODEL_REAL(1.) / dsx) * (MODEL_REAL(1.) / dsz); - f_p1_p1 = scal[AC_VTXBUF_IDX(i + 1, j, k + 1, mesh_info)]; - f_m1_p1 = scal[AC_VTXBUF_IDX(i - 1, j, k + 1, mesh_info)]; - f_m1_m1 = scal[AC_VTXBUF_IDX(i - 1, j, k - 1, mesh_info)]; - f_p1_m1 = scal[AC_VTXBUF_IDX(i + 1, j, k - 1, mesh_info)]; + f_p1_p1 = scal[acVertexBufferIdx(i + 1, j, k + 1, mesh_info)]; + f_m1_p1 = scal[acVertexBufferIdx(i - 1, j, k + 1, mesh_info)]; + f_m1_m1 = scal[acVertexBufferIdx(i - 1, j, k - 1, mesh_info)]; + f_p1_m1 = scal[acVertexBufferIdx(i + 1, j, k - 1, mesh_info)]; - f_p2_p2 = scal[AC_VTXBUF_IDX(i + 2, j, k + 2, mesh_info)]; - f_m2_p2 = scal[AC_VTXBUF_IDX(i - 2, j, k + 2, mesh_info)]; - f_m2_m2 = scal[AC_VTXBUF_IDX(i - 2, j, k - 2, mesh_info)]; - f_p2_m2 = scal[AC_VTXBUF_IDX(i + 2, j, k - 2, mesh_info)]; + f_p2_p2 = scal[acVertexBufferIdx(i + 2, j, k + 2, mesh_info)]; + f_m2_p2 = scal[acVertexBufferIdx(i - 2, j, k + 2, mesh_info)]; + f_m2_m2 = scal[acVertexBufferIdx(i - 2, j, k - 2, mesh_info)]; + f_p2_m2 = scal[acVertexBufferIdx(i + 2, j, k - 2, mesh_info)]; - f_p3_p3 = scal[AC_VTXBUF_IDX(i + 3, j, k + 3, mesh_info)]; - f_m3_p3 = scal[AC_VTXBUF_IDX(i - 3, j, k + 3, mesh_info)]; - f_m3_m3 = scal[AC_VTXBUF_IDX(i - 3, j, k - 3, mesh_info)]; - f_p3_m3 = scal[AC_VTXBUF_IDX(i + 3, j, k - 3, mesh_info)]; + f_p3_p3 = scal[acVertexBufferIdx(i + 3, j, k + 3, mesh_info)]; + f_m3_p3 = scal[acVertexBufferIdx(i - 3, j, k + 3, mesh_info)]; + f_m3_m3 = scal[acVertexBufferIdx(i - 3, j, k - 3, mesh_info)]; + f_p3_m3 = scal[acVertexBufferIdx(i + 3, j, k - 3, mesh_info)]; break; default: ERROR("Invalid dernm type"); diff --git a/src/standalone/model/model_reduce.cc b/src/standalone/model/model_reduce.cc index dde5403..6d48c4b 100644 --- a/src/standalone/model/model_reduce.cc +++ b/src/standalone/model/model_reduce.cc @@ -99,7 +99,7 @@ model_reduce_scal(const ModelMesh& mesh, const ReductionType& rtype, ERROR("Unrecognized RTYPE"); } - const int initial_idx = AC_VTXBUF_IDX( + const int initial_idx = acVertexBufferIdx( mesh.info.int_params[AC_nx_min], mesh.info.int_params[AC_ny_min], mesh.info.int_params[AC_nz_min], mesh.info); @@ -115,7 +115,7 @@ model_reduce_scal(const ModelMesh& mesh, const ReductionType& rtype, j < mesh.info.int_params[AC_ny_max]; ++j) { for (int i = mesh.info.int_params[AC_nx_min]; i < mesh.info.int_params[AC_nx_max]; ++i) { - const int idx = AC_VTXBUF_IDX(i, j, k, mesh.info); + const int idx = acVertexBufferIdx(i, j, k, mesh.info); const ModelScalar curr_val = reduce_initial( mesh.vertex_buffer[a][idx]); res = reduce(res, curr_val); @@ -166,7 +166,7 @@ model_reduce_vec(const ModelMesh& mesh, const ReductionType& rtype, ERROR("Unrecognized RTYPE"); } - const int initial_idx = AC_VTXBUF_IDX( + const int initial_idx = acVertexBufferIdx( mesh.info.int_params[AC_nx_min], mesh.info.int_params[AC_ny_min], mesh.info.int_params[AC_nz_min], mesh.info); @@ -184,7 +184,7 @@ model_reduce_vec(const ModelMesh& mesh, const ReductionType& rtype, j < mesh.info.int_params[AC_ny_max]; j++) { for (int i = mesh.info.int_params[AC_nx_min]; i < mesh.info.int_params[AC_nx_max]; i++) { - const int idx = AC_VTXBUF_IDX(i, j, k, mesh.info); + const int idx = acVertexBufferIdx(i, j, k, mesh.info); const ModelScalar curr_val = reduce_initial( mesh.vertex_buffer[a][idx], mesh.vertex_buffer[b][idx], mesh.vertex_buffer[c][idx]); diff --git a/src/standalone/model/model_rk3.cc b/src/standalone/model/model_rk3.cc index 9353980..3907f93 100644 --- a/src/standalone/model/model_rk3.cc +++ b/src/standalone/model/model_rk3.cc @@ -68,7 +68,7 @@ get(const AcRealParam param) static inline int IDX(const int i, const int j, const int k) { - return AC_VTXBUF_IDX(i, j, k, (*mesh_info)); + return acVertexBufferIdx(i, j, k, (*mesh_info)); } /* @@ -749,7 +749,7 @@ static void solve_alpha_step(const int step_number, const ModelScalar dt, const int i, const int j, const int k, ModelMesh& in, ModelMesh* out) { - const int idx = AC_VTXBUF_IDX(i, j, k, in.info); + const int idx = acVertexBufferIdx(i, j, k, in.info); const ModelScalarData lnrho = read_data(i, j, k, in.vertex_buffer, VTXBUF_LNRHO); const ModelVectorData uu = read_data(i, j, k, in.vertex_buffer, @@ -797,7 +797,7 @@ static void solve_beta_step(const int step_number, const ModelScalar dt, const int i, const int j, const int k, const ModelMesh& in, ModelMesh* out) { - const int idx = AC_VTXBUF_IDX(i, j, k, in.info); + const int idx = acVertexBufferIdx(i, j, k, in.info); // Williamson (1980) NOTE: older version of astaroth used inhomogenous const ModelScalar beta[] = {ModelScalar(1. / 3.), ModelScalar(15. / 16.), diff --git a/src/standalone/renderer.cc b/src/standalone/renderer.cc index 52aed16..1522cc5 100644 --- a/src/standalone/renderer.cc +++ b/src/standalone/renderer.cc @@ -162,7 +162,7 @@ draw_vertex_buffer(const AcMesh& mesh, const VertexBufferHandle& vertex_buffer, for (int i = 0; i < mesh.info.int_params[AC_mx]; ++i) { ERRCHK(i < datasurface_width && j < datasurface_height); - const int idx = AC_VTXBUF_IDX(i, j, k, mesh.info); + const int idx = acVertexBufferIdx(i, j, k, mesh.info); const uint8_t shade = (uint8_t)( 255.f * (fabsf(float(mesh.vertex_buffer[vertex_buffer][idx]) - mid)) / range); uint8_t color[4] = {0, 0, 0, 255}; @@ -219,7 +219,7 @@ draw_vertex_buffer_vec(const AcMesh& mesh, const VertexBufferHandle& vertex_buff for (int i = 0; i < mesh.info.int_params[AC_mx]; ++i) { ERRCHK(i < datasurface_width && j < datasurface_height); - const int idx = AC_VTXBUF_IDX(i, j, k, mesh.info); + const int idx = acVertexBufferIdx(i, j, k, mesh.info); const uint8_t r = (uint8_t)( 255.f * (fabsf(float(mesh.vertex_buffer[vertex_buffer_a][idx]) - mid)) / range); const uint8_t g = (uint8_t)( diff --git a/src/standalone/simulation.cc b/src/standalone/simulation.cc index 2fac549..f6b7e46 100644 --- a/src/standalone/simulation.cc +++ b/src/standalone/simulation.cc @@ -100,7 +100,7 @@ save_mesh(const AcMesh& save_mesh, const int step, const AcReal t_step) FILE* save_ptr; for (int w = 0; w < NUM_VTXBUF_HANDLES; ++w) { - const size_t n = AC_VTXBUF_SIZE(save_mesh.info); + const size_t n = acVertexBufferSize(save_mesh.info); const char* buffername = vtxbuf_names[w]; char cstep[11];