fix windows build

Author: pcarruscag

Common/include/option_structure.hpp

@@ -91,23 +91,23 @@ const unsigned int ZONE_0 = 0;  /*!< \brief Definition of the first grid domain.
 const unsigned int ZONE_1 = 1;  /*!< \brief Definition of the second grid domain. */
 const unsigned int INST_0 = 0;  /*!< \brief Definition of the first instance per grid level. */
 
-const su2double STANDARD_GRAVITY = 9.80665;           /*!< \brief Acceleration due to gravity at surface of earth. */
-const su2double UNIVERSAL_GAS_CONSTANT = 8.3144598;   /*!< \brief Universal gas constant in J/(mol*K) */
-const su2double BOLTZMANN_CONSTANT = 1.3806503E-23;   /*!< \brief Boltzmann's constant [J K^-1] */
-const su2double AVOGAD_CONSTANT = 6.0221415E26; /*!< \brief Avogadro's constant, number of particles in one kmole. */
-const su2double FUND_ELEC_CHARGE_CGS = 4.8032047E-10; /*!< \brief Fundamental electric charge in CGS units, cm^(3/2) g^(1/2) s^(-1). */
+static constexpr passivedouble STANDARD_GRAVITY = 9.80665;           /*!< \brief Acceleration due to gravity at surface of earth. */
+static constexpr passivedouble UNIVERSAL_GAS_CONSTANT = 8.3144598;   /*!< \brief Universal gas constant in J/(mol*K) */
+static constexpr passivedouble BOLTZMANN_CONSTANT = 1.3806503E-23;   /*!< \brief Boltzmann's constant [J K^-1] */
+static constexpr passivedouble AVOGAD_CONSTANT = 6.0221415E26;       /*!< \brief Avogadro's constant, number of particles in one kmole. */
+static constexpr passivedouble FUND_ELEC_CHARGE_CGS = 4.8032047E-10; /*!< \brief Fundamental electric charge in CGS units, cm^(3/2) g^(1/2) s^(-1). */
 
-const su2double EPS = 1.0E-16;        /*!< \brief Error scale. */
-const su2double TURB_EPS = 1.0E-16;   /*!< \brief Turbulent Error scale. */
+static constexpr passivedouble EPS = 1.0E-16;        /*!< \brief Error scale. */
+static constexpr passivedouble TURB_EPS = 1.0E-16;   /*!< \brief Turbulent Error scale. */
 
-const su2double ONE2 = 0.5;         /*!< \brief One divided by two. */
-const su2double ONE3 = 1.0 / 3.0;   /*!< \brief One divided by three. */
-const su2double TWO3 = 2.0 / 3.0;   /*!< \brief Two divided by three. */
-const su2double FOUR3 = 4.0 / 3.0;  /*!< \brief Four divided by three. */
+static constexpr passivedouble ONE2 = 0.5;         /*!< \brief One divided by two. */
+static constexpr passivedouble ONE3 = 1.0 / 3.0;   /*!< \brief One divided by three. */
+static constexpr passivedouble TWO3 = 2.0 / 3.0;   /*!< \brief Two divided by three. */
+static constexpr passivedouble FOUR3 = 4.0 / 3.0;  /*!< \brief Four divided by three. */
 
-const su2double PI_NUMBER = 4.0 * atan(1.0);  /*!< \brief Pi number. */
+static constexpr passivedouble PI_NUMBER = 3.14159265358979323846;  /*!< \brief Pi number (not using M_PI to avoid Windows issues). */
 
-const su2double STEFAN_BOLTZMANN = 5.670367E-08;  /*!< \brief Stefan-Boltzmann constant in W/(m^2*K^4). */
+static constexpr passivedouble STEFAN_BOLTZMANN = 5.670367E-08;  /*!< \brief Stefan-Boltzmann constant in W/(m^2*K^4). */
 
 const int MASTER_NODE = 0;      /*!< \brief Master node for MPI parallelization. */
 const int SINGLE_NODE = 1;      /*!< \brief There is only a node in the MPI parallelization. */
@@ -195,7 +195,7 @@ const int SU2_CONN_SIZE   = 10;  /*!< \brief Size of the connectivity array that
                                              that we read from a mesh file in the format [[globalID vtkType n0 n1 n2 n3 n4 n5 n6 n7 n8]. */
 const int SU2_CONN_SKIP   = 2;   /*!< \brief Offset to skip the globalID and VTK type at the start of the element connectivity list for each CGNS element. */
 
-const su2double COLORING_EFF_THRESH = 0.875;  /*!< \brief Below this value fallback strategies are used instead. */
+static constexpr passivedouble COLORING_EFF_THRESH = 0.875;  /*!< \brief Below this value fallback strategies are used instead. */
 
 /*--- All temperature polynomial fits for the fluid models currently
    assume a quartic form (5 coefficients). For example,

SU2_CFD/src/iteration/CFluidIteration.cpp

@@ -348,7 +348,7 @@ void CFluidIteration::UpdateRamp(CGeometry**** geometry_container, CConfig** con
           config->SetMUSCLRampValue(std::pow(std::min<double>(1.0, iterFrac), RampMUSCLParam.RampMUSCLPower));
           break;
         case MUSCL_RAMP_TYPE::SMOOTH_FUNCTION:
-          config->SetMUSCLRampValue(std::pow((0.5 * (1 -  cos(M_PI * std::min(1.0, iterFrac)))), RampMUSCLParam.RampMUSCLPower));
+          config->SetMUSCLRampValue(std::pow((0.5 * (1 -  cos(PI_NUMBER * std::min(1.0, iterFrac)))), RampMUSCLParam.RampMUSCLPower));
           break;
         default:
           break;