Merge branch 'dev' into directory_reorganization

Author: reinhold-willcox

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

@@ -81,7 +81,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.5"
+   "version": "3.7.4"
   }
  },
  "nbformat": 4,

postProcessing/Folders/CosmicIntegration/0_CosmicIntegrationOverview.ipynb

@@ -466,9 +466,9 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.5"
+   "version": "3.7.4"
   }
  },
  "nbformat": 4,
  "nbformat_minor": 2
-}
+}