Reverted the default settings to same as on master for easier merge

This commit is contained in:
jpekkila
2020-05-30 19:06:21 +03:00
parent 4748e48c7d
commit 555bf8b252
2 changed files with 12 additions and 12 deletions

View File

@@ -28,11 +28,11 @@ endif()
message(STATUS "Build type: " ${CMAKE_BUILD_TYPE}) message(STATUS "Build type: " ${CMAKE_BUILD_TYPE})
## Options ## Options
option(DOUBLE_PRECISION "Generates double precision code." ON) option(DOUBLE_PRECISION "Generates double precision code." OFF)
option(BUILD_SAMPLES "Builds projects in samples subdirectory." ON) option(BUILD_SAMPLES "Builds projects in samples subdirectory." OFF)
option(BUILD_STANDALONE "Builds standalone Astaroth." OFF) option(BUILD_STANDALONE "Builds standalone Astaroth." ON)
option(MPI_ENABLED "Enables additional functions for MPI communciation." 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." 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) ## Options (DEPRECATED)
# option(BUILD_DEBUG "Builds the program with extensive error checking" OFF) # option(BUILD_DEBUG "Builds the program with extensive error checking" OFF)

View File

@@ -5,9 +5,9 @@
* "Compile-time" params * "Compile-time" params
* ============================================================================= * =============================================================================
*/ */
AC_nx = 512 AC_nx = 128
AC_ny = 512 AC_ny = 128
AC_nz = 512 AC_nz = 128
AC_dsx = 0.04908738521 AC_dsx = 0.04908738521
AC_dsy = 0.04908738521 AC_dsy = 0.04908738521
@@ -24,11 +24,11 @@ AC_bin_steps = 1000
AC_bin_save_t = 1e666 AC_bin_save_t = 1e666
// Set to 0 if you want to run the simulation from the beginning, or just a new // 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. // simulation. If continuing from a saved step, specify the step number here.
AC_start_step = 0 AC_start_step = 0
// Maximum time in code units. If negative, there is no time limit // Maximum time in code units. If negative, there is no time limit
AC_max_time = -1.0 AC_max_time = -1.0
// Hydro // Hydro
AC_cdt = 0.4 AC_cdt = 0.4
@@ -49,7 +49,7 @@ AC_forcing_magnitude = 1e-5
AC_kmin = 0.8 AC_kmin = 0.8
AC_kmax = 1.2 AC_kmax = 1.2
// Switches forcing off and accretion on // Switches forcing off and accretion on
AC_switch_accretion = 0 AC_switch_accretion = 0
// Entropy // Entropy
AC_cp_sound = 1.0 AC_cp_sound = 1.0