merge in develop, remove/comment unused variables, update some version #s

Author: WallyMaier

SU2_CFD/include/numerics/NEMO/NEMO_diffusion.hpp

@@ -34,7 +34,7 @@
  * \brief Class for computing viscous term using the average of gradients.
  * \ingroup ViscDiscr
  * \author S.R. Copeland, W. Maier, C. Garbacz
- * \version 7.0.6 "falcon"
+ * \version 7.0.8 "Blackbird"
  */
 class CAvgGrad_NEMO : public CNEMONumerics {
 private:

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

@@ -34,15 +34,17 @@
  * \brief Class for solving an approximate Riemann AUSM.
  * \ingroup ConvDiscr
  * \author F. Palacios, S.R. Copeland, W. Maier, C. Garbacz
- * \version 7.0.6 'Falcon'
+ * \version 7.0.8 'Blackbird'
  */
 class CUpwAUSM_NEMO : public CNEMONumerics {
 private:
-  su2double *FcL, *FcR, *FcLR;
-  su2double *dmLP, *dmRM, *dpLP, *dpRM;
-  su2double *daL, *daR;
+  su2double *FcL, *FcR;
+  //su2double *FcLR;
+  //su2double *dmLP, *dmRM, *dpLP, *dpRM;
+  //su2double *daL, *daR;
   su2double ProjVel_i, ProjVel_j;
-  su2double sq_vel, Proj_ModJac_Tensor_ij;
+  su2double sq_vel;
+  //su2double  Proj_ModJac_Tensor_ij;
 
 public:
 
@@ -64,4 +66,4 @@ class CUpwAUSM_NEMO : public CNEMONumerics {
    * \param[in] config - Definition of the particular problem.
    */
   ResidualType<> ComputeResidual(const CConfig* config) final;
-};
+};

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

@@ -38,26 +38,14 @@
 class CUpwAUSMPLUSUP2_NEMO : public CNEMONumerics {
 private:
   su2double *FcL, *FcR, *FcLR;
-  su2double *dmLP, *dmRM, *dpLP, *dpRM;
-  su2double *daL, *daR;
+  //su2double *dmLP, *dmRM, *dpLP, *dpRM;
+  //su2double *daL, *daR;
   su2double ProjVel_i, ProjVel_j;
-  su2double sq_vel, Proj_ModJac_Tensor_ij;
   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 rhoCvtr_i, rhoCvtr_j, rhoCvve_i, rhoCvve_j;
 
-  /*--- Roe Only ---*/
-  su2double *Diff_U;
-  su2double *RoeU, *RoeV, *RoeEve;
-  su2double *ProjFlux_i, *ProjFlux_j;
-  su2double *Lambda, *Epsilon;
-  su2double **P_Tensor, **invP_Tensor;
-  su2double RoeSoundSpeed;
-  su2double ProjVelocity, ProjVelocity_i, ProjVelocity_j;
-  su2double R;
-  su2double *RoedPdU;
-
 public:
 
   /*!

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

@@ -34,21 +34,18 @@
  * \brief Class for computing the Lax-Friedrich centered scheme.
  * \ingroup ConvDiscr
  * \author F. Palacios, S.R. Copeland, W. Maier, C. Garbacz
- * \version 2.0.6
+ * \version 7.0.8
  */
 class CCentLax_NEMO : public CNEMONumerics {
 private:
-  unsigned short iDim, iVar, jVar; /*!< \brief Iteration on dimension and variables. */
+  unsigned short iDim, iVar; /*!< \brief Iteration on dimension and variables. */
   su2double *Diff_U; /*!< \brief Difference of conservative variables. */
   su2double *MeanU, *MeanV;
-  vector<su2double> mean_eves;
-  su2double *MeandPdU;
   su2double *ProjFlux;  /*!< \brief Projected inviscid flux tensor. */
   su2double Param_p, Param_Kappa_0; /*!< \brief Artificial dissipation parameters. */
   su2double Local_Lambda_i, Local_Lambda_j, MeanLambda; /*!< \brief Local eigenvalues. */
   su2double Phi_i, Phi_j, sc0, StretchingFactor; /*!< \brief Streching parameters. */
-  su2double Epsilon_0, cte; /*!< \brief Artificial dissipation values. */
-  bool stretching;
+  su2double Epsilon_0; /*!< \brief Artificial dissipation values. */
 
 public:
 

SU2_CFD/include/solvers/CNEMONSSolver.hpp

@@ -38,7 +38,8 @@
  * \brief Main class for defining the NEMO Navier-Stokes flow solver.
  * \ingroup Navier_Stokes_Equations
  * \author S. R. Copeland, F. Palacios, W. Maier.
- * \version 6.1
+ * \version 7.0.8
+ *
  */
 class CNEMONSSolver final : public CNEMOEulerSolver {
 private:

SU2_CFD/include/variables/CNEMONSVariable.hpp

@@ -34,7 +34,7 @@
  * \brief Main class for defining the variables of the NEMO Navier-Stokes' solver.
  * \ingroup Navier_Stokes_Equations
  * \author C. Garbacz, W. Maier, S.R. Copeland.
- * \version 7.0.6
+ * \version 7.0.8
  */
 class CNEMONSVariable final : public CNEMOEulerVariable {
 private:

SU2_CFD/src/numerics/NEMO/convection/ausm.cpp

@@ -36,10 +36,10 @@ CUpwAUSM_NEMO::CUpwAUSM_NEMO(unsigned short val_nDim, unsigned short val_nVar,
 
   FcL    = new su2double [nVar];
   FcR    = new su2double [nVar];
-  dmLP   = new su2double [nVar];
-  dmRM   = new su2double [nVar];
-  dpLP   = new su2double [nVar];
-  dpRM   = new su2double [nVar];
+  //dmLP   = new su2double [nVar];
+  //dmRM   = new su2double [nVar];
+  //dpLP   = new su2double [nVar];
+  //dpRM   = new su2double [nVar];
   rhos_i = new su2double [nSpecies];
   rhos_j = new su2double [nSpecies];
   u_i    = new su2double [nDim];
@@ -53,10 +53,10 @@ CUpwAUSM_NEMO::~CUpwAUSM_NEMO(void) {
 
   delete [] FcL;
   delete [] FcR;
-  delete [] dmLP;
-  delete [] dmRM;
-  delete [] dpLP;
-  delete [] dpRM;
+  //delete [] dmLP;
+  //delete [] dmRM;
+  //delete [] dpLP;
+  //delete [] dpRM;
   delete [] rhos_i;
   delete [] rhos_j;
   delete [] u_i;

SU2_CFD/src/numerics/NEMO/convection/ausmplusup2.cpp

@@ -34,80 +34,38 @@ CUpwAUSMPLUSUP2_NEMO::CUpwAUSMPLUSUP2_NEMO(unsigned short val_nDim, unsigned sho
                                            CConfig *config): CNEMONumerics (val_nDim, val_nVar, val_nPrimVar, val_nPrimVarGrad,
                                                           config){
 
-
-  unsigned short iVar;
-
   /*--- Define useful constants ---*/
   Kp       = 0.25;
   sigma    = 1.0;
 
   /*--- Allocate data structures ---*/
   FcL    = new su2double [nVar];
   FcR    = new su2double [nVar];
-  dmLP   = new su2double [nVar];
-  dmRM   = new su2double [nVar];
-  dpLP   = new su2double [nVar];
-  dpRM   = new su2double [nVar];
-  daL    = new su2double [nVar];
-  daR    = new su2double [nVar];
   rhos_i = new su2double [nSpecies];
   rhos_j = new su2double [nSpecies];
   u_i    = new su2double [nDim];
   u_j    = new su2double [nDim];
 
-  /*--- Allocate arrays ---*/
-  Diff_U      = new su2double [nVar];
-  RoeU        = new su2double[nVar];
-  RoeV        = new su2double[nPrimVar];
-  RoedPdU     = new su2double [nVar];
-  RoeEve      = new su2double [nSpecies];
-  Lambda      = new su2double [nVar];
-  Epsilon     = new su2double [nVar];
-  P_Tensor    = new su2double* [nVar];
-  invP_Tensor = new su2double* [nVar];
-  for (iVar = 0; iVar < nVar; iVar++) {
-    P_Tensor[iVar] = new su2double [nVar];
-    invP_Tensor[iVar] = new su2double [nVar];
-  }
-
   Flux   = new su2double[nVar];
 }
 
 CUpwAUSMPLUSUP2_NEMO::~CUpwAUSMPLUSUP2_NEMO(void) {
 
   delete [] FcL;
   delete [] FcR;
-  delete [] dmLP;
-  delete [] dmRM;
-  delete [] dpLP;
-  delete [] dpRM;
   delete [] rhos_i;
   delete [] rhos_j;
   delete [] u_i;
   delete [] u_j;
-  unsigned short iVar;
-
-  delete [] Diff_U;
-  delete [] RoeU;
-  delete [] RoeV;
-  delete [] RoedPdU;
-  delete [] RoeEve;
-  delete [] Lambda;
-  delete [] Epsilon;
-  for (iVar = 0; iVar < nVar; iVar++) {
-    delete [] P_Tensor[iVar];
-    delete [] invP_Tensor[iVar];
-  }
-  delete [] P_Tensor;
-  delete [] invP_Tensor;
+
   delete [] Flux;
 }
 
 CNumerics::ResidualType<> CUpwAUSMPLUSUP2_NEMO::ComputeResidual(const CConfig *config) {
 
   unsigned short iDim, iVar, iSpecies;
   su2double rho_i, rho_j,
-  e_ve_i, e_ve_j, mL, mR, mLP, mRM, mF, pLP, pRM, pF, Phi, sq_veli, sq_velj;
+  e_ve_i, e_ve_j, sq_veli, sq_velj;
 
   /*--- Face area ---*/
   Area = GeometryToolbox::Norm(nDim, Normal);

SU2_CFD/src/numerics/NEMO/convection/lax.cpp

@@ -45,27 +45,22 @@ CCentLax_NEMO::CCentLax_NEMO(unsigned short val_nDim,
   Diff_U   = new su2double[nVar];
   MeanU    = new su2double[nVar];
   MeanV    = new su2double[nPrimVar];
-  MeandPdU = new su2double[nVar];
   ProjFlux = new su2double[nVar];
   Flux     = new su2double[nVar];
 
-  mean_eves.resize(nSpecies,0.0);
-
 }
 
 CCentLax_NEMO::~CCentLax_NEMO(void) {
 
   delete [] Diff_U;
   delete [] MeanU;
   delete [] MeanV;
-  delete [] MeandPdU;
   delete [] ProjFlux;
   delete [] Flux;
 }
 
 CNumerics::ResidualType<> CCentLax_NEMO::ComputeResidual(const CConfig *config) {
 
-  unsigned short iDim, iVar;
   su2double rho_i, rho_j, h_i, h_j, a_i, a_j;
   su2double ProjVel_i, ProjVel_j;
 
@@ -87,8 +82,8 @@ CNumerics::ResidualType<> CCentLax_NEMO::ComputeResidual(const CConfig *config)
     MeanV[iVar] = 0.5*(V_i[iVar]+V_j[iVar]);
 
   /*--- Compute NonEq specific variables ---*/
-  vector<su2double> mean_eves = fluidmodel->ComputeSpeciesEve(MeanV[TVE_INDEX]);
-  fluidmodel->ComputedPdU(MeanV, mean_eves, MeandPdU);
+  //vector<su2double> mean_eves = fluidmodel->ComputeSpeciesEve(MeanV[TVE_INDEX]);
+  //fluidmodel->ComputedPdU(MeanV, mean_eves, MeandPdU);
 
   /*--- Get projected flux tensor ---*/
   GetInviscidProjFlux(MeanU, MeanV, Normal, ProjFlux);