Made sure initial density and energy are set for all relevant boundary conditions in the compressible flow solvers

Author: EvertBunschoten

Common/include/CConfig.hpp

@@ -521,11 +521,11 @@ class CConfig {
   Kind_TimeIntScheme_Heat,      /*!< \brief Time integration for the wave equations. */
   Kind_TimeStep_Heat,           /*!< \brief Time stepping method for the (fvm) heat equation. */
   n_Datadriven_files;
-  ENUM_DATADRIVEN_METHOD Kind_DataDriven_Method;       /*!< \brief Method used for datset regression in datadriven fluid models. */
+  ENUM_DATADRIVEN_METHOD Kind_DataDriven_Method;       /*!< \brief Method used for datset regression in data-driven fluid models. */
 
-  su2double DataDriven_Relaxation_Factor, /*!< \brief Relaxation factor for Newton solvers in datadriven fluid models. */
-            DataDriven_initial_density,   /*!< \brief Initial density value for Newton solvers in datadriven fluid models. */
-            DataDriven_initial_energy;    /*!< \brief Initial static energy value for Newton solvers in datadriven fluid models. */
+  su2double DataDriven_Relaxation_Factor, /*!< \brief Relaxation factor for Newton solvers in data-driven fluid models. */
+            DataDriven_initial_density,   /*!< \brief Initial density value for Newton solvers in data-driven fluid models. */
+            DataDriven_initial_energy;    /*!< \brief Initial static energy value for Newton solvers in data-driven fluid models. */
 
   STRUCT_TIME_INT Kind_TimeIntScheme_FEA;    /*!< \brief Time integration for the FEA equations. */
   STRUCT_SPACE_ITE Kind_SpaceIteScheme_FEA;  /*!< \brief Iterative scheme for nonlinear structural analysis. */
@@ -806,7 +806,7 @@ class CConfig {
   SurfSens_FileName,             /*!< \brief Output file for the sensitivity on the surface (discrete adjoint). */
   VolSens_FileName,              /*!< \brief Output file for the sensitivity in the volume (discrete adjoint). */
   ObjFunc_Hess_FileName,         /*!< \brief Hessian approximation obtained by the Sobolev smoothing solver. */
-  *DataDriven_Method_FileNames;    /*!< \brief Dataset information for datadriven fluid models. */
+  *DataDriven_Method_FileNames;    /*!< \brief Dataset information for data-driven fluid models. */
 
   bool
   Wrt_Performance,           /*!< \brief Write the performance summary at the end of a calculation.  */
@@ -3789,7 +3789,7 @@ class CConfig {
 
   /*!
    * \brief Get number of listed look-up table or multi-layer perceptron input files.
-   * \return Number of listed datadriven method input files.
+   * \return Number of listed data-driven method input files.
    */
   unsigned short GetNDataDriven_Files(void) const { return n_Datadriven_files; }
 

Common/src/CConfig.cpp

@@ -4922,6 +4922,11 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i
     }
   }
 
+  /*--- Data-driven fluid model is currently only supported for compressible flow problems. ---*/
+  if ((Kind_Solver == MAIN_SOLVER::INC_EULER || Kind_Solver == MAIN_SOLVER::INC_NAVIER_STOKES || Kind_Solver == MAIN_SOLVER::INC_RANS) && (Kind_FluidModel == DATADRIVEN_FLUID)) {
+    SU2_MPI::Error("Data-driven fluid model can only be used for compressible flows.", CURRENT_FUNCTION);
+  }
+
   if ((Kind_Solver == MAIN_SOLVER::INC_EULER || Kind_Solver == MAIN_SOLVER::INC_NAVIER_STOKES || Kind_Solver == MAIN_SOLVER::INC_RANS) && (Kind_FluidModel == INC_IDEAL_GAS_POLY)) {
     su2double sum = 0.0;
     for (unsigned short iVar = 0; iVar < N_POLY_COEFFS; iVar++) {

SU2_CFD/include/variables/CEulerVariable.hpp

@@ -75,9 +75,9 @@ class CEulerVariable : public CFlowVariable {
   MatrixType WindGustDer;   /*! < \brief Wind gust derivatives value */
 
   bool DataDrivenFluid = false; /*!< \brief Usage of data-driven fluid model. DatasetExtrapolation and FluidEntropy will not be sized if disabled. */
-  su2vector<unsigned short> DatasetExtrapolation; /*!< \brief Stores instances of dataset bounds violation when using datadriven fluid models. */
-  su2vector<unsigned long> NIterNewtonsolver;    /*!< \brief Stores number of Newton solver iterations when using datadriven fluid models. */
-  VectorType FluidEntropy;          /*!< \brief Stores the fluid entropy value as computed by the datadriven fluid model. */
+  su2vector<unsigned short> DatasetExtrapolation; /*!< \brief Stores instances of dataset bounds violation when using data-driven fluid models. */
+  su2vector<unsigned long> NIterNewtonsolver;    /*!< \brief Stores number of Newton solver iterations when using data-driven fluid models. */
+  VectorType FluidEntropy;          /*!< \brief Stores the fluid entropy value as computed by the data-driven fluid model. */
 
  public:
   /*!

SU2_CFD/src/solvers/CEulerSolver.cpp

@@ -5672,7 +5672,8 @@ void CEulerSolver::PreprocessBC_Giles(CGeometry *geometry, CConfig *config, CNum
                   su2double Velocity2_i = GeometryToolbox::SquaredNorm(nDim, Velocity_i);
                   su2double Energy_i = nodes->GetEnergy(iPoint);
                   su2double StaticEnergy_i = Energy_i - 0.5*Velocity2_i;
-                  GetFluidModel()->SetTDState_rhoe(AverageDensity[iMarker][iSpan], StaticEnergy_i);
+                  GetFluidModel()->SetInitialDensity(AverageDensity[iMarker][iSpan]);
+                  GetFluidModel()->SetInitialEnergy(StaticEnergy_i);
                 }
 
                 ComputeTurboVelocity(Velocity_i, turboNormal, turboVelocity, marker_flag, config->GetKind_TurboMachinery(iZone));
@@ -7910,6 +7911,11 @@ void CEulerSolver::BC_ActDisk(CGeometry *geometry, CSolver **solver_container, C
       /*--- Subsonic outlet ---*/
 
       else {
+        /* Set initial guesses for density and static energy in case of data-driven fluid model. */
+        if (config->GetKind_FluidModel() == DATADRIVEN_FLUID) {
+          GetFluidModel()->SetInitialDensity(config->GetDensity_Init_DataDriven());
+          GetFluidModel()->SetInitialEnergy(config->GetEnergy_Init_DataDriven());
+        }
 
         GetFluidModel()->SetTDState_PT(P_static, T_static);
         SoS_outlet = GetFluidModel()->GetSoundSpeed();
@@ -8440,6 +8446,11 @@ void CEulerSolver::SetFreeStream_TurboSolution(CConfig *config) {
 
   auto turboNormal = config->GetFreeStreamTurboNormal();
 
+  /* Set initial guess for static energy in case of data-driven fluid model. */
+  if (config->GetKind_FluidModel() == DATADRIVEN_FLUID) {
+    GetFluidModel()->SetInitialEnergy(config->GetEnergy_Init_DataDriven());
+  }
+
   GetFluidModel()->SetTDState_Prho(Pressure_Inf, Density_Inf);
   SoundSpeed = GetFluidModel()->GetSoundSpeed();
 
@@ -8925,6 +8936,11 @@ void CEulerSolver::TurboAverageProcess(CSolver **solver, CGeometry *geometry, CC
             AverageTurboNormal  = geometry->GetAverageTurboNormal(iMarker,iSpan);
             nVert               = geometry->GetnTotVertexSpan(iMarker,iSpan);
 
+            /* Set initial guess for static energy in case of data-driven fluid model. */
+            if (config->GetKind_FluidModel() == DATADRIVEN_FLUID) {
+              GetFluidModel()->SetInitialEnergy(config->GetEnergy_Init_DataDriven());
+            }
+
             /*--- compute normal Mach number as a check for massflow average and mixedout average ---*/
             GetFluidModel()->SetTDState_Prho(TotalAreaPressure/TotalArea, TotalAreaDensity / TotalArea);
             soundSpeed = GetFluidModel()->GetSoundSpeed();
@@ -9244,6 +9260,11 @@ void CEulerSolver::MixedOut_Average (CConfig *config, su2double val_init_pressur
 
   pressure_mix = val_init_pressure;
 
+  /* Set initial guess for static energy in case of data-driven fluid model. */
+  if (config->GetKind_FluidModel() == DATADRIVEN_FLUID) {
+    GetFluidModel()->SetInitialEnergy(config->GetEnergy_Init_DataDriven());
+  }
+
   /*--- Newton-Raphson's method with central difference formula ---*/
 
   while ( iter <= maxiter ) {

SU2_CFD/src/solvers/CFEM_DG_EulerSolver.cpp

@@ -7789,8 +7789,16 @@ void CFEM_DG_EulerSolver::BoundaryStates_Riemann(CConfig                  *confi
       P_Total /= config->GetPressure_Ref();
       T_Total /= config->GetTemperature_Ref();
 
+      /* Set initial guesses for density and static energy in case of 
+         data-driven fluid model. */
+      if (config->GetKind_FluidModel() == DATADRIVEN_FLUID) {
+        FluidModel->SetInitialDensity(config->GetDensity_Init_DataDriven());
+        FluidModel->SetInitialEnergy(config->GetEnergy_Init_DataDriven());
+      }
+      
       /* Compute the total enthalpy and entropy from these values. */
       FluidModel->SetTDState_PT(P_Total, T_Total);
+
       const su2double Enthalpy_e = FluidModel->GetStaticEnergy()
                                  + FluidModel->GetPressure()/FluidModel->GetDensity();
       const su2double Entropy_e  = FluidModel->GetEntropy();
@@ -7850,6 +7858,13 @@ void CFEM_DG_EulerSolver::BoundaryStates_Riemann(CConfig                  *confi
       P_static /= config->GetPressure_Ref();
       T_static /= config->GetTemperature_Ref();
 
+      /* Set initial guesses for density and static energy in case of 
+         data-driven fluid model. */
+      if (config->GetKind_FluidModel() == DATADRIVEN_FLUID) {
+        FluidModel->SetInitialDensity(config->GetDensity_Init_DataDriven());
+        FluidModel->SetInitialEnergy(config->GetEnergy_Init_DataDriven());
+      }
+
       /* Compute the prescribed density, static energy per unit mass
          and speed of sound. */
       FluidModel->SetTDState_PT(P_static, T_static);
@@ -7901,6 +7916,12 @@ void CFEM_DG_EulerSolver::BoundaryStates_Riemann(CConfig                  *confi
       P_static /= config->GetPressure_Ref();
       Rho_static /= config->GetDensity_Ref();
 
+      /* Set initial guess for static energy in case of 
+         data-driven fluid model. */
+      if (config->GetKind_FluidModel() == DATADRIVEN_FLUID) {
+        FluidModel->SetInitialEnergy(config->GetEnergy_Init_DataDriven());
+      }
+
       /* Compute the prescribed pressure, static energy per unit mass
          and speed of sound. */
       FluidModel->SetTDState_Prho(P_static, Rho_static);
@@ -7986,6 +8007,12 @@ void CFEM_DG_EulerSolver::BoundaryStates_Riemann(CConfig                  *confi
       const su2double Pressure_e = config->GetRiemann_Var1(Marker_Tag)
                                  / config->GetPressure_Ref();
 
+      /* Set initial guesses for density and static energy in case of 
+         data-driven fluid model. */             
+      if (config->GetKind_FluidModel() == DATADRIVEN_FLUID) {
+        FluidModel->SetInitialDensity(config->GetDensity_Init_DataDriven());
+        FluidModel->SetInitialEnergy(config->GetEnergy_Init_DataDriven());
+      }
       /* Loop over the faces that are treated simultaneously. */
       for(unsigned short l=0; l<nFaceSimul; ++l) {
         const unsigned short llNVar = l*nVar;

SU2_CFD/src/solvers/CIncEulerSolver.cpp

@@ -30,7 +30,6 @@
 #include "../../include/fluid/CConstantDensity.hpp"
 #include "../../include/fluid/CIncIdealGas.hpp"
 #include "../../include/fluid/CIncIdealGasPolynomial.hpp"
-#include "../../include/fluid/CDataDrivenFluid.hpp"
 #include "../../include/variables/CIncNSVariable.hpp"
 #include "../../include/limiters/CLimiterDetails.hpp"
 #include "../../../Common/include/toolboxes/geometry_toolbox.hpp"
@@ -329,14 +328,6 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
       auxFluidModel->SetTDState_T(Temperature_FreeStream, config->GetSpecies_Init());
       break;
 
-    case DATADRIVEN_FLUID:
-    
-      auxFluidModel = new CDataDrivenFluid(config);
-      auxFluidModel->SetTDState_T(Temperature_FreeStream);
-      Pressure_Thermodynamic = auxFluidModel->GetPressure();
-      config->SetPressure_Thermodynamic(Pressure_Thermodynamic);
-      break;
-
     default:
 
       SU2_MPI::Error("Fluid model not implemented for incompressible solver.", CURRENT_FUNCTION);
@@ -499,11 +490,6 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i
         fluidModel->SetTDState_T(Temperature_FreeStreamND);
         break;
 
-      case DATADRIVEN_FLUID:
-        fluidModel = new CDataDrivenFluid(config, false);
-        fluidModel->SetTDState_T(Temperature_FreeStreamND);
-        break;
-
     }
 
     if (viscous) {