diff --git a/CMakeLists.txt b/CMakeLists.txt index 04100bc..682be55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ project(astaroth C CXX CUDA) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) ## Project-wide compilation flags -set(COMMON_FLAGS "-mavx -Wall -Wextra -Wdouble-promotion -Wfloat-conversion -Wshadow") +set(COMMON_FLAGS "-mavx -Wall -Wextra -Werror -Wdouble-promotion -Wfloat-conversion -Wshadow") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}") set(CMAKE_C_STANDARD 11) @@ -19,7 +19,7 @@ set(CMAKE_CXX_STANDARD 11) find_package(CUDA) # Still required for various macros, such as cuda_select_nvcc_... cuda_select_nvcc_arch_flags(ARCHLIST Common) # Common architectures depend on the available CUDA version. Listed here: https://github.com/Kitware/CMake/blob/master/Modules/FindCUDA/select_compute_arch.cmake string(REPLACE ";" " " CUDA_ARCH_FLAGS "${ARCHLIST}") -set(COMMON_FLAGS_CUDA "-mavx,-Wall,-Wextra,-Wdouble-promotion,-Wfloat-conversion,-Wshadow") +set(COMMON_FLAGS_CUDA "-mavx,-Wall,-Wextra,-Werror,-Wdouble-promotion,-Wfloat-conversion,-Wshadow") set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} ${CUDA_ARCH_FLAGS} -ccbin=${CMAKE_CXX_COMPILER} --compiler-options=${COMMON_FLAGS_CUDA}") diff --git a/acc/mhd_solver/stencil_kernel.ac b/acc/mhd_solver/stencil_kernel.ac index 0f37ea5..905eb65 100644 --- a/acc/mhd_solver/stencil_kernel.ac +++ b/acc/mhd_solver/stencil_kernel.ac @@ -5,8 +5,8 @@ #define LMAGNETIC (1) #define LENTROPY (1) #define LTEMPERATURE (0) -#define LFORCING (0) -#define LUPWD (0) +#define LFORCING (1) +#define LUPWD (1) #define LSINK (0) #define AC_THERMAL_CONDUCTIVITY (0.001) // TODO: make an actual config parameter diff --git a/config/astaroth.conf b/config/astaroth.conf index 83e93d9..190948b 100644 --- a/config/astaroth.conf +++ b/config/astaroth.conf @@ -5,9 +5,9 @@ * "Compile-time" params * ============================================================================= */ -AC_nx = 256 -AC_ny = 256 -AC_nz = 256 +AC_nx = 128 +AC_ny = 128 +AC_nz = 128 AC_dsx = 0.04908738521 AC_dsy = 0.04908738521 diff --git a/src/utils/modelsolver.c b/src/utils/modelsolver.c index e482bd9..d9446eb 100644 --- a/src/utils/modelsolver.c +++ b/src/utils/modelsolver.c @@ -38,8 +38,8 @@ #define LMAGNETIC (1) #define LENTROPY (1) #define LTEMPERATURE (0) -#define LFORCING (0) -#define LUPWD (0) +#define LFORCING (1) +#define LUPWD (1) #define AC_THERMAL_CONDUCTIVITY ((Scalar)(0.001)) // TODO: make an actual config parameter typedef AcReal Scalar;