Merge pull request #566 from TomWagg/lbv_defaults

Change default LBV wind prescription 💨

Author: jeffriley

defaults/pythonSubmit.py

@@ -138,7 +138,7 @@ class pythonProgramOptions:
     envelope_state_prescription = 'LEGACY'
 
     mass_loss_prescription = 'VINK'
-    luminous_blue_variable_prescription = 'BELCZYNSKI'
+    luminous_blue_variable_prescription = 'HURLEY_ADD'
     luminous_blue_variable_multiplier = 1.5
     overall_wind_mass_loss_multiplier = 1.0
     wolf_rayet_multiplier = 1.0

docs/COMPAS_Doc.pdf

@@ -167,7 +167,7 @@ \section{Program Options}\label{sec:ProgramOptionsAppendix}
 
 \programOption{log-level}{}{Determines which print statements are included in the logfile.}{0}
 
-\programOption{luminous-blue-variable-prescription}{}{Luminous blue variable mass loss prescription. \\ Options: \lcb\ NONE, HURLEY, HURLEY\_ADD, BELCZYNSKI\ \rcb}{BELCZYNSKI}
+\programOption{luminous-blue-variable-prescription}{}{Luminous blue variable mass loss prescription. \\ Options: \lcb\ NONE, HURLEY, HURLEY\_ADD, BELCZYNSKI\ \rcb}{HURLEY\_ADD}
 
 \programOption{luminous-blue-variable-multiplier}{}{Multiplicative constant for LBV mass loss. (Use 10 for \citet{Mennekens_2014})  Note that wind mass loss will also be multiplied by the overall-wind-mass-loss-multiplier. }{1.5}
 

docs/COMPAS_LaTex/sections/Appendices/ProgramOptions.tex

@@ -82,6 +82,7 @@
 \revisionHistoryRow{19 February 2021}{2.14}{Added descriptions for options rotational-frequency, rotational-frequency-1, and rotational-frequency-2}{Jeff Riley}
 \revisionHistoryRow{06 April 2021}{2.15}{Added FARMER prescription for option pulsational-pair-instability-prescription}{Lieke van Son}
 \revisionHistoryRow{20 April 2021}{2.16}{Added option add-options-to-sysparms}{Jeff Riley}
+\revisionHistoryRow{18 May 2021}{2.17}{Changed default LBV prescription}{Tom Wagg}
 
 \end{tabularx}  % why is this too wide?
 \normalsize

docs/COMPAS_LaTex/sections/RevisionHistory.tex

@@ -1494,8 +1494,8 @@ double BaseStar::CalculateMassLossRateLBV(const LBV_PRESCRIPTION p_LBV_prescript
                 rate = CalculateMassLossRateLBVBelczynski();
                 break;
             default:
-                SHOW_WARN(ERROR::UNKNOWN_LBV_PRESCRIPTION, "Using default value BELCZYNSKI");
-                rate = CalculateMassLossRateLBVBelczynski();
+                SHOW_WARN(ERROR::UNKNOWN_LBV_PRESCRIPTION, "Using default value HURLEY_ADD");
+                rate = CalculateMassLossRateLBVHurley(HD_limit_factor);
                 break;
         }
     } else {

src/BaseStar.cpp

@@ -326,7 +326,7 @@ void Options::OptionValues::Initialise() {
     m_MassLossPrescription.type                                     = MASS_LOSS_PRESCRIPTION::VINK;
     m_MassLossPrescription.typeString                               = MASS_LOSS_PRESCRIPTION_LABEL.at(m_MassLossPrescription.type);
 
-    m_LuminousBlueVariablePrescription.type                         = LBV_PRESCRIPTION::BELCZYNSKI;
+    m_LuminousBlueVariablePrescription.type                         = LBV_PRESCRIPTION::HURLEY_ADD;
     m_LuminousBlueVariablePrescription.typeString                   = LBV_PRESCRIPTION_LABEL.at(m_LuminousBlueVariablePrescription.type);
 
     // Wind mass loss multiplicitive constants

src/Options.cpp

@@ -743,8 +743,10 @@
 //                                      Modified h5view.py (in postProcessing/Folders/H5/PythonScripts) to handle detailed ouput files
 // 02.19.02     LVS - May 04, 2021   - Defect Repairs:
 //                                      - Avoid possibility of exceeding total mass in Farmer PPISN prescription
+// 02.19.03     TW - May 18, 2021    - Enhancement:
+//                                      - Change default LBV wind prescription to HURLEY_ADD
 
 
-const std::string VERSION_STRING = "02.19.02";
+const std::string VERSION_STRING = "02.19.03";
 
 # endif // __changelog_h__