Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Common/include/CConfig.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1255,7 +1255,7 @@ class CConfig {
string GasModel, /*!< \brief Gas Model. */
*Wall_Catalytic; /*!< \brief Pointer to catalytic walls. */
string NoneqStateModel; /*!< \brief Nonequilibrium State Model. */
bool Newton_2T; /*!< \brief M++ derivative vs. Perturbation Method for Newton's Method. */
bool Mpp_Temp_Solve_Robust; /*!< \brief M++ derivative vs. Perturbation Method for Newton's Method. */
TRANSCOEFFMODEL Kind_TransCoeffModel; /*!< \brief Transport coefficient Model for NEMO solver. */
su2double CatalyticEfficiency; /*!< \brief Wall catalytic efficiency. */
su2double *Inlet_MassFrac; /*!< \brief Specified Mass fraction vectors for NEMO inlet boundaries. */
Expand Down Expand Up @@ -3960,7 +3960,7 @@ class CConfig {
* \brief 2T Nonequilibrium numerical method to solve for temperatures.
* \return Bool to use M++ implementation vs. Perturbation Method.
*/
bool Get2TNewton(void) const {return Newton_2T;}
bool Get_Mpp_Temp_Solve_Robust(void) const {return Mpp_Temp_Solve_Robust;}


/*!
Expand Down
2 changes: 1 addition & 1 deletion Common/src/CConfig.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1243,7 +1243,7 @@ void CConfig::SetConfig_Options() {
/* DESCRIPTION: Specify Nonequilibrium Temperature Model */
addStringOption("NONEQ_STATE_MODEL", NoneqStateModel, string("2T"));
/* DESCRIPTION: Specify M++ Derivative vs. Perturbation Method for Newton's Method solving for temperatures */
addBoolOption("2T_NEWTON", Newton_2T, true);
addBoolOption("MPP_TEMP_SOLVE_ROBUST", Mpp_Temp_Solve_Robust, false);
/* DESCRIPTION: Specify transport coefficient model for multi-species simulations */
addEnumOption("TRANSPORT_COEFF_MODEL", Kind_TransCoeffModel, TransCoeffModel_Map, TRANSCOEFFMODEL::WILKE);
/* DESCRIPTION: Specify mass fraction of each species */
Expand Down
2 changes: 1 addition & 1 deletion SU2_CFD/include/fluid/CMutationTCLib.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class CMutationTCLib : public CNEMOGas {

su2double Tref; /*!< \brief Reference temperature. */

bool NEWTON; /*!< \brief Boolean to use Newton-Raphson h/cp or Perturbation Method to calculate Jacobian. */
bool NEWTON_ROBUST; /*!< \brief Boolean to use Newton-Raphson h/cp or Perturbation Method to calculate Jacobian. */

public:

Expand Down
9 changes: 6 additions & 3 deletions SU2_CFD/src/fluid/CMutationTCLib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,16 @@ CMutationTCLib::CMutationTCLib(const CConfig* config, unsigned short val_nDim):
else if (Kind_TransCoeffModel == TRANSCOEFFMODEL::CHAPMANN_ENSKOG)
transport_model = "Chapmann-Enskog_LDLT";

NEWTON = config->Get2TNewton();
NEWTON_ROBUST = config->Get_Mpp_Temp_Solve_Robust();
if (NoneqStateModel == "2T") {
opt.setStateModel("ChemNonEqTTv");
}
else if (NoneqStateModel == "1T"){
opt.setStateModel("ChemNonEq1T");
}
else if (NoneqStateModel == "EQUILIBRIUM"){
opt.setStateModel("Equil");
}

if (frozen) opt.setMechanism("none");

Expand Down Expand Up @@ -138,7 +141,7 @@ void CMutationTCLib::SetTDStateRhosTTv(vector<su2double>& val_rhos, su2double va

Pressure = ComputePressure();

mix->setState(rhos.data(), temperatures.data(), 1, NEWTON);
mix->setState(rhos.data(), temperatures.data(), 1, NEWTON_ROBUST);

}

Expand Down Expand Up @@ -296,7 +299,7 @@ vector<su2double>& CMutationTCLib::ComputeTemperatures(vector<su2double>& val_rh
energies[0] = rhoE - rhoEvel;
energies[1] = rhoEve;

mix->setState(rhos.data(), energies.data(), 0, NEWTON);
mix->setState(rhos.data(), energies.data(), 0, NEWTON_ROBUST);

mix->getTemperatures(temperatures.data());

Expand Down
4 changes: 2 additions & 2 deletions config_template.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,8 @@ GAS_COMPOSITION= (0.77, 0.23, 0.0, 0.0, 0.0)
FROZEN_MIXTURE= NO
% 1-Temperature vs. 2-Temperature Model for Mutation++
NONEQ_STATE_MODEL= 2T
% Use Mutationpp h/cp relation for solving for 2T temperatures vs. Perturbation Method
2T_NEWTON= YES
% Use Perturbation Method vs. Mutationpp h/cp relation for solving for 2T temperatures
MPP_TEMP_SOLVE_ROBUST= NO
%
% Datadriven fluid model
% For data-driven fluid models, an interpolation algorithm is used to retrieve the thermodynamic state for a given density and internal energy
Expand Down
Loading