Now compiles and runs.

PLEASE NOTE THAT FLAGS NEED TO BE SET SEPARATELY IN simulation.cc and renderer.cc FOR LSINK and LFORCING!
This commit is contained in:
Miikka Vaisala
2019-09-02 14:47:58 +08:00
parent 02ac6c956f
commit b4cd92da0c
5 changed files with 21 additions and 15 deletions

View File

@@ -1,9 +1,9 @@
#define LDENSITY (1)
#define LHYDRO (1)
#define LMAGNETIC (1)
#define LENTROPY (1)
#define LMAGNETIC (0)
#define LENTROPY (0)
#define LTEMPERATURE (0)
#define LFORCING (1)
#define LFORCING (0)
#define LUPWD (1)
#define LSINK (1)

View File

@@ -456,8 +456,8 @@ out ScalarField out_tt(VTXBUF_TEMPERATURE);
#endif
#if LSINK
in Scalar accretion = VTXBUF_ACCRETION;
out Scalar out_accretion = VTXBUF_ACCRETION;
in ScalarField accretion(VTXBUF_ACCRETION);
out ScalarField out_accretion(VTXBUF_ACCRETION);
#endif
Kernel void
@@ -471,13 +471,13 @@ solve()
#endif
#if LENTROPY
out_uu = rk3(out_uu, uu, momentum(uu, lnrho, ss, aa), dt);
out_uu = rk3(out_uu, uu, momentum(globalVertexIdx, uu, lnrho, ss, aa, dt), dt);
out_ss = rk3(out_ss, ss, entropy(ss, uu, lnrho, aa), dt);
#elif LTEMPERATURE
out_uu = rk3(out_uu, uu, momentum(uu, lnrho, tt), dt);
out_uu = rk3(out_uu, uu, momentum(globalVertexIdx, uu, lnrho, tt, dt), dt);
out_tt = rk3(out_tt, tt, heat_transfer(uu, lnrho, tt), dt);
#else
out_uu = rk3(out_uu, uu, momentum(uu, lnrho), dt);
out_uu = rk3(out_uu, uu, momentum(globalVertexIdx, uu, lnrho, dt), dt);
#endif
#if LFORCING