diff --git a/examples/EAGLE_12/eagle_12.yml b/examples/EAGLE_12/eagle_12.yml new file mode 100644 index 0000000000000000000000000000000000000000..778d04fdd02004fd10ac468321568069e39dd217 --- /dev/null +++ b/examples/EAGLE_12/eagle_12.yml @@ -0,0 +1,46 @@ +# Define the system of units to use internally. +InternalUnitSystem: + UnitMass_in_cgs: 1 # Grams + UnitLength_in_cgs: 1 # Centimeters + UnitVelocity_in_cgs: 1 # Centimeters per second + UnitCurrent_in_cgs: 1 # Amperes + UnitTemp_in_cgs: 1 # Kelvin + +# Parameters for the task scheduling +Scheduler: + cell_sub_size: 6000 # Value used for the original scaling tests + cell_split_size: 300 # Value used for the original scaling tests + +# Parameters governing the time integration +TimeIntegration: + time_begin: 0. # The starting time of the simulation (in internal units). + time_end: 1. # 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-2 # The maximal time-step size of the simulation (in internal units). + +# Parameters governing the snapshots +Snapshots: + basename: eagle # Common part of the name of output files + time_first: 0. # Time of the first output (in internal units) + delta_time: 0.05 # Time difference between consecutive outputs (in internal units) + UnitMass_in_cgs: 1 # Grams + UnitLength_in_cgs: 1 # Centimeters + UnitVelocity_in_cgs: 1 # Centimeters per second + UnitCurrent_in_cgs: 1 # Amperes + UnitTemp_in_cgs: 1 # Kelvin + +# Parameters governing the conserved quantities statistics +Statistics: + delta_time: 1e-2 # Time between statistics output + +# Parameters for the hydrodynamics scheme +SPH: + resolution_eta: 1.2348 # Target smoothing length in units of the mean inter-particle separation (1.2348 == 48Ngbs with the cubic spline kernel). + delta_neighbours: 0.1 # The tolerance for the targetted number of neighbours. + max_smoothing_length: 0.1 # Maximal smoothing length allowed (in internal units). + CFL_condition: 0.1 # Courant-Friedrich-Levy condition for time integration. + +# Parameters related to the initial conditions +InitialConditions: + file_name: ./EAGLE_ICs_12.hdf5 # The file to read + diff --git a/examples/EAGLE_12/getIC.sh b/examples/EAGLE_12/getIC.sh new file mode 100755 index 0000000000000000000000000000000000000000..e23ea1bdb9d20629256e36fa63335d37bb14275a --- /dev/null +++ b/examples/EAGLE_12/getIC.sh @@ -0,0 +1,2 @@ +#!/bin/bash +wget http://icc.dur.ac.uk/swift/Files/EAGLE_ICs_12.hdf5 diff --git a/examples/EAGLE_12/run.sh b/examples/EAGLE_12/run.sh new file mode 100755 index 0000000000000000000000000000000000000000..58c92adc0a1afadf0d15f81613d749f6e736f211 --- /dev/null +++ b/examples/EAGLE_12/run.sh @@ -0,0 +1,11 @@ +#!/bin/bash + + # Generate the initial conditions if they are not present. +if [ ! -e EAGLE_ICs_12.hdf5 ] +then + echo "Fetching initial conditions for the EAGLE 12Mpc example..." + ./getIC.sh +fi + +../swift -s -t 16 eagle_12.yml + diff --git a/examples/EAGLE_25/eagle_25.yml b/examples/EAGLE_25/eagle_25.yml new file mode 100644 index 0000000000000000000000000000000000000000..731d87ea360ced596c4190880c62fdfb1cd605f8 --- /dev/null +++ b/examples/EAGLE_25/eagle_25.yml @@ -0,0 +1,46 @@ +# Define the system of units to use internally. +InternalUnitSystem: + UnitMass_in_cgs: 1 # Grams + UnitLength_in_cgs: 1 # Centimeters + UnitVelocity_in_cgs: 1 # Centimeters per second + UnitCurrent_in_cgs: 1 # Amperes + UnitTemp_in_cgs: 1 # Kelvin + +# Parameters for the task scheduling +Scheduler: + cell_sub_size: 6000 # Value used for the original scaling tests + cell_split_size: 300 # Value used for the original scaling tests + +# Parameters governing the time integration +TimeIntegration: + time_begin: 0. # The starting time of the simulation (in internal units). + time_end: 1. # 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-2 # The maximal time-step size of the simulation (in internal units). + +# Parameters governing the snapshots +Snapshots: + basename: eagle # Common part of the name of output files + time_first: 0. # Time of the first output (in internal units) + delta_time: 0.05 # Time difference between consecutive outputs (in internal units) + UnitMass_in_cgs: 1 # Grams + UnitLength_in_cgs: 1 # Centimeters + UnitVelocity_in_cgs: 1 # Centimeters per second + UnitCurrent_in_cgs: 1 # Amperes + UnitTemp_in_cgs: 1 # Kelvin + +# Parameters governing the conserved quantities statistics +Statistics: + delta_time: 1e-2 # Time between statistics output + +# Parameters for the hydrodynamics scheme +SPH: + resolution_eta: 1.2348 # Target smoothing length in units of the mean inter-particle separation (1.2348 == 48Ngbs with the cubic spline kernel). + delta_neighbours: 0.1 # The tolerance for the targetted number of neighbours. + max_smoothing_length: 0.1 # Maximal smoothing length allowed (in internal units). + CFL_condition: 0.1 # Courant-Friedrich-Levy condition for time integration. + +# Parameters related to the initial conditions +InitialConditions: + file_name: ./EAGLE_ICs_25.hdf5 # The file to read + diff --git a/examples/EAGLE_25/getIC.sh b/examples/EAGLE_25/getIC.sh new file mode 100755 index 0000000000000000000000000000000000000000..6ccc31686a02535b1536b4a85eea0ee065326970 --- /dev/null +++ b/examples/EAGLE_25/getIC.sh @@ -0,0 +1,2 @@ +#!/bin/bash +wget http://icc.dur.ac.uk/swift/Files/EAGLE_ICs_25.hdf5 diff --git a/examples/EAGLE_25/run.sh b/examples/EAGLE_25/run.sh new file mode 100755 index 0000000000000000000000000000000000000000..f232cf98f772ab9900bd22b635090e3c103749b5 --- /dev/null +++ b/examples/EAGLE_25/run.sh @@ -0,0 +1,11 @@ +#!/bin/bash + + # Generate the initial conditions if they are not present. +if [ ! -e EAGLE_ICs_25.hdf5 ] +then + echo "Fetching initial conditions for the EAGLE 25Mpc example..." + ./getIC.sh +fi + +../swift -s -t 16 eagle_25.yml + diff --git a/src/parallel_io.c b/src/parallel_io.c index c5cac1cb5efc6e533e599867e39cdd7c7b2c87fa..0430fce658fdb10c41dcf23b09880747811a3950 100644 --- a/src/parallel_io.c +++ b/src/parallel_io.c @@ -486,7 +486,7 @@ void read_ic_parallel(char* fileName, double dim[3], struct part** parts, break; default: - error("Particle Type %d not yet supported. Aborting", ptype); + message("Particle Type %d not yet supported. Particles ignored", ptype); } /* Close particle group */ diff --git a/src/serial_io.c b/src/serial_io.c index 7e78276dc83430655b4ea4de2fb7425e71e07966..de756a1974ce098d1f400e5e86a1ac0bc0763e92 100644 --- a/src/serial_io.c +++ b/src/serial_io.c @@ -562,7 +562,7 @@ void read_ic_serial(char* fileName, double dim[3], struct part** parts, break; default: - error("Particle Type %d not yet supported. Aborting", ptype); + message("Particle Type %d not yet supported. Particles ignored", ptype); } /* Close particle group */ diff --git a/src/single_io.c b/src/single_io.c index 3f65aae0b5d495670f2b4862e466ec849f997d63..d7c39cb729a9c52cd0413ee14410b3a2157196c0 100644 --- a/src/single_io.c +++ b/src/single_io.c @@ -436,7 +436,7 @@ void read_ic_single(char* fileName, double dim[3], struct part** parts, break; default: - error("Particle Type %d not yet supported. Aborting", ptype); + message("Particle Type %d not yet supported. Particles ignored", ptype); } /* Close particle group */