Adding thermal conductivity, heat capacity and diffusivity as outputs. by Cristopher-Morales · Pull Request #1956 · su2code/SU2 · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
2068233
adding Cp as a volumeoutput
Dec 14, 2022
f3bfb34
Merge branch 'develop' into feature_output_primitives
Dec 21, 2022
0370297
fixing laminar diffusivities
Dec 22, 2022
ab7fc68
fixing segmentation fault
Dec 22, 2022
882388a
Merge branch 'develop' into feature_output_primitives
Dec 24, 2022
b28c260
small fixings
Dec 24, 2022
593a808
format fixings
Dec 24, 2022
43d2009
Merge branch 'master' into feature_output_primitives
Dec 24, 2022
8295af0
Merge branch 'master' into develop
Dec 24, 2022
873a1e2
Merge branch 'develop' into feature_output_primitives
Dec 28, 2022
e73e73c
Merge branch 'develop' of https://github.com/su2code/SU2 into develop
Jan 2, 2023
6ba4443
Merge branch 'develop' into feature_output_primitives
Jan 2, 2023
b3ac829
reformulating thermal conductivity
Jan 5, 2023
3cfbd9b
adding thermal conductivity as output
Jan 5, 2023
b256292
Merge branch 'develop' into feature_output_primitives
Jan 5, 2023
684caa7
adding source term energy equation
Jan 9, 2023
2040c93
fixing source term energy equation
Jan 9, 2023
8acd31d
fixing source term
Jan 9, 2023
d65070d
Merge branch 'develop' into feature_output_primitives
Jan 9, 2023
020a8a2
Merge branch 'develop' into feature_output_primitives
Jan 10, 2023
4208212
format fix
Jan 11, 2023
854b619
Merge branch 'develop' into feature_output_primitives
Jan 11, 2023
080899d
Merge branch 'develop' into feature_output_primitives
Jan 13, 2023
3565b4c
Merge branch 'develop' into feature_output_primitives
Jan 13, 2023
2102d91
Merge branch 'develop' into feature_output_primitives
Jan 13, 2023
aa4c9fb
Merge branch 'develop' into feature_output_primitives
Jan 13, 2023
e5772b0
Merge branch 'develop' into feature_output_primitives
Jan 16, 2023
8acb284
changing name to effective conductivity
Jan 17, 2023
416b79c
spelling fix
Jan 17, 2023
12747ee
Merge branch 'develop' into feature_output_primitives
Jan 19, 2023
64f1ba0
Merge branch 'develop' into feature_output_primitives
Jan 21, 2023
e3aac8c
Merge branch 'develop' into feature_output_primitives
Jan 24, 2023
e583f0d
Merge branch 'develop' into feature_output_primitives
Jan 29, 2023
28a1255
Merge branch 'develop' into feature_output_primitives
Jan 30, 2023
92c64b3
Merge branch 'develop' into feature_output_primitives
Feb 28, 2023
3a641e2
small fix
Mar 1, 2023
b71685a
Merge branch 'develop' into feature_output_primitives
Mar 1, 2023
0bf0365
cleaning up
Mar 3, 2023
7311c26
reducing number of variables for computing diffusivity
Mar 6, 2023
fa3b69b
fixing test case
Mar 6, 2023
e944c45
Merge branch 'develop' into feature_output_primitives
Cristopher-Morales Mar 7, 2023
567a675
updating residuals
Mar 7, 2023
bf76204
updating multizone restart
Mar 8, 2023
66b9b05
updating reggresion test
Mar 8, 2023
fe369bd
pointing to develop
Mar 8, 2023
e074154
Update SU2_CFD/src/output/CFlowIncOutput.cpp
Cristopher-Morales Mar 8, 2023
e625d06
Merge branch 'develop' into feature_output_primitives
Cristopher-Morales Mar 8, 2023
8e11122
addressing comments
Mar 8, 2023
90407d0
Apply suggestions from code review
pcarruscag Mar 9, 2023
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/src/CConfig.cpp
3 changes: 1 addition & 2 deletions SU2_CFD/include/fluid/CConstantDiffusivity.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,5 @@ class CConstantDiffusivity final : public CDiffusivityModel {
/*!
* \brief Set diffusivity.
*/
void SetDiffusivity(su2double T, su2double rho, su2double mu_lam, su2double mu_turb, su2double cp,
su2double kt) override {}
void SetDiffusivity(su2double rho, su2double mu_lam, su2double cp, su2double kt) override {}
};
3 changes: 1 addition & 2 deletions SU2_CFD/include/fluid/CConstantLewisDiffusivity.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ class CConstantLewisDiffusivity final : public CDiffusivityModel {
/*!
* \brief Set diffusivity.
*/
void SetDiffusivity(su2double T, su2double rho, su2double mu_lam, su2double mu_turb, su2double cp,
su2double kt) override {
void SetDiffusivity(su2double rho, su2double mu_lam, su2double cp, su2double kt) override {
diff_ = kt / (Lewis_ * rho * cp);
}

Expand Down
3 changes: 1 addition & 2 deletions SU2_CFD/include/fluid/CConstantSchmidt.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ class CConstantSchmidt final : public CDiffusivityModel {
/*!
* \brief Set diffusivity.
*/
void SetDiffusivity(su2double T, su2double rho, su2double mu_lam, su2double mu_turb, su2double cp,
su2double kt) override {
void SetDiffusivity(su2double rho, su2double mu_lam, su2double cp, su2double kt) override {
diff_ = mu_lam / (rho * sc_lam_);
}

Expand Down
3 changes: 1 addition & 2 deletions SU2_CFD/include/fluid/CDiffusivityModel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ class CDiffusivityModel {
/*!
* \brief Set mass diffusivity
*/
virtual void SetDiffusivity(su2double T, su2double rho, su2double mu_lam, su2double mu_turb, su2double cp,
su2double kt) = 0;
virtual void SetDiffusivity(su2double rho, su2double mu_lam, su2double cp, su2double kt) = 0;

protected:
su2double diff_{0.0}; /*!< \brief mass diffusivity. */
Expand Down
2 changes: 1 addition & 1 deletion SU2_CFD/include/fluid/CFluidModel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class CFluidModel {
* \brief Get fluid mass diffusivity.
*/
inline virtual su2double GetMassDiffusivity(int iVar) {
MassDiffusivity->SetDiffusivity(Temperature, Density, Mu, Mu_Turb, Cp, Kt);
MassDiffusivity->SetDiffusivity(Density, Mu, Cp, Kt);
mass_diffusivity = MassDiffusivity->GetDiffusivity();
return mass_diffusivity;
}
Expand Down
10 changes: 8 additions & 2 deletions SU2_CFD/include/fluid/CFluidScalar.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ class CFluidScalar final : public CFluidModel {
const su2double Gamma; /*!< \brief Ratio of specific heats of the gas. */
const su2double Pressure_Thermodynamic; /*!< \brief Constant pressure thermodynamic. */
const su2double GasConstant_Ref; /*!< \brief Gas constant reference needed for Nondimensional problems. */
const su2double Prandtl_Number; /*!< \brief Prandlt number.*/

const bool wilke;
const bool davidson;
Expand Down Expand Up @@ -96,6 +97,11 @@ class CFluidScalar final : public CFluidModel {
*/
su2double ComputeGasConstant();

/*!
* \brief Compute mass diffusivity for species.
*/
void ComputeMassDiffusivity();

public:
/*!
* \brief Constructor of the class.
Expand Down Expand Up @@ -125,12 +131,12 @@ class CFluidScalar final : public CFluidModel {
/*!
* \brief Get fluid thermal conductivity.
*/
inline su2double GetThermalConductivity() override { return Kt; }
inline su2double GetThermalConductivity() override { return Kt + Mu_Turb * Cp / Prandtl_Number; }

/*!
* \brief Get fluid mass diffusivity.
*/
inline su2double GetMassDiffusivity(int ivar) override;
inline su2double GetMassDiffusivity(int ivar) override { return massDiffusivity[ivar]; }

/*!
* \brief Set the Dimensionless State using Temperature.
Expand Down
8 changes: 8 additions & 0 deletions SU2_CFD/include/variables/CScalarVariable.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,12 @@ class CScalarVariable : public CVariable {
inline su2double GetHarmonicBalance_Source(unsigned long iPoint, unsigned long iVar) const final {
return HB_Source(iPoint, iVar);
}

/*!
* \brief Get the value of the mass diffusivity
* \param[in] iPoint - Point index.
* \param[in] val_ivar - eqn. index to the mass diffusivity.
* \return Value of the mass diffusivity
*/
inline virtual su2double GetDiffusivity(unsigned long iPoint, unsigned short val_ivar) const { return 0.0; }
};
2 changes: 1 addition & 1 deletion SU2_CFD/include/variables/CSpeciesVariable.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class CSpeciesVariable : public CScalarVariable {
* \param[in] val_ivar - eqn. index to the mass diffusivity.
* \return Value of the mass diffusivity
*/
inline su2double GetDiffusivity(unsigned long iPoint, unsigned short val_ivar) {
inline su2double GetDiffusivity(unsigned long iPoint, unsigned short val_ivar) const {
return Diffusivity(iPoint, val_ivar);
}

Expand Down
7 changes: 7 additions & 0 deletions SU2_CFD/include/variables/CVariable.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1114,6 +1114,13 @@ class CVariable {
*/
inline virtual su2double GetThermalConductivity(unsigned long iPoint) const { return 0.0; }

/*!
* \brief A virtual member.
* \param[in] iPoint - Point index.
* \return Value of the mass diffusivity.
*/
inline virtual su2double GetDiffusivity(unsigned long iPoint, unsigned short val_ivar) const { return 0.0; }
Comment thread
pcarruscag marked this conversation as resolved.

/*!
* \brief A virtual member.
* \param[in] iPoint - Point index.
Expand Down
13 changes: 9 additions & 4 deletions SU2_CFD/src/fluid/CFluidScalar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ CFluidScalar::CFluidScalar(su2double val_Cp, su2double val_gas_constant, su2doub
Gamma(config->GetGamma()),
Pressure_Thermodynamic(value_pressure_operating),
GasConstant_Ref(config->GetGas_Constant_Ref()),
Prandtl_Number(config->GetPrandtl_Turb()),
wilke(config->GetKind_MixingViscosityModel() == MIXINGVISCOSITYMODEL::WILKE),
davidson(config->GetKind_MixingViscosityModel() == MIXINGVISCOSITYMODEL::DAVIDSON) {
if (n_species_mixture > ARRAYSIZE) {
Expand All @@ -63,6 +64,7 @@ CFluidScalar::CFluidScalar(su2double val_Cp, su2double val_gas_constant, su2doub

SetLaminarViscosityModel(config);
SetThermalConductivityModel(config);
SetMassDiffusivityModel(config);
}

void CFluidScalar::SetLaminarViscosityModel(const CConfig* config) {
Expand All @@ -83,9 +85,11 @@ void CFluidScalar::SetMassDiffusivityModel(const CConfig* config) {
}
}

su2double CFluidScalar::GetMassDiffusivity(int iVar) {
MassDiffusivityPointers[iVar]->SetDiffusivity(Temperature, Density, Mu, Mu_Turb, Cp, Kt);
return MassDiffusivityPointers[iVar]->GetDiffusivity();
void CFluidScalar::ComputeMassDiffusivity() {
for (int iVar = 0; iVar < n_species_mixture; iVar++) {
MassDiffusivityPointers[iVar]->SetDiffusivity(Density, Mu, Cp, Kt);
massDiffusivity[iVar] = MassDiffusivityPointers[iVar]->GetDiffusivity();
}
}

void CFluidScalar::MassToMoleFractions(const su2double* val_scalars) {
Expand Down Expand Up @@ -168,7 +172,7 @@ su2double CFluidScalar::DavidsonViscosity(const su2double* val_scalars) {
su2double CFluidScalar::WilkeConductivity(const su2double* val_scalars) {

for (int iVar = 0; iVar < n_species_mixture; iVar++) {
ThermalConductivityPointers[iVar]->SetConductivity(Temperature, Density, Mu, Mu_Turb, Cp, 0.0, 0.0);
ThermalConductivityPointers[iVar]->SetConductivity(Temperature, Density, Mu, 0.0, 0.0, 0.0, 0.0);
laminarThermalConductivity[iVar] = ThermalConductivityPointers[iVar]->GetConductivity();
}

Expand Down Expand Up @@ -227,4 +231,5 @@ void CFluidScalar::SetTDState_T(const su2double val_temperature, const su2double
}

Kt = WilkeConductivity(val_scalars);
ComputeMassDiffusivity();
}
4 changes: 4 additions & 0 deletions SU2_CFD/src/output/CFlowIncOutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,8 @@ void CFlowIncOutput::SetVolumeOutputFields(CConfig *config){

if (config->GetKind_Solver() == MAIN_SOLVER::INC_RANS || config->GetKind_Solver() == MAIN_SOLVER::INC_NAVIER_STOKES){
AddVolumeOutput("LAMINAR_VISCOSITY", "Laminar_Viscosity", "PRIMITIVE", "Laminar viscosity");
AddVolumeOutput("HEAT_CAPACITY", "Heat_Capacity", "PRIMITIVE", "Heat capacity");
AddVolumeOutput("THERMAL_CONDUCTIVITY", "Thermal_Conductivity", "PRIMITIVE", "Thermal conductivity");

AddVolumeOutput("SKIN_FRICTION-X", "Skin_Friction_Coefficient_x", "PRIMITIVE", "x-component of the skin friction vector");
AddVolumeOutput("SKIN_FRICTION-Y", "Skin_Friction_Coefficient_y", "PRIMITIVE", "y-component of the skin friction vector");
Expand Down Expand Up @@ -407,6 +409,8 @@ void CFlowIncOutput::LoadVolumeData(CConfig *config, CGeometry *geometry, CSolve

if (config->GetKind_Solver() == MAIN_SOLVER::INC_RANS || config->GetKind_Solver() == MAIN_SOLVER::INC_NAVIER_STOKES){
SetVolumeOutputValue("LAMINAR_VISCOSITY", iPoint, Node_Flow->GetLaminarViscosity(iPoint));
SetVolumeOutputValue("HEAT_CAPACITY", iPoint, Node_Flow->GetSpecificHeatCp(iPoint));
SetVolumeOutputValue("THERMAL_CONDUCTIVITY", iPoint, Node_Flow->GetThermalConductivity(iPoint));
}

SetVolumeOutputValue("RES_PRESSURE", iPoint, solver[FLOW_SOL]->LinSysRes(iPoint, 0));
Expand Down
8 changes: 6 additions & 2 deletions SU2_CFD/src/output/CFlowOutput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1159,8 +1159,9 @@ void CFlowOutput::SetVolumeOutputFields_ScalarSolution(const CConfig* config){
}

if (config->GetKind_Species_Model() != SPECIES_MODEL::NONE) {
for (unsigned short iVar = 0; iVar < config->GetnSpecies(); iVar++)
for (unsigned short iVar = 0; iVar < config->GetnSpecies(); iVar++) {
AddVolumeOutput("SPECIES_" + std::to_string(iVar), "Species_" + std::to_string(iVar), "SOLUTION", "Species_" + std::to_string(iVar) + " mass fraction");
}
}
}

Expand Down Expand Up @@ -1190,8 +1191,10 @@ void CFlowOutput::SetVolumeOutputFields_ScalarResidual(const CConfig* config) {
}

if (config->GetKind_Species_Model() != SPECIES_MODEL::NONE) {
for (unsigned short iVar = 0; iVar < config->GetnSpecies(); iVar++)
for (unsigned short iVar = 0; iVar < config->GetnSpecies(); iVar++){
AddVolumeOutput("RES_SPECIES_" + std::to_string(iVar), "Residual_Species_" + std::to_string(iVar), "RESIDUAL", "Residual of the transported species " + std::to_string(iVar));
AddVolumeOutput("DIFFUSIVITY_" + std::to_string(iVar), "Diffusivity_" + std::to_string(iVar), "PRIMITIVE", "Diffusivity of the transported species " + std::to_string(iVar));
}
}
}

Expand Down Expand Up @@ -1324,6 +1327,7 @@ void CFlowOutput::LoadVolumeData_Scalar(const CConfig* config, const CSolver* co
for (unsigned short iVar = 0; iVar < config->GetnSpecies(); iVar++) {
SetVolumeOutputValue("SPECIES_" + std::to_string(iVar), iPoint, Node_Species->GetSolution(iPoint, iVar));
SetVolumeOutputValue("RES_SPECIES_" + std::to_string(iVar), iPoint, solver[SPECIES_SOL]->LinSysRes(iPoint, iVar));
SetVolumeOutputValue("DIFFUSIVITY_"+ std::to_string(iVar), iPoint, Node_Species->GetDiffusivity(iPoint,iVar));
if (config->GetKind_SlopeLimit_Species() != LIMITER::NONE)
SetVolumeOutputValue("LIMITER_SPECIES_" + std::to_string(iVar), iPoint, Node_Species->GetLimiter(iPoint, iVar));
}
Expand Down
11 changes: 7 additions & 4 deletions SU2_CFD/src/solvers/CSpeciesSolver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ CSpeciesSolver::CSpeciesSolver(CGeometry* geometry, CConfig* config, unsigned sh
/*--- Initialize the mass diffusivity. Nondimensionalization done in the flow solver. ---*/
SU2_OMP_FOR_STAT(omp_chunk_size)
for (unsigned long iPoint = 0; iPoint < nPoint; iPoint++) {
for (auto iVar = 0u; iVar < nVar; iVar++) {
for (auto iVar = 0u; iVar <= nVar; iVar++) {
const auto MassDiffusivity = config->GetDiffusivity_ConstantND();
nodes->SetDiffusivity(iPoint, MassDiffusivity, iVar);
}
Expand Down Expand Up @@ -290,9 +290,12 @@ void CSpeciesSolver::Preprocessing(CGeometry* geometry, CSolver** solver_contain
/*--- Set the laminar mass Diffusivity for the species solver. ---*/
SU2_OMP_FOR_STAT(omp_chunk_size)
for (auto iPoint = 0u; iPoint < nPoint; iPoint++) {
for (auto iVar = 0u; iVar < nVar; iVar++) {
solver_container[FLOW_SOL]->GetFluidModel()->SetMassDiffusivityModel(config);
su2double mass_diffusivity = solver_container[FLOW_SOL]->GetFluidModel()->GetMassDiffusivity(iVar);
const su2double temperature = solver_container[FLOW_SOL]->GetNodes()->GetTemperature(iPoint);
const su2double* scalar = solver_container[SPECIES_SOL]->GetNodes()->GetSolution(iPoint);
solver_container[FLOW_SOL]->GetFluidModel()->SetMassDiffusivityModel(config);
solver_container[FLOW_SOL]->GetFluidModel()->SetTDState_T(temperature, scalar);
for (auto iVar = 0u; iVar <= nVar; iVar++) {
const su2double mass_diffusivity = solver_container[FLOW_SOL]->GetFluidModel()->GetMassDiffusivity(iVar);
nodes->SetDiffusivity(iPoint, mass_diffusivity, iVar);
}

Expand Down
2 changes: 1 addition & 1 deletion SU2_CFD/src/variables/CSpeciesVariable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ CSpeciesVariable::CSpeciesVariable(const su2double* species_inf, unsigned long n
unsigned long nvar, const CConfig* config)
: CScalarVariable(npoint, ndim, nvar, config) {
/*--- Allocate space for the mass diffusivity. ---*/
Diffusivity.resize(nPoint, nVar) = su2double(0.0);
Diffusivity.resize(nPoint, nVar + 1) = su2double(0.0);

for (unsigned long iPoint = 0; iPoint < nPoint; iPoint++)
for (unsigned long iVar = 0; iVar < nVar; iVar++)
Expand Down
14 changes: 7 additions & 7 deletions TestCases/parallel_regression.py
Original file line number Diff line number Diff line change
Expand Up @@ -1429,7 +1429,7 @@ def main():
species2_primitiveVenturi_mixingmodel.cfg_dir = "species_transport/venturi_primitive_3species"
species2_primitiveVenturi_mixingmodel.cfg_file = "species2_primitiveVenturi_mixingmodel.cfg"
species2_primitiveVenturi_mixingmodel.test_iter = 50
species2_primitiveVenturi_mixingmodel.test_vals = [-5.477236, -4.589782, -4.582531, -5.690416, -0.068943, -5.631254, 5.000000, -1.668303, 5.000000, -4.866978, 5.000000, -1.168368, 0.000425, 0.000404, 0.000021, 0.000000]
species2_primitiveVenturi_mixingmodel.test_vals = [-5.447741, -4.578625, -4.560889, -5.671675, -0.069655, -5.630277, 5.000000, -1.714271, 5.000000, -4.878115, 5.000000, -1.254671, 0.000418, 0.000394, 0.000024, 0.000000]
species2_primitiveVenturi_mixingmodel.new_output = True
test_list.append(species2_primitiveVenturi_mixingmodel)

Expand All @@ -1438,7 +1438,7 @@ def main():
species2_primitiveVenturi_mixingmodel_boundedscalar.cfg_dir = "species_transport/venturi_primitive_3species"
species2_primitiveVenturi_mixingmodel_boundedscalar.cfg_file = "species2_primitiveVenturi_mixingmodel_boundedscalar.cfg"
species2_primitiveVenturi_mixingmodel_boundedscalar.test_iter = 50
species2_primitiveVenturi_mixingmodel_boundedscalar.test_vals = [-5.419823, -4.490921, -4.496340, -5.724950, -0.120331, -5.693224, 5.000000, -1.766882, 5.000000, -4.958487, 5.000000, -2.150247, 0.000300, 0.000300, 0.000000, 0.000000]
species2_primitiveVenturi_mixingmodel_boundedscalar.test_vals = [-5.398649, -4.476373, -4.477258, -5.733271, -0.122667, -5.687136, 5.000000, -1.797791, 5.000000, -4.942913, 5.000000, -2.082842, 0.000295, 0.000295, 0.000000, 0.000000]
species2_primitiveVenturi_mixingmodel_boundedscalar.new_output = True
test_list.append(species2_primitiveVenturi_mixingmodel_boundedscalar)

Expand All @@ -1447,7 +1447,7 @@ def main():
species2_primitiveVenturi_mixingmodel_viscosity.cfg_dir = "species_transport/venturi_primitive_3species"
species2_primitiveVenturi_mixingmodel_viscosity.cfg_file = "species2_primitiveVenturi_mixingmodel_viscosity.cfg"
species2_primitiveVenturi_mixingmodel_viscosity.test_iter = 50
species2_primitiveVenturi_mixingmodel_viscosity.test_vals = [-4.738778, -4.325766, -4.610914, -5.834431, 0.521730, -4.934375, 5.000000, -1.887191, 5.000000, -5.499917, 5.000000, -1.770845, 2.292904, 0.971941, 0.608500, 0.712464]
species2_primitiveVenturi_mixingmodel_viscosity.test_vals = [-4.725129, -4.311366, -4.610113, -5.833264, 0.552520, -4.945381, 5.000000, -1.834845, 5.000000, -5.496023, 5.000000, -1.733470, 2.277964, 0.972376, 0.608230, 0.697358]
species2_primitiveVenturi_mixingmodel_viscosity.new_output = True
test_list.append(species2_primitiveVenturi_mixingmodel_viscosity)

Expand All @@ -1456,7 +1456,7 @@ def main():
species2_primitiveVenturi_mixingmodel_heatcapacity_H2.cfg_dir = "species_transport/venturi_primitive_3species"
species2_primitiveVenturi_mixingmodel_heatcapacity_H2.cfg_file = "species2_primitiveVenturi_mixingmodel_heatcapacity_H2.cfg"
species2_primitiveVenturi_mixingmodel_heatcapacity_H2.test_iter = 50
species2_primitiveVenturi_mixingmodel_heatcapacity_H2.test_vals = [-6.105905, -4.979417, -4.870704, -7.338344, 2.435662, -5.621107, 30.000000, -5.737172, 12.000000, -8.148164, 9.000000, -8.040415, 2.084589, 1.000000, 0.600000, 0.484589]
species2_primitiveVenturi_mixingmodel_heatcapacity_H2.test_vals = [-6.113626, -4.989076, -4.880565, -7.351737, 2.452701, -5.627391, 30.000000, -5.721303, 11.000000, -8.001991, 10.000000, -8.813670, 2.084143, 1.000000, 0.600000, 0.484143]
species2_primitiveVenturi_mixingmodel_heatcapacity_H2.su2_exec = "mpirun -n 2 SU2_CFD"
species2_primitiveVenturi_mixingmodel_heatcapacity_H2.timeout = 1600
species2_primitiveVenturi_mixingmodel_heatcapacity_H2.new_output = True
Expand All @@ -1468,7 +1468,7 @@ def main():
species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.cfg_dir = "species_transport/venturi_primitive_3species"
species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.cfg_file = "species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.cfg"
species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.test_iter = 50
species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.test_vals = [-5.711760, -5.284237, -5.175532, -8.342082, 2.130839, -5.226944, 30.000000, -5.737157, 12.000000, -8.148020, 9.000000, -8.040460, 2.084591, 1.000000, 0.600000, 0.484591]
species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.test_vals = [-5.719472, -5.293846, -5.185419, -8.355307, 2.147874, -5.233215, 30.000000, -5.721396, 11.000000, -8.000062, 10.000000, -8.814100, 2.084145, 1.000000, 0.600000, 0.484145]
species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.su2_exec = "mpirun -n 2 SU2_CFD"
species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.timeout = 1600
species2_primitiveVenturi_mixingmodel_heatcapacity_H2_ND.new_output = True
Expand Down Expand Up @@ -1498,7 +1498,7 @@ def main():
species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.cfg_dir = "species_transport/venturi_primitive_3species"
species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.cfg_file = "species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.cfg"
species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.test_iter = 50
species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.test_vals = [-4.019621, -1.652733, -1.414138, -0.971744, 1.590456, -3.762843, 23.000000, -5.066221, 12.000000, -5.359931, 4.000000, -6.078888, 2.000000, 1.000000, 0.000000, 1.000000]
species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.test_vals = [-4.012157, -1.650191, -1.405134, -0.990205, 1.619918, -3.764227, 23.000000, -5.039466, 12.000000, -5.346201, 4.000000, -6.084514, 2.000000, 1.000000, 0.000000, 1.000000]
species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.su2_exec = "mpirun -n 2 SU2_CFD"
species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.timeout = 1600
species2_primitiveVenturi_mixingmodel_TURBULENT_MARKERS.new_output = True
Expand Down Expand Up @@ -1530,7 +1530,7 @@ def main():
species3_multizone_restart.cfg_dir = "species_transport/multizone"
species3_multizone_restart.cfg_file = "configMaster.cfg"
species3_multizone_restart.test_iter = 5
species3_multizone_restart.test_vals = [-7.169637, -6.381576]
species3_multizone_restart.test_vals = [-6.571720, -6.086110]
species3_multizone_restart.new_output = True
species3_multizone_restart.multizone = True
test_list.append(species3_multizone_restart)
Expand Down
Loading