Fixed logical flaw in if/else

Author: ilyamandel

src/BaseBinaryStar.cpp

@@ -1526,7 +1526,7 @@ void BaseBinaryStar::ResolveCommonEnvelopeEvent() {
             m_Flags.stellarMerger        = true;
         }
     }
-	else {
+	if (!m_Flags.stellarMerger) {
 
         STELLAR_TYPE stellarType1 = m_Star1->StellarType();                                                             // star 1 stellar type before resolving envelope loss
         STELLAR_TYPE stellarType2 = m_Star2->StellarType();                                                             // star 2 stellar type before resolving envelope loss

src/HG.cpp

@@ -751,7 +751,7 @@ double HG::CalculateZeta(ZETA_PRESCRIPTION p_ZetaPrescription) {
  */
 ENVELOPE HG::DetermineEnvelopeType() const {
 
-    ENVELOPE envelope = ENVELOPE::RADIATIVE;                                                         // default envelope type  is RADIATIVE
+    ENVELOPE envelope = ENVELOPE::RADIATIVE;                                                         // default envelope type is RADIATIVE
 
     switch (OPTIONS->EnvelopeStatePrescription()) {                                                  // which envelope prescription?
 

src/HeHG.cpp

@@ -325,7 +325,7 @@ double HeHG::CalculateLambdaNanjing() const {
  */
 ENVELOPE HeHG::DetermineEnvelopeType() const {
 
-    ENVELOPE envelope = ENVELOPE::RADIATIVE;                                                         // default envelope type  is RADIATIVE
+    ENVELOPE envelope = ENVELOPE::RADIATIVE;                                                         // default envelope type is RADIATIVE
 
     switch (OPTIONS->EnvelopeStatePrescription()) {                                                  // which envelope prescription?
 

src/constants.h

@@ -2623,7 +2623,7 @@ const std::map<ANY_STAR_PROPERTY, PROPERTY_DETAILS> ANY_STAR_PROPERTY_DETAIL = {
     { ANY_STAR_PROPERTY::ZETA_HURLEY,                                       { TYPENAME::DOUBLE,         "Zeta_Hurley",          "-",                14, 6 }},
     { ANY_STAR_PROPERTY::ZETA_HURLEY_HE,                                    { TYPENAME::DOUBLE,         "Zeta_Hurley_He",       "-",                14, 6 }},
     { ANY_STAR_PROPERTY::ZETA_SOBERMAN,                                     { TYPENAME::DOUBLE,         "Zeta_Soberman",        "-",                14, 6 }},
-    { ANY_STAR_PROPERTY::ZETA_SOBERMAN_HE,                                  { TYPENAME::DOUBLE,         "Zeta_SoberMan_He",     "-",                14, 6 }}
+    { ANY_STAR_PROPERTY::ZETA_SOBERMAN_HE,                                  { TYPENAME::DOUBLE,         "Zeta_Soberman_He",     "-",                14, 6 }}
 };
 
 // map BINARY_PROPERTY_DETAIL

utils/example_plots/methods_paper_plots/detailed_evolution/pythonSubmitDemo.py

@@ -186,7 +186,7 @@ class pythonProgramOptions:
     common_envelope_mass_accretion_max = 0.10                   # For 'MACLEOD+2014' [Msol]
     envelope_state_prescription = 'LEGACY'
     common_envelope_allow_radiative_envelope_survive = False
-    common_envelope_allow_immediate_RLOF_post_CE_survive = False
+    common_envelope_allow_immediate_RLOF_post_CE_survive = True
 
     mass_loss_prescription = 'VINK'
     luminous_blue_variable_prescription = 'HURLEY_ADD'