Fixing metallicity discrepancy

Author: ilyamandel

src/Options.cpp

@@ -439,8 +439,8 @@ void Options::OptionValues::Initialise() {
 
 
     // Metallicity options
-    m_Metallicity                                                   = 0.0142;                                               // Solar metallicity Asplund+2010 (note that ZSOL is something different)
-    m_MetallicityDistribution.type                                  = METALLICITY_DISTRIBUTION::ZSOLAR; 
+    m_Metallicity                                                   = ZSOL_ASPLUND;
+    m_MetallicityDistribution.type                                  = METALLICITY_DISTRIBUTION::ZSOLAR;
     m_MetallicityDistribution.typeString                            = METALLICITY_DISTRIBUTION_LABEL.at(m_MetallicityDistribution.type);
     m_MetallicityDistributionMin                                    = MINIMUM_METALLICITY;
     m_MetallicityDistributionMax                                    = MAXIMUM_METALLICITY;

src/constants.h

@@ -225,7 +225,8 @@ constexpr double G_SN                                   = G * 1.0E-9 / KG_TO_MSO
 constexpr double G_SOLAR_YEAR                           = 3.14E7;                                                   // Gravitational constant in Lsol Rsol yr Msol^-2 for calculating photon tiring limit
 
 constexpr double RSOL                                   = 6.957E8;                                                  // Solar Radius (in m)
-constexpr double ZSOL                                   = 0.02;                                                     // Solar Metallicity
+constexpr double ZSOL                                   = 0.02;                                                     // Solar Metallicity used in scalings
+constexpr double ZSOL_ASPLUND				= 0.0142;						    // Solar Metallicity (Asplund+ 2010) used in initial condition
 constexpr double TSOL                                   = 5778.0;                                                   // Solar Temperature in kelvin
 
 constexpr double AU                                     = 149597870700.0;                                           // 1 AU (Astronomical Unit) in metres

src/utils.cpp

@@ -1083,7 +1083,7 @@ namespace utils {
         switch (p_Zdist) {                                                                              // which distribution?
 
             case METALLICITY_DISTRIBUTION::ZSOLAR:                                                      // ZSOLAR - all systems have Z = ZSOLAR
-                metallicity = ZSOL;
+                metallicity = ZSOL_ASPLUND;
                 break;
 
             case METALLICITY_DISTRIBUTION::LOGUNIFORM: {                                                // LOGUNIFORM - sample Z uniformly in the log