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

Added loading and storing functions to the fortran interface

Browse Source
This commit is contained in:
jpekkila
2020-06-26 09:52:33 +03:00
parent ee4b18c81c
commit 6f59890a3f
2 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/astaroth_fortran.h
View File

@@ -23,9 +23,11 @@ void acupdatebuiltinparams_(AcMeshInfo* info);
void acdeviceswapbuffers_(const Device* device); void acdeviceswapbuffers_(const Device* device);
void acdeviceloadmesh_(const Device* device, const Stream* stream, const AcMesh* host_mesh); void acdeviceloadmesh_(const Device* device, const Stream* stream, const AcMeshInfo* info,
const int* num_farrays, AcReal* farray);
void acdevicestoremesh_(const Device* device, const Stream* stream, AcMesh* host_mesh); void acdevicestoremesh_(const Device* device, const Stream* stream, const AcMeshInfo* info,
const int* num_farrays, AcReal* farray);
void acdeviceintegratesubstep_(const Device* device, const Stream* stream, const int* step_number, void acdeviceintegratesubstep_(const Device* device, const Stream* stream, const int* step_number,
const int3* start, const int3* end, const AcReal* dt); const int3* start, const int3* end, const AcReal* dt);

29
src/core/astaroth_fortran.cc
View File

@@ -2,6 +2,7 @@
#include "astaroth.h" #include "astaroth.h"
#include "astaroth_utils.h" #include "astaroth_utils.h"
#include "errchk.h"
void void
acdevicecreate_(const int* id, const AcMeshInfo* info, Device* handle) acdevicecreate_(const int* id, const AcMeshInfo* info, Device* handle)
@@ -38,17 +39,33 @@ acdeviceswapbuffers_(const Device* device)
} }
void void
acdeviceloadmesh_(const Device* device, const Stream* stream, const AcMesh* host_mesh) acdeviceloadmesh_(const Device* device, const Stream* stream, const AcMeshInfo* info,
const int* num_farrays, AcReal* farray)
{ {
// TODO construct AcMesh from fortran farray ERRCHK_ALWAYS(*num_farrays == NUM_VTXBUF_HANDLES);
acDeviceLoadMesh(*device, *stream, *host_mesh); const size_t mxyz = info->int_params[AC_mx] * info->int_params[AC_mx] * info->int_params[AC_mx];
AcMesh mesh;
mesh.info = *info;
for (int i = 0; i < *num_farrays; ++i)
mesh.vertex_buffer[i] = &farray[i * mxyz];
acDeviceLoadMesh(*device, *stream, mesh);
} }
void void
acdevicestoremesh_(const Device* device, const Stream* stream, AcMesh* host_mesh) acdevicestoremesh_(const Device* device, const Stream* stream, const AcMeshInfo* info,
const int* num_farrays, AcReal* farray)
{ {
// TODO construct AcMesh from fortran farray ERRCHK_ALWAYS(*num_farrays == NUM_VTXBUF_HANDLES);
acDeviceStoreMesh(*device, *stream, host_mesh); AcMesh mesh;
mesh.info = *info;
const size_t mxyz = info->int_params[AC_mx] * info->int_params[AC_mx] * info->int_params[AC_mx];
for (int i = 0; i < *num_farrays; ++i)
mesh.vertex_buffer[i] = &farray[i * mxyz];
acDeviceStoreMesh(*device, *stream, &mesh);
} }
void void