From f21e9f4974b821d5b10560dfa424b006add4f6c2 Mon Sep 17 00:00:00 2001 From: Cristopher-Morales Date: Fri, 15 Sep 2023 09:56:33 +0200 Subject: [PATCH 1/5] using thermodynamic pressure for Inc Ideal gas models --- SU2_CFD/src/solvers/CIncEulerSolver.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/SU2_CFD/src/solvers/CIncEulerSolver.cpp b/SU2_CFD/src/solvers/CIncEulerSolver.cpp index d8f53845622..15b02264728 100644 --- a/SU2_CFD/src/solvers/CIncEulerSolver.cpp +++ b/SU2_CFD/src/solvers/CIncEulerSolver.cpp @@ -298,17 +298,15 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i case INC_IDEAL_GAS: config->SetGas_Constant(UNIVERSAL_GAS_CONSTANT/(config->GetMolecular_Weight()/1000.0)); - Pressure_Thermodynamic = Density_FreeStream*Temperature_FreeStream*config->GetGas_Constant(); + Pressure_Thermodynamic = config->GetPressure_Thermodynamic(); auxFluidModel = new CIncIdealGas(config->GetSpecific_Heat_Cp(), config->GetGas_Constant(), Pressure_Thermodynamic); auxFluidModel->SetTDState_T(Temperature_FreeStream); - Pressure_Thermodynamic = auxFluidModel->GetPressure(); - config->SetPressure_Thermodynamic(Pressure_Thermodynamic); break; case INC_IDEAL_GAS_POLY: config->SetGas_Constant(UNIVERSAL_GAS_CONSTANT/(config->GetMolecular_Weight()/1000.0)); - Pressure_Thermodynamic = Density_FreeStream*Temperature_FreeStream*config->GetGas_Constant(); + Pressure_Thermodynamic = config->GetPressure_Thermodynamic(); auxFluidModel = new CIncIdealGasPolynomial(config->GetGas_Constant(), Pressure_Thermodynamic); if (viscous) { /*--- Variable Cp model via polynomial. ---*/ @@ -317,8 +315,6 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i auxFluidModel->SetCpModel(config); } auxFluidModel->SetTDState_T(Temperature_FreeStream); - Pressure_Thermodynamic = auxFluidModel->GetPressure(); - config->SetPressure_Thermodynamic(Pressure_Thermodynamic); break; case FLUID_MIXTURE: @@ -334,7 +330,6 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i config->SetGas_Constant(UNIVERSAL_GAS_CONSTANT / (config->GetMolecular_Weight() / 1000.0)); Pressure_Thermodynamic = config->GetPressure_Thermodynamic(); auxFluidModel = new CFluidFlamelet(config, Pressure_Thermodynamic); - config->SetPressure_Thermodynamic(Pressure_Thermodynamic); auxFluidModel->SetTDState_T(Temperature_FreeStream, config->GetSpecies_Init()); break; From 4ad661a258b3fb5fd16849b1d1cf4e879fbe888a Mon Sep 17 00:00:00 2001 From: Cristopher-Morales Date: Mon, 18 Sep 2023 16:59:19 +0200 Subject: [PATCH 2/5] update test cases options --- Common/include/CConfig.hpp | 8 ++++---- Common/src/CConfig.cpp | 10 ++++++++-- SU2_CFD/src/solvers/CIncEulerSolver.cpp | 8 ++++++-- .../coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg | 2 +- .../disc_adj_unsteadyCHT_cylinder/fluid.cfg | 2 +- TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg | 2 +- .../coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg | 2 +- .../intersection_prevention/def_intersect.cfg | 2 +- TestCases/disc_adj_heat/disc_adj_heat.cfg | 4 ++-- TestCases/disc_adj_heat/primal.cfg | 2 +- .../naca0012/incomp_NACA0012_disc.cfg | 2 +- .../cylinder/heated_cylinder.cfg | 2 +- .../disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg | 2 +- .../lam_prem_ch4_cfd.cfg | 1 - .../lam_prem_ch4_hx_ad.cfg | 1 - .../lam_prem_ch4_hx_dot.cfg | 1 - .../lam_prem_ch4_cht_cfd_fluid.cfg | 1 - .../lam_prem_ch4_cht_ad_fluid.cfg | 1 - .../lam_prem_ch4_cfd_axi.cfg | 1 - .../lam_partial_prem_ch4_cfd.cfg | 1 - TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg | 2 +- TestCases/incomp_euler/nozzle/inv_nozzle.cfg | 2 +- TestCases/incomp_navierstokes/bend/lam_bend.cfg | 2 +- .../buoyancy_cavity/lam_buoyancy_cavity.cfg | 3 ++- .../incomp_navierstokes/cylinder/incomp_cylinder.cfg | 2 +- .../incomp_navierstokes/cylinder/poly_cylinder.cfg | 2 +- .../chtPinArray_2d/BC_HeatTransfer.cfg | 2 +- .../streamwise_periodic/chtPinArray_2d/configFluid.cfg | 2 +- .../streamwise_periodic/chtPinArray_3d/configFluid.cfg | 2 +- .../dp-adjoint_chtPinArray_2d/configFluid.cfg | 2 +- .../pipeSlice_3d/sp_pipeSlice_3d_dp_hf_tp.cfg | 2 +- TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg | 2 +- .../rough_flatplate/rough_flatplate_incomp.cfg | 2 +- TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg | 2 +- .../disc_adj_flow/mesh_disp_sens/configAD_flow.cfg | 2 +- TestCases/radiation/p1adjoint/configp1adjoint.cfg | 4 ++-- TestCases/radiation/p1model/configp1.cfg | 2 +- .../incompressible_steady/configCircle.cfg | 2 +- .../incompressible_steady/configOut.cfg | 2 +- .../incompressible_unsteady/configCircle.cfg | 2 +- .../incompressible_unsteady/configOut.cfg | 2 +- TestCases/species_transport/multizone/zone1.cfg | 2 +- TestCases/species_transport/multizone/zone2.cfg | 2 +- .../passive_transport_validation/passive_transport.cfg | 2 +- .../species2_primitiveVenturi.cfg | 2 +- .../species2_primitiveVenturi_boundedscalar.cfg | 2 +- .../species2_primitiveVenturi_mixingmodel.cfg | 1 - ..._primitiveVenturi_mixingmodel_TURBULENT_MARKERS.cfg | 1 - ...ies2_primitiveVenturi_mixingmodel_boundedscalar.cfg | 1 - ...s2_primitiveVenturi_mixingmodel_heatcapacity_H2.cfg | 1 - ...primitiveVenturi_mixingmodel_heatcapacity_H2_ND.cfg | 1 - ...species2_primitiveVenturi_mixingmodel_viscosity.cfg | 1 - .../species3_primitiveVenturi_inletFile.cfg | 2 +- .../transitional_BC_model_ConfigFile.cfg | 2 +- .../vandv/species_transport/sandia_jet/validation.cfg | 1 - .../flatplate/incompressible_SA/turb_SA_flatplate.cfg | 2 +- .../incompressible_SST/turb_SST_flatplate.cfg | 2 +- config_template.cfg | 8 ++++---- 58 files changed, 65 insertions(+), 68 deletions(-) diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp index 563d477a696..207a7046102 100644 --- a/Common/include/CConfig.hpp +++ b/Common/include/CConfig.hpp @@ -832,7 +832,7 @@ class CConfig { Inc_Density_Ref, /*!< \brief Reference density for custom incompressible non-dim. */ Inc_Velocity_Ref, /*!< \brief Reference velocity for custom incompressible non-dim. */ Inc_Temperature_Ref, /*!< \brief Reference temperature for custom incompressible non-dim. */ - Inc_Density_Init, /*!< \brief Initial density for incompressible flows. */ + Density_Constant, /*!< \brief Initial density for incompressible flows. */ Inc_Temperature_Init, /*!< \brief Initial temperature for incompressible flows w/ heat transfer. */ Heat_Flux_Ref, /*!< \brief Reference heat flux for non-dim. */ Gas_Constant_Ref, /*!< \brief Reference specific gas constant. */ @@ -2081,10 +2081,10 @@ class CConfig { su2double GetInc_Temperature_Ref(void) const { return Inc_Temperature_Ref; } /*! - * \brief Get the value of the initial density for incompressible flows. - * \return Initial density for incompressible flows. + * \brief Get the value of the constant density for incompressible flows. + * \return Constant density for incompressible flows when CONSTANT_DENSITY fluid model is used. */ - su2double GetInc_Density_Init(void) const { return Inc_Density_Init; } + su2double GetInc_Constant_Density(void) const { return Density_Constant; } /*! * \brief Get the value of the initial velocity for incompressible flows. diff --git a/Common/src/CConfig.cpp b/Common/src/CConfig.cpp index f660ec5633d..d3ac71c987f 100644 --- a/Common/src/CConfig.cpp +++ b/Common/src/CConfig.cpp @@ -1246,6 +1246,9 @@ void CConfig::SetConfig_Options() { /* DESCRIPTION: default value for AIR */ addDoubleListOption("MU_CONSTANT", nMu_Constant, Mu_Constant); + /*!\brief CONSTANT_DENSITY \n DESCRIPTION: Constant density for incompressible flows (1.2886 kg/m^3 by default) \ingroup Config*/ + addDoubleOption("DENSITY_CONSTANT", Density_Constant, 1.2886); + /*--- Options related to Sutherland Viscosity Model ---*/ /* DESCRIPTION: Sutherland Viscosity Ref default value for AIR SI */ @@ -1334,8 +1337,6 @@ void CConfig::SetConfig_Options() { addDoubleOption("INC_VELOCITY_REF", Inc_Velocity_Ref, 1.0); /*!\brief INC_TEMPERATURE_REF \n DESCRIPTION: Reference temperature for incompressible flows with the energy equation (1.0 by default) \ingroup Config*/ addDoubleOption("INC_TEMPERATURE_REF", Inc_Temperature_Ref, 1.0); - /*!\brief INC_DENSITY_INIT \n DESCRIPTION: Initial density for incompressible flows (1.2886 kg/m^3 by default) \ingroup Config*/ - addDoubleOption("INC_DENSITY_INIT", Inc_Density_Init, 1.2886); /*!\brief INC_VELOCITY_INIT \n DESCRIPTION: Initial velocity for incompressible flows (1.0,0,0 m/s by default) \ingroup Config*/ vel_init[0] = 1.0; vel_init[1] = 0.0; vel_init[2] = 0.0; addDoubleArrayOption("INC_VELOCITY_INIT", 3, vel_init); @@ -3022,6 +3023,11 @@ void CConfig::SetConfig_Parsing(istream& config_buffer){ newString.append("DYNAMIC_ANALYSIS is deprecated. Use TIME_DOMAIN instead.\n\n"); else if (!option_name.compare("SPECIES_USE_STRONG_BC")) newString.append("SPECIES_USE_STRONG_BC is deprecated. Use MARKER_SPECIES_STRONG_BC= (marker1, ...) instead.\n\n"); + else if (!option_name.compare("INC_DENSITY_INIT")) + newString.append( + "INC_DENSITY_INIT is deprecated. The initial density is computed using the ideal gas law based on the " + "THERMODYNAMICS_PRESSURE and INC_TEMPERATURE_INIT. For Using the FLUID_MODEL=CONSTANT_DENSITY, the " + "constant density must be given using the following option DENSITY_CONSTANT.\n\n"); else { /*--- Find the most likely candidate for the unrecognized option, based on the length of start and end character sequences shared by candidates and the option. ---*/ diff --git a/SU2_CFD/src/solvers/CIncEulerSolver.cpp b/SU2_CFD/src/solvers/CIncEulerSolver.cpp index 15b02264728..5d60c01deee 100644 --- a/SU2_CFD/src/solvers/CIncEulerSolver.cpp +++ b/SU2_CFD/src/solvers/CIncEulerSolver.cpp @@ -265,7 +265,6 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i /*--- Compute dimensional free-stream values. ---*/ - Density_FreeStream = config->GetInc_Density_Init(); config->SetDensity_FreeStream(Density_FreeStream); Temperature_FreeStream = config->GetInc_Temperature_Init(); config->SetTemperature_FreeStream(Temperature_FreeStream); Pressure_FreeStream = 0.0; config->SetPressure_FreeStream(Pressure_FreeStream); @@ -291,8 +290,9 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i case CONSTANT_DENSITY: - auxFluidModel = new CConstantDensity(Density_FreeStream, config->GetSpecific_Heat_Cp()); + auxFluidModel = new CConstantDensity(config->GetInc_Constant_Density(), config->GetSpecific_Heat_Cp()); auxFluidModel->SetTDState_T(Temperature_FreeStream); + Density_FreeStream= auxFluidModel->GetDensity(); config->SetDensity_FreeStream(Density_FreeStream); break; case INC_IDEAL_GAS: @@ -301,6 +301,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i Pressure_Thermodynamic = config->GetPressure_Thermodynamic(); auxFluidModel = new CIncIdealGas(config->GetSpecific_Heat_Cp(), config->GetGas_Constant(), Pressure_Thermodynamic); auxFluidModel->SetTDState_T(Temperature_FreeStream); + Density_FreeStream= auxFluidModel->GetDensity(); config->SetDensity_FreeStream(Density_FreeStream); break; case INC_IDEAL_GAS_POLY: @@ -315,6 +316,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i auxFluidModel->SetCpModel(config); } auxFluidModel->SetTDState_T(Temperature_FreeStream); + Density_FreeStream= auxFluidModel->GetDensity(); config->SetDensity_FreeStream(Density_FreeStream); break; case FLUID_MIXTURE: @@ -323,6 +325,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i Pressure_Thermodynamic = config->GetPressure_Thermodynamic(); auxFluidModel = new CFluidScalar(config->GetSpecific_Heat_Cp(), config->GetGas_Constant(), Pressure_Thermodynamic, config); auxFluidModel->SetTDState_T(Temperature_FreeStream, config->GetSpecies_Init()); + Density_FreeStream= auxFluidModel->GetDensity(); config->SetDensity_FreeStream(Density_FreeStream); break; case FLUID_FLAMELET: @@ -331,6 +334,7 @@ void CIncEulerSolver::SetNondimensionalization(CConfig *config, unsigned short i Pressure_Thermodynamic = config->GetPressure_Thermodynamic(); auxFluidModel = new CFluidFlamelet(config, Pressure_Thermodynamic); auxFluidModel->SetTDState_T(Temperature_FreeStream, config->GetSpecies_Init()); + Density_FreeStream= auxFluidModel->GetDensity(); config->SetDensity_FreeStream(Density_FreeStream); break; default: diff --git a/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg b/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg index 500d5db42f1..974982881fa 100644 --- a/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg +++ b/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg @@ -27,7 +27,6 @@ MARKER_MONITORING= (cylinder_outer1, cylinder_outer2, cylinder_outer3) % INC_DENSITY_MODEL= VARIABLE INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 0.000210322 INC_VELOCITY_INIT= ( 3.40297, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 288.15 INC_NONDIM= DIMENSIONAL @@ -37,6 +36,7 @@ INC_NONDIM= DIMENSIONAL FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 +THERMODYNAMIC_PRESSURE = 17.39862 % --------------------------- VISCOSITY MODEL ---------------------------------% % diff --git a/TestCases/coupled_cht/disc_adj_unsteadyCHT_cylinder/fluid.cfg b/TestCases/coupled_cht/disc_adj_unsteadyCHT_cylinder/fluid.cfg index d4e4a3ce2ef..a5541b119fe 100644 --- a/TestCases/coupled_cht/disc_adj_unsteadyCHT_cylinder/fluid.cfg +++ b/TestCases/coupled_cht/disc_adj_unsteadyCHT_cylinder/fluid.cfg @@ -10,7 +10,7 @@ OBJECTIVE_WEIGHT= 0.0 INC_NONDIM= DIMENSIONAL % ~Water at room temperature INC_DENSITY_MODEL= CONSTANT -INC_DENSITY_INIT= 1.0e3 +DENSITY_CONSTANT = 1.0e3 % % Re = rho*v*d/mu_dyn = 1e3*v*1/1e-3 = 200 => v = 2.0e-4 INC_VELOCITY_INIT= ( 2.0e-4, 0.0, 0.0 ) diff --git a/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg b/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg index 360d8a94e50..8401888f1b9 100644 --- a/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg +++ b/TestCases/coupled_cht/incomp_2d/flow_cylinder.cfg @@ -25,7 +25,6 @@ MARKER_MONITORING= (cylinder_outer1, cylinder_outer2, cylinder_outer3) % INC_DENSITY_MODEL= VARIABLE INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 0.000210322 INC_VELOCITY_INIT= ( 3.40297, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 288.15 INC_NONDIM= DIMENSIONAL @@ -35,6 +34,7 @@ INC_NONDIM= DIMENSIONAL FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 +THERMODYNAMIC_PRESSURE = 17.39861946 % --------------------------- VISCOSITY MODEL ---------------------------------% % diff --git a/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg b/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg index c99794377c8..f917513c644 100644 --- a/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg +++ b/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg @@ -25,7 +25,6 @@ MARKER_MONITORING= (cylinder_outer1, cylinder_outer2, cylinder_outer3) % INC_DENSITY_MODEL= VARIABLE INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 0.0210322 INC_VELOCITY_INIT= ( 3.40297, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 288.15 INC_NONDIM= DIMENSIONAL @@ -35,6 +34,7 @@ INC_NONDIM= DIMENSIONAL FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 +THERMODYNAMIC_PRESSURE = 1739.862 % --------------------------- VISCOSITY MODEL ---------------------------------% % diff --git a/TestCases/deformation/intersection_prevention/def_intersect.cfg b/TestCases/deformation/intersection_prevention/def_intersect.cfg index 6df45ec5ce7..8a15b6717ec 100644 --- a/TestCases/deformation/intersection_prevention/def_intersect.cfg +++ b/TestCases/deformation/intersection_prevention/def_intersect.cfg @@ -29,8 +29,8 @@ AXISYMMETRIC = NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT +DENSITY_CONSTANT= 1.1728 INC_ENERGY_EQUATION = NO -INC_DENSITY_INIT= 1.1728 INC_VELOCITY_INIT= (1.0, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 300.0 INC_INLET_TYPE= VELOCITY_INLET diff --git a/TestCases/disc_adj_heat/disc_adj_heat.cfg b/TestCases/disc_adj_heat/disc_adj_heat.cfg index e4989879349..f9ef0996ed0 100644 --- a/TestCases/disc_adj_heat/disc_adj_heat.cfg +++ b/TestCases/disc_adj_heat/disc_adj_heat.cfg @@ -33,9 +33,9 @@ ITER = 11 INC_DENSITY_MODEL= CONSTANT -INC_ENERGY_EQUATION= NO +DENSITY_CONSTANT= 998.2 -INC_DENSITY_INIT= 998.2 +INC_ENERGY_EQUATION= NO INC_VELOCITY_INIT= ( 0.25, 0.0, 0.0 ) diff --git a/TestCases/disc_adj_heat/primal.cfg b/TestCases/disc_adj_heat/primal.cfg index 6ada129211c..d3e77f409a0 100644 --- a/TestCases/disc_adj_heat/primal.cfg +++ b/TestCases/disc_adj_heat/primal.cfg @@ -20,8 +20,8 @@ OBJECTIVE_FUNCTION= TOTAL_HEATFLUX % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% INC_DENSITY_MODEL= CONSTANT +DENSITY_CONSTANT= 998.2 INC_ENERGY_EQUATION= NO -INC_DENSITY_INIT= 998.2 INC_VELOCITY_INIT= ( 0.25, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 300.0 INC_NONDIM= INITIAL_VALUES 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 d92f2bc75db..5e5471abd7c 100644 --- a/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg +++ b/TestCases/disc_adj_incomp_euler/naca0012/incomp_NACA0012_disc.cfg @@ -17,7 +17,7 @@ READ_BINARY_RESTART= NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % -INC_DENSITY_INIT= 1.2886 +DENSITY_CONSTANT= 1.2886 INC_VELOCITY_INIT= ( 33.1588, 1.15793, 0.0 ) % ---------------------- REFERENCE VALUE DEFINITION ---------------------------% diff --git a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg index dc328c88f05..e05134ed73d 100644 --- a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg +++ b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg @@ -19,7 +19,6 @@ RESTART_SOL= NO % INC_DENSITY_MODEL= VARIABLE INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 0.000210322 INC_VELOCITY_INIT= ( 3.40297, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 288.15 @@ -28,6 +27,7 @@ INC_TEMPERATURE_INIT= 288.15 FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 +THERMODYNAMIC_PRESSURE = 17.3986 % --------------------------- VISCOSITY MODEL ---------------------------------% % diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg index 56cb3331551..78632a79e00 100755 --- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg +++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sa.cfg @@ -18,7 +18,7 @@ RESTART_SOL= NO % -------------------- INCOMPRESSIBLE FREE-STREAM DEFINITION ------------------% % -INC_DENSITY_INIT= 2.13163 +DENSITY_CONSTANT= 2.13163 % AoA 10 deg INC_VELOCITY_INIT= ( 51.36481493540834, 9.0570027322096198, 0.0 ) diff --git a/TestCases/flamelet/01_laminar_premixed_ch4_flame_cfd/lam_prem_ch4_cfd.cfg b/TestCases/flamelet/01_laminar_premixed_ch4_flame_cfd/lam_prem_ch4_cfd.cfg index d218369f9f7..2b0205882fe 100644 --- a/TestCases/flamelet/01_laminar_premixed_ch4_flame_cfd/lam_prem_ch4_cfd.cfg +++ b/TestCases/flamelet/01_laminar_premixed_ch4_flame_cfd/lam_prem_ch4_cfd.cfg @@ -19,7 +19,6 @@ RESTART_SOL = YES % INC_DENSITY_MODEL= FLAMELET INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 1.00 INC_VELOCITY_INIT= (0.5, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 300.0 INC_NONDIM= DIMENSIONAL diff --git a/TestCases/flamelet/02_laminar_premixed_ch4_flame_hx_ad/lam_prem_ch4_hx_ad.cfg b/TestCases/flamelet/02_laminar_premixed_ch4_flame_hx_ad/lam_prem_ch4_hx_ad.cfg index 0d9ad8f0331..f442c020087 100644 --- a/TestCases/flamelet/02_laminar_premixed_ch4_flame_hx_ad/lam_prem_ch4_hx_ad.cfg +++ b/TestCases/flamelet/02_laminar_premixed_ch4_flame_hx_ad/lam_prem_ch4_hx_ad.cfg @@ -28,7 +28,6 @@ CUSTOM_OUTPUTS= 'avg_NOx : MassFlowAvg{SPECIES[3]}[outlet]' % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= FLAMELET -INC_DENSITY_INIT= 1.1766 INC_VELOCITY_INIT= ( 0.2, 0, 0 ) INC_ENERGY_EQUATION= YES INC_TEMPERATURE_INIT= 300.0 diff --git a/TestCases/flamelet/02_laminar_premixed_ch4_flame_hx_ad/lam_prem_ch4_hx_dot.cfg b/TestCases/flamelet/02_laminar_premixed_ch4_flame_hx_ad/lam_prem_ch4_hx_dot.cfg index e24fba9b935..70f31da5f8d 100644 --- a/TestCases/flamelet/02_laminar_premixed_ch4_flame_hx_ad/lam_prem_ch4_hx_dot.cfg +++ b/TestCases/flamelet/02_laminar_premixed_ch4_flame_hx_ad/lam_prem_ch4_hx_dot.cfg @@ -29,7 +29,6 @@ CUSTOM_OUTPUTS= 'avg_NOx : MassFlowAvg{SPECIES[3]}[outlet]' % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= FLAMELET -INC_DENSITY_INIT= 1.1766 INC_VELOCITY_INIT= ( 0.2, 0, 0 ) INC_ENERGY_EQUATION= YES INC_TEMPERATURE_INIT= 300.0 diff --git a/TestCases/flamelet/03_laminar_premixed_ch4_flame_cht_cfd/lam_prem_ch4_cht_cfd_fluid.cfg b/TestCases/flamelet/03_laminar_premixed_ch4_flame_cht_cfd/lam_prem_ch4_cht_cfd_fluid.cfg index e0828cc4d44..f17573ff898 100644 --- a/TestCases/flamelet/03_laminar_premixed_ch4_flame_cht_cfd/lam_prem_ch4_cht_cfd_fluid.cfg +++ b/TestCases/flamelet/03_laminar_premixed_ch4_flame_cht_cfd/lam_prem_ch4_cht_cfd_fluid.cfg @@ -43,7 +43,6 @@ MARKER_SPECIES_STRONG_BC= (inlet, outlet, wall_burner) % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% INC_DENSITY_MODEL= FLAMELET -INC_DENSITY_INIT= 1.1766 INC_VELOCITY_INIT= ( 0.2, 0, 0 ) INC_ENERGY_EQUATION= YES INC_TEMPERATURE_INIT= 300.0 diff --git a/TestCases/flamelet/04_laminar_premixed_ch4_flame_cht_ad/lam_prem_ch4_cht_ad_fluid.cfg b/TestCases/flamelet/04_laminar_premixed_ch4_flame_cht_ad/lam_prem_ch4_cht_ad_fluid.cfg index 7824d6780fd..a7ffee3fac0 100644 --- a/TestCases/flamelet/04_laminar_premixed_ch4_flame_cht_ad/lam_prem_ch4_cht_ad_fluid.cfg +++ b/TestCases/flamelet/04_laminar_premixed_ch4_flame_cht_ad/lam_prem_ch4_cht_ad_fluid.cfg @@ -45,7 +45,6 @@ MARKER_SPECIES_STRONG_BC= (inlet, wall_burner) % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% INC_DENSITY_MODEL= FLAMELET -INC_DENSITY_INIT= 1.1766 INC_VELOCITY_INIT= ( 0.2, 0, 0 ) INC_ENERGY_EQUATION= YES INC_TEMPERATURE_INIT= 300.0 diff --git a/TestCases/flamelet/05_laminar_premixed_ch4_flame_cfd_axi/lam_prem_ch4_cfd_axi.cfg b/TestCases/flamelet/05_laminar_premixed_ch4_flame_cfd_axi/lam_prem_ch4_cfd_axi.cfg index d2750fcae1d..95b22d2cac3 100644 --- a/TestCases/flamelet/05_laminar_premixed_ch4_flame_cfd_axi/lam_prem_ch4_cfd_axi.cfg +++ b/TestCases/flamelet/05_laminar_premixed_ch4_flame_cfd_axi/lam_prem_ch4_cfd_axi.cfg @@ -20,7 +20,6 @@ RESTART_SOL= YES % INC_DENSITY_MODEL= FLAMELET INC_ENERGY_EQUATION= YES -INC_DENSITY_INIT= 1.00 INC_VELOCITY_INIT= (0.5, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 300.0 INC_NONDIM= DIMENSIONAL diff --git a/TestCases/flamelet/06_laminar_partial_premixed_ch4_flame_cfd/lam_partial_prem_ch4_cfd.cfg b/TestCases/flamelet/06_laminar_partial_premixed_ch4_flame_cfd/lam_partial_prem_ch4_cfd.cfg index 1ac7c1ebf67..9f39a29b87d 100644 --- a/TestCases/flamelet/06_laminar_partial_premixed_ch4_flame_cfd/lam_partial_prem_ch4_cfd.cfg +++ b/TestCases/flamelet/06_laminar_partial_premixed_ch4_flame_cfd/lam_partial_prem_ch4_cfd.cfg @@ -19,7 +19,6 @@ RESTART_SOL= YES % INC_DENSITY_MODEL= VARIABLE INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 1.00 INC_VELOCITY_INIT= (0.7, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 300.0 INC_NONDIM= DIMENSIONAL diff --git a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg index 216a1881a31..8baafb35e4f 100644 --- a/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg +++ b/TestCases/incomp_euler/naca0012/incomp_NACA0012.cfg @@ -17,7 +17,7 @@ RESTART_SOL= NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % -INC_DENSITY_INIT= 998.2 +DENSITY_CONSTANT= 998.2 INC_VELOCITY_INIT= ( 1.775, 0.0, 0.0 ) INC_INLET_TYPE= VELOCITY_INLET INC_INLET_DAMPING= 0.1 diff --git a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg index 314311408e6..2463d848161 100644 --- a/TestCases/incomp_euler/nozzle/inv_nozzle.cfg +++ b/TestCases/incomp_euler/nozzle/inv_nozzle.cfg @@ -17,8 +17,8 @@ RESTART_SOL= NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT +DENSITY_CONSTANT= 1.0 INC_ENERGY_EQUATION = NO -INC_DENSITY_INIT= 1.0 INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 288.15 INC_INLET_TYPE= PRESSURE_INLET diff --git a/TestCases/incomp_navierstokes/bend/lam_bend.cfg b/TestCases/incomp_navierstokes/bend/lam_bend.cfg index 02226a59427..b260edfb323 100755 --- a/TestCases/incomp_navierstokes/bend/lam_bend.cfg +++ b/TestCases/incomp_navierstokes/bend/lam_bend.cfg @@ -19,8 +19,8 @@ RESTART_SOL= NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT +DENSITY_CONSTANT= 1.2886 INC_ENERGY_EQUATION = NO -INC_DENSITY_INIT= 1.2886 INC_VELOCITY_INIT= ( 0.1, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 288.15 INC_NONDIM= INITIAL_VALUES diff --git a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg index 96bcd92712b..ffae424a314 100644 --- a/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg +++ b/TestCases/incomp_navierstokes/buoyancy_cavity/lam_buoyancy_cavity.cfg @@ -24,7 +24,7 @@ INC_ENERGY_EQUATION = YES %INC_DENSITY_INIT= 0.00018903539834 % Ra ~ 1e3 %INC_DENSITY_INIT= 0.00059778241716 % Ra ~ 1e4 %INC_DENSITY_INIT= 0.00189035398341 % Ra ~ 1e5 -INC_DENSITY_INIT= 0.00597782417156 % Ra ~ 1e6 +%INC_DENSITY_INIT= 0.00597782417156 % Ra ~ 1e6 % INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 288.15 @@ -34,6 +34,7 @@ INC_TEMPERATURE_INIT= 288.15 FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 +THERMODYNAMIC_PRESSURE = 494.5078878 % --------------------------- VISCOSITY MODEL ---------------------------------% % diff --git a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg index 416c10715c5..4381a600ac2 100644 --- a/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg +++ b/TestCases/incomp_navierstokes/cylinder/incomp_cylinder.cfg @@ -18,7 +18,7 @@ RESTART_SOL= NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % -INC_DENSITY_INIT= 998.2 +DENSITY_CONSTANT= 998.2 INC_VELOCITY_INIT= ( 0.000008, 0.0, 0.0 ) % --------------------------- VISCOSITY MODEL ---------------------------------% diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg index 7e12b59731f..c91916446c1 100644 --- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg +++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg @@ -20,7 +20,6 @@ RESTART_SOL= NO % INC_DENSITY_MODEL= VARIABLE INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 0.000210322 INC_VELOCITY_INIT= ( 3.40297, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 288.15 INC_NONDIM= DIMENSIONAL @@ -31,6 +30,7 @@ FLUID_MODEL= INC_IDEAL_GAS_POLY SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 CP_POLYCOEFFS= ( 1004.703, 0.1, 0.0, 0.0, 0.0) +THERMODYNAMIC_PRESSURE = 17.39862 % --------------------------- VISCOSITY MODEL ---------------------------------% % diff --git a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/BC_HeatTransfer.cfg b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/BC_HeatTransfer.cfg index accd40e479a..65a61af64cc 100644 --- a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/BC_HeatTransfer.cfg +++ b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/BC_HeatTransfer.cfg @@ -22,7 +22,7 @@ OPT_OBJECTIVE= NONE % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT -INC_DENSITY_INIT= 1045.0 +DENSITY_CONSTANT= 1045.0 INC_VELOCITY_INIT= ( 0.1, 0.0, 0.0 ) % INC_ENERGY_EQUATION = YES diff --git a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configFluid.cfg b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configFluid.cfg index 23a368fe73d..46b55af0887 100644 --- a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configFluid.cfg +++ b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_2d/configFluid.cfg @@ -22,7 +22,7 @@ OPT_OBJECTIVE= NONE % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT -INC_DENSITY_INIT= 1045.0 +DENSITY_CONSTANT= 1045.0 INC_VELOCITY_INIT= ( 0.1, 0.0, 0.0 ) % INC_ENERGY_EQUATION = YES diff --git a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configFluid.cfg b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configFluid.cfg index e6b53711cf2..38b99fbd56f 100644 --- a/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configFluid.cfg +++ b/TestCases/incomp_navierstokes/streamwise_periodic/chtPinArray_3d/configFluid.cfg @@ -17,7 +17,7 @@ KIND_TURB_MODEL= SST % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT -INC_DENSITY_INIT= 1045.0 +DENSITY_CONSTANT= 1045.0 INC_VELOCITY_INIT= ( 0.1, 0.0, 0.0 ) % INC_ENERGY_EQUATION = YES diff --git a/TestCases/incomp_navierstokes/streamwise_periodic/dp-adjoint_chtPinArray_2d/configFluid.cfg b/TestCases/incomp_navierstokes/streamwise_periodic/dp-adjoint_chtPinArray_2d/configFluid.cfg index 41c4c40e07f..fbe79935860 100644 --- a/TestCases/incomp_navierstokes/streamwise_periodic/dp-adjoint_chtPinArray_2d/configFluid.cfg +++ b/TestCases/incomp_navierstokes/streamwise_periodic/dp-adjoint_chtPinArray_2d/configFluid.cfg @@ -26,7 +26,7 @@ OBJECTIVE_WEIGHT= 1.0 % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT -INC_DENSITY_INIT= 1045.0 +DENSITY_CONSTANT= 1045.0 INC_VELOCITY_INIT= ( 0.1, 0.0, 0.0 ) % INC_ENERGY_EQUATION = YES diff --git a/TestCases/incomp_navierstokes/streamwise_periodic/pipeSlice_3d/sp_pipeSlice_3d_dp_hf_tp.cfg b/TestCases/incomp_navierstokes/streamwise_periodic/pipeSlice_3d/sp_pipeSlice_3d_dp_hf_tp.cfg index 5b80170d3f7..7ee6dbe2e55 100644 --- a/TestCases/incomp_navierstokes/streamwise_periodic/pipeSlice_3d/sp_pipeSlice_3d_dp_hf_tp.cfg +++ b/TestCases/incomp_navierstokes/streamwise_periodic/pipeSlice_3d/sp_pipeSlice_3d_dp_hf_tp.cfg @@ -18,8 +18,8 @@ KIND_TURB_MODEL= NONE % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT +DENSITY_CONSTANT= 1.0 INC_ENERGY_EQUATION = NO -INC_DENSITY_INIT= 1.0 INC_VELOCITY_INIT= ( 0.0, 0.0, 0.3 ) INC_NONDIM= DIMENSIONAL % diff --git a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg index c351edbd375..bb16c56ad88 100644 --- a/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg +++ b/TestCases/incomp_rans/naca0012/naca0012_SST_SUST.cfg @@ -24,7 +24,7 @@ TIME_MARCHING= NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % -INC_DENSITY_INIT= 2.13163 +DENSITY_CONSTANT= 2.13163 INC_VELOCITY_INIT= ( 52.1572, 0.0, 0.0 ) % --------------------------- VISCOSITY MODEL ---------------------------------% diff --git a/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg b/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg index 46d029f7e6d..2866efb6b03 100644 --- a/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg +++ b/TestCases/incomp_rans/rough_flatplate/rough_flatplate_incomp.cfg @@ -19,8 +19,8 @@ RESTART_SOL= NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT +DENSITY_CONSTANT= 1.32905 INC_ENERGY_EQUATION = NO -INC_DENSITY_INIT= 1.32905 INC_VELOCITY_INIT= ( 69.4448, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 300.0 INC_NONDIM= INITIAL_VALUES diff --git a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg index 0ca4f269eae..82015ce1960 100755 --- a/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg +++ b/TestCases/mms/fvm_incomp_euler/inv_mms_jst.cfg @@ -17,7 +17,7 @@ KIND_VERIFICATION_SOLUTION= MMS_INC_EULER % -------------------- INCOMPRESSIBLE FREE-STREAM DEFINITION ------------------% % -INC_DENSITY_INIT= 1.0 +DENSITY_CONSTANT= 1.0 INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) INC_NONDIM= DIMENSIONAL diff --git a/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg b/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg index a387578e514..ddd261b6e01 100644 --- a/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg +++ b/TestCases/py_wrapper/disc_adj_flow/mesh_disp_sens/configAD_flow.cfg @@ -25,8 +25,8 @@ OBJECTIVE_FUNCTION = DRAG % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% INC_DENSITY_MODEL= CONSTANT +DENSITY_CONSTANT= 1.0 INC_ENERGY_EQUATION = NO -INC_DENSITY_INIT= 1.0 INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 300 INC_NONDIM= INITIAL_VALUES diff --git a/TestCases/radiation/p1adjoint/configp1adjoint.cfg b/TestCases/radiation/p1adjoint/configp1adjoint.cfg index bc71c6fdfd3..aa2c9d2ace7 100644 --- a/TestCases/radiation/p1adjoint/configp1adjoint.cfg +++ b/TestCases/radiation/p1adjoint/configp1adjoint.cfg @@ -21,8 +21,7 @@ OBJECTIVE_FUNCTION = DRAG %%%%%%%%%%%%%%%%%%%%%%% INC_DENSITY_MODEL = VARIABLE -INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT = 0.0004 +INC_ENERGY_EQUATION = YES INC_VELOCITY_INIT = ( 1.0, 0.0, 0.0 ) INC_TEMPERATURE_INIT = 300 INC_NONDIM = DIMENSIONAL @@ -30,6 +29,7 @@ INC_NONDIM = DIMENSIONAL FLUID_MODEL = INC_IDEAL_GAS SPECIFIC_HEAT_CP = 1004.703 MOLECULAR_WEIGHT = 28.96 +THERMODYNAMIC_PRESSURE = 34.45028 VISCOSITY_MODEL = SUTHERLAND MU_REF = 1.0E-5 diff --git a/TestCases/radiation/p1model/configp1.cfg b/TestCases/radiation/p1model/configp1.cfg index 49c24ef4813..3f505c87c10 100644 --- a/TestCases/radiation/p1model/configp1.cfg +++ b/TestCases/radiation/p1model/configp1.cfg @@ -21,7 +21,6 @@ SOLVER = INC_NAVIER_STOKES INC_DENSITY_MODEL= VARIABLE INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 0.00597782417156 INC_TEMPERATURE_INIT= 288.15 INC_VELOCITY_INIT= (0, 0, 0) INC_NONDIM = DIMENSIONAL @@ -29,6 +28,7 @@ INC_NONDIM = DIMENSIONAL FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 +THERMODYNAMIC_PRESSURE= 494.5078878 VISCOSITY_MODEL= CONSTANT_VISCOSITY MU_CONSTANT= 1.716e-5 diff --git a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg index 757f2469edc..31b2af61a06 100644 --- a/TestCases/sliding_interface/incompressible_steady/configCircle.cfg +++ b/TestCases/sliding_interface/incompressible_steady/configCircle.cfg @@ -24,7 +24,6 @@ MULTIZONE_MESH = NO INC_DENSITY_MODEL= VARIABLE INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 1.0 INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 200 @@ -33,6 +32,7 @@ INC_TEMPERATURE_INIT= 200 FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 +THERMODYNAMIC_PRESSURE = 57417.12707 % --------------------------- VISCOSITY MODEL ---------------------------------% diff --git a/TestCases/sliding_interface/incompressible_steady/configOut.cfg b/TestCases/sliding_interface/incompressible_steady/configOut.cfg index f9523435cce..1fba0bfb5bd 100644 --- a/TestCases/sliding_interface/incompressible_steady/configOut.cfg +++ b/TestCases/sliding_interface/incompressible_steady/configOut.cfg @@ -24,7 +24,6 @@ MULTIZONE_MESH = NO INC_DENSITY_MODEL= VARIABLE INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 1.0 INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 200 @@ -33,6 +32,7 @@ INC_TEMPERATURE_INIT= 200 FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 +THERMODYNAMIC_PRESSURE= 57417.12707 % --------------------------- VISCOSITY MODEL ---------------------------------% diff --git a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg index 6640fda6613..bcbe8ebd53d 100644 --- a/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg +++ b/TestCases/sliding_interface/incompressible_unsteady/configCircle.cfg @@ -32,7 +32,6 @@ MAX_TIME= 100 INC_DENSITY_MODEL= VARIABLE INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 1.0 INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 200 @@ -41,6 +40,7 @@ INC_TEMPERATURE_INIT= 200 FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 +THERMODYNAMIC_PRESSURE = 57417.12707 % --------------------------- VISCOSITY MODEL ---------------------------------% diff --git a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg index 7885a977b1e..6b2e153a89b 100644 --- a/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg +++ b/TestCases/sliding_interface/incompressible_unsteady/configOut.cfg @@ -30,7 +30,6 @@ MAX_TIME= 100 INC_DENSITY_MODEL= VARIABLE INC_ENERGY_EQUATION = YES -INC_DENSITY_INIT= 1.0 INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) INC_TEMPERATURE_INIT= 200 @@ -39,6 +38,7 @@ INC_TEMPERATURE_INIT= 200 FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 +THERMODYNAMIC_PRESSURE= 57417.12707 % --------------------------- VISCOSITY MODEL ---------------------------------% diff --git a/TestCases/species_transport/multizone/zone1.cfg b/TestCases/species_transport/multizone/zone1.cfg index c18f0565b1e..cde42ebcea9 100644 --- a/TestCases/species_transport/multizone/zone1.cfg +++ b/TestCases/species_transport/multizone/zone1.cfg @@ -27,7 +27,6 @@ MARKER_MONITORING= (NONE) % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= VARIABLE -INC_DENSITY_INIT= 1.2 INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) INC_ENERGY_EQUATION= YES INC_TEMPERATURE_INIT= 300.0 @@ -36,6 +35,7 @@ INC_NONDIM= DIMENSIONAL % -------------------- FLUID PROPERTIES ------------------------------------- % % FLUID_MODEL= FLUID_MIXTURE +THERMODYNAMIC_PRESSURE = 101325.0 MOLECULAR_WEIGHT= (28.96, 25.0, 20.0) SPECIFIC_HEAT_CP= (1009.0, 880.0, 800.0) CONDUCTIVITY_MODEL= CONSTANT_CONDUCTIVITY diff --git a/TestCases/species_transport/multizone/zone2.cfg b/TestCases/species_transport/multizone/zone2.cfg index 2ad80c3dd58..0696c564d27 100644 --- a/TestCases/species_transport/multizone/zone2.cfg +++ b/TestCases/species_transport/multizone/zone2.cfg @@ -27,7 +27,6 @@ MARKER_MONITORING= (NONE) % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= VARIABLE -INC_DENSITY_INIT= 1.2 INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) INC_ENERGY_EQUATION= YES INC_TEMPERATURE_INIT= 300.0 @@ -36,6 +35,7 @@ INC_NONDIM= DIMENSIONAL % -------------------- FLUID PROPERTIES ------------------------------------- % % FLUID_MODEL= FLUID_MIXTURE +THERMODYNAMIC_PRESSURE = 101325.0 MOLECULAR_WEIGHT= (28.96, 25.0, 20.0) SPECIFIC_HEAT_CP= (1009.0, 880.0, 800.0) CONDUCTIVITY_MODEL= CONSTANT_CONDUCTIVITY diff --git a/TestCases/species_transport/passive_transport_validation/passive_transport.cfg b/TestCases/species_transport/passive_transport_validation/passive_transport.cfg index fa8becb14b7..fa7c750d3b1 100644 --- a/TestCases/species_transport/passive_transport_validation/passive_transport.cfg +++ b/TestCases/species_transport/passive_transport_validation/passive_transport.cfg @@ -17,8 +17,8 @@ SOLVER = INC_NAVIER_STOKES % % For the mean flow it is only inmportant to ensure a velocity (1,0,0) everywhere. INC_DENSITY_MODEL = CONSTANT +DENSITY_CONSTANT = 1 INC_ENERGY_EQUATION = NO -INC_DENSITY_INIT = 1 INC_VELOCITY_INIT = (1.00, 0.0, 0.0 ) INC_NONDIM = DIMENSIONAL % diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi.cfg index 1b71c6a547c..4053052f14d 100644 --- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi.cfg +++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi.cfg @@ -17,7 +17,7 @@ KIND_TURB_MODEL= SST % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT -INC_DENSITY_INIT= 1.1766 +DENSITY_CONSTANT= 1.1766 % INC_VELOCITY_INIT= ( 1.00, 0.0, 0.0 ) % diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_boundedscalar.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_boundedscalar.cfg index 203761d77b7..e359945e981 100644 --- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_boundedscalar.cfg +++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_boundedscalar.cfg @@ -17,7 +17,7 @@ KIND_TURB_MODEL= SST % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT -INC_DENSITY_INIT= 1.1766 +DENSITY_CONSTANT= 1.1766 % INC_VELOCITY_INIT= ( 1.00, 0.0, 0.0 ) % diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel.cfg index 92d226acb9a..64676e88507 100644 --- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel.cfg +++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel.cfg @@ -19,7 +19,6 @@ KIND_TURB_MODEL= SST % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= VARIABLE -INC_DENSITY_INIT= 1.1766 % INC_VELOCITY_INIT= ( 1.00, 0.0, 0.0 ) % diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.cfg index 370cba307fd..64de8fa1c14 100644 --- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.cfg +++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.cfg @@ -20,7 +20,6 @@ KIND_TURB_MODEL= SST % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= VARIABLE -INC_DENSITY_INIT= 0.0807 % INC_VELOCITY_INIT= ( 15.00, 0.0, 0.0 ) % diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_boundedscalar.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_boundedscalar.cfg index 7ecc9f86d17..13419e4a8eb 100644 --- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_boundedscalar.cfg +++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_boundedscalar.cfg @@ -19,7 +19,6 @@ KIND_TURB_MODEL= SST % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= VARIABLE -INC_DENSITY_INIT= 1.1766 % INC_VELOCITY_INIT= ( 1.00, 0.0, 0.0 ) % diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_heatcapacity_H2.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_heatcapacity_H2.cfg index d9d8a07ed19..a5101c02ee8 100644 --- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_heatcapacity_H2.cfg +++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_heatcapacity_H2.cfg @@ -20,7 +20,6 @@ KIND_TURB_MODEL= SST % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= VARIABLE -INC_DENSITY_INIT= 0.0807 % INC_VELOCITY_INIT= ( 5.00, 0.0, 0.0 ) % diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.cfg index d8c4b002f53..7dd6dabde3d 100644 --- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.cfg +++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.cfg @@ -21,7 +21,6 @@ KIND_TURB_MODEL= SST % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= VARIABLE -INC_DENSITY_INIT= 0.0807 % INC_VELOCITY_INIT= ( 5.00, 0.0, 0.0 ) % diff --git a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_viscosity.cfg b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_viscosity.cfg index 22fc0fcb07a..72971bf71a0 100644 --- a/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_viscosity.cfg +++ b/TestCases/species_transport/venturi_primitive_3species/species2_primitiveVenturi_mixingmodel_viscosity.cfg @@ -20,7 +20,6 @@ KIND_TURB_MODEL= SA % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= VARIABLE -INC_DENSITY_INIT= 1.1766 % INC_VELOCITY_INIT= ( 5.00, 0.0, 0.0 ) % diff --git a/TestCases/species_transport/venturi_primitive_3species/species3_primitiveVenturi_inletFile.cfg b/TestCases/species_transport/venturi_primitive_3species/species3_primitiveVenturi_inletFile.cfg index 17488e3af0e..af68064bdea 100644 --- a/TestCases/species_transport/venturi_primitive_3species/species3_primitiveVenturi_inletFile.cfg +++ b/TestCases/species_transport/venturi_primitive_3species/species3_primitiveVenturi_inletFile.cfg @@ -18,7 +18,7 @@ KIND_TURB_MODEL= SST % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT -INC_DENSITY_INIT= 1.1766 +DENSITY_CONSTANT= 1.1766 % INC_VELOCITY_INIT= ( 1.00, 0.0, 0.0 ) % diff --git a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg index 3ce91fc9f73..359a2f8879d 100644 --- a/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg +++ b/TestCases/transition/Schubauer_Klebanoff/transitional_BC_model_ConfigFile.cfg @@ -21,7 +21,7 @@ RESTART_SOL= NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % -INC_DENSITY_INIT= 1.2 +DENSITY_CONSTANT= 1.2 INC_VELOCITY_INIT= ( 50.1, 0.0, 0.0 ) INC_INLET_TYPE= VELOCITY_INLET INC_INLET_DAMPING= 0.1 diff --git a/TestCases/vandv/species_transport/sandia_jet/validation.cfg b/TestCases/vandv/species_transport/sandia_jet/validation.cfg index 6ca77c4ca66..76f6ad98301 100644 --- a/TestCases/vandv/species_transport/sandia_jet/validation.cfg +++ b/TestCases/vandv/species_transport/sandia_jet/validation.cfg @@ -19,7 +19,6 @@ RESTART_SOL= YES % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= VARIABLE -INC_DENSITY_INIT= 1.828 % INC_VELOCITY_INIT= ( 53.0, 0.0, 0.0 ) % diff --git a/TestCases/wallfunctions/flatplate/incompressible_SA/turb_SA_flatplate.cfg b/TestCases/wallfunctions/flatplate/incompressible_SA/turb_SA_flatplate.cfg index 6a63d1febd2..10ea1693707 100644 --- a/TestCases/wallfunctions/flatplate/incompressible_SA/turb_SA_flatplate.cfg +++ b/TestCases/wallfunctions/flatplate/incompressible_SA/turb_SA_flatplate.cfg @@ -19,7 +19,7 @@ RESTART_SOL= NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT -INC_DENSITY_INIT= 1.3254 +DENSITY_CONSTANT= 1.3254 INC_ENERGY_EQUATION= YES INC_TEMPERATURE_INIT= 300.00 INC_VELOCITY_INIT= (70, 0.0, 0.0 ) diff --git a/TestCases/wallfunctions/flatplate/incompressible_SST/turb_SST_flatplate.cfg b/TestCases/wallfunctions/flatplate/incompressible_SST/turb_SST_flatplate.cfg index 0492f2222a6..35670183e52 100644 --- a/TestCases/wallfunctions/flatplate/incompressible_SST/turb_SST_flatplate.cfg +++ b/TestCases/wallfunctions/flatplate/incompressible_SST/turb_SST_flatplate.cfg @@ -19,7 +19,7 @@ RESTART_SOL= NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % INC_DENSITY_MODEL= CONSTANT -INC_DENSITY_INIT= 1.3254 +DENSITY_CONSTANT= 1.3254 INC_ENERGY_EQUATION= YES INC_TEMPERATURE_INIT= 300.00 INC_VELOCITY_INIT= (70, 0.0, 0.0 ) diff --git a/config_template.cfg b/config_template.cfg index 811df18a014..5546b99109b 100644 --- a/config_template.cfg +++ b/config_template.cfg @@ -226,10 +226,6 @@ INC_DENSITY_MODEL= CONSTANT % Solve the energy equation in the incompressible flow solver INC_ENERGY_EQUATION = NO % -% Initial density for incompressible flows -% (1.2886 kg/m^3 by default (air), 998.2 Kg/m^3 (water)) -INC_DENSITY_INIT= 1.2886 -% % Initial velocity for incompressible flows (1.0,0,0 m/s by default) INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) % @@ -340,6 +336,10 @@ CRITICAL_PRESSURE= 3588550.0 % Acentri factor (0.035 (air)) ACENTRIC_FACTOR= 0.035 % +% Constant density for incompressible flows when CONSTANT_DENSITY models is used. +% (1.2886 kg/m^3 by default (air), 998.2 Kg/m^3 (water)) +DENSITY_CONSTANT= 1.2886 +% % Thermodynamics(operating) Pressure (101325 Pa default value, only for incompressible flow and FLUID_MIXTURE) THERMODYNAMIC_PRESSURE= 101325.0 % From 5c4bb374cfcddf0aced67cac783881f33e0ab03a Mon Sep 17 00:00:00 2001 From: Cristopher-Morales Date: Wed, 20 Sep 2023 12:23:41 +0200 Subject: [PATCH 3/5] moving options --- Common/include/CConfig.hpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Common/include/CConfig.hpp b/Common/include/CConfig.hpp index 207a7046102..4de0ae6ceb8 100644 --- a/Common/include/CConfig.hpp +++ b/Common/include/CConfig.hpp @@ -821,6 +821,7 @@ class CConfig { su2double Gamma, /*!< \brief Ratio of specific heats of the gas. */ Bulk_Modulus, /*!< \brief Value of the bulk modulus for incompressible flows. */ Beta_Factor, /*!< \brief Value of the epsilon^2 multiplier for Beta for the incompressible preconditioner. */ + Density_Constant, /*!< \brief Constant Density for ConstantDensity model (only for incompressible flows). */ Gas_Constant, /*!< \brief Specific gas constant. */ Gas_ConstantND, /*!< \brief Non-dimensional specific gas constant. */ *Molecular_Weight; /*!< \brief Molecular weight of an incompressible ideal gas (g/mol). */ @@ -831,8 +832,7 @@ class CConfig { Thermal_Expansion_CoeffND, /*!< \brief Non-dimensional thermal expansion coefficient. */ Inc_Density_Ref, /*!< \brief Reference density for custom incompressible non-dim. */ Inc_Velocity_Ref, /*!< \brief Reference velocity for custom incompressible non-dim. */ - Inc_Temperature_Ref, /*!< \brief Reference temperature for custom incompressible non-dim. */ - Density_Constant, /*!< \brief Initial density for incompressible flows. */ + Inc_Temperature_Ref, /*!< \brief Reference temperature for custom incompressible non-dim. */ Inc_Temperature_Init, /*!< \brief Initial temperature for incompressible flows w/ heat transfer. */ Heat_Flux_Ref, /*!< \brief Reference heat flux for non-dim. */ Gas_Constant_Ref, /*!< \brief Reference specific gas constant. */ @@ -1668,6 +1668,12 @@ class CConfig { */ su2double GetMolecular_Weight(unsigned short val_index = 0) const { return Molecular_Weight[val_index]; } + /*! + * \brief Get the value of the constant density for incompressible flows. + * \return Constant density for incompressible flows when CONSTANT_DENSITY fluid model is used. + */ + su2double GetInc_Constant_Density(void) const { return Density_Constant; } + /*! * \brief Get the value of specific heat at constant pressure. * \return Value of the constant: Cp @@ -2080,12 +2086,6 @@ class CConfig { */ su2double GetInc_Temperature_Ref(void) const { return Inc_Temperature_Ref; } - /*! - * \brief Get the value of the constant density for incompressible flows. - * \return Constant density for incompressible flows when CONSTANT_DENSITY fluid model is used. - */ - su2double GetInc_Constant_Density(void) const { return Density_Constant; } - /*! * \brief Get the value of the initial velocity for incompressible flows. * \return Initial velocity for incompressible flows. From ecfe347c714d6718417287a2b142a6f41e3960c6 Mon Sep 17 00:00:00 2001 From: Cristopher-Morales Date: Wed, 20 Sep 2023 13:43:33 +0200 Subject: [PATCH 4/5] deleting INC_DENSITY_INIT from test cases --- TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg | 2 +- TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg | 2 +- TestCases/incomp_rans/naca0012/naca0012.cfg | 2 +- TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg index aea7942ecef..2cdbfcd578c 100755 --- a/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg +++ b/TestCases/disc_adj_incomp_rans/naca0012/turb_naca0012_sst.cfg @@ -17,7 +17,7 @@ RESTART_SOL= NO % -------------------- INCOMPRESSIBLE FREE-STREAM DEFINITION ------------------% % -INC_DENSITY_INIT= 2.13163 +DENSITY_CONSTANT= 2.13163 % AoA 10 deg INC_VELOCITY_INIT= ( 51.36481493540834, 9.0570027322096198, 0.0 ) diff --git a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg index b8046ad1c99..34e8cb0313a 100644 --- a/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg +++ b/TestCases/incomp_rans/AhmedBody/turb_ahmed.cfg @@ -16,7 +16,7 @@ RESTART_SOL= NO % -------------------- INCOMPRESSIBLE FREE-STREAM DEFINITION ------------------% % -INC_DENSITY_INIT= 1.2642 +DENSITY_CONSTANT= 1.2642 % Re ~ 4.29E6 based on L ~ 1.044 INC_VELOCITY_INIT= ( 60.0, 0.0, 0.0 ) FREESTREAM_VISCOSITY= 1.845E-5 diff --git a/TestCases/incomp_rans/naca0012/naca0012.cfg b/TestCases/incomp_rans/naca0012/naca0012.cfg index 49bb44fde10..9125118bd94 100644 --- a/TestCases/incomp_rans/naca0012/naca0012.cfg +++ b/TestCases/incomp_rans/naca0012/naca0012.cfg @@ -23,7 +23,7 @@ TIME_MARCHING= NO % ---------------- INCOMPRESSIBLE FLOW CONDITION DEFINITION -------------------% % -INC_DENSITY_INIT= 2.13163 +DENSITY_CONSTANT= 2.13163 INC_VELOCITY_INIT= ( 52.1572, 0.0, 0.0 ) % --------------------------- VISCOSITY MODEL ---------------------------------% diff --git a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg index 1e77e3c1574..6befc2f2533 100755 --- a/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg +++ b/TestCases/mms/fvm_incomp_navierstokes/lam_mms_fds.cfg @@ -17,7 +17,7 @@ KIND_VERIFICATION_SOLUTION= MMS_INC_NS % -------------------- INCOMPRESSIBLE FREE-STREAM DEFINITION ------------------% % -INC_DENSITY_INIT= 1.0 +DENSITY_CONSTANT= 1.0 INC_VELOCITY_INIT= ( 1.0, 0.0, 0.0 ) INC_NONDIM= DIMENSIONAL From 710b8c1c8a52ee4e352cbd7b84e2bfff4d404fef Mon Sep 17 00:00:00 2001 From: Cristopher-Morales Date: Wed, 20 Sep 2023 14:23:05 +0200 Subject: [PATCH 5/5] thermodynamics pressure update --- TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg | 2 +- TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg | 2 +- .../disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg | 2 +- TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg | 2 +- TestCases/radiation/p1adjoint/configp1adjoint.cfg | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg b/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg index 974982881fa..2df4feab380 100644 --- a/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg +++ b/TestCases/coupled_cht/disc_adj_incomp_2d/flow_cylinder.cfg @@ -36,7 +36,7 @@ INC_NONDIM= DIMENSIONAL FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 -THERMODYNAMIC_PRESSURE = 17.39862 +THERMODYNAMIC_PRESSURE = 17.39861946 % --------------------------- VISCOSITY MODEL ---------------------------------% % diff --git a/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg b/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg index f917513c644..47a75266953 100644 --- a/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg +++ b/TestCases/coupled_cht/incomp_2d_unsteady/flow_cylinder.cfg @@ -34,7 +34,7 @@ INC_NONDIM= DIMENSIONAL FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 -THERMODYNAMIC_PRESSURE = 1739.862 +THERMODYNAMIC_PRESSURE = 1739.861946 % --------------------------- VISCOSITY MODEL ---------------------------------% % diff --git a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg index e05134ed73d..2052ae48ca8 100644 --- a/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg +++ b/TestCases/disc_adj_incomp_navierstokes/cylinder/heated_cylinder.cfg @@ -27,7 +27,7 @@ INC_TEMPERATURE_INIT= 288.15 FLUID_MODEL= INC_IDEAL_GAS SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 -THERMODYNAMIC_PRESSURE = 17.3986 +THERMODYNAMIC_PRESSURE = 17.39861946 % --------------------------- VISCOSITY MODEL ---------------------------------% % diff --git a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg index c91916446c1..dc85077ef08 100644 --- a/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg +++ b/TestCases/incomp_navierstokes/cylinder/poly_cylinder.cfg @@ -30,7 +30,7 @@ FLUID_MODEL= INC_IDEAL_GAS_POLY SPECIFIC_HEAT_CP= 1004.703 MOLECULAR_WEIGHT= 28.96 CP_POLYCOEFFS= ( 1004.703, 0.1, 0.0, 0.0, 0.0) -THERMODYNAMIC_PRESSURE = 17.39862 +THERMODYNAMIC_PRESSURE = 17.39861946 % --------------------------- VISCOSITY MODEL ---------------------------------% % diff --git a/TestCases/radiation/p1adjoint/configp1adjoint.cfg b/TestCases/radiation/p1adjoint/configp1adjoint.cfg index aa2c9d2ace7..739c2f1ca34 100644 --- a/TestCases/radiation/p1adjoint/configp1adjoint.cfg +++ b/TestCases/radiation/p1adjoint/configp1adjoint.cfg @@ -29,7 +29,7 @@ INC_NONDIM = DIMENSIONAL FLUID_MODEL = INC_IDEAL_GAS SPECIFIC_HEAT_CP = 1004.703 MOLECULAR_WEIGHT = 28.96 -THERMODYNAMIC_PRESSURE = 34.45028 +THERMODYNAMIC_PRESSURE = 34.45027624 VISCOSITY_MODEL = SUTHERLAND MU_REF = 1.0E-5