diff --git a/SU2_CFD/include/integration/ComputeLinSysResRMS.hpp b/SU2_CFD/include/integration/ComputeLinSysResRMS.hpp deleted file mode 100644 index 9471557d4020..000000000000 --- a/SU2_CFD/include/integration/ComputeLinSysResRMS.hpp +++ /dev/null @@ -1,63 +0,0 @@ -/*! - * \file ComputeLinSysResRMS.hpp - * \brief Helper to compute the global RMS of LinSysRes across all variables and domain points. - * \author Nijso Beishuizen - * \version 8.4.0 "Harrier" - * - * SU2 Project Website: https://su2code.github.io - * - * The SU2 Project is maintained by the SU2 Foundation - * (http://su2foundation.org) - * - * Copyright 2012-2026, 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 "../../include/solvers/CSolver.hpp" -#include "../../../Common/include/parallelization/omp_structure.hpp" -#include - -/*! - * \brief Compute the global (MPI-reduced) RMS of LinSysRes over all variables and domain points. - * - * \note Thread-safety: This function MUST be called by ALL threads in the current - * OpenMP parallel region, because squaredNorm() uses parallel for + barriers - * internally. Do NOT call from inside BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS. - * The return value is correct only on the master thread (thread 0). - * - * \param[in] solver - Solver whose LinSysRes is evaluated. - * \return Global RMS value (valid on master thread; other threads return 0). - */ -inline passivedouble ComputeLinSysResRMS(const CSolver* solver) { - - /*--- squaredNorm() -> dot() uses OMP parallel for + barriers internally, - * so all threads must participate. ---*/ - const su2double sqNorm = solver->LinSysRes.squaredNorm(); - - /*--- The MPI reduction for nElmDomain must be single-threaded. ---*/ - passivedouble result = 0.0; - BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS - { - unsigned long nElmDomain = solver->LinSysRes.GetNElmDomain(); - unsigned long globalNElmDomain = 0; - SU2_MPI::Allreduce(&nElmDomain, &globalNElmDomain, 1, MPI_UNSIGNED_LONG, MPI_SUM, SU2_MPI::GetComm()); - if (globalNElmDomain > 0) - result = std::sqrt(SU2_TYPE::GetValue(sqNorm) / static_cast(globalNElmDomain)); - } - END_SU2_OMP_SAFE_GLOBAL_ACCESS - - return result; -} diff --git a/SU2_CFD/src/integration/CMultiGridIntegration.cpp b/SU2_CFD/src/integration/CMultiGridIntegration.cpp index 35eb24e3aa7b..742ecdeca574 100644 --- a/SU2_CFD/src/integration/CMultiGridIntegration.cpp +++ b/SU2_CFD/src/integration/CMultiGridIntegration.cpp @@ -25,11 +25,11 @@ * License along with SU2. If not, see . */ -#include "../../include/integration/ComputeLinSysResRMS.hpp" #include "../../include/integration/CMultiGridIntegration.hpp" #include "../../../Common/include/parallelization/omp_structure.hpp" #include "../../../Common/include/toolboxes/printing_toolbox.hpp" +namespace { /*!\cond PRIVATE Helper: shared logic for adapting a single MG damping factor. * Inputs: * performed[] - actual iteration counts per level from this cycle @@ -79,6 +79,15 @@ static void adaptMGDampingFactor(const unsigned short* performed, setPersist(factor); } +inline passivedouble ComputeLinSysResRMS(const CSolver* solver) { + passivedouble result = 0; + for (unsigned short iVar = 0; iVar < solver->GetnVar(); ++iVar) { + result += pow(SU2_TYPE::GetValue(solver->GetRes_RMS(iVar)), 2); + } + return sqrt(result / solver->GetnVar()); +} +} + void CMultiGridIntegration::adaptRestrictionDamping(CConfig* config) { SU2_ZONE_SCOPED const auto& mgOpts = config->GetMGOptions(); @@ -145,7 +154,7 @@ passivedouble CMultiGridIntegration::computeMultigridCFL(CConfig* config, unsign last_reset_iter = current_iter; } - unsigned short lvl = min(iMesh, (unsigned short)(MAX_MG_LEVELS - 1)); + unsigned short lvl = min(iMesh, MAX_MG_LEVELS - 1); unsigned long iter = current_iter; /*--- rms_res_coarse is passed in (from lastPreSmoothRMS, already MPI-reduced). ---*/ @@ -223,13 +232,13 @@ passivedouble CMultiGridIntegration::computeMultigridCFL(CConfig* config, unsign last_update_iter[lvl] = iter; } - /*--- Clamp coefficient between 0.5 and 1.0 ---*/ - new_coeff = max(0.5, min(1.0, new_coeff)); + /*--- Clamp coefficient between 0.5 and 1.0 ---*/ + new_coeff = max(0.5, min(1.0, new_coeff)); - /*--- Update coarse grid CFL ---*/ - CFL_coarse_new = max(0.5 * CFL_fine, min(CFL_fine, CFL_fine * new_coeff)); + /*--- Update coarse grid CFL ---*/ + CFL_coarse_new = max(0.5 * CFL_fine, min(CFL_fine, CFL_fine * new_coeff)); - config->SetCFL(iMesh+1, CFL_coarse_new); + config->SetCFL(iMesh+1, CFL_coarse_new); AD::EndPassive(wasActive); return CFL_coarse_new; @@ -279,7 +288,7 @@ void CMultiGridIntegration::MultiGrid_Iteration(CGeometry ****geometry, su2double monitor = 1.0; bool FullMG = false; - unsigned short RecursiveParam = static_cast(config[iZone]->GetMGCycle()); + auto RecursiveParam = static_cast(config[iZone]->GetMGCycle()); if (config[iZone]->GetMGCycle() == MG_CYCLE::FULL) { RecursiveParam = static_cast(MG_CYCLE::V); @@ -381,8 +390,7 @@ void CMultiGridIntegration::MultiGrid_Iteration(CGeometry ****geometry, * and the signal would always point to "scale down"). ---*/ const auto& mgOptsZone = config[iZone]->GetMGOptions(); if (mgOptsZone.MG_Smooth_EarlyExit) { - BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS - { + BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS { adaptRestrictionDamping(config[iZone]); adaptProlongationDamping(config[iZone]); } @@ -392,52 +400,50 @@ void CMultiGridIntegration::MultiGrid_Iteration(CGeometry ****geometry, /*--- Print compact smoothing summary when MG_SMOOTH_OUTPUT= YES. ---*/ if (mgOptsZone.MG_Smooth_Output) { BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS - { - if (SU2_MPI::GetRank() == MASTER_NODE) { - - /*--- Helper: format one cell as "act/max [init->final]". ---*/ - auto cellStr = [](unsigned short act, unsigned short mx, - su2double rms0, su2double rms1) -> std::string { - std::ostringstream ss; - ss << act << "/" << mx << " [" - << std::scientific << std::setprecision(2) - << rms0 << "->" << rms1 << "]"; - return ss.str(); - }; - - PrintingToolbox::CTablePrinter table(&std::cout); - table.AddColumn("Smoother", 13); - for (unsigned short i = 0; i <= nMGLevels; ++i) - table.AddColumn("Level " + std::to_string(i), 26); - table.PrintHeader(); - - /*--- Pre-smooth: defined on all levels 0..nMGLevels. ---*/ - table << "Pre-smooth"; - for (unsigned short i = 0; i <= nMGLevels; ++i) - table << cellStr(lastPreSmoothIters[i], mgOptsZone.MG_PreSmooth[i], - lastPreSmoothRMS[i][0], lastPreSmoothRMS[i][1]); - - /*--- Post-smooth: defined on levels 0..nMGLevels-1; coarsest has none. ---*/ - table << "Post-smooth"; - for (unsigned short i = 0; i < nMGLevels; ++i) - table << cellStr(lastPostSmoothIters[i], mgOptsZone.MG_PostSmooth[i], - lastPostSmoothRMS[i][0], lastPostSmoothRMS[i][1]); - table << "-"; - - /*--- Corr.-smooth: defined on levels 0..nMGLevels-1; coarsest has none. ---*/ - table << "Corr-smooth"; - for (unsigned short i = 0; i < nMGLevels; ++i) - table << cellStr(lastCorrecSmoothIters[i], mgOptsZone.MG_CorrecSmooth[i], - lastCorrecSmoothRMS[i][0], lastCorrecSmoothRMS[i][1]); - table << "-"; - - table.PrintFooter(); - - cout << std::fixed << std::setprecision(4) - << "Damping [restrict | prolong] : " << config[iZone]->GetDamp_Res_Restric() - << " | " << config[iZone]->GetDamp_Correc_Prolong() << "\n" - << std::defaultfloat << std::setprecision(6); - } + if (SU2_MPI::GetRank() == MASTER_NODE) { + + /*--- Helper: format one cell as "act/max [init->final]". ---*/ + auto cellStr = [](unsigned short act, unsigned short mx, + su2double rms0, su2double rms1) -> std::string { + std::ostringstream ss; + ss << act << "/" << mx << " [" + << std::scientific << std::setprecision(2) + << rms0 << "->" << rms1 << "]"; + return ss.str(); + }; + + PrintingToolbox::CTablePrinter table(&std::cout); + table.AddColumn("Smoother", 13); + for (unsigned short i = 0; i <= nMGLevels; ++i) + table.AddColumn("Level " + std::to_string(i), 26); + table.PrintHeader(); + + /*--- Pre-smooth: defined on all levels 0..nMGLevels. ---*/ + table << "Pre-smooth"; + for (unsigned short i = 0; i <= nMGLevels; ++i) + table << cellStr(lastPreSmoothIters[i], mgOptsZone.MG_PreSmooth[i], + lastPreSmoothRMS[i][0], lastPreSmoothRMS[i][1]); + + /*--- Post-smooth: defined on levels 0..nMGLevels-1; coarsest has none. ---*/ + table << "Post-smooth"; + for (unsigned short i = 0; i < nMGLevels; ++i) + table << cellStr(lastPostSmoothIters[i], mgOptsZone.MG_PostSmooth[i], + lastPostSmoothRMS[i][0], lastPostSmoothRMS[i][1]); + table << "-"; + + /*--- Corr.-smooth: defined on levels 0..nMGLevels-1; coarsest has none. ---*/ + table << "Corr-smooth"; + for (unsigned short i = 0; i < nMGLevels; ++i) + table << cellStr(lastCorrecSmoothIters[i], mgOptsZone.MG_CorrecSmooth[i], + lastCorrecSmoothRMS[i][0], lastCorrecSmoothRMS[i][1]); + table << "-"; + + table.PrintFooter(); + + cout << std::fixed << std::setprecision(4) + << "Damping [restrict | prolong] : " << config[iZone]->GetDamp_Res_Restric() + << " | " << config[iZone]->GetDamp_Correc_Prolong() << "\n" + << std::defaultfloat << std::setprecision(6); } END_SU2_OMP_SAFE_GLOBAL_ACCESS } @@ -596,33 +602,28 @@ void CMultiGridIntegration::PreSmoothing(unsigned short RunTime_EqSystem, /*--- Space integration ---*/ Space_Integration(geometry_fine, solver_container_fine, numerics_fine, config, iMesh, iRKStep, RunTime_EqSystem); + /*--- Time integration, update solution using the old solution plus the solution increment ---*/ + Time_Integration(geometry_fine, solver_container_fine, config, iRKStep, RunTime_EqSystem); + /*--- Capture initial RMS after the very first residual evaluation. - * This is the earliest point where LinSysRes = R(u_current) (not stale). - * ComputeLinSysResRMS must be called by all threads (uses parallel dot). ---*/ + * This is the earliest point where LinSysRes = R(u_current) (not stale). ---*/ if (iPreSmooth == 0 && iRKStep == 0) { - const passivedouble initial_rms = ComputeLinSysResRMS(solver_fine); - BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS - { + BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS { + const passivedouble initial_rms = ComputeLinSysResRMS(solver_fine); lastPreSmoothRMS[iMesh][0] = initial_rms; if (early_exit) mg_initial_smooth_rms = initial_rms; } END_SU2_OMP_SAFE_GLOBAL_ACCESS } - /*--- Time integration, update solution using the old solution plus the solution increment ---*/ - Time_Integration(geometry_fine, solver_container_fine, config, iRKStep, RunTime_EqSystem); - /*--- Send-Receive boundary conditions, and postprocessing ---*/ solver_fine->Postprocessing(geometry_fine, solver_container_fine, config, iMesh); } - /*--- Early exit: check if RMS has dropped sufficiently. - * ComputeLinSysResRMS must be called by all threads. - * only master uses the result inside the safe block. ---*/ + /*--- Early exit: check if RMS has dropped sufficiently. ---*/ if (early_exit) { - const passivedouble current_rms = ComputeLinSysResRMS(solver_fine); - BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS - { + BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS { + const passivedouble current_rms = ComputeLinSysResRMS(solver_fine); mg_last_smooth_rms = current_rms; if (mg_last_smooth_rms < mgOpts.MG_Smooth_Res_Threshold * mg_initial_smooth_rms) { lastPreSmoothIters[iMesh] = iPreSmooth + 1; @@ -639,10 +640,10 @@ void CMultiGridIntegration::PreSmoothing(unsigned short RunTime_EqSystem, * in the normal path we compute it once here. * The condition is the same for all threads so they all agree on whether to call. ---*/ passivedouble final_pre_rms = mg_last_smooth_rms; - if (!(early_exit && mg_early_exit_flag)) + if (!(early_exit && mg_early_exit_flag)) { final_pre_rms = ComputeLinSysResRMS(solver_fine); - BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS - { + } + BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS { mg_last_smooth_rms = final_pre_rms; lastPreSmoothRMS[iMesh][1] = final_pre_rms; lastPreSmoothProgress[iMesh] = mg_early_exit_flag || @@ -688,34 +689,30 @@ void CMultiGridIntegration::PostSmoothing(unsigned short RunTime_EqSystem, /*--- Space integration ---*/ Space_Integration(geometry_fine, solver_container_fine, numerics_fine, config, iMesh, iRKStep, RunTime_EqSystem); + /*--- Time integration, update solution using the old solution plus the solution increment ---*/ + Time_Integration(geometry_fine, solver_container_fine, config, iRKStep, RunTime_EqSystem); + /*--- Capture initial RMS after the very first residual evaluation. * Before this point, LinSysRes held the smoothed correction (from SmoothProlongated_Correction), - * NOT the spatial residual R(u). This is the first valid R(u) after applying the correction. - * ComputeLinSysResRMS must be called by all threads (uses parallel dot). ---*/ + * NOT the spatial residual R(u). This is the first valid R(u) after applying the correction. ---*/ if (iPostSmooth == 0 && iRKStep == 0) { - const passivedouble initial_rms = ComputeLinSysResRMS(solver_fine); - BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS - { + BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS { + const passivedouble initial_rms = ComputeLinSysResRMS(solver_fine); lastPostSmoothRMS[iMesh][0] = initial_rms; if (early_exit) mg_initial_smooth_rms = initial_rms; } END_SU2_OMP_SAFE_GLOBAL_ACCESS } - /*--- Time integration, update solution using the old solution plus the solution increment ---*/ - Time_Integration(geometry_fine, solver_container_fine, config, iRKStep, RunTime_EqSystem); - /*--- Send-Receive boundary conditions, and postprocessing ---*/ solver_fine->Postprocessing(geometry_fine, solver_container_fine, config, iMesh); } - /*--- Early exit: check if RMS has dropped sufficiently. - * ComputeLinSysResRMS must be called by all threads (uses parallel dot). ---*/ + /*--- Early exit: check if RMS has dropped sufficiently. ---*/ if (early_exit) { - const passivedouble current_rms = ComputeLinSysResRMS(solver_fine); - BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS - { + BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS { + const passivedouble current_rms = ComputeLinSysResRMS(solver_fine); mg_last_smooth_rms = current_rms; if (mg_last_smooth_rms < mgOpts.MG_Smooth_Res_Threshold * mg_initial_smooth_rms) { lastPostSmoothIters[iMesh] = iPostSmooth + 1; @@ -731,10 +728,10 @@ void CMultiGridIntegration::PostSmoothing(unsigned short RunTime_EqSystem, * In the early-exit path mg_last_smooth_rms is already current; otherwise compute once. * The condition is the same for all threads so they all agree on whether to call. ---*/ passivedouble final_post_rms = mg_last_smooth_rms; - if (!(early_exit && mg_early_exit_flag)) + if (!(early_exit && mg_early_exit_flag)) { final_post_rms = ComputeLinSysResRMS(solver_fine); - BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS - { + } + BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS { mg_last_smooth_rms = final_post_rms; lastPostSmoothRMS[iMesh][1] = final_post_rms; lastPostSmoothProgress[iMesh] = mg_early_exit_flag || @@ -747,18 +744,16 @@ void CMultiGridIntegration::PostSmoothing(unsigned short RunTime_EqSystem, void CMultiGridIntegration::GetProlongated_Correction(unsigned short RunTime_EqSystem, CSolver *sol_fine, CSolver *sol_coarse, CGeometry *geo_fine, CGeometry *geo_coarse, CConfig *config) { SU2_ZONE_SCOPED - const su2double *Solution_Fine = nullptr, *Solution_Coarse = nullptr; const unsigned short nVar = sol_coarse->GetnVar(); - - auto *Solution = new su2double[nVar]; + su2activevector Solution(nVar); SU2_OMP_FOR_STAT(roundUpDiv(geo_coarse->GetnPointDomain(), omp_get_num_threads())) for (auto Point_Coarse = 0ul; Point_Coarse < geo_coarse->GetnPointDomain(); Point_Coarse++) { su2double Area_Parent = geo_coarse->nodes->GetVolume(Point_Coarse); - for (auto iVar = 0u; iVar < nVar; iVar++) Solution[iVar] = 0.0; + Solution = su2double(0); /*--- Accumulate children contributions with stable ordering ---*/ /*--- Process all children in sequential order to ensure deterministic FP summation ---*/ @@ -766,24 +761,22 @@ void CMultiGridIntegration::GetProlongated_Correction(unsigned short RunTime_EqS for (auto iChildren = 0u; iChildren < nChildren; iChildren++) { auto Point_Fine = geo_coarse->nodes->GetChildren_CV(Point_Coarse, iChildren); su2double Area_Children = geo_fine->nodes->GetVolume(Point_Fine); - Solution_Fine = sol_fine->GetNodes()->GetSolution(Point_Fine); + const auto* Solution_Fine = sol_fine->GetNodes()->GetSolution(Point_Fine); su2double weight = Area_Children / Area_Parent; for (auto iVar = 0u; iVar < nVar; iVar++) Solution[iVar] -= Solution_Fine[iVar] * weight; } - Solution_Coarse = sol_coarse->GetNodes()->GetSolution(Point_Coarse); + const auto* Solution_Coarse = sol_coarse->GetNodes()->GetSolution(Point_Coarse); for (auto iVar = 0u; iVar < nVar; iVar++) Solution[iVar] += Solution_Coarse[iVar]; for (auto iVar = 0u; iVar < nVar; iVar++) - sol_coarse->GetNodes()->SetSolution_Old(Point_Coarse,Solution); + sol_coarse->GetNodes()->SetSolution_Old(Point_Coarse, Solution.data()); } END_SU2_OMP_FOR - delete [] Solution; - /*--- Enforce Euler wall BC on corrections by projecting to tangent plane ---*/ sol_coarse->MultigridProjectEulerWall(geo_coarse, config, true); @@ -831,22 +824,18 @@ void CMultiGridIntegration::SmoothProlongated_Correction(unsigned short RunTime_ /*--- Check if there is work to do. ---*/ if (val_nSmooth == 0) return; - const su2double *Residual_Old, *Residual_Sum, *Residual_j; - const unsigned short nVar = solver->GetnVar(); SU2_OMP_FOR_STAT(roundUpDiv(geometry->GetnPoint(), omp_get_num_threads())) for (auto iPoint = 0ul; iPoint < geometry->GetnPoint(); iPoint++) { - Residual_Old = solver->LinSysRes.GetBlock(iPoint); - solver->GetNodes()->SetResidual_Old(iPoint,Residual_Old); + const auto* Residual_Old = solver->LinSysRes.GetBlock(iPoint); + solver->GetNodes()->SetResidual_Old(iPoint, Residual_Old); } END_SU2_OMP_FOR - /*--- Record initial correction norm for debugging output. - * ComputeLinSysResRMS must be called by all threads (uses parallel dot). ---*/ - { - const passivedouble initial_corr_rms = ComputeLinSysResRMS(solver); - SU2_OMP_SAFE_GLOBAL_ACCESS(lastCorrecSmoothRMS[iMesh][0] = initial_corr_rms;) + /*--- Record initial correction norm for debugging output. ---*/ + if (config->GetMGOptions().MG_Smooth_Output) { + SU2_OMP_SAFE_GLOBAL_ACCESS(lastCorrecSmoothRMS[iMesh][0] = ComputeLinSysResRMS(solver);) } /*--- Jacobi iterations (no early exit — Jacobi targets high-frequency modes, @@ -863,7 +852,7 @@ void CMultiGridIntegration::SmoothProlongated_Correction(unsigned short RunTime_ for (auto iNeigh = 0u; iNeigh < geometry->nodes->GetnPoint(iPoint); ++iNeigh) { auto jPoint = geometry->nodes->GetPoint(iPoint, iNeigh); - Residual_j = solver->LinSysRes.GetBlock(jPoint); + const auto* Residual_j = solver->LinSysRes.GetBlock(jPoint); solver->GetNodes()->AddResidual_Sum(iPoint, Residual_j); } @@ -877,8 +866,8 @@ void CMultiGridIntegration::SmoothProlongated_Correction(unsigned short RunTime_ su2double factor = 1.0/(1.0+val_smooth_coeff*su2double(geometry->nodes->GetnPoint(iPoint))); - Residual_Sum = solver->GetNodes()->GetResidual_Sum(iPoint); - Residual_Old = solver->GetNodes()->GetResidual_Old(iPoint); + const auto* Residual_Sum = solver->GetNodes()->GetResidual_Sum(iPoint); + const auto* Residual_Old = solver->GetNodes()->GetResidual_Old(iPoint); for (auto iVar = 0u; iVar < nVar; iVar++) solver->LinSysRes(iPoint,iVar) = (Residual_Old[iVar] + val_smooth_coeff*Residual_Sum[iVar])*factor; @@ -895,7 +884,7 @@ void CMultiGridIntegration::SmoothProlongated_Correction(unsigned short RunTime_ SU2_OMP_FOR_STAT(32) for (auto iVertex = 0ul; iVertex < geometry->GetnVertex(iMarker); iVertex++) { auto iPoint = geometry->vertex[iMarker][iVertex]->GetNode(); - Residual_Old = solver->GetNodes()->GetResidual_Old(iPoint); + const auto* Residual_Old = solver->GetNodes()->GetResidual_Old(iPoint); solver->LinSysRes.SetBlock(iPoint, Residual_Old); } END_SU2_OMP_FOR @@ -904,17 +893,16 @@ void CMultiGridIntegration::SmoothProlongated_Correction(unsigned short RunTime_ } - /*--- Record final correction norm for debugging output. - * ComputeLinSysResRMS must be called by all threads (uses parallel dot). ---*/ - const passivedouble final_corr_rms = ComputeLinSysResRMS(solver); - SU2_OMP_SAFE_GLOBAL_ACCESS(lastCorrecSmoothRMS[iMesh][1] = final_corr_rms;) - + /*--- Record final correction norm for debugging output. ---*/ + if (config->GetMGOptions().MG_Smooth_Output) { + const su2double res = sqrt(solver->LinSysRes.squaredNorm() / (nVar * geometry->GetGlobal_nPointDomain())); + SU2_OMP_SAFE_GLOBAL_ACCESS(lastCorrecSmoothRMS[iMesh][1] = SU2_TYPE::GetValue(res);) + } } void CMultiGridIntegration::SetProlongated_Correction(CSolver *sol_fine, CGeometry *geo_fine, CConfig *config, unsigned short iMesh) { SU2_ZONE_SCOPED - su2double *Solution_Fine, *Residual_Fine; const unsigned short nVar = sol_fine->GetnVar(); @@ -929,8 +917,8 @@ void CMultiGridIntegration::SetProlongated_Correction(CSolver *sol_fine, CGeomet SU2_OMP_FOR_STAT(roundUpDiv(geo_fine->GetnPointDomain(), omp_get_num_threads())) for (auto Point_Fine = 0ul; Point_Fine < geo_fine->GetnPointDomain(); Point_Fine++) { - Residual_Fine = sol_fine->LinSysRes.GetBlock(Point_Fine); - Solution_Fine = sol_fine->GetNodes()->GetSolution(Point_Fine); + auto* Residual_Fine = sol_fine->LinSysRes.GetBlock(Point_Fine); + auto* Solution_Fine = sol_fine->GetNodes()->GetSolution(Point_Fine); for (auto iVar = 0u; iVar < nVar; iVar++) { /*--- Prevent a fine grid divergence due to a coarse grid divergence ---*/ if (Residual_Fine[iVar] != Residual_Fine[iVar]) @@ -972,26 +960,24 @@ void CMultiGridIntegration::SetForcing_Term(CSolver *sol_fine, CSolver *sol_coar const unsigned short nVar = sol_coarse->GetnVar(); const su2double factor = config->GetDamp_Res_Restric(); - auto *Residual = new su2double[nVar]; + su2activevector Residual(nVar); SU2_OMP_FOR_STAT(roundUpDiv(geo_coarse->GetnPointDomain(), omp_get_num_threads())) for (auto Point_Coarse = 0ul; Point_Coarse < geo_coarse->GetnPointDomain(); Point_Coarse++) { sol_coarse->GetNodes()->SetRes_TruncErrorZero(Point_Coarse); - for (auto iVar = 0u; iVar < nVar; iVar++) Residual[iVar] = 0.0; + Residual = su2double(0); for (auto iChildren = 0u; iChildren < geo_coarse->nodes->GetnChildren_CV(Point_Coarse); iChildren++) { auto Point_Fine = geo_coarse->nodes->GetChildren_CV(Point_Coarse, iChildren); Residual_Fine = sol_fine->LinSysRes.GetBlock(Point_Fine); for (auto iVar = 0u; iVar < nVar; iVar++) Residual[iVar] += factor * Residual_Fine[iVar]; } - sol_coarse->GetNodes()->AddRes_TruncError(Point_Coarse, Residual); + sol_coarse->GetNodes()->AddRes_TruncError(Point_Coarse, Residual.data()); } END_SU2_OMP_FOR - delete [] Residual; - for (auto iMarker = 0u; iMarker < config->GetnMarker_All(); iMarker++) { if (config->GetViscous_Wall(iMarker)) { SU2_OMP_FOR_STAT(32) diff --git a/SU2_CFD/src/solvers/CSolver.cpp b/SU2_CFD/src/solvers/CSolver.cpp index 5a5bf0caaffb..538b7a4db2c5 100644 --- a/SU2_CFD/src/solvers/CSolver.cpp +++ b/SU2_CFD/src/solvers/CSolver.cpp @@ -1963,7 +1963,7 @@ void CSolver::AdaptCFLNumber(CGeometry **geometry, void CSolver::SetResidual_RMS(const CGeometry *geometry, const CConfig *config) { SU2_ZONE_SCOPED - if (geometry->GetMGLevel() != MESH_0) return; + if (geometry->GetMGLevel() != MESH_0 && !config->GetMGOptions().MG_Smooth_EarlyExit) return; BEGIN_SU2_OMP_SAFE_GLOBAL_ACCESS { diff --git a/TestCases/cont_adj_euler/naca0012/of_grad_cd_disc.dat.ref b/TestCases/cont_adj_euler/naca0012/of_grad_cd_disc.dat.ref index f7e509e5e3cb..1fae3ad9106f 100644 --- a/TestCases/cont_adj_euler/naca0012/of_grad_cd_disc.dat.ref +++ b/TestCases/cont_adj_euler/naca0012/of_grad_cd_disc.dat.ref @@ -1,39 +1,39 @@ VARIABLES="VARIABLE" , "GRADIENT" , "FINDIFF_STEP" - 0 , -7747.74 , 0.001 - 1 , -10948.1 , 0.001 - 2 , -8280.46 , 0.001 - 3 , -3802.21 , 0.001 - 4 , 658.085 , 0.001 - 5 , 4392.72 , 0.001 - 6 , 7268.92 , 0.001 - 7 , 9422.0 , 0.001 - 8 , 11077.6 , 0.001 - 9 , 12447.2 , 0.001 - 10 , 13660.8 , 0.001 - 11 , 14713.0 , 0.001 - 12 , 15397.1 , 0.001 - 13 , 15179.4 , 0.001 - 14 , 12887.9 , 0.001 - 15 , 5922.05 , 0.001 - 16 , -11571.8 , 0.001 - 17 , -51702.7 , 0.001 - 18 , -126889.0 , 0.001 - 19 , -21493.4 , 0.001 - 20 , -22571.2 , 0.001 - 21 , -16492.2 , 0.001 - 22 , -10533.8 , 0.001 - 23 , -6901.19 , 0.001 - 24 , -5763.06 , 0.001 - 25 , -6449.91 , 0.001 - 26 , -8061.2 , 0.001 - 27 , -9790.18 , 0.001 - 28 , -11077.2 , 0.001 - 29 , -11650.8 , 0.001 - 30 , -11500.7 , 0.001 - 31 , -10793.0 , 0.001 - 32 , -9652.1 , 0.001 - 33 , -7555.2 , 0.001 - 34 , -2031.11 , 0.001 - 35 , 12735.8 , 0.001 - 36 , 43905.7 , 0.001 - 37 , 85428.3 , 0.001 + 0 , -3129.83 , 0.001 + 1 , -11358.3 , 0.001 + 2 , -14484.0 , 0.001 + 3 , -14330.8 , 0.001 + 4 , -12608.7 , 0.001 + 5 , -10550.0 , 0.001 + 6 , -8889.13 , 0.001 + 7 , -7943.27 , 0.001 + 8 , -7729.55 , 0.001 + 9 , -8089.35 , 0.001 + 10 , -8803.82 , 0.001 + 11 , -9689.36 , 0.001 + 12 , -10673.2 , 0.001 + 13 , -11870.0 , 0.001 + 14 , -13689.4 , 0.001 + 15 , -16954.6 , 0.001 + 16 , -23081.3 , 0.001 + 17 , -35877.8 , 0.001 + 18 , -71117.5 , 0.001 + 19 , -17877.2 , 0.001 + 20 , -22149.1 , 0.001 + 21 , -18300.4 , 0.001 + 22 , -12702.7 , 0.001 + 23 , -8337.57 , 0.001 + 24 , -6019.84 , 0.001 + 25 , -5270.34 , 0.001 + 26 , -4986.92 , 0.001 + 27 , -3951.65 , 0.001 + 28 , -1206.3 , 0.001 + 29 , 3646.51 , 0.001 + 30 , 10149.0 , 0.001 + 31 , 16714.8 , 0.001 + 32 , 20678.6 , 0.001 + 33 , 19464.5 , 0.001 + 34 , 13560.5 , 0.001 + 35 , 8716.09 , 0.001 + 36 , 9495.39 , 0.001 + 37 , 14681.0 , 0.001 diff --git a/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref b/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref index 0218e98d3169..74e94906510b 100644 --- a/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref +++ b/TestCases/cont_adj_euler/naca0012/of_grad_directdiff.dat.ref @@ -1,4 +1,4 @@ VARIABLES="VARIABLE" , "DRAG" , "EFFICIENCY" , "FORCE_X" , "FORCE_Y" , "FORCE_Z" , "LIFT" , "MOMENT_X" , "MOMENT_Y" , "MOMENT_Z" , "SIDEFORCE" - 0 , 0.05240962543 , -27.33945591 , 0.08647516198 , -1.560629715 , 0.0 , -1.562144773 , 0.0 , 0.0 , 0.8858124377 , 0.0 - 1 , 0.2008795877 , -41.40890891 , 0.2463424389 , -2.081341632 , 0.0 , -2.086220261 , 0.0 , 0.0 , 0.737429107 , 0.0 - 2 , 0.371975273 , -55.04424867 , 0.4271103196 , -2.522745633 , 0.0 , -2.531462651 , 0.0 , 0.0 , 0.4069664819 , 0.0 + 0 , 0.08545925082 , -29.66992584 , 0.119474273 , -1.557954145 , 0.0 , -1.560189712 , 0.0 , 0.0 , 0.893137395 , 0.0 + 1 , 0.2201968158 , -43.87838086 , 0.2655030157 , -2.073951675 , 0.0 , -2.079250049 , 0.0 , 0.0 , 0.7622913414 , 0.0 + 2 , 0.3777725459 , -57.65606719 , 0.4325932101 , -2.508274445 , 0.0 , -2.517114515 , 0.0 , 0.0 , 0.4420784146 , 0.0 diff --git a/TestCases/cont_adj_euler/wedge/of_grad_combo.dat.ref b/TestCases/cont_adj_euler/wedge/of_grad_combo.dat.ref index 88d7794ce033..351372905338 100644 --- a/TestCases/cont_adj_euler/wedge/of_grad_combo.dat.ref +++ b/TestCases/cont_adj_euler/wedge/of_grad_combo.dat.ref @@ -1,5 +1,5 @@ -VARIABLES="VARIABLE" , "GRADIENT" , "FINDIFF_STEP" - 0 , 0.00701137 , 0.0001 - 1 , 0.00485473 , 0.0001 - 2 , 0.00244467 , 0.0001 - 3 , 0.000872557 , 0.0001 +VARIABLES="VARIABLE" , "GRADIENT" , "FINDIFF_STEP" + 0 , 0.00709917 , 0.0001 + 1 , 0.00484543 , 0.0001 + 2 , 0.00243268 , 0.0001 + 3 , 0.000869029 , 0.0001 diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py index b8e39bc9fbaa..d49811958416 100644 --- a/TestCases/hybrid_regression.py +++ b/TestCases/hybrid_regression.py @@ -51,7 +51,7 @@ def main(): channel.cfg_dir = "euler/channel" channel.cfg_file = "inv_channel_RK.cfg" channel.test_iter = 20 - channel.test_vals = [-2.318252, 3.226111, 0.133426, 0.150359] + channel.test_vals = [-2.319129, 3.225210, 0.133418, 0.150245] test_list.append(channel) # NACA0012 @@ -59,7 +59,7 @@ def main(): naca0012.cfg_dir = "euler/naca0012" naca0012.cfg_file = "inv_NACA0012_Roe.cfg" naca0012.test_iter = 20 - naca0012.test_vals = [-4.252415, -3.789971, 0.306821, 0.024573] + naca0012.test_vals = [-4.453269, -3.983021, 0.319791, 0.022524] test_list.append(naca0012) # Supersonic wedge @@ -67,7 +67,7 @@ def main(): wedge.cfg_dir = "euler/wedge" wedge.cfg_file = "inv_wedge_HLLC.cfg" wedge.test_iter = 20 - wedge.test_vals = [-3.587150, 2.136260, -0.249533, 0.043953] + wedge.test_vals = [-3.646429, 2.077530, -0.249532, 0.043953] test_list.append(wedge) # ONERA M6 Wing @@ -83,7 +83,7 @@ def main(): fixedCL_naca0012.cfg_dir = "fixed_cl/naca0012" fixedCL_naca0012.cfg_file = "inv_NACA0012.cfg" fixedCL_naca0012.test_iter = 10 - fixedCL_naca0012.test_vals = [-3.936884, 1.574653, 0.300864, 0.019462] + fixedCL_naca0012.test_vals = [-3.966360, 1.567244, 0.301039, 0.019480] test_list.append(fixedCL_naca0012) # HYPERSONIC FLOW PAST BLUNT BODY @@ -103,7 +103,7 @@ def main(): flatplate.cfg_dir = "navierstokes/flatplate" flatplate.cfg_file = "lam_flatplate.cfg" flatplate.test_iter = 100 - flatplate.test_vals = [-6.382489, -0.905413, 0.001313, 0.025294, 2.361500, -2.336200, 0.000000, 0.000000] + flatplate.test_vals = [-6.654433, -1.183199, 0.001171, 0.030357, 2.361500, -2.331200, 0.000000, 0.000000] test_list.append(flatplate) # Laminar cylinder (steady) @@ -111,7 +111,7 @@ def main(): cylinder.cfg_dir = "navierstokes/cylinder" cylinder.cfg_file = "lam_cylinder.cfg" cylinder.test_iter = 25 - cylinder.test_vals = [-8.460419, -2.972300, 0.271000, 1.701198, 0.000000] + cylinder.test_vals = [-8.768338, -3.285074, 0.143219, 1.662177, 0.000000] test_list.append(cylinder) # Laminar cylinder (low Mach correction) @@ -119,7 +119,7 @@ def main(): cylinder_lowmach.cfg_dir = "navierstokes/cylinder" cylinder_lowmach.cfg_file = "cylinder_lowmach.cfg" cylinder_lowmach.test_iter = 25 - cylinder_lowmach.test_vals = [-6.629113, -1.167336, -0.016421, -73.160843, 0.000000] + cylinder_lowmach.test_vals = [-6.735716, -1.273932, 0.102816, -71.533948, 0.000000] cylinder_lowmach.test_vals_aarch64 = [-6.830996, -1.368850, -0.143956, 73.963354, 0] test_list.append(cylinder_lowmach) @@ -128,7 +128,7 @@ def main(): poiseuille.cfg_dir = "navierstokes/poiseuille" poiseuille.cfg_file = "lam_poiseuille.cfg" poiseuille.test_iter = 10 - poiseuille.test_vals = [-5.046131, 0.652984, 0.008355, 13.735816, 0.000000] + poiseuille.test_vals = [0.652981, 0.008352, 13.735778, 0.000000] test_list.append(poiseuille) # 2D Poiseuille flow (inlet profile file) @@ -136,7 +136,7 @@ def main(): poiseuille_profile.cfg_dir = "navierstokes/poiseuille" poiseuille_profile.cfg_file = "profile_poiseuille.cfg" poiseuille_profile.test_iter = 10 - poiseuille_profile.test_vals = [-12.005215, -7.539613, -0.000000, 2.089953] + poiseuille_profile.test_vals = [-12.008899, -7.560274, -0.000000, 2.089953] poiseuille_profile.test_vals_aarch64 = [-12.009012, -7.262530, -0.000000, 2.089953] test_list.append(poiseuille_profile) @@ -157,7 +157,7 @@ def main(): rae2822_sa.cfg_dir = "rans/rae2822" rae2822_sa.cfg_file = "turb_SA_RAE2822.cfg" rae2822_sa.test_iter = 20 - rae2822_sa.test_vals = [-2.169314, -5.450577, 0.293838, 0.104752, 0.000000] + rae2822_sa.test_vals = [-5.351280, 0.549684, 0.049689, 0.000000] test_list.append(rae2822_sa) # RAE2822 SST @@ -165,7 +165,7 @@ def main(): rae2822_sst.cfg_dir = "rans/rae2822" rae2822_sst.cfg_file = "turb_SST_RAE2822.cfg" rae2822_sst.test_iter = 20 - rae2822_sst.test_vals = [-1.028401, 5.875380, 0.279522, 0.093893, 0.000000] + rae2822_sst.test_vals = [5.867771, 0.528334, 0.037584, 0.000000] test_list.append(rae2822_sst) # RAE2822 SST_SUST @@ -173,7 +173,7 @@ def main(): rae2822_sst_sust.cfg_dir = "rans/rae2822" rae2822_sst_sust.cfg_file = "turb_SST_SUST_RAE2822.cfg" rae2822_sst_sust.test_iter = 20 - rae2822_sst_sust.test_vals = [-2.540329, 5.875369, 0.279522, 0.093893] + rae2822_sst_sust.test_vals = [-2.455084, 5.867761, 0.528334, 0.037584] test_list.append(rae2822_sst_sust) # Flat plate @@ -181,7 +181,7 @@ def main(): turb_flatplate.cfg_dir = "rans/flatplate" turb_flatplate.cfg_file = "turb_SA_flatplate.cfg" turb_flatplate.test_iter = 20 - turb_flatplate.test_vals = [-4.938980, -7.469368, -0.187651, 0.015894] + turb_flatplate.test_vals = [-5.101466, -7.435401, -0.187609, 0.011521] test_list.append(turb_flatplate) # ONERA M6 Wing @@ -197,7 +197,7 @@ def main(): turb_naca0012_sa.cfg_dir = "rans/naca0012" turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" turb_naca0012_sa.test_iter = 5 - turb_naca0012_sa.test_vals = [-12.038153, -16.332090, 1.080346, 0.018385, 20, -2.872824, 0, -14.250271, 0] + turb_naca0012_sa.test_vals = [20.000000, -2.872824, 0.000000, -14.250271, 0.000000] turb_naca0012_sa.test_vals_aarch64 = [-12.038091, -16.332090, 1.080346, 0.018385, 20.000000, -2.873236, 0.000000, -14.250271, 0.000000] test_list.append(turb_naca0012_sa) @@ -206,7 +206,7 @@ def main(): turb_naca0012_sst.cfg_dir = "rans/naca0012" turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" turb_naca0012_sst.test_iter = 10 - turb_naca0012_sst.test_vals = [-12.093892, -15.251078, -5.906327, 1.070413, 0.015775, -2.855348, 0] + turb_naca0012_sst.test_vals = [-5.906327, 1.070413, 0.015775, -2.855348, 0.000000] turb_naca0012_sst.test_vals_aarch64 = [-12.075928, -15.246732, -5.861249, 1.070036, 0.015841, -2.835263, 0] test_list.append(turb_naca0012_sst) @@ -215,7 +215,7 @@ def main(): turb_naca0012_sst_sust.cfg_dir = "rans/naca0012" turb_naca0012_sst_sust.cfg_file = "turb_NACA0012_sst_sust.cfg" turb_naca0012_sst_sust.test_iter = 10 - turb_naca0012_sst_sust.test_vals = [-12.080757, -14.837176, -5.732917, 1.000893, 0.019109, -2.120437] + turb_naca0012_sst_sust.test_vals = [-14.837176, -5.732917, 1.000893, 0.019109, -2.120437] turb_naca0012_sst_sust.test_vals_aarch64 = [-12.073210, -14.836724, -5.732627, 1.000050, 0.019144, -2.629689] test_list.append(turb_naca0012_sst_sust) @@ -224,7 +224,7 @@ def main(): turb_naca0012_sst_fixedvalues.cfg_dir = "rans/naca0012" turb_naca0012_sst_fixedvalues.cfg_file = "turb_NACA0012_sst_fixedvalues.cfg" turb_naca0012_sst_fixedvalues.test_iter = 10 - turb_naca0012_sst_fixedvalues.test_vals = [-5.192389, -10.448080, 0.773965, 1.022534, 0.040529, -2.383403] + turb_naca0012_sst_fixedvalues.test_vals = [-10.448081, 0.773965, 1.022534, 0.040529, -2.383403] test_list.append(turb_naca0012_sst_fixedvalues) # NACA0012 (SST, explicit Euler for flow and turbulence equations) @@ -232,7 +232,7 @@ def main(): turb_naca0012_sst_expliciteuler.cfg_dir = "rans/naca0012" turb_naca0012_sst_expliciteuler.cfg_file = "turb_NACA0012_sst_expliciteuler.cfg" turb_naca0012_sst_expliciteuler.test_iter = 10 - turb_naca0012_sst_expliciteuler.test_vals = [-3.532365, -3.157224, 3.743381, 1.124798, 0.501715, -float("inf")] + turb_naca0012_sst_expliciteuler.test_vals = [-3.157224, 3.743381, 1.124798, 0.501715, -float("inf")] test_list.append(turb_naca0012_sst_expliciteuler) # PROPELLER @@ -266,7 +266,7 @@ def main(): turb_naca0012_sst_restart_mg.cfg_file = "turb_NACA0012_sst_multigrid_restart.cfg" turb_naca0012_sst_restart_mg.test_iter = 20 turb_naca0012_sst_restart_mg.ntest_vals = 5 - turb_naca0012_sst_restart_mg.test_vals = [-6.538814, -5.057150, 0.830240, -0.008813, 0.078177] + turb_naca0012_sst_restart_mg.test_vals = [-6.626682, -5.057151, 0.830239, -0.008800, 0.078091] test_list.append(turb_naca0012_sst_restart_mg) ############################# @@ -347,7 +347,7 @@ def main(): inc_euler_naca0012.cfg_dir = "incomp_euler/naca0012" inc_euler_naca0012.cfg_file = "incomp_NACA0012.cfg" inc_euler_naca0012.test_iter = 20 - inc_euler_naca0012.test_vals = [-5.737092, -4.868827, 0.512333, 0.009264] + inc_euler_naca0012.test_vals = [-5.921438, -5.037342, 0.522786, 0.008788] test_list.append(inc_euler_naca0012) # C-D nozzle with pressure inlet and mass flow outlet @@ -355,7 +355,7 @@ def main(): inc_nozzle.cfg_dir = "incomp_euler/nozzle" inc_nozzle.cfg_file = "inv_nozzle.cfg" inc_nozzle.test_iter = 20 - inc_nozzle.test_vals = [-5.362338, -4.748247, -0.017498, 0.115865] + inc_nozzle.test_vals = [-6.268182, -5.423348, -0.012012, 0.126403] test_list.append(inc_nozzle) ############################# @@ -367,7 +367,7 @@ def main(): inc_lam_cylinder.cfg_dir = "incomp_navierstokes/cylinder" inc_lam_cylinder.cfg_file = "incomp_cylinder.cfg" inc_lam_cylinder.test_iter = 10 - inc_lam_cylinder.test_vals = [-4.168263, -3.611146, 0.013547, 4.538946] + inc_lam_cylinder.test_vals = [-4.563928, -3.919592, -0.001697, 3.466808] test_list.append(inc_lam_cylinder) # Buoyancy-driven cavity @@ -383,7 +383,7 @@ def main(): inc_poly_cylinder.cfg_dir = "incomp_navierstokes/cylinder" inc_poly_cylinder.cfg_file = "poly_cylinder.cfg" inc_poly_cylinder.test_iter = 20 - inc_poly_cylinder.test_vals = [-8.241953, -2.424330, 0.027284, 1.909617, -173.010000] + inc_poly_cylinder.test_vals = [-2.424330, 0.027284, 1.909617, -173.010000] inc_poly_cylinder.test_vals_aarch64 = [-8.260165, -2.445453, 0.027209, 1.915447, -171.620000] test_list.append(inc_poly_cylinder) @@ -432,7 +432,7 @@ def main(): cavity.cfg_dir = "moving_wall/cavity" cavity.cfg_file = "lam_cavity.cfg" cavity.test_iter = 25 - cavity.test_vals = [-7.325788, -1.861524, 1.097830, 1.028368] + cavity.test_vals = [-7.189954, -1.735475, -0.736787, -0.665735] test_list.append(cavity) # Spinning cylinder @@ -440,7 +440,7 @@ def main(): spinning_cylinder.cfg_dir = "moving_wall/spinning_cylinder" spinning_cylinder.cfg_file = "spinning_cylinder.cfg" spinning_cylinder.test_iter = 25 - spinning_cylinder.test_vals = [-7.881383, -2.419298, 1.535192, 1.450905] + spinning_cylinder.test_vals = [-7.761584, -2.305453, 2.744850, 1.921618] spinning_cylinder.test_vals_aarch64 = [-8.008023, -2.611064, 1.497308, 1.487483] test_list.append(spinning_cylinder) @@ -462,7 +462,7 @@ def main(): sine_gust.cfg_dir = "gust" sine_gust.cfg_file = "inv_gust_NACA0012.cfg" sine_gust.test_iter = 5 - sine_gust.test_vals = [-1.977498, 3.481817, -0.009878, -0.005086] + sine_gust.test_vals = [0.000000, -1.977498, 3.481817, -0.007120, -0.009955] sine_gust.unsteady = True test_list.append(sine_gust) @@ -471,7 +471,7 @@ def main(): cosine_gust.cfg_dir = "gust" cosine_gust.cfg_file = "cosine_gust_zdir.cfg" cosine_gust.test_iter = 79 - cosine_gust.test_vals = [-2.418805, 0.001521, -0.001239, 0.000394, -0.000593] + cosine_gust.test_vals = [-2.418805, 0.001653, -0.001246, 0.000403, -0.000593] cosine_gust.unsteady = True cosine_gust.enabled_with_tsan = False test_list.append(cosine_gust) @@ -481,7 +481,7 @@ def main(): gust_mesh_defo.cfg_dir = "gust" gust_mesh_defo.cfg_file = "gust_with_mesh_deformation.cfg" gust_mesh_defo.test_iter = 6 - gust_mesh_defo.test_vals = [-1.844761, 0.001077, -0.000263] + gust_mesh_defo.test_vals = [6.000000, 0.000000, -1.844761, 0.000990, -0.000275] gust_mesh_defo.unsteady = True gust_mesh_defo.enabled_with_tsan = False test_list.append(gust_mesh_defo) @@ -521,7 +521,7 @@ def main(): unst_deforming_naca0012.cfg_dir = "disc_adj_euler/naca0012_pitching_def" unst_deforming_naca0012.cfg_file = "inv_NACA0012_pitching_deform.cfg" unst_deforming_naca0012.test_iter = 5 - unst_deforming_naca0012.test_vals = [-3.665243, -3.794042, -3.716822, -3.148495] + unst_deforming_naca0012.test_vals = [-3.665266, -3.794183, -3.716909, -3.148538] unst_deforming_naca0012.unsteady = True unst_deforming_naca0012.enabled_with_tsan = False test_list.append(unst_deforming_naca0012) @@ -535,7 +535,7 @@ def main(): edge_VW.cfg_dir = "nicf/edge" edge_VW.cfg_file = "edge_VW.cfg" edge_VW.test_iter = 40 - edge_VW.test_vals = [-8.895442, -2.694280, -0.000009, 0.000000] + edge_VW.test_vals = [-5.636492, 0.564576, -0.000009, 0.000000] test_list.append(edge_VW) # Rarefaction shock wave edge_PPR @@ -543,7 +543,7 @@ def main(): edge_PPR.cfg_dir = "nicf/edge" edge_PPR.cfg_file = "edge_PPR.cfg" edge_PPR.test_iter = 20 - edge_PPR.test_vals = [-10.590427, -4.427866, -0.000034, 0.000000] + edge_PPR.test_vals = [-9.540238, -3.371355, -0.000034, 0.000000] edge_PPR.test_vals_aarch64 = [ -7.139211, -0.980821, -0.000034, 0.000000] test_list.append(edge_PPR) @@ -656,7 +656,7 @@ def main(): bars_SST_2D.cfg_dir = "sliding_interface/bars_SST_2D" bars_SST_2D.cfg_file = "bars.cfg" bars_SST_2D.test_iter = 13 - bars_SST_2D.test_vals = [13.000000, -0.473801, -1.563681] + bars_SST_2D.test_vals = [13.000000, -0.467383, -1.388612] bars_SST_2D.multizone = True test_list.append(bars_SST_2D) diff --git a/TestCases/hybrid_regression_AD.py b/TestCases/hybrid_regression_AD.py index 63fd98baf120..8d7fb91ebca0 100644 --- a/TestCases/hybrid_regression_AD.py +++ b/TestCases/hybrid_regression_AD.py @@ -99,7 +99,7 @@ def main(): discadj_incomp_NACA0012.cfg_dir = "disc_adj_incomp_euler/naca0012" discadj_incomp_NACA0012.cfg_file = "incomp_NACA0012_disc.cfg" discadj_incomp_NACA0012.test_iter = 20 - discadj_incomp_NACA0012.test_vals = [20.000000, -3.338267, -2.490046, 0.000000] + discadj_incomp_NACA0012.test_vals = [20.000000, -3.954252, -2.527402, 0.000000] test_list.append(discadj_incomp_NACA0012) ##################################### diff --git a/TestCases/multiple_ffd/naca0012/of_grad_cd.dat.ref b/TestCases/multiple_ffd/naca0012/of_grad_cd.dat.ref index 8ab0b5b0fe70..1732f7634be0 100644 --- a/TestCases/multiple_ffd/naca0012/of_grad_cd.dat.ref +++ b/TestCases/multiple_ffd/naca0012/of_grad_cd.dat.ref @@ -1,3 +1,3 @@ VARIABLES="VARIABLE" , "GRADIENT" , "FINDIFF_STEP" - 0 , 0.0456482 , 0.001 - 1 , -0.0881187 , 0.001 + 0 , 0.0604102 , 0.001 + 1 , -0.110616 , 0.001 diff --git a/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref b/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref index 9365cd9cd74a..b41df1c5079d 100644 --- a/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref +++ b/TestCases/multiple_ffd/naca0012/of_grad_directdiff.dat.ref @@ -1,3 +1,3 @@ VARIABLES="VARIABLE" , "DRAG" , "EFFICIENCY" , "FORCE_X" , "FORCE_Y" , "FORCE_Z" , "LIFT" , "MOMENT_X" , "MOMENT_Y" , "MOMENT_Z" , "SIDEFORCE" - 0 , 0.04734305575 , -0.4824482295 , 0.04752721691 , -0.00792353334 , 0.0 , -0.008958448527 , 0.0 , 0.0 , 0.02636591979 , 0.0 - 1 , -0.09189465405 , 0.6527341405 , -0.09165316206 , -0.01206987592 , 0.0 , -0.01006760043 , 0.0 , 0.0 , 0.06097366677 , 0.0 + 0 , 0.0621108981 , -0.2624243967 , 0.06130571532 , 0.0375785561 , 0.0 , 0.03623223629 , 0.0 , 0.0 , 0.02584654398 , 0.0 + 1 , -0.1154230095 , 2.008147391 , -0.117038139 , 0.07276121951 , 0.0 , 0.07529707785 , 0.0 , 0.0 , 0.06082567096 , 0.0 diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index 1c25e4942d22..bf1d925b69af 100755 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -220,7 +220,7 @@ def main(): channel.cfg_dir = "euler/channel" channel.cfg_file = "inv_channel_RK.cfg" channel.test_iter = 20 - channel.test_vals = [-2.305051, 3.237256, 0.125006, 0.154077] + channel.test_vals = [-2.305865, 3.236424, 0.124945, 0.153985] test_list.append(channel) # NACA0012 @@ -228,7 +228,7 @@ def main(): naca0012.cfg_dir = "euler/naca0012" naca0012.cfg_file = "inv_NACA0012_Roe.cfg" naca0012.test_iter = 20 - naca0012.test_vals = [-4.314738, -3.845428, 0.307738, 0.024670] + naca0012.test_vals = [-8.373603, -7.829504, 0.335767, 0.023275] test_list.append(naca0012) # Supersonic wedge @@ -236,7 +236,7 @@ def main(): wedge.cfg_dir = "euler/wedge" wedge.cfg_file = "inv_wedge_HLLC.cfg" wedge.test_iter = 20 - wedge.test_vals = [-3.573085, 2.150321, -0.249533, 0.043953] + wedge.test_vals = [-3.627493, 2.096561, -0.249532, 0.043953] test_list.append(wedge) # ONERA M6 Wing @@ -244,7 +244,7 @@ def main(): oneram6.cfg_dir = "euler/oneram6" oneram6.cfg_file = "inv_ONERAM6.cfg" oneram6.test_iter = 10 - oneram6.test_vals = [-11.525271, -10.995902, 0.280800, 0.008623] + oneram6.test_vals = [-11.496917, -10.965749, 0.280800, 0.008623] oneram6.timeout = 3200 test_list.append(oneram6) @@ -253,7 +253,7 @@ def main(): fixedCL_naca0012.cfg_dir = "fixed_cl/naca0012" fixedCL_naca0012.cfg_file = "inv_NACA0012.cfg" fixedCL_naca0012.test_iter = 10 - fixedCL_naca0012.test_vals = [-3.919916, 1.592064, 0.300852, 0.019461] + fixedCL_naca0012.test_vals = [-3.958947, 1.574762, 0.301047, 0.019480] test_list.append(fixedCL_naca0012) # Polar sweep of the inviscid NACA0012 @@ -262,7 +262,7 @@ def main(): polar_naca0012.cfg_file = "inv_NACA0012.cfg" polar_naca0012.polar = True polar_naca0012.test_iter = 10 - polar_naca0012.test_vals = [-1.206973, 4.234604, 0.013410, 0.073285] + polar_naca0012.test_vals = [-1.180633, 4.269908, 0.017027, 0.067471] polar_naca0012.test_vals_aarch64 = [-1.083394, 4.386134, 0.001588, 0.033513] polar_naca0012.command = TestCase.Command(exec = "compute_polar.py", param = "-i 11") # flaky test on arm64 @@ -319,7 +319,7 @@ def main(): flatplate.cfg_dir = "navierstokes/flatplate" flatplate.cfg_file = "lam_flatplate.cfg" flatplate.test_iter = 100 - flatplate.test_vals = [-6.397042, -0.919335, 0.001321, 0.025064, 2.361500, -2.336500, 0.000000, 0.000000] + flatplate.test_vals = [-6.619907, -1.147097, 0.001192, 0.029461, 2.361500, -2.332100, 0.000000, 0.000000] test_list.append(flatplate) # Custom objective function @@ -344,7 +344,7 @@ def main(): cylinder.cfg_dir = "navierstokes/cylinder" cylinder.cfg_file = "lam_cylinder.cfg" cylinder.test_iter = 25 - cylinder.test_vals = [-8.529918, -3.059339, 0.189560, 1.746170, 0.000000] + cylinder.test_vals = [-8.657890, -3.175240, 0.015659, 1.644795, 0.000000] test_list.append(cylinder) # Laminar cylinder (low Mach correction) @@ -352,7 +352,7 @@ def main(): cylinder_lowmach.cfg_dir = "navierstokes/cylinder" cylinder_lowmach.cfg_file = "cylinder_lowmach.cfg" cylinder_lowmach.test_iter = 25 - cylinder_lowmach.test_vals = [-6.603373, -1.141590, -0.715787, -63.545748, 0.000000] + cylinder_lowmach.test_vals = [-6.710791, -1.248981, 0.281368, -67.973070, 0.000000] test_list.append(cylinder_lowmach) # 2D Poiseuille flow (body force driven with periodic inlet / outlet) @@ -360,7 +360,7 @@ def main(): poiseuille.cfg_dir = "navierstokes/poiseuille" poiseuille.cfg_file = "lam_poiseuille.cfg" poiseuille.test_iter = 10 - poiseuille.test_vals = [-5.050889, 0.648196, 0.000199, 13.639173, 0.000000] + poiseuille.test_vals = [0.648196, 0.000199, 13.639173, 0.000000] poiseuille.tol = 0.001 test_list.append(poiseuille) @@ -369,7 +369,7 @@ def main(): poiseuille_profile.cfg_dir = "navierstokes/poiseuille" poiseuille_profile.cfg_file = "profile_poiseuille.cfg" poiseuille_profile.test_iter = 10 - poiseuille_profile.test_vals = [-12.004334, -7.534404, -0.000000, 2.089953] + poiseuille_profile.test_vals = [-12.008298, -7.539167, -0.000000, 2.089953] poiseuille_profile.test_vals_aarch64 = [-12.007498, -7.226926, -0.000000, 2.089953] test_list.append(poiseuille_profile) @@ -382,7 +382,7 @@ def main(): rae2822_sa.cfg_dir = "rans/rae2822" rae2822_sa.cfg_file = "turb_SA_RAE2822.cfg" rae2822_sa.test_iter = 20 - rae2822_sa.test_vals = [-2.172705, -5.465982, 0.292927, 0.103369, 0.000000] + rae2822_sa.test_vals = [-5.356335, 0.551628, 0.049451, 0.000000] test_list.append(rae2822_sa) # RAE2822 SST @@ -390,7 +390,7 @@ def main(): rae2822_sst.cfg_dir = "rans/rae2822" rae2822_sst.cfg_file = "turb_SST_RAE2822.cfg" rae2822_sst.test_iter = 20 - rae2822_sst.test_vals = [-1.035662, 5.868036, 0.283073, 0.094756, 0.000000] + rae2822_sst.test_vals = [5.867418, 0.522358, 0.039169, 0.000000] test_list.append(rae2822_sst) # RAE2822 SST_SUST @@ -398,7 +398,7 @@ def main(): rae2822_sst_sust.cfg_dir = "rans/rae2822" rae2822_sst_sust.cfg_file = "turb_SST_SUST_RAE2822.cfg" rae2822_sst_sust.test_iter = 20 - rae2822_sst_sust.test_vals = [-2.542992, 5.868021, 0.283073, 0.094756] + rae2822_sst_sust.test_vals = [-2.489258, 5.867404, 0.522358, 0.039169] test_list.append(rae2822_sst_sust) # Flat plate @@ -406,7 +406,7 @@ def main(): turb_flatplate.cfg_dir = "rans/flatplate" turb_flatplate.cfg_file = "turb_SA_flatplate.cfg" turb_flatplate.test_iter = 20 - turb_flatplate.test_vals = [-4.879863, -7.464877, -0.187760, 0.016260] + turb_flatplate.test_vals = [-5.082740, -7.435143, -0.187601, 0.011644] test_list.append(turb_flatplate) # Flat plate (compressible) with species inlet @@ -414,7 +414,7 @@ def main(): turb_flatplate_species.cfg_dir = "rans/flatplate" turb_flatplate_species.cfg_file = "turb_SA_flatplate_species.cfg" turb_flatplate_species.test_iter = 20 - turb_flatplate_species.test_vals = [-4.548766, -1.476908, -1.980237, 0.937064, -3.573976, 3.000000, -0.475230, 2.000000, -1.511528, 3.000000, -0.699313, 0.999900, 0.999900] + turb_flatplate_species.test_vals = [-4.876686, -1.664775, -2.430911, 0.640693] test_list.append(turb_flatplate_species) # Flat plate SST compressibility correction Wilcox @@ -422,7 +422,7 @@ def main(): turb_flatplate_CC_Wilcox.cfg_dir = "rans/flatplate" turb_flatplate_CC_Wilcox.cfg_file = "turb_SST_flatplate_compressibility_Wilcox.cfg" turb_flatplate_CC_Wilcox.test_iter = 20 - turb_flatplate_CC_Wilcox.test_vals = [-1.169750, 2.167973, 1.488567, 5.244807, -3.795767, 9.699598] + turb_flatplate_CC_Wilcox.test_vals = [-4.876686, -1.664775, -2.430911, 0.640693] test_list.append(turb_flatplate_CC_Wilcox) # Flat plate SST compressibility correction Sarkar @@ -430,7 +430,7 @@ def main(): turb_flatplate_CC_Sarkar.cfg_dir = "rans/flatplate" turb_flatplate_CC_Sarkar.cfg_file = "turb_SST_flatplate_compressibility_Sarkar.cfg" turb_flatplate_CC_Sarkar.test_iter = 20 - turb_flatplate_CC_Sarkar.test_vals = [-1.169750, 2.167973, 1.488567, 5.244807, -3.795765, 9.699598] + turb_flatplate_CC_Sarkar.test_vals = [-4.876686, -1.664775, -2.430911, 0.640693] test_list.append(turb_flatplate_CC_Sarkar) # FLAT PLATE, ROUGHNESS BC KNOPP SST @@ -482,7 +482,7 @@ def main(): turb_naca0012_sa.cfg_dir = "rans/naca0012" turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" turb_naca0012_sa.test_iter = 5 - turb_naca0012_sa.test_vals = [-12.037476, -16.376950, 1.080346, 0.018385, 20, -1.564171, 20, -4.180937, 0] + turb_naca0012_sa.test_vals = [20.000000, -1.564171, 20.000000, -4.180937, 0.000000] turb_naca0012_sa.test_vals_aarch64 = [-12.037489, -16.376949, 1.080346, 0.018385, 20.000000, -1.564143, 20.000000, -4.180945, 0.000000] turb_naca0012_sa.timeout = 3200 test_list.append(turb_naca0012_sa) @@ -492,7 +492,7 @@ def main(): turb_naca0012_sst.cfg_dir = "rans/naca0012" turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" turb_naca0012_sst.test_iter = 10 - turb_naca0012_sst.test_vals = [-12.094714, -15.251093, -5.906365, 1.070413, 0.015775, -2.376111, 0] + turb_naca0012_sst.test_vals = [-5.906365, 1.070413, 0.015775, -2.376111, 0.000000] turb_naca0012_sst.test_vals_aarch64 = [-12.075620, -15.246688, -5.861276, 1.070036, 0.015841, -1.991001, 0.000000] turb_naca0012_sst.timeout = 3200 test_list.append(turb_naca0012_sst) @@ -502,7 +502,7 @@ def main(): turb_naca0012_sst_sust.cfg_dir = "rans/naca0012" turb_naca0012_sst_sust.cfg_file = "turb_NACA0012_sst_sust.cfg" turb_naca0012_sst_sust.test_iter = 10 - turb_naca0012_sst_sust.test_vals = [-12.082149, -14.837177, -5.733436, 1.000893, 0.019109, -2.240949] + turb_naca0012_sst_sust.test_vals = [-14.837177, -5.733436, 1.000893, 0.019109, -2.240949] turb_naca0012_sst_sust.test_vals_aarch64 = [-12.073964, -14.836726, -5.732390, 1.000050, 0.019144, -2.229074] turb_naca0012_sst_sust.timeout = 3200 test_list.append(turb_naca0012_sst_sust) @@ -512,7 +512,7 @@ def main(): turb_naca0012_sst_2003_Vm.cfg_dir = "rans/naca0012" turb_naca0012_sst_2003_Vm.cfg_file = "turb_NACA0012_sst_2003-Vm.cfg" turb_naca0012_sst_2003_Vm.test_iter = 10 - turb_naca0012_sst_2003_Vm.test_vals = [-7.134118, -10.168739, -3.668709, 1.060563, 0.019147, -2.282800] + turb_naca0012_sst_2003_Vm.test_vals = [-10.168739, -3.668709, 1.060563, 0.019147, -2.282800] turb_naca0012_sst_2003_Vm.timeout = 3200 test_list.append(turb_naca0012_sst_2003_Vm) @@ -521,7 +521,7 @@ def main(): turb_naca0012_sst_1994_KLm.cfg_dir = "rans/naca0012" turb_naca0012_sst_1994_KLm.cfg_file = "turb_NACA0012_sst_1994-KLm.cfg" turb_naca0012_sst_1994_KLm.test_iter = 10 - turb_naca0012_sst_1994_KLm.test_vals = [-7.142696, -10.390871, -3.701584, 1.062164, 0.019076, -2.426123] + turb_naca0012_sst_1994_KLm.test_vals = [-10.390871, -3.701584, 1.062164, 0.019076, -2.426123] turb_naca0012_sst_1994_KLm.timeout = 3200 test_list.append(turb_naca0012_sst_1994_KLm) @@ -530,7 +530,7 @@ def main(): turb_naca0012_sst_fixedvalues.cfg_dir = "rans/naca0012" turb_naca0012_sst_fixedvalues.cfg_file = "turb_NACA0012_sst_fixedvalues.cfg" turb_naca0012_sst_fixedvalues.test_iter = 10 - turb_naca0012_sst_fixedvalues.test_vals = [-5.216551, -10.440018, 0.774146, 1.022363, 0.040546, -3.736444] + turb_naca0012_sst_fixedvalues.test_vals = [-10.440018, 0.774146, 1.022363, 0.040546, -3.736444] turb_naca0012_sst_fixedvalues.timeout = 3200 test_list.append(turb_naca0012_sst_fixedvalues) @@ -539,7 +539,7 @@ def main(): turb_naca0012_sst_expliciteuler.cfg_dir = "rans/naca0012" turb_naca0012_sst_expliciteuler.cfg_file = "turb_NACA0012_sst_expliciteuler.cfg" turb_naca0012_sst_expliciteuler.test_iter = 10 - turb_naca0012_sst_expliciteuler.test_vals = [-3.532365, -3.157224, 3.743381, 1.124798, 0.501715, -float("inf")] + turb_naca0012_sst_expliciteuler.test_vals = [-3.157224, 3.743381, 1.124798, 0.501715, -float("inf")] turb_naca0012_sst_expliciteuler.timeout = 3200 test_list.append(turb_naca0012_sst_expliciteuler) @@ -586,7 +586,7 @@ def main(): turb_naca0012_sst_restart_mg.cfg_file = "turb_NACA0012_sst_multigrid_restart.cfg" turb_naca0012_sst_restart_mg.test_iter = 20 turb_naca0012_sst_restart_mg.ntest_vals = 5 - turb_naca0012_sst_restart_mg.test_vals = [-6.538846, -5.057149, 0.830238, -0.008740, 0.078171] + turb_naca0012_sst_restart_mg.test_vals = [-6.624755, -5.057150, 0.830237, -0.008624, 0.078094] turb_naca0012_sst_restart_mg.timeout = 3200 turb_naca0012_sst_restart_mg.tol = 0.000001 test_list.append(turb_naca0012_sst_restart_mg) @@ -600,7 +600,7 @@ def main(): inc_euler_naca0012.cfg_dir = "incomp_euler/naca0012" inc_euler_naca0012.cfg_file = "incomp_NACA0012.cfg" inc_euler_naca0012.test_iter = 20 - inc_euler_naca0012.test_vals = [-5.984413, -5.104039, 0.523625, 0.008885] + inc_euler_naca0012.test_vals = [-6.148698, -5.237430, 0.527489, 0.008671] test_list.append(inc_euler_naca0012) # C-D nozzle with pressure inlet and mass flow outlet @@ -608,7 +608,7 @@ def main(): inc_nozzle.cfg_dir = "incomp_euler/nozzle" inc_nozzle.cfg_file = "inv_nozzle.cfg" inc_nozzle.test_iter = 20 - inc_nozzle.test_vals = [-5.594509, -4.878247, 0.005147, 0.139611] + inc_nozzle.test_vals = [-6.144528, -5.335725, 0.005747, 0.125515] test_list.append(inc_nozzle) # Laminar wall mounted cylinder, Euler walls, cylinder wall diagonally split @@ -628,7 +628,7 @@ def main(): inc_lam_cylinder.cfg_dir = "incomp_navierstokes/cylinder" inc_lam_cylinder.cfg_file = "incomp_cylinder.cfg" inc_lam_cylinder.test_iter = 10 - inc_lam_cylinder.test_vals = [-4.157264, -3.589125, -0.018681, 4.659302] + inc_lam_cylinder.test_vals = [-4.535580, -3.903517, -0.001555, 3.463461] test_list.append(inc_lam_cylinder) # Laminar sphere, Re=1. Last column: Cd=24/Re @@ -652,7 +652,7 @@ def main(): inc_poly_cylinder.cfg_dir = "incomp_navierstokes/cylinder" inc_poly_cylinder.cfg_file = "poly_cylinder.cfg" inc_poly_cylinder.test_iter = 20 - inc_poly_cylinder.test_vals = [-8.030976, -2.362995, 0.006829, 1.923532, -172.590000] + inc_poly_cylinder.test_vals = [-2.362995, 0.006829, 1.923532, -172.590000] test_list.append(inc_poly_cylinder) # X-coarse laminar bend as a mixed element CGNS test @@ -774,7 +774,7 @@ def main(): turbmod_sa_bsl_rae2822.cfg_dir = "turbulence_models/sa/rae2822" turbmod_sa_bsl_rae2822.cfg_file = "turb_SA_BSL_RAE2822.cfg" turbmod_sa_bsl_rae2822.test_iter = 20 - turbmod_sa_bsl_rae2822.test_vals = [-2.610446, 0.335724, -0.118510, -5.463071, 0.765741, 0.028251] + turbmod_sa_bsl_rae2822.test_vals = [-2.927086, -0.064872, -0.560799, -5.278151, 0.836910, 0.027204] test_list.append(turbmod_sa_bsl_rae2822) # SA Negative @@ -782,7 +782,7 @@ def main(): turbmod_sa_neg_rae2822.cfg_dir = "turbulence_models/sa/rae2822" turbmod_sa_neg_rae2822.cfg_file = "turb_SA_NEG_RAE2822.cfg" turbmod_sa_neg_rae2822.test_iter = 10 - turbmod_sa_neg_rae2822.test_vals = [-1.345560, 1.448328, 1.208614, -0.846773, 1.277698, 0.499718, 0] + turbmod_sa_neg_rae2822.test_vals = [1.448328, 1.208614, -0.846773, 1.277698, 0.499718, 0.000000] turbmod_sa_neg_rae2822.test_vals_aarch64 = [-1.345593, 1.448310, 1.208721, -0.846597, 1.248410, 0.489117, 0.000000] test_list.append(turbmod_sa_neg_rae2822) @@ -791,7 +791,7 @@ def main(): turbmod_sa_comp_rae2822.cfg_dir = "turbulence_models/sa/rae2822" turbmod_sa_comp_rae2822.cfg_file = "turb_SA_COMP_RAE2822.cfg" turbmod_sa_comp_rae2822.test_iter = 20 - turbmod_sa_comp_rae2822.test_vals = [-2.610449, 0.335720, -0.118515, -5.468848, 0.765768, 0.028257] + turbmod_sa_comp_rae2822.test_vals = [-2.926182, -0.063627, -0.559634, -5.279910, 0.836886, 0.027139] test_list.append(turbmod_sa_comp_rae2822) # SA Edwards @@ -799,7 +799,7 @@ def main(): turbmod_sa_edw_rae2822.cfg_dir = "turbulence_models/sa/rae2822" turbmod_sa_edw_rae2822.cfg_file = "turb_SA_EDW_RAE2822.cfg" turbmod_sa_edw_rae2822.test_iter = 20 - turbmod_sa_edw_rae2822.test_vals = [-2.609968, 0.336105, -0.118179, -6.022707, 0.765928, 0.028192] + turbmod_sa_edw_rae2822.test_vals = [-2.928241, -0.064845, -0.560918, -5.953350, 0.837854, 0.027180] test_list.append(turbmod_sa_edw_rae2822) # SA Compressibility and Edwards @@ -807,7 +807,7 @@ def main(): turbmod_sa_comp_edw_rae2822.cfg_dir = "turbulence_models/sa/rae2822" turbmod_sa_comp_edw_rae2822.cfg_file = "turb_SA_COMP_EDW_RAE2822.cfg" turbmod_sa_comp_edw_rae2822.test_iter = 20 - turbmod_sa_comp_edw_rae2822.test_vals = [-2.610041, 0.336057, -0.118225, -6.023847, 0.765944, 0.028196] + turbmod_sa_comp_edw_rae2822.test_vals = [-2.926124, -0.062158, -0.558874, -5.933325, 0.837911, 0.027020] test_list.append(turbmod_sa_comp_edw_rae2822) # SA QCR @@ -815,7 +815,7 @@ def main(): turbmod_sa_qcr_rae2822.cfg_dir = "turbulence_models/sa/rae2822" turbmod_sa_qcr_rae2822.cfg_file = "turb_SA_QCR_RAE2822.cfg" turbmod_sa_qcr_rae2822.test_iter = 20 - turbmod_sa_qcr_rae2822.test_vals = [-2.320855, 0.512787, 0.108026, -5.449178, 0.770698, 0.026693] + turbmod_sa_qcr_rae2822.test_vals = [-2.868992, 0.045625, -0.444345, -5.303336, 0.827669, 0.027373] test_list.append(turbmod_sa_qcr_rae2822) ############################ @@ -839,7 +839,7 @@ def main(): contadj_naca0012.cfg_dir = "cont_adj_euler/naca0012" contadj_naca0012.cfg_file = "inv_NACA0012.cfg" contadj_naca0012.test_iter = 5 - contadj_naca0012.test_vals = [-9.520784, -15.101278, -0.726250, 0.020280] + contadj_naca0012.test_vals = [-9.566932, -15.166429, -0.726250, 0.020280] contadj_naca0012.test_vals_aarch64 = [-9.662546, -14.998818, -0.726250, 0.020280] test_list.append(contadj_naca0012) @@ -848,7 +848,7 @@ def main(): contadj_oneram6.cfg_dir = "cont_adj_euler/oneram6" contadj_oneram6.cfg_file = "inv_ONERAM6.cfg" contadj_oneram6.test_iter = 10 - contadj_oneram6.test_vals = [-12.069374, -12.632463, -1.086100, 0.007556] + contadj_oneram6.test_vals = [-12.018827, -12.567570, -1.086100, 0.007556] test_list.append(contadj_oneram6) # Inviscid WEDGE: tests averaged outflow total pressure adjoint @@ -864,7 +864,7 @@ def main(): contadj_fixed_CL_naca0012.cfg_dir = "fixed_cl/naca0012" contadj_fixed_CL_naca0012.cfg_file = "inv_NACA0012_ContAdj.cfg" contadj_fixed_CL_naca0012.test_iter = 100 - contadj_fixed_CL_naca0012.test_vals = [1.154889, -4.342907, -0.075177, -0.007496] + contadj_fixed_CL_naca0012.test_vals = [1.043429, -4.449377, -0.043084, -0.005092] test_list.append(contadj_fixed_CL_naca0012) ################################### @@ -876,7 +876,7 @@ def main(): contadj_ns_cylinder.cfg_dir = "cont_adj_navierstokes/cylinder" contadj_ns_cylinder.cfg_file = "lam_cylinder.cfg" contadj_ns_cylinder.test_iter = 20 - contadj_ns_cylinder.test_vals = [-3.589714, -9.027143, 2.056700, -0.000000] + contadj_ns_cylinder.test_vals = [-3.591070, -9.031676, 2.056700, -0.000000] test_list.append(contadj_ns_cylinder) # Adjoint laminar naca0012 subsonic @@ -920,7 +920,7 @@ def main(): contadj_rans_rae2822.cfg_dir = "cont_adj_rans/rae2822" contadj_rans_rae2822.cfg_file = "turb_SA_RAE2822.cfg" contadj_rans_rae2822.test_iter = 20 - contadj_rans_rae2822.test_vals = [-5.399633, -10.904666, -0.212470, 0.005448] + contadj_rans_rae2822.test_vals = [-5.398695, -10.903283, -0.212470, 0.005448] test_list.append(contadj_rans_rae2822) ############################# @@ -1000,7 +1000,7 @@ def main(): rot_naca0012.cfg_dir = "rotating/naca0012" rot_naca0012.cfg_file = "rot_NACA0012.cfg" rot_naca0012.test_iter = 25 - rot_naca0012.test_vals = [-1.302487, 4.220598, -0.002152, 0.124241] + rot_naca0012.test_vals = [-1.395261, 4.114147, -0.008916, 0.078703] test_list.append(rot_naca0012) # Lid-driven cavity @@ -1008,7 +1008,7 @@ def main(): cavity.cfg_dir = "moving_wall/cavity" cavity.cfg_file = "lam_cavity.cfg" cavity.test_iter = 25 - cavity.test_vals = [-8.194578, -2.735580, 0.005612, -0.019805] + cavity.test_vals = [-7.866620, -2.398839, 0.005654, 0.009526] test_list.append(cavity) # Spinning cylinder @@ -1016,7 +1016,7 @@ def main(): spinning_cylinder.cfg_dir = "moving_wall/spinning_cylinder" spinning_cylinder.cfg_file = "spinning_cylinder.cfg" spinning_cylinder.test_iter = 25 - spinning_cylinder.test_vals = [-7.716789, -2.257294, 2.054821, 1.660858] + spinning_cylinder.test_vals = [-7.501513, -2.041214, 3.986940, 1.777302] test_list.append(spinning_cylinder) ###################################### @@ -1037,7 +1037,7 @@ def main(): sine_gust.cfg_dir = "gust" sine_gust.cfg_file = "inv_gust_NACA0012.cfg" sine_gust.test_iter = 5 - sine_gust.test_vals = [-1.977498, 3.481817, -0.010372, -0.005217] + sine_gust.test_vals = [0.000000, -1.977498, 3.481817, -0.008845, -0.009632] sine_gust.unsteady = True test_list.append(sine_gust) @@ -1046,7 +1046,7 @@ def main(): aeroelastic.cfg_dir = "aeroelastic" aeroelastic.cfg_file = "aeroelastic_NACA64A010.cfg" aeroelastic.test_iter = 2 - aeroelastic.test_vals = [0.073686, 0.027423, -0.001644, -0.000125] + aeroelastic.test_vals = [0.073912, 0.027470, -0.001643, -0.000126] aeroelastic.unsteady = True test_list.append(aeroelastic) @@ -1073,7 +1073,7 @@ def main(): flatplate_unsteady.cfg_dir = "navierstokes/flatplate" flatplate_unsteady.cfg_file = "lam_flatplate_unst.cfg" flatplate_unsteady.test_iter = 3 - flatplate_unsteady.test_vals = [-8.875128, -8.250204, -6.305788, -5.469452, -3.398230, 0.002075, -0.325535] + flatplate_unsteady.test_vals = [0.000008, -8.875128, -8.250204, -6.305788, -5.469452, -3.398230, 0.002075, -0.325535] flatplate_unsteady.unsteady = True test_list.append(flatplate_unsteady) @@ -1086,7 +1086,7 @@ def main(): edge_VW.cfg_dir = "nicf/edge" edge_VW.cfg_file = "edge_VW.cfg" edge_VW.test_iter = 25 - edge_VW.test_vals = [-3.178712, 3.023048, -0.000009, 0.000000] + edge_VW.test_vals = [-3.448918, 2.752889, -0.000022, 0.000000] test_list.append(edge_VW) # Rarefaction shock wave edge_PPR @@ -1094,7 +1094,7 @@ def main(): edge_PPR.cfg_dir = "nicf/edge" edge_PPR.cfg_file = "edge_PPR.cfg" edge_PPR.test_iter = 25 - edge_PPR.test_vals = [-9.020461, -2.870274, -0.000034, 0.000000] + edge_PPR.test_vals = [-8.640223, -2.486172, -0.000034, 0.000000] test_list.append(edge_PPR) # Rarefaction Q1D nozzle, include CoolProp fluid model @@ -1241,7 +1241,7 @@ def main(): bars_SST_2D.cfg_dir = "sliding_interface/bars_SST_2D" bars_SST_2D.cfg_file = "bars.cfg" bars_SST_2D.test_iter = 13 - bars_SST_2D.test_vals = [13.000000, -0.472766, -1.559919] + bars_SST_2D.test_vals = [13.000000, -0.477372, -1.386674] bars_SST_2D.multizone = True test_list.append(bars_SST_2D) @@ -1450,7 +1450,7 @@ def main(): pywrapper_naca0012.cfg_dir = "euler/naca0012" pywrapper_naca0012.cfg_file = "inv_NACA0012_Roe.cfg" pywrapper_naca0012.test_iter = 80 - pywrapper_naca0012.test_vals = [-7.755848, -7.082517, 0.335769, 0.023275] + pywrapper_naca0012.test_vals = [-8.373603, -7.829504, 0.335767, 0.023275] pywrapper_naca0012.command = TestCase.Command("mpirun -np 2", "SU2_CFD.py", "--parallel -f") test_list.append(pywrapper_naca0012) @@ -1459,7 +1459,7 @@ def main(): pywrapper_turb_naca0012_sst.cfg_dir = "rans/naca0012" pywrapper_turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" pywrapper_turb_naca0012_sst.test_iter = 10 - pywrapper_turb_naca0012_sst.test_vals = [-12.094714, -15.251093, -5.906365, 1.070413, 0.015775, -2.376111, 0] + pywrapper_turb_naca0012_sst.test_vals = [-5.906365, 1.070413, 0.015775, -2.376111, 0.000000] pywrapper_turb_naca0012_sst.test_vals_aarch64 = [-12.075620, -15.246688, -5.861276, 1.070036, 0.015841, -1.991001, 0.000000] pywrapper_turb_naca0012_sst.command = TestCase.Command("mpirun -np 2", "SU2_CFD.py", "--parallel -f") pywrapper_turb_naca0012_sst.timeout = 3200 @@ -1480,7 +1480,7 @@ def main(): pywrapper_aeroelastic.cfg_dir = "aeroelastic" pywrapper_aeroelastic.cfg_file = "aeroelastic_NACA64A010.cfg" pywrapper_aeroelastic.test_iter = 2 - pywrapper_aeroelastic.test_vals = [0.073686, 0.027423, -0.001644, -0.000125] + pywrapper_aeroelastic.test_vals = [0.073912, 0.027470, -0.001643, -0.000126] pywrapper_aeroelastic.command = TestCase.Command("mpirun -np 2", "SU2_CFD.py", "--parallel -f") pywrapper_aeroelastic.unsteady = True test_list.append(pywrapper_aeroelastic) @@ -1521,7 +1521,7 @@ def main(): pywrapper_unsteadyCHT.cfg_dir = "py_wrapper/flatPlate_unsteady_CHT" pywrapper_unsteadyCHT.cfg_file = "unsteady_CHT_FlatPlate_Conf.cfg" pywrapper_unsteadyCHT.test_iter = 5 - pywrapper_unsteadyCHT.test_vals = [-1.614168, 2.259984, -0.005601, 0.129785] + pywrapper_unsteadyCHT.test_vals = [-1.614167, 2.259984, -0.001488, 0.113181] pywrapper_unsteadyCHT.command = TestCase.Command("mpirun -np 2", "python", "launch_unsteady_CHT_FlatPlate.py --parallel -f") pywrapper_unsteadyCHT.unsteady = True test_list.append(pywrapper_unsteadyCHT) diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py index 2c2369c6e9e4..b4f0e2840cfd 100644 --- a/TestCases/parallel_regression_AD.py +++ b/TestCases/parallel_regression_AD.py @@ -104,7 +104,7 @@ def main(): discadj_incomp_NACA0012.cfg_dir = "disc_adj_incomp_euler/naca0012" discadj_incomp_NACA0012.cfg_file = "incomp_NACA0012_disc.cfg" discadj_incomp_NACA0012.test_iter = 20 - discadj_incomp_NACA0012.test_vals = [20.000000, -3.319959, -2.489110, 0.000000] + discadj_incomp_NACA0012.test_vals = [20.000000, -3.934896, -2.531482, 0.000000] test_list.append(discadj_incomp_NACA0012) ##################################### @@ -231,7 +231,7 @@ def main(): discadj_trans_stator.cfg_dir = "disc_adj_turbomachinery/transonic_stator_2D" discadj_trans_stator.cfg_file = "transonic_stator.cfg" discadj_trans_stator.test_iter = 79 - discadj_trans_stator.test_vals = [79.000000, 2.599437, 2.336310, 2.141020, 0.786888] + discadj_trans_stator.test_vals = [79.000000, 2.580793, 2.319818, 2.113089, 0.750023] discadj_trans_stator.test_vals_aarch64 = [79.000000, 0.696755, 0.485950, 0.569475, -0.990065] test_list.append(discadj_trans_stator) diff --git a/TestCases/py_wrapper/translating_NACA0012/forces_0.csv.ref b/TestCases/py_wrapper/translating_NACA0012/forces_0.csv.ref index 782f0d2d8060..24b8b3f8254e 100644 --- a/TestCases/py_wrapper/translating_NACA0012/forces_0.csv.ref +++ b/TestCases/py_wrapper/translating_NACA0012/forces_0.csv.ref @@ -1,200 +1,200 @@ -199, -0.88, -0.00, 0.00 -0, -2.74, 18.87, 0.00 -1, -4.00, 27.56, 0.00 -2, -4.94, 34.10, 0.00 -3, -5.93, 41.01, 0.00 -4, -6.68, 46.33, 0.00 -5, -7.33, 51.03, 0.00 -6, -7.86, 54.95, 0.00 -7, -8.30, 58.28, 0.00 -8, -8.60, 60.75, 0.00 -9, -8.85, 62.89, 0.00 -10, -8.96, 64.06, 0.00 -11, -9.01, 64.88, 0.00 -12, -8.93, 64.80, 0.00 -13, -8.77, 64.14, 0.00 -14, -8.51, 62.83, 0.00 -15, -8.19, 61.03, 0.00 -16, -7.81, 58.73, 0.00 -17, -7.52, 57.17, 0.00 -18, -6.97, 53.51, 0.00 -19, -6.23, 48.37, 0.00 -20, -5.59, 43.91, 0.00 -21, -4.89, 38.89, 0.00 -22, -4.16, 33.52, 0.00 -23, -3.27, 26.73, 0.00 -24, -2.44, 20.19, 0.00 -25, -1.23, 10.28, 0.00 -26, -0.37, 3.17, 0.00 -27, 0.97, -8.37, 0.00 -28, 1.86, -16.27, 0.00 -29, 3.20, -28.55, 0.00 -30, 3.94, -35.67, 0.00 -31, 5.22, -48.09, 0.00 -32, 6.02, -56.52, 0.00 -33, 7.59, -72.59, 0.00 -34, 8.24, -80.30, 0.00 -35, 9.39, -93.40, 0.00 -36, 9.92, -100.86, 0.00 -37, 10.54, -109.58, 0.00 -38, 11.01, -117.21, 0.00 -39, 10.95, -119.48, 0.00 -40, 11.48, -128.65, 0.00 -41, 10.97, -126.35, 0.00 -42, 11.91, -141.43, 0.00 -43, 12.30, -150.90, 0.00 -44, 13.37, -169.77, 0.00 -45, 14.68, -193.53, 0.00 -46, 15.80, -217.03, 0.00 -47, 19.25, -276.51, 0.00 -48, 19.53, -294.59, 0.00 -49, 22.26, -354.30, 0.00 -50, 20.96, -354.19, 0.00 -51, 20.16, -364.14, 0.00 -52, 18.40, -358.18, 0.00 -53, 16.69, -353.80, 0.00 -54, 15.07, -352.32, 0.00 -55, 12.98, -340.39, 0.00 -56, 11.19, -336.20, 0.00 -57, 8.60, -304.96, 0.00 -58, 7.16, -313.01, 0.00 -59, 6.01, -347.70, 0.00 -60, 4.70, -412.79, 0.00 -61, 2.33, -445.52, 0.00 -62, -0.55, -443.29, 0.00 -63, -3.42, -427.14, 0.00 -64, -6.31, -417.03, 0.00 -65, -8.94, -395.68, 0.00 -66, -11.64, -382.49, 0.00 -67, -14.13, -365.39, 0.00 -68, -16.51, -348.88, 0.00 -69, -18.69, -331.14, 0.00 -70, -20.72, -313.74, 0.00 -71, -22.32, -293.09, 0.00 -72, -23.72, -273.12, 0.00 -73, -24.63, -251.02, 0.00 -74, -25.83, -234.51, 0.00 -75, -26.33, -214.23, 0.00 -76, -26.92, -197.22, 0.00 -77, -26.80, -177.38, 0.00 -78, -26.94, -161.54, 0.00 -79, -26.13, -142.24, 0.00 -80, -25.19, -124.64, 0.00 -81, -22.82, -102.67, 0.00 -82, -21.57, -88.23, 0.00 -83, -19.26, -71.61, 0.00 -84, -17.97, -60.61, 0.00 -85, -15.93, -48.61, 0.00 -86, -12.97, -35.71, 0.00 -87, -8.42, -20.82, 0.00 -88, -5.98, -13.21, 0.00 -89, -8.03, -15.71, 0.00 -90, 4.80, 8.23, 0.00 -91, 4.36, 6.47, 0.00 -92, 11.84, 14.99, 0.00 -93, 0.32, 0.34, 0.00 -94, 11.38, 9.67, 0.00 -95, 45.23, 29.46, 0.00 -96, 48.26, 22.12, 0.00 -97, -197.68, -53.50, 0.00 -98, -125.90, -16.89, 0.00 -99, 14.92, -0.00, 0.00 -100, 79.73, -10.70, 0.00 -101, 186.44, -50.46, 0.00 -102, 187.22, -85.81, 0.00 -103, 135.06, -87.97, 0.00 -104, 119.91, -101.86, 0.00 -105, 79.10, -83.40, 0.00 -106, 59.63, -75.52, 0.00 -107, 30.90, -45.94, 0.00 -108, 22.56, -38.71, 0.00 -109, -4.56, 8.92, 0.00 -110, -9.71, 21.43, 0.00 -111, -21.99, 54.38, 0.00 -112, -24.51, 67.48, 0.00 -113, -34.81, 106.26, 0.00 -114, -39.06, 131.73, 0.00 -115, -43.87, 163.08, 0.00 -116, -44.80, 183.28, 0.00 -117, -47.81, 215.10, 0.00 -118, -48.21, 238.52, 0.00 -119, -49.89, 271.53, 0.00 -120, -49.93, 299.38, 0.00 -121, -49.00, 324.32, 0.00 -122, -47.34, 346.82, 0.00 -123, -45.93, 373.77, 0.00 -124, -43.73, 397.06, 0.00 -125, -41.62, 424.09, 0.00 -126, -38.87, 447.69, 0.00 -127, -36.04, 473.29, 0.00 -128, -32.71, 495.38, 0.00 -129, -29.18, 517.04, 0.00 -130, -25.50, 538.64, 0.00 -131, -21.67, 560.11, 0.00 -132, -17.65, 579.80, 0.00 -133, -13.60, 601.56, 0.00 -134, -9.38, 619.71, 0.00 -135, -5.13, 640.08, 0.00 -136, -0.81, 656.70, 0.00 -137, 3.53, 674.34, 0.00 -138, 7.85, 688.58, 0.00 -139, 12.18, 704.99, 0.00 -140, 16.41, 717.64, 0.00 -141, 20.57, 729.02, 0.00 -142, 24.63, 739.65, 0.00 -143, 28.56, 748.77, 0.00 -144, 32.40, 757.51, 0.00 -145, 36.12, 765.59, 0.00 -146, 39.66, 772.06, 0.00 -147, 43.13, 778.88, 0.00 -148, 46.36, 783.25, 0.00 -149, 49.60, 789.39, 0.00 -150, 52.48, 791.53, 0.00 -151, 55.47, 796.64, 0.00 -152, 57.83, 794.45, 0.00 -153, 57.34, 756.10, 0.00 -154, 59.99, 761.83, 0.00 -155, 69.07, 847.19, 0.00 -156, 69.33, 823.32, 0.00 -157, 53.10, 611.85, 0.00 -158, 40.29, 451.37, 0.00 -159, 43.59, 475.55, 0.00 -160, 49.17, 523.27, 0.00 -161, 18.54, 192.66, 0.00 -162, 14.94, 151.89, 0.00 -163, 8.48, 84.34, 0.00 -164, 7.58, 73.94, 0.00 -165, 3.72, 35.56, 0.00 -166, 2.83, 26.52, 0.00 -167, 1.26, 11.65, 0.00 -168, 0.55, 5.03, 0.00 -169, -0.64, -5.72, 0.00 -170, -1.47, -12.88, 0.00 -171, -2.41, -20.82, 0.00 -172, -3.12, -26.59, 0.00 -173, -3.82, -32.02, 0.00 -174, -4.48, -37.03, 0.00 -175, -5.61, -45.76, 0.00 -176, -6.31, -50.81, 0.00 -177, -6.84, -54.39, 0.00 -178, -7.42, -58.32, 0.00 -179, -7.79, -60.51, 0.00 -180, -8.26, -63.45, 0.00 -181, -8.73, -66.31, 0.00 -182, -9.08, -68.30, 0.00 -183, -9.46, -70.51, 0.00 -184, -9.69, -71.54, 0.00 -185, -9.74, -71.24, 0.00 -186, -9.78, -70.95, 0.00 -187, -9.85, -70.97, 0.00 -188, -9.79, -70.04, 0.00 -189, -9.43, -66.99, 0.00 -190, -9.12, -64.44, 0.00 -191, -8.61, -60.49, 0.00 -192, -8.09, -56.58, 0.00 -193, -7.41, -51.57, 0.00 -194, -6.72, -46.59, 0.00 -195, -5.79, -40.06, 0.00 -196, -4.88, -33.67, 0.00 -197, -3.73, -25.71, 0.00 -198, -2.60, -17.88, 0.00 +199, -0.93, -0.00, 0.00 +0, -2.81, 19.36, 0.00 +1, -4.05, 27.92, 0.00 +2, -5.08, 35.07, 0.00 +3, -5.99, 41.47, 0.00 +4, -6.79, 47.09, 0.00 +5, -7.43, 51.75, 0.00 +6, -7.99, 55.86, 0.00 +7, -8.42, 59.13, 0.00 +8, -8.75, 61.76, 0.00 +9, -8.96, 63.62, 0.00 +10, -9.08, 64.90, 0.00 +11, -9.10, 65.57, 0.00 +12, -9.04, 65.63, 0.00 +13, -8.89, 65.04, 0.00 +14, -8.66, 63.91, 0.00 +15, -8.35, 62.18, 0.00 +16, -7.98, 60.01, 0.00 +17, -7.53, 57.25, 0.00 +18, -7.04, 54.05, 0.00 +19, -6.48, 50.36, 0.00 +20, -5.88, 46.20, 0.00 +21, -5.23, 41.61, 0.00 +22, -4.55, 36.62, 0.00 +23, -3.82, 31.19, 0.00 +24, -3.07, 25.41, 0.00 +25, -2.29, 19.23, 0.00 +26, -1.49, 12.68, 0.00 +27, -0.67, 5.83, 0.00 +28, 0.16, -1.40, 0.00 +29, 1.01, -9.05, 0.00 +30, 1.89, -17.11, 0.00 +31, 2.76, -25.49, 0.00 +32, 3.63, -34.04, 0.00 +33, 4.49, -42.89, 0.00 +34, 5.32, -51.91, 0.00 +35, 6.15, -61.17, 0.00 +36, 6.95, -70.65, 0.00 +37, 7.73, -80.32, 0.00 +38, 8.48, -90.23, 0.00 +39, 9.20, -100.36, 0.00 +40, 9.88, -110.64, 0.00 +41, 10.47, -120.69, 0.00 +42, 11.06, -131.33, 0.00 +43, 11.56, -141.79, 0.00 +44, 12.04, -152.97, 0.00 +45, 12.45, -164.16, 0.00 +46, 12.80, -175.78, 0.00 +47, 13.00, -186.74, 0.00 +48, 13.14, -198.15, 0.00 +49, 13.10, -208.51, 0.00 +50, 12.99, -219.44, 0.00 +51, 12.68, -229.03, 0.00 +52, 12.27, -238.90, 0.00 +53, 11.62, -246.25, 0.00 +54, 10.98, -256.80, 0.00 +55, 10.10, -264.89, 0.00 +56, 8.86, -266.14, 0.00 +57, 7.40, -262.38, 0.00 +58, 6.67, -291.53, 0.00 +59, 6.48, -375.39, 0.00 +60, 4.85, -425.42, 0.00 +61, 2.21, -423.14, 0.00 +62, -0.51, -410.98, 0.00 +63, -3.21, -400.95, 0.00 +64, -5.90, -389.64, 0.00 +65, -8.53, -377.47, 0.00 +66, -11.08, -363.94, 0.00 +67, -13.53, -349.79, 0.00 +68, -15.82, -334.31, 0.00 +69, -17.94, -317.89, 0.00 +70, -19.82, -300.10, 0.00 +71, -21.38, -280.71, 0.00 +72, -22.64, -260.71, 0.00 +73, -23.55, -239.98, 0.00 +74, -24.20, -219.72, 0.00 +75, -24.24, -197.28, 0.00 +76, -23.96, -175.54, 0.00 +77, -23.32, -154.35, 0.00 +78, -22.79, -136.68, 0.00 +79, -21.48, -116.91, 0.00 +80, -20.00, -98.97, 0.00 +81, -17.33, -77.95, 0.00 +82, -14.60, -59.73, 0.00 +83, -10.54, -39.19, 0.00 +84, -6.29, -21.20, 0.00 +85, -0.01, -0.02, 0.00 +86, 6.62, 18.23, 0.00 +87, 15.48, 38.26, 0.00 +88, 24.55, 54.18, 0.00 +89, 36.46, 71.30, 0.00 +90, 49.16, 84.34, 0.00 +91, 64.17, 95.40, 0.00 +92, 81.10, 102.71, 0.00 +93, 97.96, 103.29, 0.00 +94, 118.33, 100.52, 0.00 +95, 138.40, 90.14, 0.00 +96, 152.70, 69.99, 0.00 +97, 176.37, 47.73, 0.00 +98, 124.94, 16.77, 0.00 +99, 71.23, -0.00, 0.00 +100, 113.09, -15.18, 0.00 +101, 142.34, -38.52, 0.00 +102, 114.28, -52.38, 0.00 +103, 88.64, -57.74, 0.00 +104, 68.79, -58.44, 0.00 +105, 40.72, -42.93, 0.00 +106, 26.54, -33.61, 0.00 +107, 6.89, -10.25, 0.00 +108, -3.72, 6.38, 0.00 +109, -17.22, 33.68, 0.00 +110, -24.01, 52.99, 0.00 +111, -32.34, 79.96, 0.00 +112, -37.08, 102.10, 0.00 +113, -42.46, 129.60, 0.00 +114, -47.70, 160.89, 0.00 +115, -50.44, 187.52, 0.00 +116, -50.78, 207.77, 0.00 +117, -51.58, 232.09, 0.00 +118, -51.26, 253.57, 0.00 +119, -51.18, 278.55, 0.00 +120, -50.53, 302.98, 0.00 +121, -49.77, 329.38, 0.00 +122, -48.42, 354.70, 0.00 +123, -46.87, 381.35, 0.00 +124, -44.81, 406.84, 0.00 +125, -42.53, 433.40, 0.00 +126, -39.80, 458.40, 0.00 +127, -36.82, 483.52, 0.00 +128, -33.42, 506.10, 0.00 +129, -29.83, 528.58, 0.00 +130, -26.01, 549.55, 0.00 +131, -22.07, 570.51, 0.00 +132, -17.96, 589.92, 0.00 +133, -13.77, 609.28, 0.00 +134, -9.49, 627.05, 0.00 +135, -5.17, 644.87, 0.00 +136, -0.82, 661.51, 0.00 +137, 3.54, 677.63, 0.00 +138, 7.88, 691.48, 0.00 +139, 12.18, 705.16, 0.00 +140, 16.41, 717.35, 0.00 +141, 20.55, 728.47, 0.00 +142, 24.59, 738.45, 0.00 +143, 28.53, 748.01, 0.00 +144, 32.34, 756.21, 0.00 +145, 36.03, 763.70, 0.00 +146, 39.56, 770.04, 0.00 +147, 42.94, 775.56, 0.00 +148, 46.15, 779.68, 0.00 +149, 49.21, 783.17, 0.00 +150, 52.07, 785.36, 0.00 +151, 54.75, 786.34, 0.00 +152, 57.29, 786.93, 0.00 +153, 59.65, 786.55, 0.00 +154, 61.91, 786.25, 0.00 +155, 63.01, 772.91, 0.00 +156, 65.70, 780.28, 0.00 +157, 64.12, 738.87, 0.00 +158, 13.02, 145.83, 0.00 +159, 0.26, 2.82, 0.00 +160, 1.95, 20.80, 0.00 +161, 1.35, 14.04, 0.00 +162, 0.85, 8.67, 0.00 +163, 0.64, 6.32, 0.00 +164, 0.27, 2.62, 0.00 +165, -0.01, -0.14, 0.00 +166, -0.44, -4.11, 0.00 +167, -0.83, -7.64, 0.00 +168, -1.32, -12.01, 0.00 +169, -1.82, -16.22, 0.00 +170, -2.36, -20.71, 0.00 +171, -2.87, -24.82, 0.00 +172, -3.45, -29.34, 0.00 +173, -4.01, -33.68, 0.00 +174, -4.60, -38.02, 0.00 +175, -5.15, -42.04, 0.00 +176, -5.71, -46.01, 0.00 +177, -6.23, -49.59, 0.00 +178, -6.75, -53.02, 0.00 +179, -7.23, -56.13, 0.00 +180, -7.67, -58.93, 0.00 +181, -8.07, -61.36, 0.00 +182, -8.43, -63.38, 0.00 +183, -8.72, -64.96, 0.00 +184, -8.96, -66.13, 0.00 +185, -9.12, -66.72, 0.00 +186, -9.15, -66.42, 0.00 +187, -9.18, -66.11, 0.00 +188, -9.13, -65.29, 0.00 +189, -8.98, -63.80, 0.00 +190, -8.73, -61.65, 0.00 +191, -8.38, -58.86, 0.00 +192, -7.92, -55.38, 0.00 +193, -7.35, -51.17, 0.00 +194, -6.68, -46.36, 0.00 +195, -5.88, -40.68, 0.00 +196, -4.95, -34.19, 0.00 +197, -3.92, -26.99, 0.00 +198, -2.67, -18.37, 0.00 diff --git a/TestCases/py_wrapper/updated_moving_frame_NACA12/forces_0.csv.ref b/TestCases/py_wrapper/updated_moving_frame_NACA12/forces_0.csv.ref index 1e7ab436b72a..c703bd29758a 100644 --- a/TestCases/py_wrapper/updated_moving_frame_NACA12/forces_0.csv.ref +++ b/TestCases/py_wrapper/updated_moving_frame_NACA12/forces_0.csv.ref @@ -1,200 +1,200 @@ -199, -0.92, -0.00, 0.00 -0, -2.82, 19.44, 0.00 -1, -3.96, 27.26, 0.00 -2, -4.94, 34.13, 0.00 -3, -5.83, 40.30, 0.00 -4, -6.56, 45.50, 0.00 -5, -7.20, 50.13, 0.00 -6, -7.69, 53.74, 0.00 -7, -8.11, 56.96, 0.00 -8, -8.36, 59.03, 0.00 -9, -8.58, 60.93, 0.00 -10, -8.62, 61.61, 0.00 -11, -8.64, 62.26, 0.00 -12, -8.50, 61.68, 0.00 -13, -8.38, 61.34, 0.00 -14, -8.07, 59.56, 0.00 -15, -7.78, 57.97, 0.00 -16, -7.34, 55.18, 0.00 -17, -6.93, 52.67, 0.00 -18, -6.35, 48.76, 0.00 -19, -5.80, 45.05, 0.00 -20, -5.13, 40.31, 0.00 -21, -4.50, 35.79, 0.00 -22, -3.74, 30.16, 0.00 -23, -2.98, 24.34, 0.00 -24, -2.17, 17.93, 0.00 -25, -1.32, 11.04, 0.00 -26, -0.49, 4.21, 0.00 -27, 0.41, -3.51, 0.00 -28, 1.27, -11.10, 0.00 -29, 2.10, -18.72, 0.00 -30, 2.92, -26.44, 0.00 -31, 3.77, -34.73, 0.00 -32, 4.60, -43.16, 0.00 -33, 5.42, -51.86, 0.00 -34, 6.20, -60.46, 0.00 -35, 6.96, -69.21, 0.00 -36, 7.70, -78.27, 0.00 -37, 8.36, -86.87, 0.00 -38, 9.02, -96.02, 0.00 -39, 9.56, -104.28, 0.00 -40, 10.12, -113.40, 0.00 -41, 10.55, -121.56, 0.00 -42, 10.95, -130.05, 0.00 -43, 11.05, -135.56, 0.00 -44, 11.34, -144.01, 0.00 -45, 11.40, -150.32, 0.00 -46, 11.65, -160.10, 0.00 -47, 12.24, -175.82, 0.00 -48, 11.59, -174.80, 0.00 -49, 10.49, -166.97, 0.00 -50, 8.68, -146.70, 0.00 -51, 4.59, -82.88, 0.00 -52, 7.31, -142.21, 0.00 -53, 21.25, -450.45, 0.00 -54, 25.14, -587.71, 0.00 -55, 21.48, -563.18, 0.00 -56, 17.96, -539.23, 0.00 -57, 15.76, -558.72, 0.00 -58, 12.71, -555.72, 0.00 -59, 9.40, -544.46, 0.00 -60, 6.08, -533.76, 0.00 -61, 2.72, -520.75, 0.00 -62, -0.63, -508.27, 0.00 -63, -3.95, -492.77, 0.00 -64, -7.24, -478.52, 0.00 -65, -10.39, -459.48, 0.00 -66, -13.50, -443.36, 0.00 -67, -16.41, -424.23, 0.00 -68, -19.24, -406.47, 0.00 -69, -21.77, -385.65, 0.00 -70, -24.22, -366.85, 0.00 -71, -26.21, -344.18, 0.00 -72, -28.12, -323.80, 0.00 -73, -29.28, -298.39, 0.00 -74, -30.70, -278.72, 0.00 -75, -31.20, -253.86, 0.00 -76, -31.79, -232.87, 0.00 -77, -31.78, -210.36, 0.00 -78, -31.81, -190.72, 0.00 -79, -29.96, -163.09, 0.00 -80, -28.81, -142.51, 0.00 -81, -25.70, -115.63, 0.00 -82, -23.36, -95.56, 0.00 -83, -17.92, -66.64, 0.00 -84, -15.19, -51.24, 0.00 -85, -4.65, -14.18, 0.00 -86, -0.26, -0.71, 0.00 -87, 9.41, 23.25, 0.00 -88, 14.47, 31.93, 0.00 -89, 23.43, 45.83, 0.00 -90, 37.69, 64.67, 0.00 -91, 42.67, 63.43, 0.00 -92, 56.09, 71.03, 0.00 -93, 53.23, 56.12, 0.00 -94, 77.35, 65.70, 0.00 -95, 42.42, 27.63, 0.00 -96, 10.74, 4.92, 0.00 -97, 47.56, 12.87, 0.00 -98, 75.03, 10.07, 0.00 -99, 0.36, -0.00, 0.00 -100, 97.48, -13.08, 0.00 -101, 172.16, -46.60, 0.00 -102, 148.56, -68.09, 0.00 -103, 130.04, -84.70, 0.00 -104, 110.88, -94.19, 0.00 -105, 98.92, -104.31, 0.00 -106, 84.16, -106.58, 0.00 -107, 53.49, -79.51, 0.00 -108, 45.94, -78.83, 0.00 -109, 17.03, -33.31, 0.00 -110, 11.56, -25.52, 0.00 -111, -7.53, 18.62, 0.00 -112, -14.11, 38.85, 0.00 -113, -26.43, 80.67, 0.00 -114, -31.15, 105.06, 0.00 -115, -36.24, 134.73, 0.00 -116, -38.44, 157.29, 0.00 -117, -41.50, 186.70, 0.00 -118, -42.29, 209.23, 0.00 -119, -43.71, 237.89, 0.00 -120, -43.36, 259.97, 0.00 -121, -43.38, 287.09, 0.00 -122, -42.21, 309.23, 0.00 -123, -41.30, 336.04, 0.00 -124, -39.47, 358.43, 0.00 -125, -37.83, 385.46, 0.00 -126, -35.45, 408.28, 0.00 -127, -32.92, 432.34, 0.00 -128, -29.95, 453.52, 0.00 -129, -26.87, 476.13, 0.00 -130, -23.51, 496.73, 0.00 -131, -20.04, 517.96, 0.00 -132, -16.35, 536.89, 0.00 -133, -12.60, 557.35, 0.00 -134, -8.70, 574.79, 0.00 -135, -4.75, 592.92, 0.00 -136, -0.75, 609.08, 0.00 -137, 3.27, 625.75, 0.00 -138, 7.29, 639.56, 0.00 -139, 11.30, 654.52, 0.00 -140, 15.25, 666.62, 0.00 -141, 19.14, 678.33, 0.00 -142, 22.92, 688.27, 0.00 -143, 26.63, 698.04, 0.00 -144, 30.19, 705.88, 0.00 -145, 33.68, 713.98, 0.00 -146, 36.96, 719.54, 0.00 -147, 40.03, 723.00, 0.00 -148, 42.96, 725.82, 0.00 -149, 45.50, 724.25, 0.00 -150, 48.43, 730.47, 0.00 -151, 51.10, 733.97, 0.00 -152, 53.48, 734.72, 0.00 -153, 39.59, 522.09, 0.00 -154, -0.60, -7.66, 0.00 -155, -3.05, -37.45, 0.00 -156, 5.42, 64.40, 0.00 -157, 6.68, 76.94, 0.00 -158, 6.61, 74.08, 0.00 -159, 5.30, 57.82, 0.00 -160, 5.37, 57.13, 0.00 -161, 4.93, 51.25, 0.00 -162, 4.64, 47.15, 0.00 -163, 4.21, 41.93, 0.00 -164, 3.81, 37.17, 0.00 -165, 3.32, 31.75, 0.00 -166, 2.81, 26.41, 0.00 -167, 2.22, 20.44, 0.00 -168, 1.62, 14.65, 0.00 -169, 0.93, 8.33, 0.00 -170, 0.25, 2.23, 0.00 -171, -0.51, -4.42, 0.00 -172, -1.24, -10.52, 0.00 -173, -1.95, -16.35, 0.00 -174, -2.66, -22.04, 0.00 -175, -3.38, -27.60, 0.00 -176, -4.10, -33.06, 0.00 -177, -4.70, -37.37, 0.00 -178, -5.35, -42.05, 0.00 -179, -5.86, -45.51, 0.00 -180, -6.43, -49.40, 0.00 -181, -6.84, -51.98, 0.00 -182, -7.31, -55.02, 0.00 -183, -7.65, -57.00, 0.00 -184, -8.01, -59.13, 0.00 -185, -8.18, -59.86, 0.00 -186, -8.41, -61.04, 0.00 -187, -8.44, -60.78, 0.00 -188, -8.49, -60.71, 0.00 -189, -8.38, -59.56, 0.00 -190, -8.23, -58.15, 0.00 -191, -7.93, -55.68, 0.00 -192, -7.56, -52.84, 0.00 -193, -7.02, -48.89, 0.00 -194, -6.43, -44.64, 0.00 -195, -5.67, -39.23, 0.00 -196, -4.82, -33.30, 0.00 -197, -3.83, -26.41, 0.00 -198, -2.73, -18.78, 0.00 +199, -1.43, -0.00, 0.00 +0, -2.98, 20.52, 0.00 +1, -4.22, 29.06, 0.00 +2, -5.35, 36.96, 0.00 +3, -6.36, 43.97, 0.00 +4, -7.22, 50.10, 0.00 +5, -7.93, 55.22, 0.00 +6, -8.53, 59.62, 0.00 +7, -8.99, 63.16, 0.00 +8, -9.33, 65.89, 0.00 +9, -9.55, 67.85, 0.00 +10, -9.66, 69.06, 0.00 +11, -9.67, 69.64, 0.00 +12, -9.57, 69.45, 0.00 +13, -9.38, 68.64, 0.00 +14, -9.09, 67.11, 0.00 +15, -8.72, 64.99, 0.00 +16, -8.28, 62.29, 0.00 +17, -7.77, 59.04, 0.00 +18, -7.18, 55.15, 0.00 +19, -6.53, 50.76, 0.00 +20, -5.82, 45.73, 0.00 +21, -5.06, 40.26, 0.00 +22, -4.24, 34.16, 0.00 +23, -3.38, 27.62, 0.00 +24, -2.48, 20.52, 0.00 +25, -1.55, 12.99, 0.00 +26, -0.58, 4.91, 0.00 +27, 0.41, -3.50, 0.00 +28, 1.42, -12.49, 0.00 +29, 2.45, -21.84, 0.00 +30, 3.50, -31.76, 0.00 +31, 4.56, -42.01, 0.00 +32, 5.61, -52.62, 0.00 +33, 6.64, -63.48, 0.00 +34, 7.64, -74.53, 0.00 +35, 8.63, -85.82, 0.00 +36, 9.57, -97.27, 0.00 +37, 10.47, -108.83, 0.00 +38, 11.32, -120.42, 0.00 +39, 12.10, -132.02, 0.00 +40, 12.80, -143.38, 0.00 +41, 13.43, -154.76, 0.00 +42, 13.96, -165.78, 0.00 +43, 14.39, -176.53, 0.00 +44, 14.67, -186.36, 0.00 +45, 14.81, -195.30, 0.00 +46, 14.75, -202.56, 0.00 +47, 14.50, -208.24, 0.00 +48, 14.04, -211.71, 0.00 +49, 13.49, -214.70, 0.00 +50, 12.91, -218.07, 0.00 +51, 11.52, -208.10, 0.00 +52, 8.70, -169.29, 0.00 +53, 11.71, -248.23, 0.00 +54, 23.50, -549.55, 0.00 +55, 22.83, -598.40, 0.00 +56, 18.84, -565.88, 0.00 +57, 15.68, -555.98, 0.00 +58, 12.58, -549.83, 0.00 +59, 9.34, -540.97, 0.00 +60, 6.05, -531.10, 0.00 +61, 2.72, -520.44, 0.00 +62, -0.63, -508.59, 0.00 +63, -3.97, -495.43, 0.00 +64, -7.29, -481.84, 0.00 +65, -10.56, -467.20, 0.00 +66, -13.75, -451.65, 0.00 +67, -16.84, -435.30, 0.00 +68, -19.80, -418.27, 0.00 +69, -22.61, -400.67, 0.00 +70, -25.27, -382.69, 0.00 +71, -27.73, -364.16, 0.00 +72, -29.98, -345.22, 0.00 +73, -31.95, -325.54, 0.00 +74, -33.67, -305.72, 0.00 +75, -35.08, -285.43, 0.00 +76, -36.14, -264.74, 0.00 +77, -36.85, -243.88, 0.00 +78, -37.17, -222.86, 0.00 +79, -37.07, -201.76, 0.00 +80, -36.54, -180.76, 0.00 +81, -35.57, -160.05, 0.00 +82, -33.96, -138.94, 0.00 +83, -31.77, -118.10, 0.00 +84, -28.81, -97.17, 0.00 +85, -24.83, -75.81, 0.00 +86, -20.14, -55.45, 0.00 +87, -14.60, -36.11, 0.00 +88, -7.77, -17.15, 0.00 +89, 1.54, 3.01, 0.00 +90, 12.23, 20.99, 0.00 +91, 26.30, 39.10, 0.00 +92, 39.79, 50.39, 0.00 +93, 56.69, 59.77, 0.00 +94, 71.61, 60.83, 0.00 +95, 86.95, 56.64, 0.00 +96, 99.35, 45.54, 0.00 +97, 110.67, 29.95, 0.00 +98, 75.13, 10.08, 0.00 +99, 39.19, -0.00, 0.00 +100, 50.71, -6.80, 0.00 +101, 51.74, -14.00, 0.00 +102, 51.32, -23.52, 0.00 +103, 54.65, -35.60, 0.00 +104, 48.51, -41.21, 0.00 +105, 35.49, -37.42, 0.00 +106, 24.35, -30.84, 0.00 +107, 13.36, -19.86, 0.00 +108, 2.88, -4.94, 0.00 +109, -7.34, 14.36, 0.00 +110, -16.88, 37.26, 0.00 +111, -24.05, 59.45, 0.00 +112, -29.52, 81.28, 0.00 +113, -34.16, 104.28, 0.00 +114, -38.08, 128.43, 0.00 +115, -40.79, 151.66, 0.00 +116, -43.07, 176.24, 0.00 +117, -44.48, 200.14, 0.00 +118, -45.20, 223.62, 0.00 +119, -45.40, 247.10, 0.00 +120, -45.15, 270.75, 0.00 +121, -44.47, 294.31, 0.00 +122, -43.42, 318.08, 0.00 +123, -42.01, 341.80, 0.00 +124, -40.20, 365.03, 0.00 +125, -38.11, 388.33, 0.00 +126, -35.75, 411.66, 0.00 +127, -33.09, 434.50, 0.00 +128, -30.15, 456.56, 0.00 +129, -26.97, 477.89, 0.00 +130, -23.61, 498.69, 0.00 +131, -20.08, 519.03, 0.00 +132, -16.40, 538.54, 0.00 +133, -12.60, 557.49, 0.00 +134, -8.71, 575.31, 0.00 +135, -4.75, 592.33, 0.00 +136, -0.75, 608.79, 0.00 +137, 3.26, 624.15, 0.00 +138, 7.27, 638.23, 0.00 +139, 11.26, 651.76, 0.00 +140, 15.19, 664.20, 0.00 +141, 19.05, 675.22, 0.00 +142, 22.82, 685.41, 0.00 +143, 26.51, 694.84, 0.00 +144, 30.07, 702.98, 0.00 +145, 33.49, 709.90, 0.00 +146, 36.78, 715.98, 0.00 +147, 39.93, 721.11, 0.00 +148, 42.91, 725.00, 0.00 +149, 45.75, 728.13, 0.00 +150, 48.15, 726.18, 0.00 +151, 50.36, 723.33, 0.00 +152, 55.81, 766.66, 0.00 +153, 45.85, 604.57, 0.00 +154, 10.03, 127.42, 0.00 +155, 5.87, 72.03, 0.00 +156, 7.05, 83.77, 0.00 +157, 6.67, 76.90, 0.00 +158, 6.60, 73.96, 0.00 +159, 6.51, 71.05, 0.00 +160, 6.31, 67.10, 0.00 +161, 5.98, 62.20, 0.00 +162, 5.57, 56.57, 0.00 +163, 5.06, 50.36, 0.00 +164, 4.48, 43.66, 0.00 +165, 3.84, 36.69, 0.00 +166, 3.14, 29.45, 0.00 +167, 2.40, 22.13, 0.00 +168, 1.62, 14.73, 0.00 +169, 0.82, 7.35, 0.00 +170, 0.00, 0.04, 0.00 +171, -0.82, -7.06, 0.00 +172, -1.65, -14.05, 0.00 +173, -2.48, -20.77, 0.00 +174, -3.30, -27.27, 0.00 +175, -4.09, -33.36, 0.00 +176, -4.86, -39.15, 0.00 +177, -5.58, -44.42, 0.00 +178, -6.27, -49.29, 0.00 +179, -6.91, -53.68, 0.00 +180, -7.50, -57.61, 0.00 +181, -8.03, -61.00, 0.00 +182, -8.50, -63.93, 0.00 +183, -8.89, -66.26, 0.00 +184, -9.23, -68.12, 0.00 +185, -9.47, -69.32, 0.00 +186, -9.65, -70.03, 0.00 +187, -9.72, -70.02, 0.00 +188, -9.68, -69.24, 0.00 +189, -9.55, -67.81, 0.00 +190, -9.29, -65.64, 0.00 +191, -8.92, -62.69, 0.00 +192, -8.44, -59.00, 0.00 +193, -7.82, -54.47, 0.00 +194, -7.11, -49.31, 0.00 +195, -6.23, -43.13, 0.00 +196, -5.24, -36.17, 0.00 +197, -4.10, -28.28, 0.00 +198, -2.90, -19.95, 0.00 diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index 9d7c6b857b14..e04b02fd9fce 100755 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -93,7 +93,7 @@ def main(): channel.cfg_dir = "euler/channel" channel.cfg_file = "inv_channel_RK.cfg" channel.test_iter = 10 - channel.test_vals = [-2.215160, 3.327978, 0.064048, 0.163516] + channel.test_vals = [-2.215649, 3.327506, 0.064208, 0.163464] test_list.append(channel) # NACA0012 @@ -101,7 +101,7 @@ def main(): naca0012.cfg_dir = "euler/naca0012" naca0012.cfg_file = "inv_NACA0012_Roe.cfg" naca0012.test_iter = 20 - naca0012.test_vals = [-4.256408, -3.795038, 0.306510, 0.024657] + naca0012.test_vals = [-4.469040, -4.000861, 0.320068, 0.022464] test_list.append(naca0012) # Supersonic wedge @@ -109,7 +109,7 @@ def main(): wedge.cfg_dir = "euler/wedge" wedge.cfg_file = "inv_wedge_HLLC.cfg" wedge.test_iter = 20 - wedge.test_vals = [-3.609826, 2.113544, -0.249533, 0.043953] + wedge.test_vals = [-3.654383, 2.069583, -0.249532, 0.043953] test_list.append(wedge) # ONERA M6 Wing @@ -117,7 +117,7 @@ def main(): oneram6.cfg_dir = "euler/oneram6" oneram6.cfg_file = "inv_ONERAM6.cfg" oneram6.test_iter = 10 - oneram6.test_vals = [-11.512881, -10.980703, 0.280800, 0.008623] + oneram6.test_vals = [-11.488461, -10.956421, 0.280800, 0.008623] oneram6.timeout = 9600 test_list.append(oneram6) @@ -126,7 +126,7 @@ def main(): fixedCL_naca0012.cfg_dir = "fixed_cl/naca0012" fixedCL_naca0012.cfg_file = "inv_NACA0012.cfg" fixedCL_naca0012.test_iter = 10 - fixedCL_naca0012.test_vals = [-3.920501, 1.594999, 0.300907, 0.019465] + fixedCL_naca0012.test_vals = [-3.914411, 1.620762, 0.301093, 0.019484] test_list.append(fixedCL_naca0012) # Polar sweep of the inviscid NACA0012 @@ -135,7 +135,7 @@ def main(): polar_naca0012.cfg_file = "inv_NACA0012.cfg" polar_naca0012.polar = True polar_naca0012.test_iter = 10 - polar_naca0012.test_vals = [-1.196985, 4.245790, 0.010492, 0.070124] + polar_naca0012.test_vals = [-1.172634, 4.280292, 0.010871, 0.064551] polar_naca0012.test_vals_aarch64 = [-1.063447, 4.401847, 0.000291, 0.031696] polar_naca0012.command = TestCase.Command(exec = "compute_polar.py", param = "-n 1 -i 11") # flaky test on arm64 @@ -166,7 +166,7 @@ def main(): flatplate.cfg_dir = "navierstokes/flatplate" flatplate.cfg_file = "lam_flatplate.cfg" flatplate.test_iter = 20 - flatplate.test_vals = [-5.448267, 0.027571, 0.002633, 0.015619, 2.361200, -2.345600, 0.000000, 0.000000] + flatplate.test_vals = [-5.601096, -0.120807, 0.002044, 0.014375, 2.361400, -2.347100, 0.000000, 0.000000] test_list.append(flatplate) # Laminar cylinder (steady) @@ -174,7 +174,7 @@ def main(): cylinder.cfg_dir = "navierstokes/cylinder" cylinder.cfg_file = "lam_cylinder.cfg" cylinder.test_iter = 25 - cylinder.test_vals = [-8.503813, -3.012051, 0.260768, 1.697376, 0.000000] + cylinder.test_vals = [-8.740192, -3.254018, -0.008123, 1.627827, 0.000000] test_list.append(cylinder) # Laminar cylinder (low Mach correction) @@ -182,7 +182,7 @@ def main(): cylinder_lowmach.cfg_dir = "navierstokes/cylinder" cylinder_lowmach.cfg_file = "cylinder_lowmach.cfg" cylinder_lowmach.test_iter = 25 - cylinder_lowmach.test_vals = [-6.604626, -1.142842, -0.080684, -80.137778, 0.000000] + cylinder_lowmach.test_vals = [-6.716353, -1.254560, 0.128307, -75.874754, 0.000000] test_list.append(cylinder_lowmach) # 2D Poiseuille flow (body force driven with periodic inlet / outlet) @@ -190,7 +190,7 @@ def main(): poiseuille.cfg_dir = "navierstokes/poiseuille" poiseuille.cfg_file = "lam_poiseuille.cfg" poiseuille.test_iter = 10 - poiseuille.test_vals = [-5.050753, 0.648333, 0.012273, 13.643141, 0.000000] + poiseuille.test_vals = [0.648333, 0.012273, 13.643141, 0.000000] test_list.append(poiseuille) # 2D Poiseuille flow (inlet profile file) @@ -198,7 +198,7 @@ def main(): poiseuille_profile.cfg_dir = "navierstokes/poiseuille" poiseuille_profile.cfg_file = "profile_poiseuille.cfg" poiseuille_profile.test_iter = 10 - poiseuille_profile.test_vals = [-12.004412, -7.544478, -0.000000, 2.089953] + poiseuille_profile.test_vals = [-12.009020, -7.568724, -0.000000, 2.089953] poiseuille_profile.test_vals_aarch64 = [-12.009012, -7.262299, -0.000000, 2.089953] #last 4 columns test_list.append(poiseuille_profile) @@ -218,7 +218,7 @@ def main(): rae2822_sa.cfg_dir = "rans/rae2822" rae2822_sa.cfg_file = "turb_SA_RAE2822.cfg" rae2822_sa.test_iter = 20 - rae2822_sa.test_vals = [-2.168944, -5.451519, 0.287676, 0.104861, 0.000000] + rae2822_sa.test_vals = [-5.352421, 0.546492, 0.049469, 0.000000] test_list.append(rae2822_sa) # RAE2822 SST @@ -226,7 +226,7 @@ def main(): rae2822_sst.cfg_dir = "rans/rae2822" rae2822_sst.cfg_file = "turb_SST_RAE2822.cfg" rae2822_sst.test_iter = 20 - rae2822_sst.test_vals = [-1.028398, 5.868068, 0.277703, 0.093381, 0.000000] + rae2822_sst.test_vals = [5.868254, 0.517887, 0.038865, 0.000000] test_list.append(rae2822_sst) # RAE2822 SST_SUST @@ -234,7 +234,7 @@ def main(): rae2822_sst_sust.cfg_dir = "rans/rae2822" rae2822_sst_sust.cfg_file = "turb_SST_SUST_RAE2822.cfg" rae2822_sst_sust.test_iter = 20 - rae2822_sst_sust.test_vals = [-2.536320, 5.868058, 0.277703, 0.093381] + rae2822_sst_sust.test_vals = [-2.482998, 5.868244, 0.517887, 0.038865] test_list.append(rae2822_sst_sust) # Flat plate @@ -242,7 +242,7 @@ def main(): turb_flatplate.cfg_dir = "rans/flatplate" turb_flatplate.cfg_file = "turb_SA_flatplate.cfg" turb_flatplate.test_iter = 20 - turb_flatplate.test_vals = [-4.939159, -7.469363, -0.187651, 0.015894] + turb_flatplate.test_vals = [-5.101513, -7.435396, -0.187609, 0.011521] test_list.append(turb_flatplate) # FLAT PLATE, WALL FUNCTIONS, COMPRESSIBLE SST @@ -283,7 +283,7 @@ def main(): turb_naca0012_sa.cfg_dir = "rans/naca0012" turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" turb_naca0012_sa.test_iter = 5 - turb_naca0012_sa.test_vals = [-12.037240, -16.384159, 1.080346, 0.018385, 20, -3.455187, 20, -4.641267, 0] + turb_naca0012_sa.test_vals = [20.000000, -3.455187, 20.000000, -4.641267, 0.000000] turb_naca0012_sa.test_vals_aarch64 = [-12.037297, -16.384158, 1.080346, 0.018385, 20.000000, -3.455886, 20.000000, -4.641247, 0.000000] turb_naca0012_sa.timeout = 3200 test_list.append(turb_naca0012_sa) @@ -293,7 +293,7 @@ def main(): turb_naca0012_sst.cfg_dir = "rans/naca0012" turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" turb_naca0012_sst.test_iter = 10 - turb_naca0012_sst.test_vals = [-12.094475, -15.251083, -5.906366, 1.070413, 0.015775, -3.178930, 0] + turb_naca0012_sst.test_vals = [-5.906366, 1.070413, 0.015775, -3.178930, 0.000000] turb_naca0012_sst.test_vals_aarch64 = [-12.076068, -15.246740, -5.861280, 1.070036, 0.015841, -3.297854, 0.000000] turb_naca0012_sst.timeout = 3200 test_list.append(turb_naca0012_sst) @@ -303,7 +303,7 @@ def main(): turb_naca0012_sst_2003m.cfg_dir = "rans/naca0012" turb_naca0012_sst_2003m.cfg_file = "turb_NACA0012_sst_2003m.cfg" turb_naca0012_sst_2003m.test_iter = 10 - turb_naca0012_sst_2003m.test_vals = [-7.129622, -10.410728, -3.699440, 1.061671, 0.019047, -2.435494, 0.000000] + turb_naca0012_sst_2003m.test_vals = [-3.699440, 1.061671, 0.019047, -2.435494, 0.000000] turb_naca0012_sst_2003m.timeout = 3200 test_list.append(turb_naca0012_sst_2003m) @@ -312,7 +312,7 @@ def main(): turb_naca0012_sst_sust_restart.cfg_dir = "rans/naca0012" turb_naca0012_sst_sust_restart.cfg_file = "turb_NACA0012_sst_sust.cfg" turb_naca0012_sst_sust_restart.test_iter = 10 - turb_naca0012_sst_sust_restart.test_vals = [-12.080392, -14.837169, -5.733461, 1.000893, 0.019109, -2.634226] + turb_naca0012_sst_sust_restart.test_vals = [-14.837169, -5.733461, 1.000893, 0.019109, -2.634226] turb_naca0012_sst_sust_restart.test_vals_aarch64 = [-12.074189, -14.836725, -5.732398, 1.000050, 0.019144, -3.315560] turb_naca0012_sst_sust_restart.timeout = 3200 test_list.append(turb_naca0012_sst_sust_restart) @@ -322,7 +322,7 @@ def main(): turb_naca0012_sst_fixedvalues.cfg_dir = "rans/naca0012" turb_naca0012_sst_fixedvalues.cfg_file = "turb_NACA0012_sst_fixedvalues.cfg" turb_naca0012_sst_fixedvalues.test_iter = 10 - turb_naca0012_sst_fixedvalues.test_vals = [-5.206619, -10.436764, 0.774095, 1.021995, 0.040553, -3.477596] + turb_naca0012_sst_fixedvalues.test_vals = [-10.436764, 0.774095, 1.021995, 0.040553, -3.477596] turb_naca0012_sst_fixedvalues.timeout = 3200 test_list.append(turb_naca0012_sst_fixedvalues) @@ -359,7 +359,7 @@ def main(): turb_naca0012_sst_restart_mg.cfg_file = "turb_NACA0012_sst_multigrid_restart.cfg" turb_naca0012_sst_restart_mg.test_iter = 50 turb_naca0012_sst_restart_mg.ntest_vals = 5 - turb_naca0012_sst_restart_mg.test_vals = [-6.575448, -5.081421, 0.810883, -0.008836, 0.077960] + turb_naca0012_sst_restart_mg.test_vals = [-6.643201, -5.081421, 0.810882, -0.008797, 0.077921] turb_naca0012_sst_restart_mg.timeout = 3200 turb_naca0012_sst_restart_mg.tol = 0.000001 test_list.append(turb_naca0012_sst_restart_mg) @@ -380,7 +380,7 @@ def main(): inc_euler_naca0012.cfg_dir = "incomp_euler/naca0012" inc_euler_naca0012.cfg_file = "incomp_NACA0012.cfg" inc_euler_naca0012.test_iter = 20 - inc_euler_naca0012.test_vals = [-5.930469, -4.994452, 0.519589, 0.008977] + inc_euler_naca0012.test_vals = [-6.053070, -5.104508, 0.525090, 0.008715] test_list.append(inc_euler_naca0012) # C-D nozzle with pressure inlet and mass flow outlet @@ -388,7 +388,7 @@ def main(): inc_nozzle.cfg_dir = "incomp_euler/nozzle" inc_nozzle.cfg_file = "inv_nozzle.cfg" inc_nozzle.test_iter = 20 - inc_nozzle.test_vals = [-5.550954, -4.854401, -0.027964, 0.120734] + inc_nozzle.test_vals = [-6.285009, -5.435149, -0.017547, 0.126323] test_list.append(inc_nozzle) ############################# @@ -407,7 +407,7 @@ def main(): inc_lam_cylinder.cfg_dir = "incomp_navierstokes/cylinder" inc_lam_cylinder.cfg_file = "incomp_cylinder.cfg" inc_lam_cylinder.test_iter = 10 - inc_lam_cylinder.test_vals = [-4.168180, -3.611108, 0.007850, 4.539924] + inc_lam_cylinder.test_vals = [-4.564259, -3.919147, -0.004034, 3.466398] test_list.append(inc_lam_cylinder) # Buoyancy-driven cavity @@ -423,7 +423,7 @@ def main(): inc_poly_cylinder.cfg_dir = "incomp_navierstokes/cylinder" inc_poly_cylinder.cfg_file = "poly_cylinder.cfg" inc_poly_cylinder.test_iter = 20 - inc_poly_cylinder.test_vals = [-8.232551, -2.412865, 0.010163, 1.895333, -172.760000] + inc_poly_cylinder.test_vals = [-2.412865, 0.010163, 1.895333, -172.760000] test_list.append(inc_poly_cylinder) # X-coarse laminar bend as a mixed element CGNS test @@ -458,7 +458,7 @@ def main(): inc_turb_naca0012_sst_sust.cfg_dir = "incomp_rans/naca0012" inc_turb_naca0012_sst_sust.cfg_file = "naca0012_SST_SUST.cfg" inc_turb_naca0012_sst_sust.test_iter = 20 - inc_turb_naca0012_sst_sust.test_vals = [-7.169704, 0.332779, 0.000021, 0.312114] + inc_turb_naca0012_sst_sust.test_vals = [-4.794001, -7.169704, 0.332779, 0.000021, 0.312114] test_list.append(inc_turb_naca0012_sst_sust) # FLAT PLATE, WALL FUNCTIONS, INCOMPRESSIBLE SST @@ -586,7 +586,7 @@ def main(): contadj_naca0012.cfg_dir = "cont_adj_euler/naca0012" contadj_naca0012.cfg_file = "inv_NACA0012.cfg" contadj_naca0012.test_iter = 5 - contadj_naca0012.test_vals = [-9.525042, -15.101716, -0.726250, 0.020280] + contadj_naca0012.test_vals = [-9.575812, -15.172064, -0.726250, 0.020280] contadj_naca0012.tol = 0.001 test_list.append(contadj_naca0012) @@ -595,7 +595,7 @@ def main(): contadj_oneram6.cfg_dir = "cont_adj_euler/oneram6" contadj_oneram6.cfg_file = "inv_ONERAM6.cfg" contadj_oneram6.test_iter = 10 - contadj_oneram6.test_vals = [-12.062243, -12.621811, -1.086100, 0.007556] + contadj_oneram6.test_vals = [-12.009612, -12.553778, -1.086100, 0.007556] test_list.append(contadj_oneram6) # Inviscid WEDGE: tests averaged outflow total pressure adjoint @@ -611,7 +611,7 @@ def main(): contadj_fixedCL_naca0012.cfg_dir = "fixed_cl/naca0012" contadj_fixedCL_naca0012.cfg_file = "inv_NACA0012_ContAdj.cfg" contadj_fixedCL_naca0012.test_iter = 100 - contadj_fixedCL_naca0012.test_vals = [1.165313, -4.338177, -0.068991, -0.007568] + contadj_fixedCL_naca0012.test_vals = [1.042298, -4.454215, -0.039421, -0.004930] test_list.append(contadj_fixedCL_naca0012) ################################### @@ -630,7 +630,7 @@ def main(): contadj_ns_cylinder.cfg_dir = "cont_adj_navierstokes/cylinder" contadj_ns_cylinder.cfg_file = "lam_cylinder.cfg" contadj_ns_cylinder.test_iter = 20 - contadj_ns_cylinder.test_vals = [-3.606048, -9.050787, 2.056700, -0.000000] + contadj_ns_cylinder.test_vals = [-3.591454, -9.034048, 2.056700, -0.000000] test_list.append(contadj_ns_cylinder) # Adjoint laminar naca0012 subsonic @@ -674,7 +674,7 @@ def main(): contadj_rans_rae2822.cfg_dir = "cont_adj_rans/rae2822" contadj_rans_rae2822.cfg_file = "turb_SA_RAE2822.cfg" contadj_rans_rae2822.test_iter = 20 - contadj_rans_rae2822.test_vals = [-5.399739, -10.904778, -0.212470, 0.005448] + contadj_rans_rae2822.test_vals = [-5.398884, -10.903337, -0.212470, 0.005448] test_list.append(contadj_rans_rae2822) ############################# @@ -752,7 +752,7 @@ def main(): rot_naca0012.cfg_dir = "rotating/naca0012" rot_naca0012.cfg_file = "rot_NACA0012.cfg" rot_naca0012.test_iter = 25 - rot_naca0012.test_vals = [-1.313205, 4.208222, -0.001635, 0.121312] + rot_naca0012.test_vals = [-1.401335, 4.106246, -0.009980, 0.078834] test_list.append(rot_naca0012) # Lid-driven cavity @@ -760,7 +760,7 @@ def main(): cavity.cfg_dir = "moving_wall/cavity" cavity.cfg_file = "lam_cavity.cfg" cavity.test_iter = 25 - cavity.test_vals = [-8.327173, -2.944600, 0.017813, 0.009045] + cavity.test_vals = [-8.233891, -2.769424, 0.010153, 0.007873] test_list.append(cavity) # Spinning cylinder @@ -768,7 +768,7 @@ def main(): spinning_cylinder.cfg_dir = "moving_wall/spinning_cylinder" spinning_cylinder.cfg_file = "spinning_cylinder.cfg" spinning_cylinder.test_iter = 25 - spinning_cylinder.test_vals = [-7.824549, -2.360413, 1.581109, 1.528894] + spinning_cylinder.test_vals = [-7.387705, -1.935159, 3.937049, 1.985920] test_list.append(spinning_cylinder) ###################################### @@ -789,7 +789,7 @@ def main(): sine_gust.cfg_dir = "gust" sine_gust.cfg_file = "inv_gust_NACA0012.cfg" sine_gust.test_iter = 5 - sine_gust.test_vals = [-1.977498, 3.481817, -0.009957, -0.005021] + sine_gust.test_vals = [-1.977498, 3.481817, -0.007662, -0.009397] sine_gust.unsteady = True test_list.append(sine_gust) @@ -798,7 +798,7 @@ def main(): aeroelastic.cfg_dir = "aeroelastic" aeroelastic.cfg_file = "aeroelastic_NACA64A010.cfg" aeroelastic.test_iter = 2 - aeroelastic.test_vals = [0.073896, 0.027450, -0.001638, -0.000130] + aeroelastic.test_vals = [0.073958, 0.027489, -0.001639, -0.000129] aeroelastic.unsteady = True test_list.append(aeroelastic) @@ -824,7 +824,7 @@ def main(): unst_pitching_naca64a010_rans.cfg_dir = "unsteady/pitching_naca64a010_rans" unst_pitching_naca64a010_rans.cfg_file = "turb_NACA64A010.cfg" unst_pitching_naca64a010_rans.test_iter = 2 - unst_pitching_naca64a010_rans.test_vals = [-1.299045, -3.951413, 0.012821, 0.008239] + unst_pitching_naca64a010_rans.test_vals = [-1.299045, -3.951363, 0.010317, 0.008245] unst_pitching_naca64a010_rans.unsteady = True test_list.append(unst_pitching_naca64a010_rans) # unsteady pitching NACA64A010, Euler @@ -832,7 +832,7 @@ def main(): unst_pitching_naca64a010_euler.cfg_dir = "unsteady/pitching_naca64a010_euler" unst_pitching_naca64a010_euler.cfg_file = "pitching_NACA64A010.cfg" unst_pitching_naca64a010_euler.test_iter = 2 - unst_pitching_naca64a010_euler.test_vals = [-1.186839, 4.280301, -0.043557, 0.000935] + unst_pitching_naca64a010_euler.test_vals = [-1.186839, 4.280301, -0.039786, 0.000919] unst_pitching_naca64a010_euler.unsteady = True test_list.append(unst_pitching_naca64a010_euler) # unsteady plunging NACA0012, Laminar NS @@ -840,7 +840,7 @@ def main(): unst_plunging_naca0012.cfg_dir = "unsteady/plunging_naca0012" unst_plunging_naca0012.cfg_file = "plunging_NACA0012.cfg" unst_plunging_naca0012.test_iter = 2 - unst_plunging_naca0012.test_vals = [-4.083462, 1.366757, -6.820746, -0.081557] + unst_plunging_naca0012.test_vals = [-4.083462, 1.366757, -6.058092, -0.076262] unst_plunging_naca0012.unsteady = True test_list.append(unst_plunging_naca0012) @@ -849,7 +849,7 @@ def main(): unst_deforming_naca0012.cfg_dir = "disc_adj_euler/naca0012_pitching_def" unst_deforming_naca0012.cfg_file = "inv_NACA0012_pitching_deform.cfg" unst_deforming_naca0012.test_iter = 5 - unst_deforming_naca0012.test_vals = [-3.665254, -3.794011, -3.716829, -3.148509] + unst_deforming_naca0012.test_vals = [-3.665379, -3.794320, -3.717073, -3.148675] unst_deforming_naca0012.unsteady = True test_list.append(unst_deforming_naca0012) @@ -862,7 +862,7 @@ def main(): ls89_sa.cfg_dir = "nicf/LS89" ls89_sa.cfg_file = "turb_SA_PR.cfg" ls89_sa.test_iter = 20 - ls89_sa.test_vals = [-5.241488, -13.580472, 0.188420, 0.414010] + ls89_sa.test_vals = [-5.369784, -13.717110, 0.166644, 0.364304] test_list.append(ls89_sa) # Rarefaction shock wave edge_VW @@ -870,7 +870,7 @@ def main(): edge_VW.cfg_dir = "nicf/edge" edge_VW.cfg_file = "edge_VW.cfg" edge_VW.test_iter = 20 - edge_VW.test_vals = [-2.656646, 3.544572, -0.000020, 0.000000] + edge_VW.test_vals = [-2.922896, 3.278934, -0.000081, 0.000000] test_list.append(edge_VW) # Rarefaction shock wave edge_PPR @@ -878,7 +878,7 @@ def main(): edge_PPR.cfg_dir = "nicf/edge" edge_PPR.cfg_file = "edge_PPR.cfg" edge_PPR.test_iter = 20 - edge_PPR.test_vals = [-12.154112, -5.995257, -0.000034, 0.000000] + edge_PPR.test_vals = [-11.608059, -5.439908, -0.000034, 0.000000] test_list.append(edge_PPR) @@ -1009,7 +1009,7 @@ def main(): bars_SST_2D.cfg_dir = "sliding_interface/bars_SST_2D" bars_SST_2D.cfg_file = "bars.cfg" bars_SST_2D.test_iter = 13 - bars_SST_2D.test_vals = [13.000000, -0.473009, -1.562179] + bars_SST_2D.test_vals = [13.000000, -0.475180, -1.412203] bars_SST_2D.multizone = True test_list.append(bars_SST_2D) @@ -1115,7 +1115,7 @@ def main(): airfoilRBF.cfg_dir = "fea_fsi/Airfoil_RBF" airfoilRBF.cfg_file = "config.cfg" airfoilRBF.test_iter = 1 - airfoilRBF.test_vals = [1.000000, 0.184123, -3.375352] + airfoilRBF.test_vals = [1.000000, 0.119580, -3.345697] airfoilRBF.tol = 0.0001 airfoilRBF.multizone = True test_list.append(airfoilRBF) @@ -1470,7 +1470,7 @@ def main(): shape_opt_euler_py.cfg_dir = "optimization_euler/steady_naca0012" shape_opt_euler_py.cfg_file = "inv_NACA0012_adv.cfg" shape_opt_euler_py.test_iter = 1 - shape_opt_euler_py.test_vals = [1.000000, 1.000000, 0.000021, 0.003643] + shape_opt_euler_py.test_vals = [1.000000, 1.000000, 0.000021, 0.003642] shape_opt_euler_py.command = TestCase.Command(exec = "shape_optimization.py", param = "-g CONTINUOUS_ADJOINT -f") shape_opt_euler_py.timeout = 1600 shape_opt_euler_py.tol = 0.00001 @@ -1498,7 +1498,7 @@ def main(): # opt_multiobj_py.cfg_dir = "optimization_euler/multiobjective_wedge" # opt_multiobj_py.cfg_file = "inv_wedge_ROE_multiobj.cfg" # opt_multiobj_py.test_iter = 1 -# opt_multiobj_py.test_vals = [1, 1, 1.084701E+02, 3.799222E+00] #last 4 columns +# opt_multiobj_py.test_vals = [1.000000, 1.000000, 2.005005, 0.000495] #last 4 columns # opt_multiobj_py.command = TestCase.Command(exec = "shape_optimization.py", param = "-g CONTINUOUS_ADJOINT -f") # opt_multiobj_py.timeout = 1600 # opt_multiobj_py.tol = 0.00001 @@ -1510,7 +1510,7 @@ def main(): # opt_multiobjcombo_py.cfg_dir = "optimization_euler/multiobjective_wedge" # opt_multiobjcombo_py.cfg_file = "inv_wedge_ROE_multiobj_combo.cfg" # opt_multiobjcombo_py.test_iter = 1 -# opt_multiobjcombo_py.test_vals = [1, 1, 1.084701E+02, 3.789322E+00] #last 4 columns +# opt_multiobjcombo_py.test_vals = [1.000000, 1.000000, 2.005005, 0.000495] #last 4 columns # opt_multiobjcombo_py.command = TestCase.Command(exec = "shape_optimization.py", param = "-g CONTINUOUS_ADJOINT -f") # opt_multiobjcombo_py.timeout = 1600 # opt_multiobjcombo_py.tol = 0.00001 @@ -1522,7 +1522,7 @@ def main(): opt_multiobj1surf_py.cfg_dir = "optimization_euler/multiobjective_wedge" opt_multiobj1surf_py.cfg_file = "inv_wedge_ROE_multiobj_1surf.cfg" opt_multiobj1surf_py.test_iter = 1 - opt_multiobj1surf_py.test_vals = [1.000000, 1.000000, 36.699910, 5.780304] + opt_multiobj1surf_py.test_vals = [1.000000, 1.000000, 36.990220, 6.027946] opt_multiobj1surf_py.command = TestCase.Command(exec = "shape_optimization.py", param = "-g CONTINUOUS_ADJOINT -f") opt_multiobj1surf_py.timeout = 1600 opt_multiobj1surf_py.tol = 0.00001 @@ -1535,7 +1535,7 @@ def main(): opt_2surf1obj_py.cfg_dir = "optimization_euler/multiobjective_wedge" opt_2surf1obj_py.cfg_file = "inv_wedge_ROE_2surf_1obj.cfg" opt_2surf1obj_py.test_iter = 1 - opt_2surf1obj_py.test_vals = [1.000000, 1.000000, 2.005030, 0.000476] + opt_2surf1obj_py.test_vals = [1.000000, 1.000000, 2.005005, 0.000495] opt_2surf1obj_py.command = TestCase.Command(exec = "shape_optimization.py", param = "-g CONTINUOUS_ADJOINT -f") opt_2surf1obj_py.timeout = 1600 opt_2surf1obj_py.tol = 0.00001 @@ -1552,7 +1552,7 @@ def main(): pywrapper_naca0012.cfg_dir = "euler/naca0012" pywrapper_naca0012.cfg_file = "inv_NACA0012_Roe.cfg" pywrapper_naca0012.test_iter = 20 - pywrapper_naca0012.test_vals = [-4.256408, -3.795038, 0.306510, 0.024657] + pywrapper_naca0012.test_vals = [-4.469040, -4.000861, 0.320068, 0.022464] pywrapper_naca0012.command = TestCase.Command(exec = "SU2_CFD.py", param = "-f") pywrapper_naca0012.timeout = 1600 pywrapper_naca0012.tol = 0.00001 @@ -1565,7 +1565,7 @@ def main(): pywrapper_turb_naca0012_sst.cfg_dir = "rans/naca0012" pywrapper_turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" pywrapper_turb_naca0012_sst.test_iter = 10 - pywrapper_turb_naca0012_sst.test_vals = [-12.094475, -15.251083, -5.906366, 1.070413, 0.015775, -3.178930, 0] + pywrapper_turb_naca0012_sst.test_vals = [-5.906366, 1.070413, 0.015775, -3.178930, 0.000000] pywrapper_turb_naca0012_sst.test_vals_aarch64 = [-12.076068, -15.246740, -5.861280, 1.070036, 0.015841, -3.297854, 0.000000] pywrapper_turb_naca0012_sst.command = TestCase.Command(exec = "SU2_CFD.py", param = "-f") pywrapper_turb_naca0012_sst.timeout = 3200 @@ -1593,7 +1593,7 @@ def main(): pywrapper_aeroelastic.cfg_dir = "aeroelastic" pywrapper_aeroelastic.cfg_file = "aeroelastic_NACA64A010.cfg" pywrapper_aeroelastic.test_iter = 2 - pywrapper_aeroelastic.test_vals = [0.075274, 0.027537, -0.001640, -0.000129] + pywrapper_aeroelastic.test_vals = [0.073958, 0.027489, -0.001639, -0.000129] pywrapper_aeroelastic.command = TestCase.Command(exec = "SU2_CFD.py", param = "-f") pywrapper_aeroelastic.timeout = 1600 pywrapper_aeroelastic.tol = 0.01 @@ -1622,7 +1622,7 @@ def main(): pywrapper_unsteadyCHT.cfg_dir = "py_wrapper/flatPlate_unsteady_CHT" pywrapper_unsteadyCHT.cfg_file = "unsteady_CHT_FlatPlate_Conf.cfg" pywrapper_unsteadyCHT.test_iter = 5 - pywrapper_unsteadyCHT.test_vals = [-1.614168, 2.259972, 0.000757, 0.113614] + pywrapper_unsteadyCHT.test_vals = [-1.614167, 2.259978, -0.000479, 0.112232] pywrapper_unsteadyCHT.command = TestCase.Command(exec = "python", param = "launch_unsteady_CHT_FlatPlate.py -f") pywrapper_unsteadyCHT.timeout = 1600 pywrapper_unsteadyCHT.tol = 0.00001 diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py index f673baabd18b..d4d3f67718e7 100644 --- a/TestCases/serial_regression_AD.py +++ b/TestCases/serial_regression_AD.py @@ -108,7 +108,7 @@ def main(): discadj_incomp_NACA0012.cfg_dir = "disc_adj_incomp_euler/naca0012" discadj_incomp_NACA0012.cfg_file = "incomp_NACA0012_disc.cfg" discadj_incomp_NACA0012.test_iter = 20 - discadj_incomp_NACA0012.test_vals = [20.000000, -3.338269, -2.490047, 0.000000] + discadj_incomp_NACA0012.test_vals = [20.000000, -3.954248, -2.527402, 0.000000] test_list.append(discadj_incomp_NACA0012) ##################################### @@ -158,7 +158,7 @@ def main(): discadj_pitchingNACA0012.cfg_dir = "disc_adj_euler/naca0012_pitching" discadj_pitchingNACA0012.cfg_file = "inv_NACA0012_pitching.cfg" discadj_pitchingNACA0012.test_iter = 4 - discadj_pitchingNACA0012.test_vals = [-1.130532, -1.575494, -0.005113, 0.000007] + discadj_pitchingNACA0012.test_vals = [-1.119624, -1.570110, -0.005041, 0.000010] discadj_pitchingNACA0012.unsteady = True test_list.append(discadj_pitchingNACA0012) @@ -167,7 +167,7 @@ def main(): unst_deforming_naca0012.cfg_dir = "disc_adj_euler/naca0012_pitching_def" unst_deforming_naca0012.cfg_file = "inv_NACA0012_pitching_deform_ad.cfg" unst_deforming_naca0012.test_iter = 4 - unst_deforming_naca0012.test_vals = [-1.885032, -1.775564, 3994.600000, 0.000002] + unst_deforming_naca0012.test_vals = [-1.907590, -1.801094, 3796.400000, 0.000003] unst_deforming_naca0012.unsteady = True test_list.append(unst_deforming_naca0012) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index bef1f3c1fdeb..184b0320e027 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -175,7 +175,7 @@ def main(): tutorial_inv_bump.cfg_dir = "../Tutorials/compressible_flow/Inviscid_Bump" tutorial_inv_bump.cfg_file = "inv_channel.cfg" tutorial_inv_bump.test_iter = 0 - tutorial_inv_bump.test_vals = [-1.437425, 4.075857, 0.043691, 0.034241] + tutorial_inv_bump.test_vals = [-1.437425, 4.075857, 0.057592, 0.023760] test_list.append(tutorial_inv_bump) # Inviscid Wedge @@ -192,7 +192,7 @@ def main(): tutorial_inv_onera.cfg_dir = "../Tutorials/compressible_flow/Inviscid_ONERAM6" tutorial_inv_onera.cfg_file = "inv_ONERAM6.cfg" tutorial_inv_onera.test_iter = 0 - tutorial_inv_onera.test_vals = [-5.204928, -4.597762, 0.255680, 0.087977] + tutorial_inv_onera.test_vals = [-5.204928, -4.597762, 0.260583, 0.085713] tutorial_inv_onera.no_restart = True test_list.append(tutorial_inv_onera) @@ -201,7 +201,7 @@ def main(): tutorial_lam_cylinder.cfg_dir = "../Tutorials/compressible_flow/Laminar_Cylinder" tutorial_lam_cylinder.cfg_file = "lam_cylinder.cfg" tutorial_lam_cylinder.test_iter = 0 - tutorial_lam_cylinder.test_vals = [-6.162141, -0.699617, -0.047729, 43.442977] + tutorial_lam_cylinder.test_vals = [-6.162141, -0.699617, -0.112574, 33.441997] tutorial_lam_cylinder.no_restart = True test_list.append(tutorial_lam_cylinder)