Merge pull request #1117 from su2code/feature_NEMO_merge

Further NEMO cleanup and improvements

Author: WallyMaier

Common/src/CConfig.cpp

@@ -3536,8 +3536,8 @@ void CConfig::SetPostprocessing(unsigned short val_software, unsigned short val_
   }
 
   if (nemo){
-    if (Kind_ConvNumScheme_Flow == SPACE_CENTERED || Kind_Upwind_Flow == ROE || Kind_Upwind_Flow == MSW || Kind_Upwind_Flow == AUSMPWPLUS)
-      SU2_MPI::Error("Only AUSM and AUSMPLUSUP2 upwind schemes are operational for NEMO. Feel free to fix the others!", CURRENT_FUNCTION);
+    if (Kind_Upwind_Flow == AUSMPWPLUS)
+      SU2_MPI::Error("AUSMPW+ is extremely unstable. Feel free to fix me!", CURRENT_FUNCTION);
   }
 
   if(GetBoolTurbomachinery()){

SU2_CFD/include/fluid/CMutationTCLib.hpp

@@ -71,34 +71,34 @@ class CMutationTCLib : public CNEMOGas {
   vector<su2double>& GetSpeciesCvTraRot() final;
 
   /*!
-   * \brief Get species V-E specific heats at constant volume.
+   * \brief Compute species V-E specific heats at constant volume.
    */
-  vector<su2double>& GetSpeciesCvVibEle() final;
+  vector<su2double>& ComputeSpeciesCvVibEle() final;
 
   /*!
-   * \brief Get mixture energies (total internal energy and vibrational energy).
+   * \brief Compute mixture energies (total internal energy and vibrational energy).
    */
-  vector<su2double>& GetMixtureEnergies() final;
+  vector<su2double>& ComputeMixtureEnergies() final;
 
   /*!
-   * \brief Get vector of species V-E energy.
+   * \brief Compute vector of species V-E energy.
    */
-  vector<su2double>& GetSpeciesEve(su2double val_T) final;
+  vector<su2double>& ComputeSpeciesEve(su2double val_T) final;
 
   /*!
-   * \brief Get species net production rates.
+   * \brief Compute species net production rates.
    */
-  vector<su2double>& GetNetProductionRates() final;
+  vector<su2double>& ComputeNetProductionRates() final;
 
   /*!
-   * \brief Get vibrational energy source term.
+   * \brief Compute vibrational energy source term.
    */
-  su2double GetEveSourceTerm() final;
+  su2double ComputeEveSourceTerm() final;
 
   /*!
-   * \brief Get species enthalpies.
+   * \brief Compute species enthalpies.
    */
-  vector<su2double>& GetSpeciesEnthalpy(su2double val_T, su2double val_Tve, su2double *val_eves) final;
+  vector<su2double>& ComputeSpeciesEnthalpy(su2double val_T, su2double val_Tve, su2double *val_eves) final;
 
   /*!
    * \brief Get species diffusion coefficients.
@@ -116,9 +116,9 @@ class CMutationTCLib : public CNEMOGas {
   vector<su2double>& GetThermalConductivities() final;
 
   /*!
-   * \brief Get translational and vibrational temperatures vector.
+   * \brief Compute translational and vibrational temperatures vector.
    */
-  vector<su2double>& GetTemperatures(vector<su2double>& val_rhos, su2double rhoE, su2double rhoEve, su2double rhoEvel) final;
+  vector<su2double>& ComputeTemperatures(vector<su2double>& val_rhos, su2double rhoE, su2double rhoEve, su2double rhoEvel) final;
 
   /*!
    * \brief Get species molar mass.

SU2_CFD/include/fluid/CNEMOGas.hpp

@@ -113,34 +113,34 @@ class CNEMOGas : public CFluidModel {
   virtual const vector<su2double>& GetSpeciesCvTraRot() = 0;
 
   /*!
-   * \brief Get species V-E specific heats at constant volume.
+   * \brief Compute species V-E specific heats at constant volume.
    */
-  virtual vector<su2double>& GetSpeciesCvVibEle() = 0;
+  virtual vector<su2double>& ComputeSpeciesCvVibEle() = 0;
 
   /*!
-   * \brief Get mixture energies (total internal energy and vibrational energy).
+   * \brief Compute mixture energies (total internal energy and vibrational energy).
    */
-  virtual vector<su2double>& GetMixtureEnergies() = 0;
+  virtual vector<su2double>& ComputeMixtureEnergies() = 0;
 
   /*!
-   * \brief Get species net production rates.
+   * \brief Compute species net production rates.
    */
-  virtual vector<su2double>& GetNetProductionRates() = 0;
+  virtual vector<su2double>& ComputeNetProductionRates() = 0;
 
   /*!
-   * \brief Get vibrational energy source term.
+   * \brief Compute vibrational energy source term.
    */
-  virtual su2double GetEveSourceTerm() { return 0; }
+  virtual su2double ComputeEveSourceTerm() { return 0; }
 
   /*!
-   * \brief Get vector of species V-E energy.
+   * \brief Compute vector of species V-E energy.
    */
-  virtual vector<su2double>& GetSpeciesEve(su2double val_T) = 0;
+  virtual vector<su2double>& ComputeSpeciesEve(su2double val_T) = 0;
 
   /*!
-   * \brief Get species enthalpies.
+   * \brief Compute species enthalpies.
    */
-  virtual vector<su2double>& GetSpeciesEnthalpy(su2double val_T, su2double val_Tve, su2double *val_eves) = 0;
+  virtual vector<su2double>& ComputeSpeciesEnthalpy(su2double val_T, su2double val_Tve, su2double *val_eves) = 0;
 
   /*!
    * \brief Get species diffusion coefficients.
@@ -158,25 +158,30 @@ class CNEMOGas : public CFluidModel {
   virtual vector<su2double>& GetThermalConductivities() = 0;
 
   /*!
-   * \brief Get translational and vibrational temperatures vector.
+   * \brief Compute translational and vibrational temperatures vector.
    */
-  virtual vector<su2double>& GetTemperatures(vector<su2double>& val_rhos, su2double rhoEmix, su2double rhoEve, su2double rhoEvel) = 0;
+  virtual vector<su2double>& ComputeTemperatures(vector<su2double>& val_rhos, su2double rhoEmix, su2double rhoEve, su2double rhoEvel) = 0;
 
   /*!
-   * \brief Get speed of sound.
+   * \brief Compute speed of sound.
    */
   su2double ComputeSoundSpeed();
 
   /*!
-   * \brief Get pressure.
+   * \brief Compute pressure.
    */
   su2double ComputePressure();
 
   /*!
-   * \brief Get gas constant.
+   * \brief Compute gas constant.
    */
   su2double ComputeGasConstant();
 
+  /*!
+   * \brief Compute ratio of specific heats (Gamma).
+   */
+  su2double ComputeGamma();
+
   /*!
    * \brief Get derivative of pressure w.r.t. conservative variables.
    */
@@ -208,19 +213,19 @@ class CNEMOGas : public CFluidModel {
   inline void SetEves(vector<su2double>& val_eves) { eves = val_eves; }
 
   /*!
-   * \brief Get rhoCvtr.
+   * \brief Compute rhoCvtr.
    */
-  inline su2double GetrhoCvtr() {
+  inline su2double ComputerhoCvtr() {
     rhoCvtr = 0.0;
     for (iSpecies = 0; iSpecies < nHeavy; iSpecies++)
       rhoCvtr += rhos[iSpecies]*Cvtrs[iSpecies];
     return rhoCvtr;
   }
 
   /*!
-   * \brief Get rhoCvtr.
+   * \brief Compute rhoCvve.
    */
-  su2double GetrhoCvve();
+  su2double ComputerhoCvve();
 
   /*!
    * \brief Get species molar mass.

SU2_CFD/include/fluid/CUserDefinedTCLib.hpp

@@ -103,34 +103,34 @@ class CUserDefinedTCLib : public CNEMOGas {
   vector<su2double>& GetSpeciesCvTraRot() final;
 
   /*!
-   * \brief Get species V-E specific heats at constant volume.
+   * \brief Compute species V-E specific heats at constant volume.
    */
-  vector<su2double>& GetSpeciesCvVibEle() final;
+  vector<su2double>& ComputeSpeciesCvVibEle() final;
 
   /*!
-   * \brief Get mixture energies (total internal energy and vibrational energy).
+   * \brief Compute mixture energies (total internal energy and vibrational energy).
    */
-  vector<su2double>& GetMixtureEnergies() final;
+  vector<su2double>& ComputeMixtureEnergies() final;
 
   /*!
-   * \brief Get vector of species V-E energy.
+   * \brief Compute species V-E energy.
    */
-  vector<su2double>& GetSpeciesEve(su2double val_T) final;
+  vector<su2double>& ComputeSpeciesEve(su2double val_T) final;
 
   /*!
-   * \brief Get species net production rates.
+   * \brief Compute species net production rates.
    */
-  vector<su2double>& GetNetProductionRates() final;
+  vector<su2double>& ComputeNetProductionRates() final;
 
   /*!
-   * \brief Get vibrational energy source term.
+   * \brief Compute vibrational energy source term.
    */
-  su2double GetEveSourceTerm() final;
+  su2double ComputeEveSourceTerm() final;
 
   /*!
-   * \brief Get species enthalpies.
+   * \brief Compute species enthalpies.
    */
-  vector<su2double>& GetSpeciesEnthalpy(su2double val_T, su2double val_Tve, su2double *val_eves) final;
+  vector<su2double>& ComputeSpeciesEnthalpy(su2double val_T, su2double val_Tve, su2double *val_eves) final;
 
   /*!
    * \brief Get species diffusion coefficients.
@@ -148,9 +148,9 @@ class CUserDefinedTCLib : public CNEMOGas {
   vector<su2double>& GetThermalConductivities() final;
 
   /*!
-   * \brief Get translational and vibrational temperatures vector.
+   * \brief Compute translational and vibrational temperatures vector.
    */
-  vector<su2double>& GetTemperatures(vector<su2double>& val_rhos, su2double rhoEmix, su2double rhoEve, su2double rhoEvel) final;
+  vector<su2double>& ComputeTemperatures(vector<su2double>& val_rhos, su2double rhoEmix, su2double rhoEve, su2double rhoEvel) final;
 
   private:
 
@@ -164,7 +164,7 @@ class CUserDefinedTCLib : public CNEMOGas {
    * \param[out] A - Reference to coefficient array.
    * \param[in] val_reaction - Reaction number indicator.
    */
-  void GetKeqConstants(unsigned short val_Reaction);
+  void ComputeKeqConstants(unsigned short val_Reaction);
 
   /*!
    * \brief Get species diffusion coefficients with Wilke/Blottner/Eucken transport model.

SU2_CFD/include/numerics/CNumerics.hpp

@@ -1509,16 +1509,48 @@ class CNumerics {
    */
   static void tql2(su2double **V, su2double *d, su2double *e, unsigned short n);
 
+  /*!
+   * \brief Set the pressure derivatives.
+   * \param[in] val_dPdU_i - pressure derivatives at i. 
+   * \param[in] val_dPdU_j - pressure derivatives at j.
+   */
   virtual inline void SetdPdU(su2double *val_dPdU_i, su2double *val_dPdU_j)       { }
 
+  /*!
+   * \brief Set the temperature derivatives.
+   * \param[in] val_dTdU_i - temperature derivatives at i. 
+   * \param[in] val_dTdU_j - temperature derivatives at j.
+   */
   virtual inline void SetdTdU(su2double *val_dTdU_i, su2double *val_dTdU_j)       { }
 
+  /*!
+   * \brief Set the vib-el temperture derivatives.
+   * \param[in] val_dTvedU_i - t_ve derivatives at i. 
+   * \param[in] val_dTvedU_j - t_ve derivatives at j.
+   */
   virtual inline void SetdTvedU(su2double *val_dTvedU_i, su2double *val_dTvedU_j) { }
 
+  /*!
+   * \brief Set the vib-elec energy.
+   * \param[in] val_Eve_i - vib-el energy at i. 
+   * \param[in] val_Eve_j - vib-el energy at j.
+   */
   virtual inline void SetEve(su2double *val_Eve_i, su2double *val_Eve_j)          { }
 
+  /*!
+   * \brief Set the vib-elec specific heat.
+   * \param[in] val_Cvve_i - Cvve at i. 
+   * \param[in] val_Cvve_j - Cvve at j.
+   */
   virtual inline void SetCvve(su2double *val_Cvve_i, su2double *val_Cvve_j)       { }
 
+  /*!
+   * \brief Set the ratio of specific heats.
+   * \param[in] val_Gamma_i - Gamma at i.
+   * \param[in] val_Gamma_j - Gamma at j.
+   */
+  virtual inline void SetGamma(su2double val_Gamma_i, su2double val_Gamma_j)       { }
+
 };
 
 /*!

SU2_CFD/include/numerics/NEMO/CNEMONumerics.hpp

@@ -50,6 +50,7 @@ class CNEMONumerics : public CNumerics {
   su2double *dPdU_i, *dPdU_j;
   su2double *dTdU_i, *dTdU_j;
   su2double *dTvedU_i, *dTvedU_j;
+  su2double Gamma_i, Gamma_j;
 
   vector<su2double> hs;
   su2double *eve_i, *eve_j, *Cvve_i, *Cvve_j;
@@ -185,17 +186,50 @@ class CNEMONumerics : public CNumerics {
    * \param[out] val_invp_tensor - Pointer to inverse of the P matrix.
    */
   void GetPMatrix_inv(const su2double *U, const su2double *V, const su2double *val_dPdU,
-                     const su2double *val_normal, const su2double *l, const su2double *m,
-                     su2double **val_invp_tensor) const;
+                      const su2double *val_normal, const su2double *l, const su2double *m,
+                      su2double **val_invp_tensor) const;
 
+  
+  /*!
+   * \brief Set the pressure derivatives.
+   * \param[in] val_dPdU_i - pressure derivatives at i. 
+   * \param[in] val_dPdU_j - pressure derivatives at j.
+   */
   inline void SetdPdU(su2double *val_dPdU_i, su2double *val_dPdU_j)       final { dPdU_i = val_dPdU_i; dPdU_j = val_dPdU_j; }
-        
+   
+  /*!
+   * \brief Set the temperature derivatives.
+   * \param[in] val_dTdU_i - temperature derivatives at i. 
+   * \param[in] val_dTdU_j - temperature derivatives at j.
+   */      
   inline void SetdTdU(su2double *val_dTdU_i, su2double *val_dTdU_j)       final { dTdU_i = val_dTdU_i; dTdU_j = val_dTdU_j; }
 
+  /*!
+   * \brief Set the vib-el temperature derivatives.
+   * \param[in] val_dTvedU_i - t_ve derivatives at i. 
+   * \param[in] val_dTvedU_j - t_ve derivatives at j.
+   */
   inline void SetdTvedU(su2double *val_dTvedU_i, su2double *val_dTvedU_j) final { dTvedU_i = val_dTvedU_i; dTvedU_j = val_dTvedU_j; }
 
+  /*!
+   * \brief Set the vib-el energy.
+   * \param[in] val_Eve_i - vib-el energy at i. 
+   * \param[in] val_Eve_j - vib-el energy at j.
+   */
   inline void SetEve(su2double *val_Eve_i, su2double *val_Eve_j)          final {eve_i = val_Eve_i; eve_j = val_Eve_j; }
 
+  /*!
+   * \brief Set the Cvve.
+   * \param[in] val_Cvve_i - cvve at i. 
+   * \param[in] val_Cvve_j - cvve at j.
+   */
   inline void SetCvve(su2double *val_Cvve_i, su2double *val_Cvve_j)       final {Cvve_i = val_Cvve_i; Cvve_j = val_Cvve_j; }
 
+  /*!
+   * \brief Set the ratio of specific heats.
+   * \param[in] val_Gamma_i - Gamma at i.
+   * \param[in] val_Gamma_j - Gamma at j.
+   */
+  inline void SetGamma(su2double val_Gamma_i, su2double val_Gamma_j)      final {Gamma_i = val_Gamma_i; Gamma_j = val_Gamma_j; }
+
 };

SU2_CFD/include/numerics/NEMO/NEMO_sources.hpp

@@ -78,7 +78,7 @@ class CSource_NEMO : public CNEMONumerics {
   * \param[in] val_reaction - Reaction number indicator.
   * \param[in] config - Definition of the particular problem.
   */
-  void GetKeqConstants(su2double *A, unsigned short val_reaction, CConfig *config);
+  void ComputeKeqConstants(su2double *A, unsigned short val_reaction, CConfig *config);
 
   /*!
    * \brief Residual of the translational to vibrational energy.

SU2_CFD/include/numerics/NEMO/convection/ausmplusup2.hpp

@@ -45,7 +45,6 @@ class CUpwAUSMPLUSUP2_NEMO : public CNEMONumerics {
   su2double mL, mR, mLP, mRM, mF, pLP, pRM, pFi, pF, Phi;
   su2double CstarL, CstarR, ChatL, ChatR, aF, rhoF, MFsq, Mrefsq, Mp, fa;
   su2double Kp, sigma, alpha, beta, param1, mfP, mfM;
-  su2double Gamma_i, Gamma_j;
   su2double rhoCvtr_i, rhoCvtr_j, rhoCvve_i, rhoCvve_j;
 
   /*--- Roe Only ---*/

SU2_CFD/include/numerics/NEMO/convection/ausmpwplus.hpp

@@ -34,18 +34,16 @@
  * \brief Class for solving an approximate Riemann AUSM.
  * \ingroup ConvDiscr
  * \author F. Palacios, W.Maier, C. Garbacz
- * \version 7.0.6 "Falcon"
+ * \version 7.0.8 "Falcon"
  */
 class CUpwAUSMPWplus_NEMO : public CNEMONumerics {
 private:
+
   su2double *FcL, *FcR;
-  su2double *dmLdL, *dmLdR, *dmRdL, *dmRdR;
-  su2double *dmLPdL, *dmLPdR, *dmRMdL, *dmRMdR;
-  su2double *dmbLPdL, *dmbLPdR, *dmbRMdL, *dmbRMdR;
-  su2double *dpLPdL, *dpLPdR, *dpRMdL, *dpRMdR;
-  su2double *dHnL, *dHnR;
-  su2double *daL, *daR;
-  su2double *dPdU_i, *dPdU_j;
+
+  su2double ProjVel_i, ProjVel_j;
+  su2double rhoCvtr_i, rhoCvtr_j, rhoCvve_i, rhoCvve_j;
+
 
 public: