diff --git a/acc/mhd_solver/stencil_process.sps b/acc/mhd_solver/stencil_process.sps index 6065d24..4960554 100644 --- a/acc/mhd_solver/stencil_process.sps +++ b/acc/mhd_solver/stencil_process.sps @@ -2,7 +2,7 @@ #define LENTROPY (1) #define LTEMPERATURE (0) #define LGRAVITY (0) -#define LFORCING (1) +#define LFORCING (0) #define LUPWD (0) diff --git a/include/astaroth.h b/include/astaroth.h index 45159f5..504f768 100644 --- a/include/astaroth.h +++ b/include/astaroth.h @@ -76,7 +76,7 @@ extern "C" { #define LMAGNETIC (1) #define LENTROPY (1) #define LTEMPERATURE (0) - #define LFORCING (1) + #define LFORCING (0) #endif // clang-format on diff --git a/src/standalone/autotest.cc b/src/standalone/autotest.cc index 4385d5f..0f961fa 100644 --- a/src/standalone/autotest.cc +++ b/src/standalone/autotest.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018, Johannes Pekkilae, Miikka Vaeisalae. + Copyright (C) 2014-2019, Johannes Pekkilae, Miikka Vaeisalae. This file is part of Astaroth. @@ -32,6 +32,7 @@ #include "core/math_utils.h" #include "model/host_memory.h" #include "model/host_timestep.h" +#include "model/host_forcing.h" #include "model/model_boundconds.h" #include "model/model_reduce.h" #include "model/model_rk3.h" @@ -699,6 +700,11 @@ run_autotest(void) VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ); const AcReal dt = host_timestep(umax, config); +#if LFORCING + + //CURRENTLY AUTOTEST NOT SUPPORTED WITH FORCING!!! + +#endif // Host integration step diff --git a/src/standalone/model/model_rk3.cc b/src/standalone/model/model_rk3.cc index afec5d0..6c79908 100644 --- a/src/standalone/model/model_rk3.cc +++ b/src/standalone/model/model_rk3.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014-2018, Johannes Pekkilae, Miikka Vaeisalae. + Copyright (C) 2014-2019, Johannes Pekkilae, Miikka Vaeisalae. This file is part of Astaroth. @@ -710,6 +710,8 @@ is_valid(const ModelVector& a) } +#if 0 +//FORCING NOT SUPPORTED FOR AUTOTEST static inline ModelVector simple_vortex_forcing(ModelVector a, ModelVector b, ModelScalar magnitude) @@ -784,6 +786,7 @@ forcing(int3 globalVertexIdx, ModelScalar dt) if (is_valid(force)) { return force; } else { return (ModelVector){0, 0, 0}; } } +#endif static void solve_alpha_step(const int step_number, const ModelScalar dt, const int i, const int j, const int k,