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

Now parameters and vertexbuffers (fields) can be declared with the DSL only. TODO: translation from the DSL header to C

Browse Source
This commit is contained in:
jpekkila
2019-08-19 17:35:03 +03:00
parent bcdd827a4f
commit d801ebdd41
2 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/device.cu
View File

@@ -60,6 +60,11 @@ DCONST(const AcReal3Param param)
{ {
return d_mesh_info.real3_params[param]; return d_mesh_info.real3_params[param];
} }
constexpr VertexBufferHandle
DCONST(const VertexBufferHandle handle)
{
return handle;
}
#define DCONST_INT(x) DCONST(x) #define DCONST_INT(x) DCONST(x)
#define DCONST_INT3(x) DCONST(x) #define DCONST_INT3(x) DCONST(x)
#define DCONST_REAL(x) DCONST(x) #define DCONST_REAL(x) DCONST(x)

46
src/core/kernels/stencil_header.hh
View File

@@ -90,34 +90,28 @@ uniform Scalar AC_inv_dsz;
* User-defined vertex buffers * User-defined vertex buffers
* ============================================================================= * =============================================================================
*/ */
// clang-format off
#if LENTROPY #if LENTROPY
#define AC_FOR_VTXBUF_HANDLES(FUNC) \ uniform ScalarField VTXBUF_LNRHO;
FUNC(VTXBUF_LNRHO), \ uniform ScalarField VTXBUF_UUX;
FUNC(VTXBUF_UUX), \ uniform ScalarField VTXBUF_UUY;
FUNC(VTXBUF_UUY), \ uniform ScalarField VTXBUF_UUZ;
FUNC(VTXBUF_UUZ), \ uniform ScalarField VTXBUF_AX;
FUNC(VTXBUF_AX), \ uniform ScalarField VTXBUF_AY;
FUNC(VTXBUF_AY), \ uniform ScalarField VTXBUF_AZ;
FUNC(VTXBUF_AZ), \ uniform ScalarField VTXBUF_ENTROPY;
FUNC(VTXBUF_ENTROPY),
#elif LMAGNETIC #elif LMAGNETIC
#define AC_FOR_VTXBUF_HANDLES(FUNC) \ uniform ScalarField VTXBUF_LNRHO;
FUNC(VTXBUF_LNRHO), \ uniform ScalarField VTXBUF_UUX;
FUNC(VTXBUF_UUX), \ uniform ScalarField VTXBUF_UUY;
FUNC(VTXBUF_UUY), \ uniform ScalarField VTXBUF_UUZ;
FUNC(VTXBUF_UUZ), \ uniform ScalarField VTXBUF_AX;
FUNC(VTXBUF_AX), \ uniform ScalarField VTXBUF_AY;
FUNC(VTXBUF_AY), \ uniform ScalarField VTXBUF_AZ;
FUNC(VTXBUF_AZ),
#elif LHYDRO #elif LHYDRO
#define AC_FOR_VTXBUF_HANDLES(FUNC) \ uniform ScalarField VTXBUF_LNRHO;
FUNC(VTXBUF_LNRHO), \ uniform ScalarField VTXBUF_UUX;
FUNC(VTXBUF_UUX), \ uniform ScalarField VTXBUF_UUY;
FUNC(VTXBUF_UUY), \ uniform ScalarField VTXBUF_UUZ;
FUNC(VTXBUF_UUZ),
#else #else
#define AC_FOR_VTXBUF_HANDLES(FUNC) \ uniform ScalarField VTXBUF_LNRHO;
FUNC(VTXBUF_LNRHO),
#endif #endif
// clang-format on