remove duplicated setvorticity_strainmag

su2code · Feb 15, 2024 · f4427f5 · f4427f5
1 parent 06935e1
commit f4427f5
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 528 deletions.
diff --git a/SU2_CFD/include/variables/CIncNSVariable.hpp b/SU2_CFD/include/variables/CIncNSVariable.hpp
@@ -62,11 +62,6 @@ class CIncNSVariable final : public CIncEulerVariable {
     Primitive(iPoint, indices.LaminarViscosity()) = laminarViscosity;
   }
 
-  /*!
-   * \brief Set the vorticity value.
-   */
-  bool SetVorticity_StrainMag() override;
-
   /*!
    * \overload
    * \param[in] eddy_visc - Value of the eddy viscosity.

diff --git a/SU2_CFD/include/variables/CNSVariable.hpp b/SU2_CFD/include/variables/CNSVariable.hpp
@@ -79,11 +79,6 @@ class CNSVariable final : public CEulerVariable {
     Primitive(iPoint, indices.CpTotal()) = val_Cp;
   }
 
-  /*!
-   * \brief Set the vorticity value.
-   */
-  bool SetVorticity_StrainMag() override;
-
   /*!
    * \overload
    * \param[in] eddy_visc - Value of the eddy viscosity.

diff --git a/SU2_CFD/include/variables/CPBIncNSVariable.hpp b/SU2_CFD/include/variables/CPBIncNSVariable.hpp
@@ -50,12 +50,12 @@ class CPBIncNSVariable final : public CPBIncEulerVariable {
 
   VectorType DES_LengthScale;
 public:
-  
+
   /*!
    * \brief Constructor of the class.
    */
   CPBIncNSVariable(void);
-  
+
   /*!
    * \param[in] val_pressure - value of the pressure.
    * \param[in] val_velocity - Value of the flow velocity (initialization value).
@@ -64,32 +64,27 @@ class CPBIncNSVariable final : public CPBIncEulerVariable {
    * \param[in] val_nvar - Number of variables of the problem.
    * \param[in] config - Definition of the particular problem.
    */
-  CPBIncNSVariable(su2double val_density, su2double val_pressure, su2double *val_velocity, 
+  CPBIncNSVariable(su2double val_density, su2double val_pressure, su2double *val_velocity,
                    unsigned long npoint, unsigned short val_nDim, unsigned short val_nvar, CConfig *config);
-  
+
   /*!
    * \brief Destructor of the class.
    */
   virtual ~CPBIncNSVariable() = default;
-  
+
   /*!
    * \brief Set all the primitive variables for incompressible flows
    */
   bool SetPrimVar(unsigned long iPoint, su2double Density_Inf, su2double Viscosity_Inf, su2double eddy_visc, su2double turb_ke, CConfig *config);
   using CVariable::SetPrimVar;
-  
+
   /*!
    * \brief Set the laminar viscosity.
    */
   inline void SetLaminarViscosity(unsigned long iPoint, su2double laminarViscosity) override {
     Primitive(iPoint,nDim+2) = laminarViscosity;
   }
 
-  /*!
-   * \brief Set the vorticity value.
-   */
-  bool SetVorticity_StrainMag() override;
-
   /*!
    * \overload
    * \param[in] eddy_visc - Value of the eddy viscosity.
@@ -134,11 +129,11 @@ class CPBIncNSVariable final : public CPBIncEulerVariable {
    * \return Value of the DES length Scale.
    */
   inline su2double GetDES_LengthScale(unsigned long iPoint) const override { return DES_LengthScale(iPoint); }
-  
+
   /*!
    * \brief Get the thermal conductivity of the flow.
    * \return Value of the laminar viscosity of the flow.
    */
   inline su2double GetThermalConductivity(unsigned long iPoint) const override { return 0.0; }
-    
+
 };
diff --git a/SU2_CFD/include/variables/CVariable.hpp b/SU2_CFD/include/variables/CVariable.hpp
@@ -1615,11 +1615,6 @@ class CVariable {
    */
   inline virtual void SetSpecificHeatCv(unsigned long iPoint, su2double Cv) {}
 
-  /*!
-   * \brief A virtual member.
-   */
-  inline virtual bool SetVorticity_StrainMag() { return false; }
-
   /*!
    * \brief A virtual member.
    */
@@ -2438,32 +2433,32 @@ class CVariable {
 inline virtual su2double GetMassFlux(unsigned long iPoint) const { return 0.0; }
 
   inline virtual void SetMassFlux(unsigned long iPoint, su2double val_MassFlux) {}
-  
+
   inline virtual void AddMassFlux(unsigned long iPoint, su2double val_MassFlux) {}
-  
+
   inline virtual void SubtractMassFlux(unsigned long iPoint, su2double val_MassFlux) {}
-  
+
   inline virtual void Set_Mom_Coeff(unsigned long iPoint, su2double *val_Mom_Coeff) {}
-  
+
   inline virtual su2double Get_Mom_Coeff(unsigned long iPoint, unsigned short val_Var) { return 0.0; }
-  
+
   inline virtual su2double Get_Mom_Coeff_nb(unsigned long iPoint, unsigned short val_Var) { return 0.0; }
-  
+
   inline virtual void Set_Mom_Coeff_nb(unsigned long iPoint, su2double *val_Mom_Coeff) {}
-  
+
   inline virtual void Add_Mom_Coeff_nb(unsigned long iPoint, su2double val_coeff_nb, unsigned short val_Var) {}
 
   inline virtual void Add_Mom_Coeff(unsigned long iPoint, su2double val_coeff, unsigned short val_Var) {}
-  
+
   inline virtual void Set_Mom_Coeff_nbZero(unsigned long iPoint) {}
-  
+
   inline virtual void Set_Mom_CoeffZero(unsigned long iPoint) {}
-  
+
   inline virtual void Set_Mom_Coeff(unsigned long iPoint, unsigned short val_Var, su2double val_Mom_Coeff) {}
-  
+
   inline virtual void Set_Mom_Coeff_nb(unsigned long iPoint, unsigned short val_Var, su2double val_Mom_Coeff) {}
 
 inline virtual su2double GetPoisson_Coeff(unsigned long iPoint) { return 0.0; }
-  
+
   inline virtual void SetPoisson_Coeff(unsigned long iPoint, su2double val_Poisson_Coeff) {}
 };