From c78ca291c395266ef54483600ad227cf4f21dfd8 Mon Sep 17 00:00:00 2001 From: Jeff Riley Date: Fri, 23 Aug 2024 10:42:26 -0600 Subject: [PATCH 1/3] Fix for issue #1179: Remove unsupported option value (FIXED) for options PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION and PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION - Remove BeBinary-related code (mostly already commented) --- .../Handling errors/error-table.rst | 4 - src/BaseBinaryStar.cpp | 75 ------------------- src/BaseBinaryStar.h | 10 --- src/ErrorCatalog.h | 4 - src/NS.cpp | 18 ----- src/changelog.h | 9 ++- src/typedefs.h | 35 +-------- 7 files changed, 8 insertions(+), 147 deletions(-) diff --git a/online-docs/pages/User guide/Handling errors/error-table.rst b/online-docs/pages/User guide/Handling errors/error-table.rst index 4e553760e..8f3e31980 100644 --- a/online-docs/pages/User guide/Handling errors/error-table.rst +++ b/online-docs/pages/User guide/Handling errors/error-table.rst @@ -313,10 +313,6 @@ Following is a list of COMPAS error numbers, corresponding symbolic name, and me Unknown rotational velocity prescription #. UNKNOWN_ZETA_PRESCRIPTION |br| Unknown stellar ZETA prescription -#. UNSUPPORTED_PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION |br| - Unsupported pulsar birth magnetic field distribution -#. UNSUPPORTED_PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION |br| - Unsupported pulsar birth spin period distribution #. WARNING |br| Unspecified warning #. WHITE_DWARF_TOO_MASSIVE |br| diff --git a/src/BaseBinaryStar.cpp b/src/BaseBinaryStar.cpp index f3a80d49f..357dea9d6 100644 --- a/src/BaseBinaryStar.cpp +++ b/src/BaseBinaryStar.cpp @@ -477,42 +477,6 @@ void BaseBinaryStar::SetRemainingValues() { m_RLOFDetails.propsPreMT = &m_RLOFDetails.props2; - // BeBinary details - properties 1 -// m_BeBinaryDetails.props1.id = -1l; -// -// m_BeBinaryDetails.props1.dt = DEFAULT_INITIAL_DOUBLE_VALUE; -// m_BeBinaryDetails.props1.totalTime = DEFAULT_INITIAL_DOUBLE_VALUE; -// -// m_BeBinaryDetails.props1.massNS = DEFAULT_INITIAL_DOUBLE_VALUE; -// -// m_BeBinaryDetails.props1.companionMass = DEFAULT_INITIAL_DOUBLE_VALUE; -// m_BeBinaryDetails.props1.companionLuminosity = DEFAULT_INITIAL_DOUBLE_VALUE; -// m_BeBinaryDetails.props1.companionTeff = DEFAULT_INITIAL_DOUBLE_VALUE; -// m_BeBinaryDetails.props1.companionRadius = DEFAULT_INITIAL_DOUBLE_VALUE; -// -// m_BeBinaryDetails.props1.semiMajorAxis = DEFAULT_INITIAL_DOUBLE_VALUE; -// m_BeBinaryDetails.props1.eccentricity = DEFAULT_INITIAL_DOUBLE_VALUE; - - // BeBinary details - properties 2 -// m_BeBinaryDetails.props2.id = -1l; -// -// m_BeBinaryDetails.props2.dt = DEFAULT_INITIAL_DOUBLE_VALUE; -// m_BeBinaryDetails.props2.totalTime = DEFAULT_INITIAL_DOUBLE_VALUE; -// -// m_BeBinaryDetails.props2.massNS = DEFAULT_INITIAL_DOUBLE_VALUE; -// -// m_BeBinaryDetails.props2.companionMass = DEFAULT_INITIAL_DOUBLE_VALUE; -// m_BeBinaryDetails.props2.companionLuminosity = DEFAULT_INITIAL_DOUBLE_VALUE; -// m_BeBinaryDetails.props2.companionTeff = DEFAULT_INITIAL_DOUBLE_VALUE; -// m_BeBinaryDetails.props2.companionRadius = DEFAULT_INITIAL_DOUBLE_VALUE; -// -// m_BeBinaryDetails.props2.semiMajorAxis = DEFAULT_INITIAL_DOUBLE_VALUE; -// m_BeBinaryDetails.props2.eccentricity = DEFAULT_INITIAL_DOUBLE_VALUE; - - // BeBinary details - current/prev props pointers -// m_BeBinaryDetails.currentProps = &m_BeBinaryDetails.props1; -// m_BeBinaryDetails.previousProps = &m_BeBinaryDetails.props2; - // pointers m_Donor = nullptr; @@ -912,43 +876,6 @@ void BaseBinaryStar::StashRLOFProperties(const MT_TIMING p_Which) { } -/* - * Squirrel BeBinaries properties away - * - * Various binary property values are stashed into the m_BeBinaryDetails.currentProps struct for use/printing later - * The existing m_BeBinaryDetails.currentProps struct is copied to the m_BeBinaryDetails.previousProps struct first - * (actually there is no copying - just switch pointers...) - * - * - * void StashBeBinaryProperties() - */ -//void BaseBinaryStar::StashBeBinaryProperties() { -// -// if (!OPTIONS->BeBinaries() || !IsBeBinary()) return; // nothing to do; -// -// // switch previous<->current (preserves existing current as (new) previous) -// BeBinaryPropertiesT* tmp = m_BeBinaryDetails.previousProps; // save pointer to existing previous props -// m_BeBinaryDetails.previousProps = m_BeBinaryDetails.currentProps; // existing current props become new previous props (values will be preserved) -// m_BeBinaryDetails.currentProps = tmp; // new current props points at existing previous (values will be replaced) -// -// // now save (new) current -// m_BeBinaryDetails.currentProps->id = m_ObjectId; // object id -// m_BeBinaryDetails.currentProps->dt = m_Dt; // timestep -// m_BeBinaryDetails.currentProps->totalTime = m_BeBinaryDetails.previousProps->dt + m_Dt; // total time - accumulate, don't just replace -// m_BeBinaryDetails.currentProps->semiMajorAxis = m_SemiMajorAxis * AU_TO_RSOL; // semi-major axis - change units to Rsol -// m_BeBinaryDetails.currentProps->eccentricity = m_Eccentricity; // eccentricity -// -// BinaryConstituentStar* neutronStar = m_Star1->IsOneOf({ STELLAR_TYPE::NEUTRON_STAR }) ? m_Star1 : m_Star2; // pointer to neutron star -// BinaryConstituentStar* companionStar = m_Star1->IsOneOf({ STELLAR_TYPE::NEUTRON_STAR }) ? m_Star2 : m_Star1; // pointer to companion -// -// m_BeBinaryDetails.currentProps->massNS = neutronStar->Mass(); // neutron star mass -// m_BeBinaryDetails.currentProps->companionMass = companionStar->Mass(); // companion mass -// m_BeBinaryDetails.currentProps->companionLuminosity = companionStar->Luminosity(); // companion luminosity -// m_BeBinaryDetails.currentProps->companionTeff = companionStar->Temperature(); // companion temperature -// m_BeBinaryDetails.currentProps->companionRadius = companionStar->Radius(); // companion radius -//} - - /* * Calculate (or set) pre common envelope values for the binary: * @@ -2753,8 +2680,6 @@ EVOLUTION_STATUS BaseBinaryStar::Evolve() { if (HasOneOf({ STELLAR_TYPE::NEUTRON_STAR })) { (void)PrintPulsarEvolutionParameters(PULSAR_RECORD_TYPE::POST_BINARY_TIMESTEP); // print (log) pulsar evolution parameters } - - //(void)PrintBeBinary(); // print (log) BeBinary properties if (IsDCO() && !IsUnbound()) { // bound double compact object? if (m_DCOFormationTime == DEFAULT_INITIAL_DOUBLE_VALUE) { // DCO not yet evaluated -- to ensure that the coalescence is only resolved once diff --git a/src/BaseBinaryStar.h b/src/BaseBinaryStar.h index 906388f17..9a187d071 100644 --- a/src/BaseBinaryStar.h +++ b/src/BaseBinaryStar.h @@ -41,11 +41,6 @@ class BaseBinaryStar { m_RandomSeed = p_Star.m_RandomSeed; -// m_BeBinaryDetails = p_Star.m_BeBinaryDetails; - -// m_BeBinaryDetails.currentProps = p_Star.m_BeBinaryDetails.currentProps == &(p_Star.m_BeBinaryDetails.props1) ? &(m_BeBinaryDetails.props1) : &(m_BeBinaryDetails.props2); -// m_BeBinaryDetails.previousProps = p_Star.m_BeBinaryDetails.previousProps == &(p_Star.m_BeBinaryDetails.props1) ? &(m_BeBinaryDetails.props1) : &(m_BeBinaryDetails.props2); - m_CircularizationTimescale = p_Star.m_CircularizationTimescale; m_CEDetails = p_Star.m_CEDetails; @@ -162,7 +157,6 @@ class BaseBinaryStar { // getters - alphabetically -// BeBinaryDetailsT BeBinaryDetails() const { return m_BeBinaryDetails; } bool CEAtLeastOnce() const { return m_CEDetails.CEEcount > 0; } unsigned int CEEventCount() const { return m_CEDetails.CEEcount; } double CircularizationTimescale() const { return m_CircularizationTimescale; } @@ -186,7 +180,6 @@ class BaseBinaryStar { bool ImmediateRLOFPostCEE() const { return m_RLOFDetails.immediateRLOFPostCEE; } STELLAR_TYPE InitialStellarType1() const { return m_Star1->InitialStellarType(); } STELLAR_TYPE InitialStellarType2() const { return m_Star2->InitialStellarType(); } - bool IsBeBinary() const { return HasOneOf({STELLAR_TYPE::NEUTRON_STAR}) && HasOneOf({STELLAR_TYPE::MS_LTE_07, STELLAR_TYPE::MS_GT_07}); } bool IsHMXRBinary() const; bool IsBHandBH() const { return HasTwoOf({STELLAR_TYPE::BLACK_HOLE}); } bool IsDCO() const { return HasTwoOf({STELLAR_TYPE::NEUTRON_STAR, STELLAR_TYPE::BLACK_HOLE}); } @@ -298,8 +291,6 @@ class BaseBinaryStar { unsigned long int m_RandomSeed; // Random seed for this binary -// BeBinaryDetailsT m_BeBinaryDetails; // BeBinary details - BinaryCEDetailsT m_CEDetails; // Common Event details double m_CircularizationTimescale; @@ -484,7 +475,6 @@ class BaseBinaryStar { const double p_RocheLobe1to2, const double p_RocheLobe2to1); - void StashBeBinaryProperties(); void StashRLOFProperties(const MT_TIMING p_Which); void UpdateSystemicVelocity(Vector3d p_newVelocity) { m_SystemicVelocity += p_newVelocity; } diff --git a/src/ErrorCatalog.h b/src/ErrorCatalog.h index d32190b97..ea0b6a707 100644 --- a/src/ErrorCatalog.h +++ b/src/ErrorCatalog.h @@ -193,8 +193,6 @@ enum class ERROR: int { UNKNOWN_VROT_PRESCRIPTION, // unknown rorational velocity prescription UNKNOWN_WR_MASS_LOSS_PRESCRIPTION, // unknown WR mass loss prescription UNKNOWN_ZETA_PRESCRIPTION, // unknown stellar ZETA prescription - UNSUPPORTED_PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION, // unsupported pulsar birth magnetic field distribution - UNSUPPORTED_PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION, // unsupported pulsar birth spin period distribution WARNING, // unspecified warning WHITE_DWARF_TOO_MASSIVE, // a white dwarf exceeds the Chandrasekhar mass limit @@ -367,8 +365,6 @@ const COMPASUnorderedMap> ERROR_CATA { ERROR::UNKNOWN_VMS_MASS_LOSS_PRESCRIPTION, { ERROR_SCOPE::ALWAYS, "Unknown VMS mass loss prescription" }}, { ERROR::UNKNOWN_VROT_PRESCRIPTION, { ERROR_SCOPE::ALWAYS, "Unknown rotational velocity prescription" }}, { ERROR::UNKNOWN_ZETA_PRESCRIPTION, { ERROR_SCOPE::ALWAYS, "Unknown stellar ZETA prescription" }}, - { ERROR::UNSUPPORTED_PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION, { ERROR_SCOPE::ALWAYS, "Unsupported pulsar birth magnetic field distribution" }}, - { ERROR::UNSUPPORTED_PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION, { ERROR_SCOPE::ALWAYS, "Unsupported pulsar birth spin period distribution" }}, { ERROR::WARNING, { ERROR_SCOPE::ALWAYS, "Warning!" }}, { ERROR::WHITE_DWARF_TOO_MASSIVE, { ERROR_SCOPE::ALWAYS, "This white dwarf exceeds the Chandrasekhar mass limit" }}, { ERROR::UNKNOWN_WR_MASS_LOSS_PRESCRIPTION, { ERROR_SCOPE::ALWAYS, "Unknown WR mass loss prescription" }} diff --git a/src/NS.cpp b/src/NS.cpp index 7af4c8103..5e0bf5782 100755 --- a/src/NS.cpp +++ b/src/NS.cpp @@ -152,15 +152,6 @@ double NS::CalculateBirthSpinPeriod() { pSpin = 0.0; break; - // JR: Unsupported? This is the only places in the code PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION::FIXED - // appears - can we remove FIXED from the available options so the user can't choose it (deprecate it)? - // If we ever decide to support it we can put it back in then. It doesn't seem right to present it to - // users as an option only to say we don't support it once they choose it. **Ilya** - case PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION::FIXED: // FIXED constant value as used in default model in Oslowski et al 2011 https://arxiv.org/abs/0903.3538 - SHOW_WARN_STATIC(ERROR::UNSUPPORTED_PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION, "Using spin = 0.0"); // show warning - pSpin = 0.0; - break; - case PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION::UNIFORM: { // UNIFORM distribution between minimum and maximum value as in Oslowski et al 2011 https://arxiv.org/abs/0903.3538 (default Pmin = and Pmax = ) // and also Kiel et al 2008 https://arxiv.org/abs/0805.0059 (default Pmin = 10 ms and Pmax 100 ms, section 3.4) double maximum = OPTIONS->PulsarBirthSpinPeriodDistributionMax(); @@ -215,15 +206,6 @@ double NS::CalculateBirthMagneticField() { log10B = 0.0; break; - // JR: Unsupported? This is the only places in the code PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION::FIXED - // appears - can we remove FIXED from the available options so the user can't choose it (deprecate it)? - // If we ever decide to support it we can put it back in then. It doesn't seem right to present it to - // users as an option only to say we don't support it once they choose it. **Ilya** - case PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION::FIXED: // FIXED - set to a fixed constant value - SHOW_WARN(ERROR::UNSUPPORTED_PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION, "Using 0.0"); // show warning - log10B = 0.0; - break; - case PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION::FLATINLOG: { // FLAT IN LOG distribution from Oslowski et al 2011 https://arxiv.org/abs/0903.3538 (log10B0min = , log10B0max = ) double maximum = OPTIONS->PulsarBirthMagneticFieldDistributionMax(); diff --git a/src/changelog.h b/src/changelog.h index 203a701d5..ab8484f8a 100644 --- a/src/changelog.h +++ b/src/changelog.h @@ -1257,14 +1257,17 @@ // - Typo fixes // 03.00.03 JR - Aug 21, 2024 - Defect repair: // - Fix for issue 1184: Segmentation Fault (Core Dumped) Encountered in COMPAS V3.0 with "--common-envelope-formalism TWO_STAGE" -// 03.00.04 JR - Aug 22, 2024 - Defect repairs: +// 03.00.04 JR - Aug 22, 2024 - Defect repair: // - Fix for issue #1182: Switch log issue -// 03.00.05 JR - Aug 22, 2024 - Defect repairs: +// 03.00.05 JR - Aug 22, 2024 - Defect repair: // - Reinstate correctly functioning code for floating-point error handling for Linux // - Disable floating-point error handling for MacOS - until I can figure out how to // make it work properly for both INTEL and ARM architectures. +// 03.00.06 JR - Aug 23, 2024 - Defect repair, code cleanup: +// - Fix for issue #1179: Remove unsupported option value (FIXED) for options PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION and PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION +// - Remove BeBinary-related code (mostly already commented) -const std::string VERSION_STRING = "03.00.05"; +const std::string VERSION_STRING = "03.00.06"; # endif // __changelog_h__ diff --git a/src/typedefs.h b/src/typedefs.h index 0f7da7ae8..08f56dd03 100755 --- a/src/typedefs.h +++ b/src/typedefs.h @@ -748,20 +748,18 @@ const COMPASUnorderedMap PPI_PRESCRIPTION_LABEL = enum class PROGRAM_STATUS: int { SUCCESS, CONTINUE, STOPPED, ERROR_IN_COMMAND_LINE, LOGGING_FAILED, ERROR_UNHANDLED_EXCEPTION }; // pulsar birth magnetic field distributions -enum class PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION: int { ZERO, FIXED, FLATINLOG, UNIFORM, LOGNORMAL }; +enum class PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION: int { ZERO, FLATINLOG, UNIFORM, LOGNORMAL }; const COMPASUnorderedMap PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION_LABEL = { { PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION::ZERO, "ZERO" }, - { PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION::FIXED, "FIXED" }, { PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION::FLATINLOG, "FLATINLOG" }, { PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION::UNIFORM, "UNIFORM" }, { PULSAR_BIRTH_MAGNETIC_FIELD_DISTRIBUTION::LOGNORMAL, "LOGNORMAL" } }; // pulsar birth spin period distributions -enum class PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION: int { ZERO, FIXED, UNIFORM, NORMAL }; +enum class PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION: int { ZERO, UNIFORM, NORMAL }; const COMPASUnorderedMap PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION_LABEL = { { PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION::ZERO, "ZERO" }, - { PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION::FIXED, "FIXED" }, { PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION::UNIFORM, "UNIFORM" }, { PULSAR_BIRTH_SPIN_PERIOD_DISTRIBUTION::NORMAL, "NORMAL" } }; @@ -1242,35 +1240,6 @@ typedef struct StellarRLOFDetails { // RLOF details pert bool RLOFPostCEE; } StellarRLOFDetailsT; - -// BeBinary properties -// JR: add descriptive comments -//typedef struct BeBinaryProperties { -// OBJECT_ID id; -// -// double dt; -// double totalTime; -// -// double massNS; -// -// double companionMass; -// double companionLuminosity; -// double companionTeff; -// double companionRadius; -// -// double semiMajorAxis; -// double eccentricity; -//} BeBinaryPropertiesT; - -// JR: add descriptive comments -//typedef struct BeBinaryDetails { -// BeBinaryPropertiesT props1; -// BeBinaryPropertiesT props2; -// BeBinaryPropertiesT* currentProps; -// BeBinaryPropertiesT* previousProps; -//} BeBinaryDetailsT; - - // Common Envelope properties // JR: add descriptive comments typedef struct BinaryCEESavedValues { From 60f0a2ae6d43c8b2f75c23899bc384c197eb9f9c Mon Sep 17 00:00:00 2001 From: Jeff Riley Date: Sat, 24 Aug 2024 20:06:40 -0600 Subject: [PATCH 2/3] Remove unnecessary statement --- src/Options.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Options.h b/src/Options.h index e9474134f..663545b13 100755 --- a/src/Options.h +++ b/src/Options.h @@ -691,12 +691,11 @@ class Options { std::vector m_Notes; // Notes contents - for user-defined annotations std::vector m_NotesHdrs; // Notes header strings - for user-defined annotations - bool m_BeBinaries; // Flag if we want to print BeBinaries (main.cpp) bool m_HMXRBinaries; // Flag if we want to store HMXRBs in RLOF output file bool m_EvolveDoubleWhiteDwarfs; // Whether to evolve double white dwarfs or not bool m_EvolvePulsars; // Whether to evolve pulsars or not bool m_NatalKickForPPISN; // Flag if PPISN remnant should receive a non-zero natal kick - bool m_EvolveUnboundSystems; // Option to chose if unbound systems are evolved until death or the evolution stops after the system is unbound during a SN. + bool m_EvolveUnboundSystems; // Option to chose if unbound systems are evolved until death or the evolution stops after the system is unbound during a SN. bool m_EvolveMainSequenceMergers; // Option to evolve binaries in which two stars merged on the main sequence bool m_EmitGravitationalRadiation; // Option to emit gravitational radiation for each timestep of binary evolution From 51d5bd476a1644a55b4694e395871673b8127a2e Mon Sep 17 00:00:00 2001 From: Jeff Riley Date: Sat, 24 Aug 2024 20:56:53 -0600 Subject: [PATCH 3/3] Updated Options.cpp, Options.h --- src/Options.cpp | 23 ----------------------- src/Options.h | 5 ----- 2 files changed, 28 deletions(-) diff --git a/src/Options.cpp b/src/Options.cpp index fdb3199e0..64ed3a7d1 100644 --- a/src/Options.cpp +++ b/src/Options.cpp @@ -163,7 +163,6 @@ void Options::OptionValues::Initialise() { m_FPErrorMode.type = FP_ERROR_MODE::OFF; m_FPErrorMode.typeString = FP_ERROR_MODE_LABEL.at(m_FPErrorMode.type); - m_BeBinaries = false; m_HMXRBinaries = false; m_EvolveDoubleWhiteDwarfs = false; @@ -584,7 +583,6 @@ void Options::OptionValues::Initialise() { m_LogfileType.type = LOGFILETYPE::HDF5; m_LogfileType.typeString = LOGFILETYPELabel.at(m_LogfileType.type); - m_LogfileBeBinariesRecordTypes = -1; // all record types m_LogfileCommonEnvelopes = std::get<0>(LOGFILE_DESCRIPTOR.at(LOGFILE::BSE_COMMON_ENVELOPES)); m_LogfileCommonEnvelopesRecordTypes = -1; // all record types m_LogfileDetailedOutput = std::get<0>(LOGFILE_DESCRIPTOR.at(LOGFILE::BSE_DETAILED_OUTPUT)); // assume BSE - get real answer when we know mode @@ -721,13 +719,6 @@ bool Options::AddOptions(OptionValues *p_Options, po::options_description *p_Opt ("Conserve angular momentum when binary is circularised when entering a Mass Transfer episode (default = " + std::string(p_Options->m_AngularMomentumConservationDuringCircularisation ? "TRUE" : "FALSE") + ")").c_str() ) - /* - ( - "BE-binaries", - po::value(&p_Options->m_BeBinaries)->default_value(p_Options->m_BeBinaries)->implicit_value(true), - ("Enable Be Binaries study (default = " + std::string(p_Options->m_BeBinaries ? "TRUE" : "FALSE") + ")").c_str() - ) - */ ( "check-photon-tiring-limit", po::value(&p_Options->m_CheckPhotonTiringLimit)->default_value(p_Options->m_CheckPhotonTiringLimit)->implicit_value(true), @@ -951,13 +942,6 @@ bool Options::AddOptions(OptionValues *p_Options, po::options_description *p_Opt ("HDF5 file dataset IO buffer size (number of chunks, default = " + std::to_string(p_Options->m_HDF5BufferSize) + ")").c_str() ) - /* - ( - "logfile-BE-binaries-record-types", - po::value(&p_Options->m_LogfileBeBinariesRecordTypes)->default_value(p_Options->m_LogfileBeBinariesRecordTypes), - ("Enabled record types for BSE Be Binaries logfile (default = " + std::to_string(p_Options->m_LogfileBeBinariesRecordTypes) + ")").c_str() - ) - */ ( "logfile-common-envelopes-record-types", po::value(&p_Options->m_LogfileCommonEnvelopesRecordTypes)->default_value(p_Options->m_LogfileCommonEnvelopesRecordTypes), @@ -1719,13 +1703,6 @@ bool Options::AddOptions(OptionValues *p_Options, po::options_description *p_Opt ("Natal kick magnitude distribution (" + AllowedOptionValuesFormatted("kick-magnitude-distribution") + ", default = '" + p_Options->m_KickMagnitudeDistribution.typeString + "')").c_str() ) - /* - ( - "logfile-BE-binaries", - po::value(&p_Options->m_LogfileBeBinaries)->default_value(p_Options->m_LogfileBeBinaries), - ("Filename for BSE Be Binaries logfile (default = " + p_Options->m_LogfileBeBinaries + ")").c_str() - ) - */ ( "logfile-rlof-parameters", diff --git a/src/Options.h b/src/Options.h index 663545b13..ed580b3f8 100755 --- a/src/Options.h +++ b/src/Options.h @@ -1033,7 +1033,6 @@ class Options { std::string m_LogfileSupernovae; // output file name: supernovae std::string m_LogfileCommonEnvelopes; // output file name: common envelopes std::string m_LogfileRLOFParameters; // output file name: Roche Lobe overflow - std::string m_LogfileBeBinaries; // output file name: Be Binaries std::string m_LogfilePulsarEvolution; // output file name: pulsar evolution std::string m_LogfileSwitchLog; // output file name: switch log @@ -1043,7 +1042,6 @@ class Options { int m_LogfileSupernovaeRecordTypes; // enabled record types: supernovae int m_LogfileCommonEnvelopesRecordTypes; // enabled record types: common envelopes int m_LogfileRLOFParametersRecordTypes; // enabled record types: Roche Lobe overflow - int m_LogfileBeBinariesRecordTypes; // enabled record types: Be Binaries int m_LogfilePulsarEvolutionRecordTypes; // enabled record types: pulsar evolution ENUM_OPT m_AddOptionsToSysParms; // Whether/when to add program option columns to BSE/SSE sysparms file @@ -1233,7 +1231,6 @@ class Options { bool AllowTouchingAtBirth() const { return OPT_VALUE("allow-touching-at-birth", m_AllowTouchingAtBirth, true); } bool AngularMomentumConservationDuringCircularisation() const { return OPT_VALUE("angular-momentum-conservation-during-circularisation", m_AngularMomentumConservationDuringCircularisation, true); } - bool BeBinaries() const { return OPT_VALUE("be-binaries", m_BeBinaries, true); } BLACK_HOLE_KICKS_MODE BlackHoleKicksMode() const { return OPTIONS->OptionSpecified("black-hole-kicks-mode") ? OPT_VALUE("black-hole-kicks-mode", m_BlackHoleKicksMode.type, true) : OPT_VALUE("black-hole-kicks", m_BlackHoleKicksMode.type, true); } // black-hole-kicks DEPRECATED June 2024 - remove end 2024 @@ -1337,8 +1334,6 @@ class Options { double KickMagnitudeRandom2() const { return OPT_VALUE("kick-magnitude-random-2", m_KickMagnitudeRandom2, true); } std::vector LogClasses() const { return m_CmdLine.optionValues.m_LogClasses; } - std::string LogfileBeBinaries() const { return m_CmdLine.optionValues.m_LogfileBeBinaries; } - int LogfileBeBinariesRecordTypes() const { return m_CmdLine.optionValues.m_LogfileBeBinariesRecordTypes; } std::string LogfileCommonEnvelopes() const { return m_CmdLine.optionValues.m_LogfileCommonEnvelopes; } int LogfileCommonEnvelopesRecordTypes() const { return m_CmdLine.optionValues.m_LogfileCommonEnvelopesRecordTypes; } std::string LogfileDefinitionsFilename() const { return m_CmdLine.optionValues.m_LogfileDefinitionsFilename; }