Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compas_python_utils/preprocessing/compasConfigDefault.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ numericalChoices:
# --hdf5-buffer-size: 1 # Default: 1
# --log-level: 0 # Default: 0
# --mass-change-fraction: 0.001000 # Default: 0.001000 # approximate desired fractional changes in stellar mass per timestep
# --maximum-evolution-time: 14021.28 # Default: 14021.28 # maximum physical time a system can be evolved [Myr]
# --maximum-evolution-time: 13800 # Default: 13800 Myr # maximum physical time a system can be evolved [Myr]
# --maximum-number-timestep-iterations: 99999 # Default: 99999
# --number-of-systems: 10 # Default: 10 # number of systems per batch
# --radial-change-fraction: 0.100000 # Default: 0.100000 # approximate desired fractional changes in stellar radius per timestep
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,8 @@ Default = 10.0

**--maximum-evolution-time** |br|
Maximum time to evolve binaries (Myr). Evolution of the binary will stop if this number is reached. |br|
Default = 13700.0
Set to 13800 Myr as the approximate age of the Universe cf. WMPA and Planck. |br|
Default = 13800

**--maximum-mass-donor-nandez-ivanova** |br|
Maximum donor mass allowed for the revised common envelope formalism of Nandez & Ivanova (:math:`M_\odot`). |br|
Expand Down
4 changes: 2 additions & 2 deletions src/Options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ void Options::OptionValues::Initialise() {
m_RandomSeed = 0;

// Specify how long to evolve for
m_MaxEvolutionTime = HUBBLE_TIME / SECONDS_IN_MYR; //13700.0;
m_MaxEvolutionTime = 13800; // in Myr; approximate age of the Universe cf. WMPA and Planck. ;
m_MaxNumberOfTimestepIterations = 99999;
m_TimestepsFileName = "";

Expand Down Expand Up @@ -2618,7 +2618,7 @@ std::string Options::OptionValues::CheckAndSetOptions() {
COMPLAIN_IF(m_MassRatioDistributionMax <= m_MassRatioDistributionMin, "Maximum mass ratio (--mass-ratio-max) must be > Minimum mass ratio (--mass-ratio-min)");

COMPLAIN_IF(m_MaxEvolutionTime <= 0.0, "Maximum evolution time in Myr (--maxEvolutionTime) must be > 0");
COMPLAIN_IF(m_MaxEvolutionTime > HUBBLE_TIME / SECONDS_IN_MYR, "Maximum evolution time in Myr (--maxEvolutionTime) must be <= " + std::to_string(HUBBLE_TIME / SECONDS_IN_MYR) + " Myr");
COMPLAIN_IF(m_MaxEvolutionTime > 13800, "Maximum evolution time in Myr (--maxEvolutionTime) must be <= " + std::to_string(13800) + " Myr");

COMPLAIN_IF(m_Metallicity < MINIMUM_METALLICITY || m_Metallicity > MAXIMUM_METALLICITY, "Metallicity (--metallicity) should be absolute metallicity and must be between " + std::to_string(MINIMUM_METALLICITY) + " and " + std::to_string(MAXIMUM_METALLICITY));
COMPLAIN_IF(m_MetallicityDistributionMin < MINIMUM_METALLICITY || m_MetallicityDistributionMin > MAXIMUM_METALLICITY, "Minimum metallicity (--metallicity-min) must be between " + std::to_string(MINIMUM_METALLICITY) + " and " + std::to_string(MAXIMUM_METALLICITY));
Expand Down
Loading