diff --git a/examples/CosmoVolume/cosmoVolume.yml b/examples/CosmoVolume/cosmoVolume.yml index acfd449cbf57408718a7c2a50d8a16bf5ccd5b4e..4ca066f8c7949e6dc6339ae93e33dd89a795b345 100644 --- a/examples/CosmoVolume/cosmoVolume.yml +++ b/examples/CosmoVolume/cosmoVolume.yml @@ -16,7 +16,7 @@ TimeIntegration: time_begin: 0. # The starting time of the simulation (in internal units). time_end: 1e-4 # The end time of the simulation (in internal units). dt_min: 1e-7 # The minimal time-step size of the simulation (in internal units). - dt_max: 1e-4 # The maximal time-step size of the simulation (in internal units). + dt_max: 1e-2 # The maximal time-step size of the simulation (in internal units). # Parameters governing the snapshots Snapshots: @@ -43,19 +43,3 @@ SPH: # Parameters related to the initial conditions InitialConditions: file_name: ./cosmoVolume.hdf5 # The file to read - -# Parameters govering domain decomposition -DomainDecomposition: - initial_type: m # The initial strategy ("g", "m", "w", or "v"). See documentation for details. - initial_grid_x: 10 # Grid size if the 'g' strategy is chosen. - initial_grid_y: 10 - initial_grid_z: 10 - repartition_type: b # The re-decomposition strategy ("n", "b", "v", "e" or "x"). See documentation for details. - -# External potential parameters -PointMass: - position_x: 5. # location of external point mass in internal units - position_y: 5. - position_z: 5. - mass: 1. # mass of external point mass in internal units - diff --git a/examples/Makefile.am b/examples/Makefile.am index 9ad4d06f8764f8f57f68d0e501f4a726941c40e6..22911e903e8bbf8265d712185f41de2bf4f53553 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -40,11 +40,11 @@ bin_PROGRAMS += swift_mpi swift_fixdt_mpi endif # engine_policy_setaffinity is available? -# if HAVESETAFFINITY -# ENGINE_POLICY_SETAFFINITY=| engine_policy_setaffinity -# else +if HAVESETAFFINITY +ENGINE_POLICY_SETAFFINITY=| engine_policy_setaffinity +else ENGINE_POLICY_SETAFFINITY= -# endif +endif # Sources for swift swift_SOURCES = main.c diff --git a/src/engine.c b/src/engine.c index a5e8b5a00b66245776031aed1aa224b9490de3c6..78d6422fe1809e42ceda7205b2fa68b3b79f0d4d 100644 --- a/src/engine.c +++ b/src/engine.c @@ -2278,7 +2278,6 @@ void engine_collect_timestep(struct engine *e) { e->g_updates = g_updates; } - /** * @brief Print the conserved quantities statistics to a log file * @@ -3185,7 +3184,7 @@ void engine_init(struct engine *e, struct space *s, #endif /* Initialize the threadpool. */ - threadpool_init(&e->threadpool, e->nr_threads); + threadpool_init(&e->threadpool, e->nr_threads); /* First of all, init the barrier and lock it. */ if (pthread_mutex_init(&e->barrier_mutex, NULL) != 0)