From 555bf8b25291bdc4cafa0833a4f8a6bd561ec99f Mon Sep 17 00:00:00 2001 From: jpekkila Date: Sat, 30 May 2020 19:06:21 +0300 Subject: [PATCH] Reverted the default settings to same as on master for easier merge --- CMakeLists.txt | 10 +++++----- config/astaroth.conf | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index be5d4d6..ac33bc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,11 +28,11 @@ endif() message(STATUS "Build type: " ${CMAKE_BUILD_TYPE}) ## Options -option(DOUBLE_PRECISION "Generates double precision code." ON) -option(BUILD_SAMPLES "Builds projects in samples subdirectory." ON) -option(BUILD_STANDALONE "Builds standalone Astaroth." OFF) -option(MPI_ENABLED "Enables additional functions for MPI communciation." ON) -option(MULTIGPU_ENABLED "Enables multi-GPU on a single node. Uses peer-to-peer communication instead of MPI. Affects Legacy & Node layers only." OFF) +option(DOUBLE_PRECISION "Generates double precision code." OFF) +option(BUILD_SAMPLES "Builds projects in samples subdirectory." OFF) +option(BUILD_STANDALONE "Builds standalone Astaroth." ON) +option(MPI_ENABLED "Enables additional functions for MPI communciation." OFF) +option(MULTIGPU_ENABLED "Enables multi-GPU on a single node. Uses peer-to-peer communication instead of MPI. Affects Legacy & Node layers only." ON) ## Options (DEPRECATED) # option(BUILD_DEBUG "Builds the program with extensive error checking" OFF) diff --git a/config/astaroth.conf b/config/astaroth.conf index 6c34cb8..abc1613 100644 --- a/config/astaroth.conf +++ b/config/astaroth.conf @@ -5,9 +5,9 @@ * "Compile-time" params * ============================================================================= */ -AC_nx = 512 -AC_ny = 512 -AC_nz = 512 +AC_nx = 128 +AC_ny = 128 +AC_nz = 128 AC_dsx = 0.04908738521 AC_dsy = 0.04908738521 @@ -24,11 +24,11 @@ AC_bin_steps = 1000 AC_bin_save_t = 1e666 // Set to 0 if you want to run the simulation from the beginning, or just a new -// simulation. If continuing from a saved step, specify the step number here. -AC_start_step = 0 +// simulation. If continuing from a saved step, specify the step number here. +AC_start_step = 0 // Maximum time in code units. If negative, there is no time limit -AC_max_time = -1.0 +AC_max_time = -1.0 // Hydro AC_cdt = 0.4 @@ -49,7 +49,7 @@ AC_forcing_magnitude = 1e-5 AC_kmin = 0.8 AC_kmax = 1.2 // Switches forcing off and accretion on -AC_switch_accretion = 0 +AC_switch_accretion = 0 // Entropy AC_cp_sound = 1.0