Merge remote-tracking branch 'origin/develop' into fix_wallfunctions

Author: TobiKattmann

AUTHORS.md

@@ -70,13 +70,15 @@ Ethan Alan Hereth
 Florian Dittmann
 Francisco D. Palacios
 Gaurav Bansal
+Giacomo Baldan
 Giulio Gori
 Guillaume Bâty
 Harichand M V
 HL Kline
 IndianaStokes
 J. Sinsay
 JSmith36
+Jacob Needels
 Jairo Paes Cavalcante Filho
 Jason Howison
 Jayant Mukhopadhaya
@@ -124,7 +126,6 @@ aaronyicongfu
 aeroamit
 anilvar
 band-a-prend
-baldang
 chamsolli
 costat
 daniel-linton
@@ -134,7 +135,6 @@ erangit
 flo
 fmpmorgado
 garcgutierrez
-jtneedels
 juliendm
 jvanoostrom
 mcolonno

Common/include/code_config.hpp

@@ -24,7 +24,6 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
-
 #pragma once
 
 #include <type_traits>

SU2_CFD/include/output/filewriter/CCGNSFileWriter.hpp

@@ -28,6 +28,9 @@
 #pragma once
 
 #ifdef HAVE_CGNS
+#ifdef __MINGW32__
+#include <basetsd.h>
+#endif
 #include "cgnslib.h"
 #endif
 
@@ -79,7 +82,7 @@ class CCGNSFileWriter final : public CFileWriter {
    * \brief Write sorted data to file in CGNS file format.
    */
   void Write_Data() override;
-  
+
  private:
 #ifdef HAVE_CGNS
   /*!

SU2_CFD/include/solvers/CFVMFlowSolverBase.inl

@@ -2392,7 +2392,7 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
 
   unsigned long iVertex, iPoint, iPointNormal;
   unsigned short iMarker, iMarker_Monitoring, iDim, jDim;
-  unsigned short T_INDEX = 0, TVE_INDEX = 0, VEL_INDEX = 0, RHOS_INDEX = 0;
+  unsigned short T_INDEX = 0, TVE_INDEX = 0, VEL_INDEX = 0;
   su2double Viscosity = 0.0, Area, Density = 0.0, GradTemperature = 0.0, WallDistMod, FrictionVel,
             UnitNormal[3] = {0.0}, TauElem[3] = {0.0}, Tau[3][3] = {{0.0}}, Cp,
             thermal_conductivity, MaxNorm = 8.0, Grad_Vel[3][3] = {{0.0}}, Grad_Temp[3] = {0.0}, AxiFactor;
@@ -2577,25 +2577,16 @@ void CFVMFlowSolverBase<V, FlowRegime>::Friction_Forces(const CGeometry* geometr
 
       } else {
 
-        unsigned short iSpecies, nSpecies = config->GetnSpecies();
-
         const auto& thermal_conductivity_tr = nodes->GetThermalConductivity(iPoint);
         const auto& thermal_conductivity_ve = nodes->GetThermalConductivity_ve(iPoint);
         const auto& Grad_PrimVar            = nodes->GetGradient_Primitive(iPoint);
-        const auto& Ds                      = nodes->GetDiffusionCoeff(iPoint);
-        const auto& hs                      = nodes->GetEnthalpys(iPoint);
-
-        /*--- Compute enthalpy transport to surface due to mass diffusion ---*/ 
-        su2double sumJhs = 0.0;
-        for (iSpecies = 0; iSpecies < nSpecies; iSpecies++)
-          sumJhs += Ds[iSpecies]*hs[iSpecies]*GeometryToolbox::DotProduct(nDim, Grad_PrimVar[RHOS_INDEX+iSpecies], UnitNormal);
 
         su2double dTn   = GeometryToolbox::DotProduct(nDim, Grad_PrimVar[T_INDEX], UnitNormal);
         su2double dTven = GeometryToolbox::DotProduct(nDim, Grad_PrimVar[TVE_INDEX], UnitNormal);
 
         /*--- Surface energy balance: trans-rot heat flux, vib-el heat flux,
         enthalpy transport due to mass diffusion ---*/ 
-        HeatFlux[iMarker][iVertex] = thermal_conductivity_tr*dTn + thermal_conductivity_ve*dTven + sumJhs;
+        HeatFlux[iMarker][iVertex] = thermal_conductivity_tr*dTn + thermal_conductivity_ve*dTven;
       }
 
       /*--- Note that y+, and heat are computed at the

SU2_CFD/src/output/COutput.cpp

@@ -25,6 +25,9 @@
  * License along with SU2. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../../Common/include/geometry/CGeometry.hpp"
+#include "../../include/solvers/CSolver.hpp"
+
 #include "../../include/output/COutput.hpp"
 #include "../../include/output/filewriter/CFVMDataSorter.hpp"
 #include "../../include/output/filewriter/CFEMDataSorter.hpp"
@@ -44,9 +47,6 @@
 #include "../../include/output/filewriter/CSU2MeshFileWriter.hpp"
 
 
-#include "../../../Common/include/geometry/CGeometry.hpp"
-#include "../../include/solvers/CSolver.hpp"
-
 COutput::COutput(const CConfig *config, unsigned short ndim, bool fem_output):
   rank(SU2_MPI::GetRank()),
   size(SU2_MPI::GetSize()),