From bc0bcea36179f7331c5120209a356e957794162e Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 26 Mar 2023 09:44:31 +0100 Subject: [PATCH 1/6] deprecate cusp and make it an error to use MUSCL_FLOW=YES with centered schemes --- Common/include/option_structure.hpp | 2 - Common/src/CConfig.cpp | 17 +- QuickStart/inv_NACA0012.cfg | 12 +- .../include/numerics/flow/convection/cusp.hpp | 69 ------- SU2_CFD/src/drivers/CDriver.cpp | 14 -- SU2_CFD/src/numerics/flow/convection/cusp.cpp | 187 ------------------ .../aeroelastic/aeroelastic_NACA64A010.cfg | 4 +- .../cont_adj_euler/naca0012/inv_NACA0012.cfg | 5 +- .../naca0012/inv_NACA0012_FD.cfg | 5 +- .../naca0012/inv_NACA0012_discadj.cfg | 3 - .../cont_adj_euler/oneram6/inv_ONERAM6.cfg | 2 - .../cont_adj_rans/naca0012/turb_nasa.cfg | 3 - .../naca0012/turb_nasa_binary.cfg | 3 - .../cont_adj_rans/oneram6/turb_ONERAM6.cfg | 3 - .../control_surface/inv_ONERAM6_moving.cfg | 3 - .../control_surface/inv_ONERAM6_setting.cfg | 3 - .../coupled_cht/comp_2d/flow_cylinder.cfg | 2 - .../deformation/naca0012/def_NACA0012.cfg | 4 +- .../naca0012/surface_file_NACA0012.cfg | 2 - .../naca0012/incomp_NACA0012_disc.cfg | 2 - TestCases/euler/CRM/inv_CRM_JST.cfg | 2 - TestCases/euler/biparabolic/BIPARABOLIC.cfg | 4 +- TestCases/euler/channel/inv_channel.cfg | 4 +- TestCases/euler/channel/inv_channel_RK.cfg | 2 - TestCases/euler/naca0012/inv_NACA0012.cfg | 4 +- TestCases/euler/oneram6/inv_ONERAM6.cfg | 2 - TestCases/fixed_cl/naca0012/inv_NACA0012.cfg | 4 +- .../naca0012/inv_NACA0012_ContAdj.cfg | 6 +- TestCases/gust/inv_gust_NACA0012.cfg | 4 +- TestCases/harmonic_balance/HB.cfg | 6 +- .../pitching_NACA64A010.cfg | 4 +- .../pitching_oneram6/pitching_ONERAM6.cfg | 4 +- .../steady_inverse_design/inv_NACA0012.cfg | 4 +- .../pitching_naca64a010/turb_NACA64A010.cfg | 4 +- .../pitching_oneram6/turb_ONERAM6.cfg | 2 - .../steady_oneram6/turb_ONERAM6.cfg | 2 - TestCases/polar/naca0012/inv_NACA0012.cfg | 2 - .../turb_NACA0012_sst_multigrid_restart.cfg | 2 - TestCases/rans/rae2822/turb_SA_RAE2822.cfg | 2 - TestCases/rans/rae2822/turb_SST_RAE2822.cfg | 2 - .../rans/rae2822/turb_SST_SUST_RAE2822.cfg | 2 - TestCases/rans/s809/trans_s809.cfg | 2 - .../caradonna_tung/rot_caradonna_tung.cfg | 2 - TestCases/rotating/naca0012/rot_NACA0012.cfg | 2 - .../sliding_interface/bars_SST_2D/bars.cfg | 2 - .../pitching_NACA64A010.cfg | 2 - .../turb_NACA64A010.cfg | 4 +- config_template.cfg | 14 +- 48 files changed, 39 insertions(+), 402 deletions(-) delete mode 100644 SU2_CFD/include/numerics/flow/convection/cusp.hpp delete mode 100644 SU2_CFD/src/numerics/flow/convection/cusp.cpp diff --git a/Common/include/option_structure.hpp b/Common/include/option_structure.hpp index ef433e22a83b..4c934f0612b2 100644 --- a/Common/include/option_structure.hpp +++ b/Common/include/option_structure.hpp @@ -820,7 +820,6 @@ enum class UPWIND { MSW, /*!< \brief Modified Steger-Warming method. */ TURKEL, /*!< \brief Roe-Turkel's upwind numerical method. */ SLAU, /*!< \brief Simple Low-Dissipation AUSM numerical method. */ - CUSP, /*!< \brief Convective upwind and split pressure numerical method. */ CONVECTIVE_TEMPLATE, /*!< \brief Template for new numerical method . */ L2ROE, /*!< \brief L2ROE numerical method . */ LMROE, /*!< \brief Rieper's Low Mach ROE numerical method . */ @@ -844,7 +843,6 @@ static const MapType Upwind_Map = { MakePair("HLLC", UPWIND::HLLC) MakePair("SW", UPWIND::SW) MakePair("MSW", UPWIND::MSW) - MakePair("CUSP", UPWIND::CUSP) MakePair("SCALAR_UPWIND", UPWIND::SCALAR_UPWIND) MakePair("BOUNDED_SCALAR", UPWIND::BOUNDED_SCALAR) MakePair("CONVECTIVE_TEMPLATE", UPWIND::CONVECTIVE_TEMPLATE) diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp index 0821cd6075a6..66ce4bdbd5cb 100644 --- a/Common/src/CConfig.cpp +++ b/Common/src/CConfig.cpp @@ -1909,7 +1909,7 @@ void CConfig::SetConfig_Options() { * \n DESCRIPTION: Convective numerical method for the adjoint solver. * \n OPTIONS: See \link Upwind_Map \endlink , \link Centered_Map \endlink. Note: not all methods are guaranteed to be implemented for the adjoint solver. \ingroup Config */ addConvectOption("CONV_NUM_METHOD_ADJFLOW", Kind_ConvNumScheme_AdjFlow, Kind_Centered_AdjFlow, Kind_Upwind_AdjFlow); - /*!\brief MUSCL_FLOW \n DESCRIPTION: Check if the MUSCL scheme should be used \ingroup Config*/ + /*!\brief MUSCL_ADJFLOW \n DESCRIPTION: Check if the MUSCL scheme should be used \ingroup Config*/ addBoolOption("MUSCL_ADJFLOW", MUSCL_AdjFlow, true); /*!\brief SLOPE_LIMITER_ADJFLOW * DESCRIPTION: Slope limiter for the adjoint solution. \n OPTIONS: See \link Limiter_Map \endlink \n DEFAULT VENKATAKRISHNAN \ingroup Config*/ @@ -1920,7 +1920,7 @@ void CConfig::SetConfig_Options() { /*!\brief LAX_SENSOR_COEFF \n DESCRIPTION: 1st order artificial dissipation coefficients for the adjoint Lax-Friedrichs method. \ingroup Config*/ addDoubleOption("ADJ_LAX_SENSOR_COEFF", Kappa_1st_AdjFlow, 0.15); - /*!\brief MUSCL_FLOW \n DESCRIPTION: Check if the MUSCL scheme should be used \ingroup Config*/ + /*!\brief MUSCL_TURB \n DESCRIPTION: Check if the MUSCL scheme should be used \ingroup Config*/ addBoolOption("MUSCL_TURB", MUSCL_Turb, false); /*!\brief SLOPE_LIMITER_TURB * \n DESCRIPTION: Slope limiter \n OPTIONS: See \link Limiter_Map \endlink \n DEFAULT VENKATAKRISHNAN \ingroup Config*/ @@ -1929,7 +1929,7 @@ void CConfig::SetConfig_Options() { * \n DESCRIPTION: Convective numerical method \ingroup Config*/ addConvectOption("CONV_NUM_METHOD_TURB", Kind_ConvNumScheme_Turb, Kind_Centered_Turb, Kind_Upwind_Turb); - /*!\brief MUSCL_FLOW \n DESCRIPTION: Check if the MUSCL scheme should be used \ingroup Config*/ + /*!\brief MUSCL_ADJTURB \n DESCRIPTION: Check if the MUSCL scheme should be used \ingroup Config*/ addBoolOption("MUSCL_ADJTURB", MUSCL_AdjTurb, false); /*!\brief SLOPE_LIMITER_ADJTURB * \n DESCRIPTION: Slope limiter \n OPTIONS: See \link Limiter_Map \endlink \n DEFAULT VENKATAKRISHNAN \ingroup Config */ @@ -1944,7 +1944,7 @@ void CConfig::SetConfig_Options() { /*!\brief CONV_NUM_METHOD_SPECIES \n DESCRIPTION: Convective numerical method for species transport \ingroup Config*/ addConvectOption("CONV_NUM_METHOD_SPECIES", Kind_ConvNumScheme_Species, Kind_Centered_Species, Kind_Upwind_Species); - /*!\brief MUSCL_FLOW \n DESCRIPTION: Check if the MUSCL scheme should be used \ingroup Config*/ + /*!\brief MUSCL_HEAT \n DESCRIPTION: Check if the MUSCL scheme should be used \ingroup Config*/ addBoolOption("MUSCL_HEAT", MUSCL_Heat, false); /*!\brief SLOPE_LIMITER_HEAT \n DESCRIPTION: Slope limiter \n OPTIONS: See \link Limiter_Map \endlink \n DEFAULT NONE \ingroup Config*/ addEnumOption("SLOPE_LIMITER_HEAT", Kind_SlopeLimit_Heat, Limiter_Map, LIMITER::NONE); @@ -3560,6 +3560,14 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i SetScalarDefaults(MUSCL_Heat, Kind_ConvNumScheme_Heat, Kind_Upwind_Heat, Kind_SlopeLimit_Heat); SetScalarDefaults(MUSCL_Species, Kind_ConvNumScheme_Species, Kind_Upwind_Species, Kind_SlopeLimit_Species); + if (MUSCL_Flow && (Kind_ConvNumScheme_Flow == SPACE_CENTERED)) { + if (OptionIsSet("MUSCL_FLOW")) { + SU2_MPI::Error("Centered schemes do not use MUSCL reconstruction (use MUSCL_FLOW= NO).", CURRENT_FUNCTION); + } else { + MUSCL_Flow = false; + } + } + if (!MUSCL_Flow || (Kind_ConvNumScheme_Flow == SPACE_CENTERED)) Kind_SlopeLimit_Flow = LIMITER::NONE; if (!MUSCL_AdjFlow || (Kind_ConvNumScheme_AdjFlow == SPACE_CENTERED)) Kind_SlopeLimit_AdjFlow = LIMITER::NONE; if (!MUSCL_AdjTurb || (Kind_ConvNumScheme_AdjTurb == SPACE_CENTERED)) Kind_SlopeLimit_AdjTurb = LIMITER::NONE; @@ -6642,7 +6650,6 @@ void CConfig::SetOutput(SU2_COMPONENT val_software, unsigned short val_izone) { if (Kind_Upwind_Flow == UPWIND::HLLC) cout << "HLLC solver for the flow inviscid terms."<< endl; if (Kind_Upwind_Flow == UPWIND::SW) cout << "Steger-Warming solver for the flow inviscid terms."<< endl; if (Kind_Upwind_Flow == UPWIND::MSW) cout << "Modified Steger-Warming solver for the flow inviscid terms."<< endl; - if (Kind_Upwind_Flow == UPWIND::CUSP) cout << "CUSP solver for the flow inviscid terms."<< endl; if (Kind_Upwind_Flow == UPWIND::L2ROE) cout << "L2ROE Low Mach ROE solver for the flow inviscid terms."<< endl; if (Kind_Upwind_Flow == UPWIND::LMROE) cout << "Rieper Low Mach ROE solver for the flow inviscid terms."<< endl; if (Kind_Upwind_Flow == UPWIND::SLAU) cout << "Simple Low-Dissipation AUSM solver for the flow inviscid terms."<< endl; diff --git a/QuickStart/inv_NACA0012.cfg b/QuickStart/inv_NACA0012.cfg index a4668268b9c9..8876c69dd7c4 100644 --- a/QuickStart/inv_NACA0012.cfg +++ b/QuickStart/inv_NACA0012.cfg @@ -146,17 +146,9 @@ MG_DAMP_PROLONGATION= 1.0 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % -% Convective numerical method (JST, LAX-FRIEDRICH, CUSP, ROE, AUSM, HLLC, -% TURKEL_PREC, MSW) -CONV_NUM_METHOD_FLOW= JST -% -% Monotonic Upwind Scheme for Conservation Laws (TVD) in the flow equations. -% Required for 2nd order upwind schemes (NO, YES) -MUSCL_FLOW= YES +% Convective numerical method % -% Slope limiter (NONE, VENKATAKRISHNAN, VENKATAKRISHNAN_WANG, -% BARTH_JESPERSEN, VAN_ALBADA_EDGE) -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN_WANG +CONV_NUM_METHOD_FLOW= JST % % 2nd and 4th order artificial dissipation coefficients JST_SENSOR_COEFF= ( 0.5, 0.02 ) diff --git a/SU2_CFD/include/numerics/flow/convection/cusp.hpp b/SU2_CFD/include/numerics/flow/convection/cusp.hpp deleted file mode 100644 index 526e0d412f25..000000000000 --- a/SU2_CFD/include/numerics/flow/convection/cusp.hpp +++ /dev/null @@ -1,69 +0,0 @@ -/*! - * \file cusp.hpp - * \brief Declaration of the CUSP numerics class. - * \author F. Palacios, T. Economon - * \version 7.5.1 "Blackbird" - * - * SU2 Project Website: https://su2code.github.io - * - * The SU2 Project is maintained by the SU2 Foundation - * (http://su2foundation.org) - * - * Copyright 2012-2023, SU2 Contributors (cf. AUTHORS.md) - * - * SU2 is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * SU2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with SU2. If not, see . - */ - -#pragma once - -#include "../../CNumerics.hpp" - -/*! - * \class CUpwCUSP_Flow - * \brief Class for centered scheme - CUSP. - * \ingroup ConvDiscr - * \author F. Palacios - */ -class CUpwCUSP_Flow final : public CNumerics { - -private: - su2double Velocity_i[MAXNDIM], Velocity_j[MAXNDIM], *ProjFlux_i, *ProjFlux_j; - bool implicit; - - su2double* Flux; /*!< \brief The flux accross the face. */ - su2double** Jacobian_i; /*!< \brief The Jacobian w.r.t. point i after computation. */ - su2double** Jacobian_j; /*!< \brief The Jacobian w.r.t. point j after computation. */ -public: - - /*! - * \brief Constructor of the class. - * \param[in] val_nDim - Number of dimension of the problem. - * \param[in] val_nVar - Number of variables of the problem. - * \param[in] config - Definition of the particular problem. - */ - CUpwCUSP_Flow(unsigned short val_nDim, unsigned short val_nVar, const CConfig* config); - - /*! - * \brief Destructor of the class. - */ - ~CUpwCUSP_Flow(void) override; - - /*! - * \brief Compute the flow residual using a JST method. - * \param[in] config - Definition of the particular problem. - * \return A lightweight const-view (read-only) of the residual/flux and Jacobians. - */ - ResidualType<> ComputeResidual(const CConfig* config) override; - -}; diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp index a5881a197de7..e754a7f2598f 100644 --- a/SU2_CFD/src/drivers/CDriver.cpp +++ b/SU2_CFD/src/drivers/CDriver.cpp @@ -1783,13 +1783,6 @@ void CDriver::Numerics_Preprocessing(CConfig *config, CGeometry **geometry, CSol } break; - case UPWIND::CUSP: - for (iMGlevel = 0; iMGlevel <= config->GetnMGLevels(); iMGlevel++) { - numerics[iMGlevel][FLOW_SOL][conv_term] = new CUpwCUSP_Flow(nDim, nVar_Flow, config); - numerics[iMGlevel][FLOW_SOL][conv_bound_term] = new CUpwCUSP_Flow(nDim, nVar_Flow, config); - } - break; - default: SU2_MPI::Error("Invalid upwind scheme or not implemented.", CURRENT_FUNCTION); break; @@ -2048,13 +2041,6 @@ void CDriver::Numerics_Preprocessing(CConfig *config, CGeometry **geometry, CSol } break; - case UPWIND::CUSP: - for (iMGlevel = 0; iMGlevel <= config->GetnMGLevels(); iMGlevel++) { - numerics[iMGlevel][FLOW_SOL][conv_term] = new CUpwCUSP_Flow(nDim, nVar_Flow, config); - numerics[iMGlevel][FLOW_SOL][conv_bound_term] = new CUpwCUSP_Flow(nDim, nVar_Flow, config); - } - break; - default: SU2_MPI::Error("Riemann solver not implemented.", CURRENT_FUNCTION); break; diff --git a/SU2_CFD/src/numerics/flow/convection/cusp.cpp b/SU2_CFD/src/numerics/flow/convection/cusp.cpp deleted file mode 100644 index 030844cb3523..000000000000 --- a/SU2_CFD/src/numerics/flow/convection/cusp.cpp +++ /dev/null @@ -1,187 +0,0 @@ -/*! - * \file cusp.cpp - * \brief Implementation of the CUSP scheme. - * \author F. Palacios, T. Economon - * \version 7.5.1 "Blackbird" - * - * SU2 Project Website: https://su2code.github.io - * - * The SU2 Project is maintained by the SU2 Foundation - * (http://su2foundation.org) - * - * Copyright 2012-2023, SU2 Contributors (cf. AUTHORS.md) - * - * SU2 is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * SU2 is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with SU2. If not, see . - */ - -#include "../../../../include/numerics/flow/convection/cusp.hpp" -#include "../../../../../Common/include/toolboxes/geometry_toolbox.hpp" - -CUpwCUSP_Flow::CUpwCUSP_Flow(unsigned short val_nDim, unsigned short val_nVar, const CConfig* config) : CNumerics(val_nDim, val_nVar, config) { - - implicit = (config->GetKind_TimeIntScheme_Flow() == EULER_IMPLICIT); - - Gamma = config->GetGamma(); - Gamma_Minus_One = Gamma - 1.0; - - if (config->GetDynamic_Grid() && (SU2_MPI::GetRank() == MASTER_NODE)) - cout << "WARNING: Grid velocities are NOT yet considered by the CUSP scheme." << endl; - - /*--- Allocate some structures ---*/ - Flux = new su2double [nVar]; - ProjFlux_i = new su2double [nVar]; - ProjFlux_j = new su2double [nVar]; - Jacobian_i = new su2double* [nVar]; - Jacobian_j = new su2double* [nVar]; - for (unsigned short iVar = 0; iVar < nVar; iVar++) { - Jacobian_i[iVar] = new su2double [nVar]; - Jacobian_j[iVar] = new su2double [nVar]; - } -} - -CUpwCUSP_Flow::~CUpwCUSP_Flow(void) { - delete [] Flux; - delete [] ProjFlux_i; - delete [] ProjFlux_j; - for (unsigned short iVar = 0; iVar < nVar; iVar++) { - delete [] Jacobian_i[iVar]; - delete [] Jacobian_j[iVar]; - } - delete [] Jacobian_i; - delete [] Jacobian_j; -} - -CNumerics::ResidualType<> CUpwCUSP_Flow::ComputeResidual(const CConfig* config) { - - implicit = (config->GetKind_TimeIntScheme() == EULER_IMPLICIT); - - unsigned short iDim, iVar; - su2double Diff_U[5] = {0.0}; - - AD::SetPreaccIn(Normal, nDim); - AD::SetPreaccIn(V_i, nDim+4); - AD::SetPreaccIn(V_j, nDim+4); - - /*--- Pressure, density, enthalpy, energy, and velocity at points i and j ---*/ - - Pressure_i = V_i[nDim+1]; Pressure_j = V_j[nDim+1]; - Density_i = V_i[nDim+2]; Density_j = V_j[nDim+2]; - Enthalpy_i = V_i[nDim+3]; Enthalpy_j = V_j[nDim+3]; - su2double Energy_i = Enthalpy_i - Pressure_i/Density_i; - su2double Energy_j = Enthalpy_j - Pressure_j/Density_j; - - su2double sq_vel_i = 0.0, sq_vel_j = 0.0; - for (iDim = 0; iDim < nDim; iDim++) { - Velocity_i[iDim] = V_i[iDim+1]; - Velocity_j[iDim] = V_j[iDim+1]; - sq_vel_i += Velocity_i[iDim]*Velocity_i[iDim]; - sq_vel_j += Velocity_j[iDim]*Velocity_j[iDim]; - } - - /*-- Face area and unit normal ---*/ - - Area = GeometryToolbox::Norm(nDim, Normal); - - for (iDim = 0; iDim < nDim; iDim++) - UnitNormal[iDim] = Normal[iDim]/Area; - - /*--- Computes differences of conservative variables, with a correction for the enthalpy ---*/ - - Diff_U[0] = Density_i - Density_j; - for (iDim = 0; iDim < nDim; iDim++) - Diff_U[iDim+1] = Density_i*Velocity_i[iDim] - Density_j*Velocity_j[iDim]; - Diff_U[nVar-1] = Density_i*Enthalpy_i - Density_j*Enthalpy_j; - - /*--- Get left and right fluxes ---*/ - - GetInviscidProjFlux(&Density_i, Velocity_i, &Pressure_i, &Enthalpy_i, UnitNormal, ProjFlux_i); - GetInviscidProjFlux(&Density_j, Velocity_j, &Pressure_j, &Enthalpy_j, UnitNormal, ProjFlux_j); - - /*--- Compute dissipation parameters based on Roe-averaged values ---*/ - - su2double Beta, Nu_c; - - su2double R = sqrt(Density_j/Density_i), ProjVelocity = 0.0, sq_vel = 0.0; - - for (iDim = 0; iDim < nDim; iDim++) { - su2double MeanVel = (R*Velocity_j[iDim]+Velocity_i[iDim])/(R+1.0); - ProjVelocity += MeanVel*UnitNormal[iDim]; - sq_vel += MeanVel*MeanVel; - } - su2double MeanEnthalpy = (R*Enthalpy_j+Enthalpy_i)/(R+1.0); - su2double MeanSoundSpeed = sqrt(Gamma_Minus_One*fabs(MeanEnthalpy-0.5*sq_vel)); - - su2double Mach = ProjVelocity / MeanSoundSpeed; - - su2double tmp1 = 0.5*(Gamma+1.0)/Gamma*ProjVelocity; - su2double tmp2 = sqrt(pow(tmp1-ProjVelocity/Gamma, 2.0) + pow(MeanSoundSpeed,2.0)/Gamma); - su2double LamdaNeg = tmp1 - tmp2, LamdaPos = tmp1 + tmp2; - - if (fabs(Mach) >= 1.0) Beta = Mach/fabs(Mach); - else if (Mach >= 0.0) Beta = max(0.0, (ProjVelocity + LamdaNeg)/(ProjVelocity - LamdaNeg)); - else Beta =-max(0.0, (ProjVelocity + LamdaPos)/(ProjVelocity - LamdaPos)); - - if (fabs(Mach) >= 1.0) Nu_c = 0.0; - else { - if (Beta > 0.0) Nu_c =-(1.0+Beta)*LamdaNeg; - else if (Beta < 0.0) Nu_c = (1.0-Beta)*LamdaPos; - /*--- Limit the minimum scalar dissipation ---*/ - else Nu_c = max(fabs(ProjVelocity), config->GetEntropyFix_Coeff()*MeanSoundSpeed); - } - - /*--- Compute the residual ---*/ - - for (iVar = 0; iVar < nVar; iVar++) - Flux[iVar] = 0.5*((1.0+Beta)*ProjFlux_i[iVar] + (1.0-Beta)*ProjFlux_j[iVar] + Nu_c*Diff_U[iVar])*Area; - - /*--- Jacobian computation ---*/ - - if (implicit) { - - /*--- Flux average and difference contributions ---*/ - - GetInviscidProjJac(Velocity_i, &Energy_i, Normal, 0.5*(1.0+Beta), Jacobian_i); - GetInviscidProjJac(Velocity_j, &Energy_j, Normal, 0.5*(1.0-Beta), Jacobian_j); - - /*--- Solution difference (scalar dissipation) contribution ---*/ - - su2double cte_0 = 0.5*Nu_c*Area*config->GetCent_Jac_Fix_Factor(); - - /*--- n-1 diagonal entries ---*/ - - for (iVar = 0; iVar < (nVar-1); iVar++) { - Jacobian_i[iVar][iVar] += cte_0; - Jacobian_j[iVar][iVar] -= cte_0; - } - - /*--- Last rows ---*/ - - Jacobian_i[nVar-1][0] += cte_0*Gamma_Minus_One*0.5*sq_vel_i; - for (iDim = 0; iDim < nDim; iDim++) - Jacobian_i[nVar-1][iDim+1] -= cte_0*Gamma_Minus_One*Velocity_i[iDim]; - Jacobian_i[nVar-1][nVar-1] += cte_0*Gamma; - - Jacobian_j[nVar-1][0] -= cte_0*Gamma_Minus_One*0.5*sq_vel_j; - for (iDim = 0; iDim < nDim; iDim++) - Jacobian_j[nVar-1][iDim+1] += cte_0*Gamma_Minus_One*Velocity_j[iDim]; - Jacobian_j[nVar-1][nVar-1] -= cte_0*Gamma; - - } - - AD::SetPreaccOut(Flux, nVar); - AD::EndPreacc(); - - return ResidualType<>(Flux, Jacobian_i, Jacobian_j); - -} diff --git a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg index 944406b2c93e..8f7fdb4048d8 100644 --- a/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg +++ b/TestCases/aeroelastic/aeroelastic_NACA64A010.cfg @@ -122,8 +122,6 @@ MG_DAMP_PROLONGATION= 0.75 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN ENTROPY_FIX_COEFF= 0.001 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -157,5 +155,5 @@ RESTART_FILENAME= restart_flow.dat VOLUME_FILENAME= flow SURFACE_FILENAME= surface_flow OUTPUT_WRT_FREQ= 1000 -SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG_ON_SURFACE, PLUNGE, PITCH) +SCREEN_OUTPUT= (TIME_ITER, INNER_ITER, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG_ON_SURFACE, PLUNGE, PITCH) OUTPUT_FILES= (RESTART_ASCII) \ No newline at end of file diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg index faac3cd114f1..292545e17be1 100644 --- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg +++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012.cfg @@ -70,9 +70,6 @@ MG_DAMP_PROLONGATION= 1.0 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -128,7 +125,7 @@ GRAD_OBJFUNC_FILENAME= of_grad.dat SURFACE_FILENAME= surface_flow SURFACE_ADJ_FILENAME= surface_adjoint OUTPUT_WRT_FREQ= 250 -SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG) +SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA, RMS_DENSITY, RMS_ENERGY, LIFT, DRAG) HISTORY_OUTPUT= (ITER, RMS_RES, AERO_COEFF, SENSITIVITY) VOLUME_OUTPUT= (COORDINATES, SOLUTION, PRESSURE, TEMPERATURE, SENSITIVITY) OUTPUT_FILES=(RESTART_ASCII, PARAVIEW, SURFACE_CSV) diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg index 7be820a3240a..fca455246007 100644 --- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg +++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_FD.cfg @@ -69,9 +69,6 @@ MG_DAMP_PROLONGATION= 1.0 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -135,4 +132,4 @@ OUTPUT_FILES=(RESTART_ASCII, PARAVIEW) % OPT_OBJECTIVE= DRAG * 0.001 OPT_CONSTRAINT= ( LIFT > 0.327 ) * 0.001; ( MOMENT_Z > 0.0 ) * 0.001; ( AIRFOIL_THICKNESS > 0.12 ) * 0.001 -DEFINITION_DV= ( 30, 1.0 | airfoil | 0, 0.05 ); ( 30, 1.0 | airfoil | 0, 0.10 ); ( 30, 1.0 | airfoil | 0, 0.15 ); +DEFINITION_DV= ( 30, 1.0 | airfoil | 0, 0.05 ); ( 30, 1.0 | airfoil | 0, 0.10 ); ( 30, 1.0 | airfoil | 0, 0.15 ); diff --git a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg index 49bda853bcdd..824e6c15caa9 100644 --- a/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg +++ b/TestCases/cont_adj_euler/naca0012/inv_NACA0012_discadj.cfg @@ -51,9 +51,6 @@ ITER= 150 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg index d1d287831e95..c7b8b52b73e1 100644 --- a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg +++ b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg @@ -79,8 +79,6 @@ MG_DAMP_PROLONGATION= 0.9 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= NONE JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg index 7b30c1faadc8..9d46631ea8f5 100644 --- a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg +++ b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg @@ -58,9 +58,6 @@ LINEAR_SOLVER_ITER= 20 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.01 JST_SENSOR_COEFF= ( 0.5, 0.005 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg index f1eca8847fa9..01749d1b3e3f 100644 --- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg +++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg @@ -59,9 +59,6 @@ LINEAR_SOLVER_ITER= 20 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.01 JST_SENSOR_COEFF= ( 0.5, 0.005 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg index 706099e9e7b1..2e52829fc48d 100644 --- a/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg +++ b/TestCases/cont_adj_rans/oneram6/turb_ONERAM6.cfg @@ -70,9 +70,6 @@ MG_DAMP_PROLONGATION= 0.7 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/control_surface/inv_ONERAM6_moving.cfg b/TestCases/control_surface/inv_ONERAM6_moving.cfg index bb09bb3f21be..ad7d458ca4cd 100644 --- a/TestCases/control_surface/inv_ONERAM6_moving.cfg +++ b/TestCases/control_surface/inv_ONERAM6_moving.cfg @@ -70,9 +70,6 @@ MG_DAMP_PROLONGATION= 0.9 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.04 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/control_surface/inv_ONERAM6_setting.cfg b/TestCases/control_surface/inv_ONERAM6_setting.cfg index 1cbf9a9bfbc7..43bf414dec57 100644 --- a/TestCases/control_surface/inv_ONERAM6_setting.cfg +++ b/TestCases/control_surface/inv_ONERAM6_setting.cfg @@ -70,9 +70,6 @@ MG_DAMP_PROLONGATION= 0.9 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.04 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg b/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg index 3b7870d310b4..218cc7fa4703 100644 --- a/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg +++ b/TestCases/coupled_cht/comp_2d/flow_cylinder.cfg @@ -49,8 +49,6 @@ LINEAR_SOLVER_ITER= 5 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= NONE TIME_DISCRE_FLOW= EULER_IMPLICIT % --------------------------- CONVERGENCE PARAMETERS --------------------------% diff --git a/TestCases/deformation/naca0012/def_NACA0012.cfg b/TestCases/deformation/naca0012/def_NACA0012.cfg index 73834aa2ee6e..5135ac45b2f1 100644 --- a/TestCases/deformation/naca0012/def_NACA0012.cfg +++ b/TestCases/deformation/naca0012/def_NACA0012.cfg @@ -74,8 +74,6 @@ MG_DAMP_PROLONGATION= 1.0 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -90,7 +88,7 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------% % -DV_KIND= HICKS_HENNE +DV_KIND= HICKS_HENNE DV_MARKER= ( airfoil ) DV_PARAM= ( 1, 0.5 ) DV_VALUE= 0.1 diff --git a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg index 18a61153927e..f39721c43220 100644 --- a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg +++ b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg @@ -74,8 +74,6 @@ MG_DAMP_PROLONGATION= 1.0 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg index 879ca518d479..f6d4b5efa5fc 100644 --- a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg +++ b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg @@ -60,8 +60,6 @@ MG_DAMP_PROLONGATION= 1.0 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= NONE VENKAT_LIMITER_COEFF= 0.001 JST_SENSOR_COEFF= ( 0.0, 0.01 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg index b7e48db4b5f0..287c9bcefd74 100644 --- a/TestCases/euler/CRM/inv_CRM_JST.cfg +++ b/TestCases/euler/CRM/inv_CRM_JST.cfg @@ -65,8 +65,6 @@ MG_DAMP_PROLONGATION= 0.9 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.04 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/euler/biparabolic/BIPARABOLIC.cfg b/TestCases/euler/biparabolic/BIPARABOLIC.cfg index 86368ceaa214..c3787da951db 100644 --- a/TestCases/euler/biparabolic/BIPARABOLIC.cfg +++ b/TestCases/euler/biparabolic/BIPARABOLIC.cfg @@ -54,7 +54,7 @@ EXT_ITER= 99999999 % -------------------------- MULTIGRID PARAMETERS -----------------------------% % -MGLEVEL= 3 +MGLEVEL= 3 MGCYCLE= V_CYCLE MG_PRE_SMOOTH= ( 1, 2, 3, 3 ) MG_POST_SMOOTH= ( 0, 0, 0, 0 ) @@ -65,8 +65,6 @@ MG_DAMP_PROLONGATION= 0.95 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/euler/channel/inv_channel.cfg b/TestCases/euler/channel/inv_channel.cfg index 279bbacdf659..9acd1819ac40 100644 --- a/TestCases/euler/channel/inv_channel.cfg +++ b/TestCases/euler/channel/inv_channel.cfg @@ -10,7 +10,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------% -% +% SOLVER= EULER MATH_PROBLEM= DIRECT RESTART_SOL= NO @@ -73,8 +73,6 @@ MG_DAMP_PROLONGATION= 0.9 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/euler/channel/inv_channel_RK.cfg b/TestCases/euler/channel/inv_channel_RK.cfg index 6a4b2731bdbc..edcf30b313ca 100644 --- a/TestCases/euler/channel/inv_channel_RK.cfg +++ b/TestCases/euler/channel/inv_channel_RK.cfg @@ -66,8 +66,6 @@ MG_DAMP_PROLONGATION= 0.9 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= RUNGE-KUTTA_EXPLICIT diff --git a/TestCases/euler/naca0012/inv_NACA0012.cfg b/TestCases/euler/naca0012/inv_NACA0012.cfg index 607879da57d6..9f998d9e0879 100644 --- a/TestCases/euler/naca0012/inv_NACA0012.cfg +++ b/TestCases/euler/naca0012/inv_NACA0012.cfg @@ -71,8 +71,6 @@ MG_DAMP_PROLONGATION= 1.0 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -87,7 +85,7 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------% % -DV_KIND= HICKS_HENNE +DV_KIND= HICKS_HENNE DV_MARKER= ( airfoil ) DV_PARAM= ( 1, 0.5 ) DV_VALUE= 0.01 diff --git a/TestCases/euler/oneram6/inv_ONERAM6.cfg b/TestCases/euler/oneram6/inv_ONERAM6.cfg index ec5e0f93aa09..c7f38f4d1941 100644 --- a/TestCases/euler/oneram6/inv_ONERAM6.cfg +++ b/TestCases/euler/oneram6/inv_ONERAM6.cfg @@ -79,8 +79,6 @@ MG_DAMP_PROLONGATION= 0.9 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= NONE JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg index 8d7b8c46ae72..1a762d295e75 100644 --- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg +++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg @@ -78,8 +78,6 @@ MG_DAMP_PROLONGATION= 1.0 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -94,7 +92,7 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------% % -DV_KIND= HICKS_HENNE +DV_KIND= HICKS_HENNE DV_MARKER= ( airfoil ) DV_PARAM= ( 1, 0.5 ) DV_VALUE= 0.01 diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg index df4c8cb355d0..98a0ff215be5 100644 --- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg +++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg @@ -79,8 +79,6 @@ MG_DAMP_PROLONGATION= 1.0 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -95,7 +93,7 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------% % -DV_KIND= HICKS_HENNE +DV_KIND= HICKS_HENNE DV_MARKER= ( airfoil ) DV_PARAM= ( 1, 0.5 ) DV_VALUE= 0.01 @@ -132,7 +130,7 @@ GRAD_OBJFUNC_FILENAME= of_grad.dat SURFACE_FILENAME= surface_flow SURFACE_ADJ_FILENAME= surface_adjoint OUTPUT_WRT_FREQ= 250 -SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA) +SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_ENERGY, SENS_GEO, SENS_AOA) OUTPUT_FILES= (RESTART_ASCII) % --------------------- OPTIMAL SHAPE DESIGN DEFINITION -----------------------% diff --git a/TestCases/gust/inv_gust_NACA0012.cfg b/TestCases/gust/inv_gust_NACA0012.cfg index 4cf8daa5f624..b34aca695d21 100644 --- a/TestCases/gust/inv_gust_NACA0012.cfg +++ b/TestCases/gust/inv_gust_NACA0012.cfg @@ -46,7 +46,7 @@ MACH_MOTION= 0.2 % --------------------------- GUST SIMULATION ---------------------------------% % % The gust simulation requires the GRID_MOVEMENT flag to be set to YES. -% and the GRID_MOVEMENT_KIND to be set to GUST or any of the other options. +% and the GRID_MOVEMENT_KIND to be set to GUST or any of the other options. % Apply a wind gust (NO, YES) WIND_GUST = YES GUST_TYPE = SINE @@ -102,8 +102,6 @@ MG_DAMP_PROLONGATION= 0.75 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN ENTROPY_FIX_COEFF= 0.001 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg index a8cc80f34952..d73c5d4d591b 100644 --- a/TestCases/harmonic_balance/HB.cfg +++ b/TestCases/harmonic_balance/HB.cfg @@ -27,7 +27,7 @@ GRID_MOVEMENT= RIGID_MOTION MOTION_ORIGIN= ( 0.248 0.0 0.0 ) PITCHING_OMEGA= ( 0.0 0.0 106.69842) PITCHING_AMPL= ( 0.0 0.0 1.01 ) - + % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------% % MACH_NUMBER= 0.796 @@ -67,8 +67,6 @@ LINEAR_SOLVER_ITER= 5 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= NONE VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -129,4 +127,4 @@ OUTPUT_WRT_FREQ= 500 % OPT_OBJECTIVE= DRAG * 0.001 OPT_CONSTRAINT= NONE -DEFINITION_DV= ( 30, 1.0 | airfoil | 1, 0.75 ) +DEFINITION_DV= ( 30, 1.0 | airfoil | 1, 0.75 ) diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg index d8aab437132f..406613be3c06 100644 --- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg +++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg @@ -41,7 +41,7 @@ PITCHING_OMEGA_Z= 106.69842 PITCHING_AMPL_X= 0.0 PITCHING_AMPL_Y= 0.0 PITCHING_AMPL_Z= 1.01 - + % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------% % MACH_NUMBER= 0.796 @@ -97,8 +97,6 @@ MG_DAMP_PROLONGATION= 0.9 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.1 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg index 5ef926bb5d88..64f4ba796f6b 100644 --- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg +++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg @@ -90,8 +90,6 @@ MG_DAMP_PROLONGATION= 0.9 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -144,7 +142,7 @@ OUTPUT_WRT_FREQ= 1 % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------% % -DV_KIND= FFD_SETTING +DV_KIND= FFD_SETTING DV_MARKER= ( UPPER_SIDE, LOWER_SIDE, TIP ) DV_PARAM= ( 0, 1, 0, 0, 0.0, 0.0, 1.0 ) DV_VALUE= 0.0 diff --git a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg index 1095bbd59488..c7cdd4ed539d 100644 --- a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg +++ b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg @@ -74,8 +74,6 @@ MG_DAMP_PROLONGATION= 1.0 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -90,7 +88,7 @@ TIME_DISCRE_ADJFLOW= EULER_IMPLICIT % ----------------------- DESIGN VARIABLE PARAMETERS --------------------------% % -DV_KIND= HICKS_HENNE +DV_KIND= HICKS_HENNE DV_MARKER= ( airfoil ) DV_PARAM= ( 1, 0.5 ) DV_VALUE= 0.01 diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg index 854a28c9699b..ee9dd3981364 100644 --- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg +++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg @@ -32,7 +32,7 @@ MACH_MOTION= 0.796 MOTION_ORIGIN= 0.248 0.0 0.0 PITCHING_OMEGA= 0.0 0.0 106.69842 PITCHING_AMPL= 0.0 0.0 1.01 - + % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------% % MACH_NUMBER= 0.796 @@ -89,8 +89,6 @@ MG_DAMP_PROLONGATION= 0.7 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg index d943deff183c..d37f0cb5b325 100644 --- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg +++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg @@ -88,8 +88,6 @@ MG_DAMP_PROLONGATION= 0.7 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg index 259e678ec14c..5d343bf53e74 100644 --- a/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg +++ b/TestCases/optimization_rans/steady_oneram6/turb_ONERAM6.cfg @@ -70,8 +70,6 @@ MG_DAMP_PROLONGATION= 0.7 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg index 663f763adfad..4bf598695c35 100644 --- a/TestCases/polar/naca0012/inv_NACA0012.cfg +++ b/TestCases/polar/naca0012/inv_NACA0012.cfg @@ -75,8 +75,6 @@ MG_DAMP_PROLONGATION= 1.0 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg index 294e470fc322..327f55dad3c0 100644 --- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg +++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg @@ -105,8 +105,6 @@ MG_DAMP_PROLONGATION= 0.8 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN ENTROPY_FIX_COEFF= 0.0 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg index 33c811fc61f3..17b6e2071f59 100644 --- a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg +++ b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg @@ -62,8 +62,6 @@ MG_DAMP_PROLONGATION= 0.95 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg index 6ff0416c4abf..e867e993ec26 100644 --- a/TestCases/rans/rae2822/turb_SST_RAE2822.cfg +++ b/TestCases/rans/rae2822/turb_SST_RAE2822.cfg @@ -66,8 +66,6 @@ MG_DAMP_PROLONGATION= 0.95 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= NONE VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg index 6c25dd630495..42f3ec6079e2 100644 --- a/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg +++ b/TestCases/rans/rae2822/turb_SST_SUST_RAE2822.cfg @@ -67,8 +67,6 @@ MG_DAMP_PROLONGATION= 0.95 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= NONE VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/rans/s809/trans_s809.cfg b/TestCases/rans/s809/trans_s809.cfg index 60ef01253e63..733d27297008 100644 --- a/TestCases/rans/s809/trans_s809.cfg +++ b/TestCases/rans/s809/trans_s809.cfg @@ -66,8 +66,6 @@ MG_DAMP_PROLONGATION= 0.95 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= NONE VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg index 1ab945c73a60..944dc7c99c3d 100644 --- a/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg +++ b/TestCases/rotating/caradonna_tung/rot_caradonna_tung.cfg @@ -76,8 +76,6 @@ MG_DAMP_PROLONGATION= 0.9 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/rotating/naca0012/rot_NACA0012.cfg b/TestCases/rotating/naca0012/rot_NACA0012.cfg index 26c1ad79747a..ea880d64c3de 100644 --- a/TestCases/rotating/naca0012/rot_NACA0012.cfg +++ b/TestCases/rotating/naca0012/rot_NACA0012.cfg @@ -78,8 +78,6 @@ MG_DAMP_PROLONGATION= 0.95 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/sliding_interface/bars_SST_2D/bars.cfg b/TestCases/sliding_interface/bars_SST_2D/bars.cfg index 02c1183f0748..0f2557b9bfd2 100644 --- a/TestCases/sliding_interface/bars_SST_2D/bars.cfg +++ b/TestCases/sliding_interface/bars_SST_2D/bars.cfg @@ -102,8 +102,6 @@ MG_DAMP_PROLONGATION= 0.75 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= NONE VENKAT_LIMITER_COEFF= 0.02 TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg index 90f3e25f8146..d9f0910c39ae 100644 --- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg +++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg @@ -93,8 +93,6 @@ MG_DAMP_PROLONGATION= 0.9 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.1 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg index ac34070b9600..3f510d03e304 100644 --- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg +++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg @@ -34,7 +34,7 @@ MACH_MOTION= 0.796 MOTION_ORIGIN= 0.248 0.0 0.0 PITCHING_OMEGA= 0.0 0.0 106.69842 PITCHING_AMPL= 0.0 0.0 1.01 - + % ----------- COMPRESSIBLE AND INCOMPRESSIBLE FREE-STREAM DEFINITION ----------% % MACH_NUMBER= 0.796 @@ -91,8 +91,6 @@ MG_DAMP_PROLONGATION= 0.7 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN VENKAT_LIMITER_COEFF= 0.03 JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/config_template.cfg b/config_template.cfg index 08acc5eedc72..7a30a6d6fc87 100644 --- a/config_template.cfg +++ b/config_template.cfg @@ -1095,23 +1095,23 @@ CUSTOM_OBJFUNC= 'DRAG + 10 * pow(fmax(0.4-LIFT, 0), 2)' % Required for 2nd order upwind schemes (NO, YES) MUSCL_FLOW= YES % -% Slope limiter (NONE, VENKATAKRISHNAN, VENKATAKRISHNAN_WANG, -% BARTH_JESPERSEN, VAN_ALBADA_EDGE) +% Slope limiter (NONE, VENKATAKRISHNAN, VENKATAKRISHNAN_WANG, BARTH_JESPERSEN, VAN_ALBADA_EDGE) +% SLOPE_LIMITER_FLOW= VENKATAKRISHNAN % % Monotonic Upwind Scheme for Conservation Laws (TVD) in the turbulence equations. % Required for 2nd order upwind schemes (NO, YES) MUSCL_TURB= NO % -% Slope limiter (NONE, VENKATAKRISHNAN, VENKATAKRISHNAN_WANG, -% BARTH_JESPERSEN, VAN_ALBADA_EDGE) +% Slope limiter (NONE, VENKATAKRISHNAN, VENKATAKRISHNAN_WANG, BARTH_JESPERSEN) +% SLOPE_LIMITER_TURB= VENKATAKRISHNAN % % Monotonic Upwind Scheme for Conservation Laws (TVD) in the adjoint flow equations. % Required for 2nd order upwind schemes (NO, YES) MUSCL_ADJFLOW= YES % -% Slope limiter (NONE, VENKATAKRISHNAN, BARTH_JESPERSEN, VAN_ALBADA_EDGE, +% Slope limiter (NONE, VENKATAKRISHNAN, VENKATAKRISHNAN_WANG, BARTH_JESPERSEN, VAN_ALBADA_EDGE, % SHARP_EDGES, WALL_DISTANCE) SLOPE_LIMITER_ADJFLOW= VENKATAKRISHNAN % @@ -1119,7 +1119,7 @@ SLOPE_LIMITER_ADJFLOW= VENKATAKRISHNAN % Required for 2nd order upwind schemes (NO, YES) MUSCL_ADJTURB= NO % -% Slope limiter (NONE, VENKATAKRISHNAN, BARTH_JESPERSEN, VAN_ALBADA_EDGE) +% Slope limiter (see SLOPE_LIMITER_ADJFLOW) SLOPE_LIMITER_ADJTURB= VENKATAKRISHNAN % % Coefficient for the Venkat's limiter (upwind scheme). A larger values decrease @@ -1210,7 +1210,7 @@ MG_DAMP_PROLONGATION= 0.75 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % -% Convective numerical method (JST, JST_KE, JST_MAT, LAX-FRIEDRICH, CUSP, ROE, AUSM, +% Convective numerical method (JST, JST_KE, JST_MAT, LAX-FRIEDRICH, ROE, AUSM, % AUSMPLUSUP, AUSMPLUSUP2, AUSMPLUSM, HLLC, TURKEL_PREC, % SW, MSW, FDS, SLAU, SLAU2, L2ROE, LMROE) CONV_NUM_METHOD_FLOW= ROE From 94b5c70632cc47609798be30e43af30b41073678 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 26 Mar 2023 10:13:10 +0100 Subject: [PATCH 2/6] fix meson --- SU2_CFD/src/meson.build | 1 - 1 file changed, 1 deletion(-) diff --git a/SU2_CFD/src/meson.build b/SU2_CFD/src/meson.build index 03fe477787df..23fbeee06278 100644 --- a/SU2_CFD/src/meson.build +++ b/SU2_CFD/src/meson.build @@ -122,7 +122,6 @@ su2_cfd_src += files(['numerics/CNumerics.cpp', 'numerics/flow/convection/roe.cpp', 'numerics/flow/convection/fds.cpp', 'numerics/flow/convection/fvs.cpp', - 'numerics/flow/convection/cusp.cpp', 'numerics/flow/convection/hllc.cpp', 'numerics/flow/convection/ausm_slau.cpp', 'numerics/flow/convection/centered.cpp', From e68082115cde16eb8dc4caa6ada397bc2d5d3244 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 26 Mar 2023 10:32:45 +0100 Subject: [PATCH 3/6] fix include --- SU2_CFD/src/drivers/CDriver.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/SU2_CFD/src/drivers/CDriver.cpp b/SU2_CFD/src/drivers/CDriver.cpp index e754a7f2598f..0ea1830519ea 100644 --- a/SU2_CFD/src/drivers/CDriver.cpp +++ b/SU2_CFD/src/drivers/CDriver.cpp @@ -61,7 +61,6 @@ #include "../../include/numerics/flow/convection/roe.hpp" #include "../../include/numerics/flow/convection/fds.hpp" #include "../../include/numerics/flow/convection/fvs.hpp" -#include "../../include/numerics/flow/convection/cusp.hpp" #include "../../include/numerics/flow/convection/hllc.hpp" #include "../../include/numerics/flow/convection/ausm_slau.hpp" #include "../../include/numerics/flow/convection/centered.hpp" From d350b08305f4d01784585a7d1ef0d3cc2c4a57c5 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 26 Mar 2023 12:59:32 +0100 Subject: [PATCH 4/6] continuous adjoint fixes --- Common/src/CConfig.cpp | 7 +++++++ QuickStart/inv_NACA0012.cfg | 8 ------- SU2_CFD/src/variables/CFlowVariable.cpp | 2 +- .../cont_adj_euler/oneram6/inv_ONERAM6.cfg | 2 -- .../cont_adj_rans/naca0012/turb_nasa.cfg | 2 -- .../naca0012/turb_nasa_binary.cfg | 2 -- .../control_surface/inv_ONERAM6_moving.cfg | 2 -- .../control_surface/inv_ONERAM6_setting.cfg | 2 -- .../deformation/naca0012/def_NACA0012.cfg | 2 -- .../naca0012/surface_file_NACA0012.cfg | 2 -- .../disc_adj_euler/arina2k/Arina2KRS.cfg | 15 +------------ .../cylinder3D/inv_cylinder3D.cfg | 21 ++++--------------- TestCases/euler/CRM/inv_CRM_JST.cfg | 2 -- TestCases/euler/biparabolic/BIPARABOLIC.cfg | 2 -- TestCases/euler/naca0012/inv_NACA0012.cfg | 2 -- TestCases/euler/oneram6/inv_ONERAM6.cfg | 2 -- TestCases/fixed_cl/naca0012/inv_NACA0012.cfg | 2 -- .../naca0012/inv_NACA0012_ContAdj.cfg | 2 -- TestCases/harmonic_balance/HB.cfg | 2 -- .../nonequilibrium/invwedge/invwedge_lax.cfg | 9 +++----- .../pitching_NACA64A010.cfg | 2 -- .../pitching_oneram6/pitching_ONERAM6.cfg | 2 -- .../steady_inverse_design/inv_NACA0012.cfg | 2 -- .../pitching_naca64a010/turb_NACA64A010.cfg | 2 -- .../pitching_oneram6/turb_ONERAM6.cfg | 2 -- TestCases/polar/naca0012/inv_NACA0012.cfg | 2 -- .../unsteady_CHT_FlatPlate_Conf.cfg | 13 ------------ .../turb_NACA0012_sst_multigrid_restart.cfg | 2 -- TestCases/rans/rae2822/turb_SA_RAE2822.cfg | 2 -- TestCases/rotating/naca0012/rot_NACA0012.cfg | 2 -- .../pitching_NACA64A010.cfg | 2 -- .../turb_NACA64A010.cfg | 2 -- 32 files changed, 16 insertions(+), 109 deletions(-) diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp index 66ce4bdbd5cb..0e8199669fdd 100644 --- a/Common/src/CConfig.cpp +++ b/Common/src/CConfig.cpp @@ -3567,6 +3567,13 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i MUSCL_Flow = false; } } + if (MUSCL_AdjFlow && (Kind_ConvNumScheme_AdjFlow == SPACE_CENTERED)) { + if (OptionIsSet("MUSCL_ADJFLOW")) { + SU2_MPI::Error("Centered schemes do not use MUSCL reconstruction (use MUSCL_ADJFLOW= NO).", CURRENT_FUNCTION); + } else { + MUSCL_AdjFlow = false; + } + } if (!MUSCL_Flow || (Kind_ConvNumScheme_Flow == SPACE_CENTERED)) Kind_SlopeLimit_Flow = LIMITER::NONE; if (!MUSCL_AdjFlow || (Kind_ConvNumScheme_AdjFlow == SPACE_CENTERED)) Kind_SlopeLimit_AdjFlow = LIMITER::NONE; diff --git a/QuickStart/inv_NACA0012.cfg b/QuickStart/inv_NACA0012.cfg index 8876c69dd7c4..7f30c73c42a5 100644 --- a/QuickStart/inv_NACA0012.cfg +++ b/QuickStart/inv_NACA0012.cfg @@ -161,14 +161,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % Convective numerical method (JST, LAX-FRIEDRICH, ROE) CONV_NUM_METHOD_ADJFLOW= JST % -% Monotonic Upwind Scheme for Conservation Laws (TVD) in the adjoint flow equations. -% Required for 2nd order upwind schemes (NO, YES) -MUSCL_ADJFLOW= YES -% -% Slope limiter (NONE, VENKATAKRISHNAN, BARTH_JESPERSEN, VAN_ALBADA_EDGE, -% SHARP_EDGES, WALL_DISTANCE) -SLOPE_LIMITER_ADJFLOW= NONE -% % Reduction factor of the CFL coefficient in the adjoint problem CFL_REDUCTION_ADJFLOW= 0.01 % diff --git a/SU2_CFD/src/variables/CFlowVariable.cpp b/SU2_CFD/src/variables/CFlowVariable.cpp index 09bc5e0f8893..1fdfd4845237 100644 --- a/SU2_CFD/src/variables/CFlowVariable.cpp +++ b/SU2_CFD/src/variables/CFlowVariable.cpp @@ -50,7 +50,7 @@ CFlowVariable::CFlowVariable(unsigned long npoint, unsigned long ndim, unsigned Primitive.resize(nPoint, nPrimVar) = su2double(0.0); - if (config->GetMUSCL_Flow() || config->GetViscous()) { + if (config->GetMUSCL_Flow() || config->GetViscous() || config->GetContinuous_Adjoint()) { Gradient_Primitive.resize(nPoint, nPrimVarGrad, nDim, 0.0); } diff --git a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg index c7b8b52b73e1..d23b40726096 100644 --- a/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg +++ b/TestCases/cont_adj_euler/oneram6/inv_ONERAM6.cfg @@ -85,8 +85,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% % CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.5 TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg index 9d46631ea8f5..ca0506980a66 100644 --- a/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg +++ b/TestCases/cont_adj_rans/naca0012/turb_nasa.cfg @@ -72,8 +72,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.002 ) CFL_REDUCTION_ADJFLOW= 0.25 diff --git a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg index 01749d1b3e3f..df636cd5fcd8 100644 --- a/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg +++ b/TestCases/cont_adj_rans/naca0012/turb_nasa_binary.cfg @@ -73,8 +73,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.002 ) CFL_REDUCTION_ADJFLOW= 0.25 diff --git a/TestCases/control_surface/inv_ONERAM6_moving.cfg b/TestCases/control_surface/inv_ONERAM6_moving.cfg index ad7d458ca4cd..d9db83c262d9 100644 --- a/TestCases/control_surface/inv_ONERAM6_moving.cfg +++ b/TestCases/control_surface/inv_ONERAM6_moving.cfg @@ -77,8 +77,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.04 ) CFL_REDUCTION_ADJFLOW= 0.5 diff --git a/TestCases/control_surface/inv_ONERAM6_setting.cfg b/TestCases/control_surface/inv_ONERAM6_setting.cfg index 43bf414dec57..d29f87022343 100644 --- a/TestCases/control_surface/inv_ONERAM6_setting.cfg +++ b/TestCases/control_surface/inv_ONERAM6_setting.cfg @@ -77,8 +77,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.04 ) CFL_REDUCTION_ADJFLOW= 0.5 diff --git a/TestCases/deformation/naca0012/def_NACA0012.cfg b/TestCases/deformation/naca0012/def_NACA0012.cfg index 5135ac45b2f1..9f5d4a7a883d 100644 --- a/TestCases/deformation/naca0012/def_NACA0012.cfg +++ b/TestCases/deformation/naca0012/def_NACA0012.cfg @@ -80,8 +80,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% % CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.5 TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg index f39721c43220..8896ecd94546 100644 --- a/TestCases/deformation/naca0012/surface_file_NACA0012.cfg +++ b/TestCases/deformation/naca0012/surface_file_NACA0012.cfg @@ -80,8 +80,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% % CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.5 TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg index 0adc1f99fefb..a6020dacefc2 100644 --- a/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg +++ b/TestCases/disc_adj_euler/arina2k/Arina2KRS.cfg @@ -20,7 +20,7 @@ RESTART_SOL= NO DISCARD_INFILES= NO SYSTEM_MEASUREMENTS= SI -% -------------------- COMPRESSIBLE FREE-STREAM +% -------------------- COMPRESSIBLE FREE-STREAM % MACH_NUMBER= 0.2395 AOA= 0.0 @@ -94,21 +94,8 @@ OBJECTIVE_WEIGHT = 1.0 % ----------- SLOPE LIMITER AND DISSIPATION SENSOR DEFINITION -----------------% % -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -MUSCL_TURB= NO -SLOPE_LIMITER_TURB= VENKATAKRISHNAN -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= VENKATAKRISHNAN -MUSCL_ADJTURB= NO -SLOPE_LIMITER_ADJTURB= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.05 -ADJ_SHARP_LIMITER_COEFF= 3.0 -LIMITER_ITER= 999999 LAX_SENSOR_COEFF= 0.15 JST_SENSOR_COEFF= ( 0.5, 0.02 ) -ADJ_LAX_SENSOR_COEFF= 0.15 -ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) % ------------------------ LINEAR SOLVER DEFINITION ---------------------------% % diff --git a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg index 6490cb0e66ab..bb26a5681093 100644 --- a/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg +++ b/TestCases/disc_adj_euler/cylinder3D/inv_cylinder3D.cfg @@ -17,7 +17,7 @@ MATH_PROBLEM= DISCRETE_ADJOINT RESTART_SOL= NO DISCARD_INFILES= NO SYSTEM_MEASUREMENTS= SI -REORIENT_ELEMENTS= NO +REORIENT_ELEMENTS= NO HISTORY_OUTPUT= (ITER, RMS_RES, SENSITIVITY) % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------% @@ -38,7 +38,7 @@ REF_DIMENSIONALIZATION= FREESTREAM_PRESS_EQ_ONE % -------------------- BOUNDARY CONDITION DEFINITION --------------------------% % MARKER_EULER= (CYLINDER_DOWN, CYLINDER_UP, SIDE, WALL) -INLET_TYPE= MASS_FLOW +INLET_TYPE= MASS_FLOW MARKER_INLET= ( IN, 1.22498, 102.089, 1.0, 0.0, 0.0 ) MARKER_OUTLET= ( OUT, 101325 ) @@ -48,7 +48,7 @@ MARKER_PLOTTING = ( CYLINDER_DOWN, CYLINDER_UP ) MARKER_MONITORING = ( CYLINDER_DOWN, CYLINDER_UP ) MARKER_DESIGNING = ( CYLINDER_DOWN, CYLINDER_UP ) MARKER_ANALYZE = ( IN, OUT ) -MARKER_ANALYZE_AVERAGE = AREA +MARKER_ANALYZE_AVERAGE = AREA % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------% % @@ -56,25 +56,12 @@ NUM_METHOD_GRAD= GREEN_GAUSS CFL_NUMBER= 10.0 CFL_ADAPT= NO CFL_ADAPT_PARAM= ( 1.5, 0.5, 1.25, 50.0 ) -OBJECTIVE_FUNCTION= LIFT +OBJECTIVE_FUNCTION= LIFT % ----------- SLOPE LIMITER AND DISSIPATION SENSOR DEFINITION -----------------% % -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -MUSCL_TURB= NO -SLOPE_LIMITER_TURB= VENKATAKRISHNAN -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= VENKATAKRISHNAN -MUSCL_ADJTURB= NO -SLOPE_LIMITER_ADJTURB= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.05 -ADJ_SHARP_LIMITER_COEFF= 3.0 -LIMITER_ITER= 999999 LAX_SENSOR_COEFF= 0.15 JST_SENSOR_COEFF= ( 0.5, 0.02 ) -ADJ_LAX_SENSOR_COEFF= 0.15 -ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) % ------------------------ LINEAR SOLVER DEFINITION ---------------------------% % diff --git a/TestCases/euler/CRM/inv_CRM_JST.cfg b/TestCases/euler/CRM/inv_CRM_JST.cfg index 287c9bcefd74..4e5e9839caab 100644 --- a/TestCases/euler/CRM/inv_CRM_JST.cfg +++ b/TestCases/euler/CRM/inv_CRM_JST.cfg @@ -73,8 +73,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.04 ) CFL_REDUCTION_ADJFLOW= 0.5 diff --git a/TestCases/euler/biparabolic/BIPARABOLIC.cfg b/TestCases/euler/biparabolic/BIPARABOLIC.cfg index c3787da951db..94a1aee34ca6 100644 --- a/TestCases/euler/biparabolic/BIPARABOLIC.cfg +++ b/TestCases/euler/biparabolic/BIPARABOLIC.cfg @@ -73,8 +73,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % OBJECTIVE_FUNCTION= EQUIVALENT_AREA CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.8 diff --git a/TestCases/euler/naca0012/inv_NACA0012.cfg b/TestCases/euler/naca0012/inv_NACA0012.cfg index 9f998d9e0879..98af59604f82 100644 --- a/TestCases/euler/naca0012/inv_NACA0012.cfg +++ b/TestCases/euler/naca0012/inv_NACA0012.cfg @@ -77,8 +77,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% % CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.5 TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/euler/oneram6/inv_ONERAM6.cfg b/TestCases/euler/oneram6/inv_ONERAM6.cfg index c7f38f4d1941..043a66e19105 100644 --- a/TestCases/euler/oneram6/inv_ONERAM6.cfg +++ b/TestCases/euler/oneram6/inv_ONERAM6.cfg @@ -85,8 +85,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% % CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.5 TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg index 1a762d295e75..e83ac88b86f6 100644 --- a/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg +++ b/TestCases/fixed_cl/naca0012/inv_NACA0012.cfg @@ -84,8 +84,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% % CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.5 TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg index 98a0ff215be5..ba4bb1f9f9a3 100644 --- a/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg +++ b/TestCases/fixed_cl/naca0012/inv_NACA0012_ContAdj.cfg @@ -85,8 +85,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% % CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.5 TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/harmonic_balance/HB.cfg b/TestCases/harmonic_balance/HB.cfg index d73c5d4d591b..b34daa826e01 100644 --- a/TestCases/harmonic_balance/HB.cfg +++ b/TestCases/harmonic_balance/HB.cfg @@ -75,8 +75,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.6 diff --git a/TestCases/nonequilibrium/invwedge/invwedge_lax.cfg b/TestCases/nonequilibrium/invwedge/invwedge_lax.cfg index 0ca7867ae3d7..d5b025f9ab49 100644 --- a/TestCases/nonequilibrium/invwedge/invwedge_lax.cfg +++ b/TestCases/nonequilibrium/invwedge/invwedge_lax.cfg @@ -47,9 +47,6 @@ LINEAR_SOLVER_ITER= 5 % -----------------------------------------------------------------------% % CONV_NUM_METHOD_FLOW= LAX-FRIEDRICH -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.05 TIME_DISCRE_FLOW= EULER_IMPLICIT % --------------------------- CONVERGENCE PARAMETERS --------------------------% @@ -63,11 +60,11 @@ CONV_CAUCHY_EPS= 1E-10 % MESH_FILENAME= invwedge.su2 MESH_FORMAT= SU2 -SOLUTION_FILENAME= restart_flow.dat -TABULAR_FORMAT= TECPLOT +SOLUTION_FILENAME= restart_flow.dat +TABULAR_FORMAT= TECPLOT CONV_FILENAME= convergence RESTART_FILENAME= restart_flow.dat VOLUME_FILENAME= soln_volume -SURFACE_FILENAME= soln_surface +SURFACE_FILENAME= soln_surface OUTPUT_WRT_FREQ= 100 OUTPUT_FILES= (RESTART_ASCII, PARAVIEW_ASCII) diff --git a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg index 406613be3c06..f4e9b0862ed1 100644 --- a/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg +++ b/TestCases/optimization_euler/pitching_naca64a010/pitching_NACA64A010.cfg @@ -105,8 +105,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.5 TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg index 64f4ba796f6b..e056a0664da2 100644 --- a/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg +++ b/TestCases/optimization_euler/pitching_oneram6/pitching_ONERAM6.cfg @@ -97,8 +97,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% % CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.25 diff --git a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg index c7cdd4ed539d..b98662f4560b 100644 --- a/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg +++ b/TestCases/optimization_euler/steady_inverse_design/inv_NACA0012.cfg @@ -80,8 +80,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% % CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.5 TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg index ee9dd3981364..0d327d0e90f8 100644 --- a/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg +++ b/TestCases/optimization_rans/pitching_naca64a010/turb_NACA64A010.cfg @@ -104,8 +104,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.01 ) CFL_REDUCTION_ADJFLOW= 0.9 diff --git a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg index d37f0cb5b325..ce6db99717a5 100644 --- a/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg +++ b/TestCases/optimization_rans/pitching_oneram6/turb_ONERAM6.cfg @@ -103,8 +103,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 ) TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/polar/naca0012/inv_NACA0012.cfg b/TestCases/polar/naca0012/inv_NACA0012.cfg index 4bf598695c35..b083add885f1 100644 --- a/TestCases/polar/naca0012/inv_NACA0012.cfg +++ b/TestCases/polar/naca0012/inv_NACA0012.cfg @@ -80,8 +80,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.5 TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg index 481b6bea1d4c..04c73f951bff 100644 --- a/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg +++ b/TestCases/py_wrapper/flatPlate_unsteady_CHT/unsteady_CHT_FlatPlate_Conf.cfg @@ -115,21 +115,8 @@ SENS_REMOVE_SHARP= NO % ----------- SLOPE LIMITER AND DISSIPATION SENSOR DEFINITION -----------------% % -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -MUSCL_TURB= NO -SLOPE_LIMITER_TURB= VENKATAKRISHNAN -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= VENKATAKRISHNAN -MUSCL_ADJTURB= NO -SLOPE_LIMITER_ADJTURB= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.05 -ADJ_SHARP_LIMITER_COEFF= 3.0 -LIMITER_ITER= 999999 LAX_SENSOR_COEFF= 0.15 JST_SENSOR_COEFF= ( 0.5, 0.02 ) -ADJ_LAX_SENSOR_COEFF= 0.15 -ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) % ------------------------ LINEAR SOLVER DEFINITION ---------------------------% % diff --git a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg index 327f55dad3c0..15af3903f870 100644 --- a/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg +++ b/TestCases/rans/naca0012/turb_NACA0012_sst_multigrid_restart.cfg @@ -119,8 +119,6 @@ CFL_REDUCTION_TURB= 1.0 % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_ADJFLOW= EULER_IMPLICIT CFL_REDUCTION_ADJFLOW= 0.8 diff --git a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg index 17b6e2071f59..a2e55937a884 100644 --- a/TestCases/rans/rae2822/turb_SA_RAE2822.cfg +++ b/TestCases/rans/rae2822/turb_SA_RAE2822.cfg @@ -75,8 +75,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT % ---------------- ADJOINT-FLOW NUMERICAL METHOD DEFINITION -------------------% OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.01 ) CFL_REDUCTION_ADJFLOW= 0.75 diff --git a/TestCases/rotating/naca0012/rot_NACA0012.cfg b/TestCases/rotating/naca0012/rot_NACA0012.cfg index ea880d64c3de..608002221adb 100644 --- a/TestCases/rotating/naca0012/rot_NACA0012.cfg +++ b/TestCases/rotating/naca0012/rot_NACA0012.cfg @@ -86,8 +86,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 ) TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg index d9f0910c39ae..bd7083dd7b1b 100644 --- a/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg +++ b/TestCases/unsteady/pitching_naca64a010_euler/pitching_NACA64A010.cfg @@ -101,8 +101,6 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_JST_SENSOR_COEFF= ( 0.0, 0.02 ) CFL_REDUCTION_ADJFLOW= 0.5 TIME_DISCRE_ADJFLOW= EULER_IMPLICIT diff --git a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg index 3f510d03e304..e2a0beda2845 100644 --- a/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg +++ b/TestCases/unsteady/pitching_naca64a010_rans/turb_NACA64A010.cfg @@ -106,8 +106,6 @@ TIME_DISCRE_TURB= EULER_IMPLICIT % OBJECTIVE_FUNCTION= DRAG CONV_NUM_METHOD_ADJFLOW= JST -MUSCL_ADJFLOW= YES -SLOPE_LIMITER_ADJFLOW= NONE ADJ_SHARP_LIMITER_COEFF= 3.0 ADJ_JST_SENSOR_COEFF= ( 0.0, 0.01 ) CFL_REDUCTION_ADJFLOW= 0.9 From 68bf5902d5163207bba3b8b332728d6884632ca7 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Mon, 27 Mar 2023 07:22:20 +0100 Subject: [PATCH 5/6] fix un init bool --- Common/src/CConfig.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp index 0e8199669fdd..ea45d2d01591 100644 --- a/Common/src/CConfig.cpp +++ b/Common/src/CConfig.cpp @@ -5157,8 +5157,7 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i Mesh_Box_Size[1] = 33; Mesh_Box_Size[2] = 33; } else if (nMesh_Box_Size != 3) { - SU2_MPI::Error(string("MESH_BOX_SIZE specified without 3 values.\n"), - CURRENT_FUNCTION); + SU2_MPI::Error("MESH_BOX_SIZE specified without 3 values.\n", CURRENT_FUNCTION); } /* Force the lowest memory preconditioner when direct solvers are used. */ @@ -5175,8 +5174,8 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i if (DiscreteAdjoint) { #if !defined CODI_REVERSE_TYPE if (Kind_SU2 == SU2_COMPONENT::SU2_CFD) { - SU2_MPI::Error(string("SU2_CFD: Config option MATH_PROBLEM= DISCRETE_ADJOINT requires AD support!\n") + - string("Please use SU2_CFD_AD (configuration/compilation is done using the preconfigure.py script)."), + SU2_MPI::Error("SU2_CFD: Config option MATH_PROBLEM= DISCRETE_ADJOINT requires AD support!\n" + "Please use SU2_CFD_AD (configuration/compilation is done using the preconfigure.py script).", CURRENT_FUNCTION); } #endif @@ -5190,8 +5189,8 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i Restart_Flow = false; if (Unst_AdjointIter- long(nTimeIter) < 0){ - SU2_MPI::Error(string("Invalid iteration number requested for unsteady adjoint.\n" ) + - string("Make sure EXT_ITER is larger or equal than UNST_ADJOINT_ITER."), + SU2_MPI::Error("Invalid iteration number requested for unsteady adjoint.\n" + "Make sure EXT_ITER is larger or equal than UNST_ADJOINT_ITER.", CURRENT_FUNCTION); } @@ -5250,8 +5249,7 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i turbulence model. */ if (MUSCL_AdjTurb) { - SU2_MPI::Error(string("MUSCL_ADJTURB= YES not currently supported.\n") + - string("Please select MUSCL_ADJTURB= NO (first-order)."), + SU2_MPI::Error("MUSCL_ADJTURB= YES not currently supported.\nPlease select MUSCL_ADJTURB= NO (first-order).", CURRENT_FUNCTION); } @@ -5272,9 +5270,11 @@ void CConfig::SetPostprocessing(SU2_COMPONENT val_software, unsigned short val_i we also want to avoid recomputation. */ ReconstructionGradientRequired = false; - Kind_Gradient_Method_Recon = Kind_Gradient_Method; + Kind_Gradient_Method_Recon = Kind_Gradient_Method; } + } else { + ReconstructionGradientRequired = false; } if (ReconstructionGradientRequired && GetFluidProblem() && Kind_ConvNumScheme_Flow == SPACE_CENTERED) From cda1c50ff481d72274df76eda6770015d3a36e5e Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Mon, 27 Mar 2023 08:32:12 +0100 Subject: [PATCH 6/6] fix more testcases --- TestCases/disc_adj_heat/disc_adj_heat.cfg | 2 -- .../harmonic_balance/hb_rans_preconditioning/davis.cfg | 8 +------- .../pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg | 3 --- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/TestCases/disc_adj_heat/disc_adj_heat.cfg b/TestCases/disc_adj_heat/disc_adj_heat.cfg index a2509c72d08d..2b3ad200e754 100644 --- a/TestCases/disc_adj_heat/disc_adj_heat.cfg +++ b/TestCases/disc_adj_heat/disc_adj_heat.cfg @@ -107,8 +107,6 @@ LINEAR_SOLVER_ITER= 10 CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES - JST_SENSOR_COEFF= ( 0.5, 0.05 ) TIME_DISCRE_FLOW= EULER_IMPLICIT diff --git a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg index 9ab79f61443c..07e6b6d0fab5 100644 --- a/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg +++ b/TestCases/harmonic_balance/hb_rans_preconditioning/davis.cfg @@ -67,16 +67,10 @@ LINEAR_SOLVER_PREC= LU_SGS LINEAR_SOLVER_ERROR= 1E-4 LINEAR_SOLVER_ITER= 5 -% ----------- SLOPE LIMITER AND DISSIPATION SENSOR DEFINITION -----------------% -% -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN -VENKAT_LIMITER_COEFF= 0.05 -JST_SENSOR_COEFF= ( 0.5, 0.02 ) - % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST +JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT % -------------------- TURBULENT NUMERICAL METHOD DEFINITION ------------------% diff --git a/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg b/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg index ee33ca1ee9cd..0f84217b43dd 100644 --- a/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg +++ b/TestCases/unsteady/pitching_naca0015_rans_inc/config_incomp_turb_sa.cfg @@ -67,10 +67,7 @@ LIMITER_ITER= 99999 % -------------------- FLOW NUMERICAL METHOD DEFINITION -----------------------% % CONV_NUM_METHOD_FLOW= JST -MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= NONE TIME_DISCRE_FLOW= EULER_IMPLICIT -RK_ALPHA_COEFF= ( 0.66667, 0.66667, 1.000000 ) % -------------------- TURBULENT NUMERICAL METHOD DEFINITION ------------------% %