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

Forcing disabled from autotest and from defaults.

Browse Source 
It is not suitable function of the autotest tool. If there in really a
mandatory need to add it. I will need special help from Johannes.
This commit is contained in:
Miikka Vaisala
2019-07-02 18:46:04 +08:00
parent 4766441ffb
commit 334ff868d9
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acc/mhd_solver/stencil_process.sps
View File

@@ -2,7 +2,7 @@
#define LENTROPY (1) #define LENTROPY (1)
#define LTEMPERATURE (0) #define LTEMPERATURE (0)
#define LGRAVITY (0) #define LGRAVITY (0)
#define LFORCING (1) #define LFORCING (0)
#define LUPWD (0) #define LUPWD (0)

2
include/astaroth.h
View File

@@ -76,7 +76,7 @@ extern "C" {
#define LMAGNETIC (1) #define LMAGNETIC (1)
#define LENTROPY (1) #define LENTROPY (1)
#define LTEMPERATURE (0) #define LTEMPERATURE (0)
#define LFORCING (1) #define LFORCING (0)
#endif #endif
// clang-format on // clang-format on

8
src/standalone/autotest.cc
View File

@@ -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. This file is part of Astaroth.
@@ -32,6 +32,7 @@
#include "core/math_utils.h" #include "core/math_utils.h"
#include "model/host_memory.h" #include "model/host_memory.h"
#include "model/host_timestep.h" #include "model/host_timestep.h"
#include "model/host_forcing.h"
#include "model/model_boundconds.h" #include "model/model_boundconds.h"
#include "model/model_reduce.h" #include "model/model_reduce.h"
#include "model/model_rk3.h" #include "model/model_rk3.h"
@@ -699,6 +700,11 @@ run_autotest(void)
VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ); VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ);
const AcReal dt = host_timestep(umax, config); const AcReal dt = host_timestep(umax, config);
#if LFORCING
//CURRENTLY AUTOTEST NOT SUPPORTED WITH FORCING!!!
#endif
// Host integration step // Host integration step

5
src/standalone/model/model_rk3.cc
View File

@@ -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. 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 static inline ModelVector
simple_vortex_forcing(ModelVector a, ModelVector b, ModelScalar magnitude) simple_vortex_forcing(ModelVector a, ModelVector b, ModelScalar magnitude)
@@ -784,6 +786,7 @@ forcing(int3 globalVertexIdx, ModelScalar dt)
if (is_valid(force)) { return force; } if (is_valid(force)) { return force; }
else { return (ModelVector){0, 0, 0}; } else { return (ModelVector){0, 0, 0}; }
} }
#endif
static void static void
solve_alpha_step(const int step_number, const ModelScalar dt, const int i, const int j, const int k, solve_alpha_step(const int step_number, const ModelScalar dt, const int i, const int j, const int k,