diff --git a/SU2_CFD/include/numerics_simd/flow/convection/common.hpp b/SU2_CFD/include/numerics_simd/flow/convection/common.hpp index 6cd97b1bdf4..b5d3c39e3f7 100644 --- a/SU2_CFD/include/numerics_simd/flow/convection/common.hpp +++ b/SU2_CFD/include/numerics_simd/flow/convection/common.hpp @@ -35,14 +35,15 @@ /*! * \brief Unlimited reconstruction. */ -template +template FORCEINLINE void musclUnlimited(Int iPoint, const VectorDbl& vector_ij, Double scale, const Gradient_t& gradient, VectorDbl& vars) { - auto grad = gatherVariables(iPoint, gradient); - for (size_t iVar = 0; iVar < nVar; ++iVar) { + constexpr auto nVarGrad = nVarGrad_ > 0 ? nVarGrad_ : nVar; + auto grad = gatherVariables(iPoint, gradient); + for (size_t iVar = 0; iVar < nVarGrad; ++iVar) { vars(iVar) += scale * dot(grad[iVar], vector_ij); } } @@ -50,16 +51,17 @@ FORCEINLINE void musclUnlimited(Int iPoint, /*! * \brief Limited reconstruction with point-based limiter. */ -template +template FORCEINLINE void musclPointLimited(Int iPoint, const VectorDbl& vector_ij, Double scale, const Limiter_t& limiter, const Gradient_t& gradient, VectorDbl& vars) { - auto lim = gatherVariables(iPoint, limiter); - auto grad = gatherVariables(iPoint, gradient); - for (size_t iVar = 0; iVar < nVar; ++iVar) { + constexpr auto nVarGrad = nVarGrad_ > 0 ? nVarGrad_ : nVar; + auto lim = gatherVariables(iPoint, limiter); + auto grad = gatherVariables(iPoint, gradient); + for (size_t iVar = 0; iVar < nVarGrad; ++iVar) { vars(iVar) += lim(iVar) * scale * dot(grad[iVar], vector_ij); } } @@ -67,18 +69,18 @@ FORCEINLINE void musclPointLimited(Int iPoint, /*! * \brief Limited reconstruction with edge-based limiter. */ -template +template FORCEINLINE void musclEdgeLimited(Int iPoint, Int jPoint, const VectorDbl& vector_ij, const Gradient_t& gradient, CPair& V) { - constexpr size_t nVar = VarType::nVar; + constexpr auto nVarGrad = nVarGrad_ > 0 ? nVarGrad_ : VarType::nVar; - auto grad_i = gatherVariables(iPoint, gradient); - auto grad_j = gatherVariables(jPoint, gradient); + auto grad_i = gatherVariables(iPoint, gradient); + auto grad_j = gatherVariables(jPoint, gradient); - for (size_t iVar = 0; iVar < nVar; ++iVar) { + for (size_t iVar = 0; iVar < nVarGrad; ++iVar) { const Double proj_i = dot(grad_i[iVar], vector_ij); const Double proj_j = dot(grad_j[iVar], vector_ij); const Double delta_ij = V.j.all(iVar) - V.i.all(iVar); @@ -93,8 +95,12 @@ FORCEINLINE void musclEdgeLimited(Int iPoint, /*! * \brief Retrieve primitive variables for points i/j, reconstructing them if needed. + * \note Density and enthalpy are recomputed from ideal gas EOS. * \param[in] iEdge, iPoint, jPoint - Edge and its nodes. + * \param[in] gamma - Heat capacity ratio. + * \param[in] gasConst - Specific gas constant. * \param[in] muscl - If true, reconstruct, else simply fetch. + * \param[in] limiterType - Type of flux limiter. * \param[in] V1st - Pair of compressible flow primitives for nodes i,j. * \param[in] vector_ij - Distance vector from i to j. * \param[in] solution - Entire solution container (a derived CVariable). @@ -102,6 +108,8 @@ FORCEINLINE void musclEdgeLimited(Int iPoint, */ template FORCEINLINE CPair reconstructPrimitives(Int iEdge, Int iPoint, Int jPoint, + const su2double& gamma, + const su2double& gasConst, bool muscl, LIMITER limiterType, const CPair& V1st, const VectorDbl& vector_ij, @@ -119,19 +127,29 @@ FORCEINLINE CPair reconstructPrimitives(Int iEdge, Int iPoint, Int } if (muscl) { + /*--- Recompute density and enthalpy instead of reconstructing. ---*/ + constexpr auto nVarGrad = ReconVarType::nVar - 2; + switch (limiterType) { case LIMITER::NONE: - musclUnlimited(iPoint, vector_ij, 0.5, gradients, V.i.all); - musclUnlimited(jPoint, vector_ij,-0.5, gradients, V.j.all); + musclUnlimited(iPoint, vector_ij, 0.5, gradients, V.i.all); + musclUnlimited(jPoint, vector_ij,-0.5, gradients, V.j.all); break; case LIMITER::VAN_ALBADA_EDGE: - musclEdgeLimited(iPoint, jPoint, vector_ij, gradients, V); + musclEdgeLimited(iPoint, jPoint, vector_ij, gradients, V); break; default: - musclPointLimited(iPoint, vector_ij, 0.5, limiters, gradients, V.i.all); - musclPointLimited(jPoint, vector_ij,-0.5, limiters, gradients, V.j.all); + musclPointLimited(iPoint, vector_ij, 0.5, limiters, gradients, V.i.all); + musclPointLimited(jPoint, vector_ij,-0.5, limiters, gradients, V.j.all); break; } + V.i.density() = V.i.pressure() / (gasConst * V.i.temperature()); + V.j.density() = V.j.pressure() / (gasConst * V.j.temperature()); + + const su2double cp = gasConst * gamma / (gamma - 1); + V.i.enthalpy() = cp * V.i.temperature() + 0.5 * squaredNorm(V.i.velocity()); + V.j.enthalpy() = cp * V.j.temperature() + 0.5 * squaredNorm(V.j.velocity()); + /*--- Detect a non-physical reconstruction based on negative pressure or density. ---*/ const Double neg_p_or_rho = fmax(fmin(V.i.pressure(), V.j.pressure()) < 0.0, fmin(V.i.density(), V.j.density()) < 0.0); diff --git a/SU2_CFD/include/numerics_simd/flow/convection/roe.hpp b/SU2_CFD/include/numerics_simd/flow/convection/roe.hpp index e1fb9843412..204738b1ef9 100644 --- a/SU2_CFD/include/numerics_simd/flow/convection/roe.hpp +++ b/SU2_CFD/include/numerics_simd/flow/convection/roe.hpp @@ -56,6 +56,7 @@ class CRoeBase : public Base { const su2double kappa; const su2double gamma; + const su2double gasConst; const su2double entropyFix; const bool finestGrid; const bool dynamicGrid; @@ -69,6 +70,7 @@ class CRoeBase : public Base { CRoeBase(const CConfig& config, unsigned iMesh, Ts&... args) : Base(config, iMesh, args...), kappa(config.GetRoe_Kappa()), gamma(config.GetGamma()), + gasConst(config.GetGas_ConstantND()), entropyFix(config.GetEntropyFix_Coeff()), finestGrid(iMesh == MESH_0), dynamicGrid(config.GetDynamic_Grid()), @@ -117,7 +119,7 @@ class CRoeBase : public Base { V1st.j.all = gatherVariables(jPoint, solution.GetPrimitive()); auto V = reconstructPrimitives >( - iEdge, iPoint, jPoint, muscl, typeLimiter, V1st, vector_ij, solution); + iEdge, iPoint, jPoint, gamma, gasConst, muscl, typeLimiter, V1st, vector_ij, solution); /*--- Compute conservative variables. ---*/ diff --git a/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl b/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl index b54622a1525..4797293529f 100644 --- a/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl +++ b/SU2_CFD/include/solvers/CFVMFlowSolverBase.inl @@ -1485,6 +1485,11 @@ void CFVMFlowSolverBase::EdgeFluxResidual(const CGeometry *geometry, "by the SIMD length (2, 4, or 8).", CURRENT_FUNCTION); } InstantiateEdgeNumerics(solvers, config); + + /*--- The SIMD numerics do not use gradients of density and enthalpy. ---*/ + if (!config->GetContinuous_Adjoint()) { + SU2_OMP_SAFE_GLOBAL_ACCESS(nPrimVarGrad = std::min(nDim + 2, nPrimVarGrad);) + } } /*--- Non-physical counter. ---*/ diff --git a/SU2_CFD/include/variables/CEulerVariable.hpp b/SU2_CFD/include/variables/CEulerVariable.hpp index 68c9587a237..c1dd2c45239 100644 --- a/SU2_CFD/include/variables/CEulerVariable.hpp +++ b/SU2_CFD/include/variables/CEulerVariable.hpp @@ -116,10 +116,8 @@ class CEulerVariable : public CFlowVariable { */ bool SetSoundSpeed(unsigned long iPoint, su2double soundspeed2) final { if (soundspeed2 < 0.0) return true; - else { - Primitive(iPoint,nDim+4) = sqrt(soundspeed2); - return false; - } + Primitive(iPoint,nDim+4) = sqrt(soundspeed2); + return false; } /*! diff --git a/SU2_CFD/src/output/CElasticityOutput.cpp b/SU2_CFD/src/output/CElasticityOutput.cpp index ba285fde425..a2abc4e6d12 100644 --- a/SU2_CFD/src/output/CElasticityOutput.cpp +++ b/SU2_CFD/src/output/CElasticityOutput.cpp @@ -111,7 +111,6 @@ void CElasticityOutput::LoadHistoryData(CConfig *config, CGeometry *geometry, CS /*--- Linear analysis: RMS of the displacements in the nDim coordinates ---*/ /*--- Nonlinear analysis: UTOL, RTOL and DTOL (defined in the Postprocessing function) ---*/ - if (linear_analysis){ SetHistoryOutputValue("RMS_DISP_X", log10(fea_solver->GetRes_RMS(0))); SetHistoryOutputValue("RMS_DISP_Y", log10(fea_solver->GetRes_RMS(1))); diff --git a/SU2_CFD/src/solvers/CEulerSolver.cpp b/SU2_CFD/src/solvers/CEulerSolver.cpp index 489bacb8a49..e89955b4f68 100644 --- a/SU2_CFD/src/solvers/CEulerSolver.cpp +++ b/SU2_CFD/src/solvers/CEulerSolver.cpp @@ -64,6 +64,7 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND); const bool time_stepping = (config->GetTime_Marching() == TIME_MARCHING::TIME_STEPPING); const bool adjoint = config->GetContinuous_Adjoint() || config->GetDiscrete_Adjoint(); + const bool centered = config->GetKind_ConvNumScheme_Flow() == SPACE_CENTERED; int Unst_RestartIter = 0; unsigned long iPoint, iMarker, counter_local = 0, counter_global = 0; @@ -116,9 +117,12 @@ CEulerSolver::CEulerSolver(CGeometry *geometry, CConfig *config, nDim = geometry->GetnDim(); - nVar = nDim+2; - nPrimVar = nDim+9; nPrimVarGrad = nDim+4; - nSecondaryVar = nSecVar; nSecondaryVarGrad = 2; + nVar = nDim + 2; + nPrimVar = nDim + 9; + /*--- Centered schemes only need gradients for viscous fluxes (T and v). ---*/ + nPrimVarGrad = nDim + (centered && !config->GetContinuous_Adjoint() ? 1 : 4); + nSecondaryVar = nSecVar; + nSecondaryVarGrad = 2; /*--- Initialize nVarGrad for deallocation ---*/ diff --git a/SU2_CFD/src/solvers/CIncEulerSolver.cpp b/SU2_CFD/src/solvers/CIncEulerSolver.cpp index 127e546fd8a..6aaf09a5183 100644 --- a/SU2_CFD/src/solvers/CIncEulerSolver.cpp +++ b/SU2_CFD/src/solvers/CIncEulerSolver.cpp @@ -56,6 +56,7 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_2ND)); bool time_stepping = config->GetTime_Marching() == TIME_MARCHING::TIME_STEPPING; bool adjoint = (config->GetContinuous_Adjoint()) || (config->GetDiscrete_Adjoint()); + const bool centered = config->GetKind_ConvNumScheme_Flow() == SPACE_CENTERED; /* A grid is defined as dynamic if there's rigid grid movement or grid deformation AND the problem is time domain */ dynamic_grid = config->GetDynamic_Grid(); @@ -117,7 +118,10 @@ CIncEulerSolver::CIncEulerSolver(CGeometry *geometry, CConfig *config, unsigned nDim = geometry->GetnDim(); /*--- Make sure to align the sizes with the constructor of CIncEulerVariable. ---*/ - nVar = nDim+2; nPrimVar = nDim+9; nPrimVarGrad = nDim+4; + nVar = nDim + 2; + nPrimVar = nDim + 9; + /*--- Centered schemes only need gradients for viscous fluxes (T and v, but we need also to include P). ---*/ + nPrimVarGrad = nDim + (centered ? 2 : 4); /*--- Initialize nVarGrad for deallocation ---*/ diff --git a/SU2_CFD/src/variables/CEulerVariable.cpp b/SU2_CFD/src/variables/CEulerVariable.cpp index a3cc7e6e2c9..23bc1813111 100644 --- a/SU2_CFD/src/variables/CEulerVariable.cpp +++ b/SU2_CFD/src/variables/CEulerVariable.cpp @@ -30,7 +30,8 @@ CEulerVariable::CEulerVariable(su2double density, const su2double *velocity, su2double energy, unsigned long npoint, unsigned long ndim, unsigned long nvar, const CConfig *config) - : CFlowVariable(npoint, ndim, nvar, ndim + 9, ndim + 4, config), + : CFlowVariable(npoint, ndim, nvar, ndim + 9, + ndim + (config->GetKind_ConvNumScheme_Flow() == SPACE_CENTERED && !config->GetContinuous_Adjoint() ? 1 : 4), config), indices(ndim, 0) { const bool dual_time = (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_1ST) || @@ -77,7 +78,7 @@ CEulerVariable::CEulerVariable(su2double density, const su2double *velocity, su2 Grad_AuxVar.resize(nPoint, nAuxVar, nDim, 0.0); AuxVar.resize(nPoint, nAuxVar) = su2double(0.0); } - + if (config->GetKind_FluidModel() == ENUM_FLUIDMODEL::DATADRIVEN_FLUID){ DataDrivenFluid = true; DatasetExtrapolation.resize(nPoint) = 0; diff --git a/SU2_CFD/src/variables/CIncEulerVariable.cpp b/SU2_CFD/src/variables/CIncEulerVariable.cpp index 929fcf84245..089845f6eb3 100644 --- a/SU2_CFD/src/variables/CIncEulerVariable.cpp +++ b/SU2_CFD/src/variables/CIncEulerVariable.cpp @@ -30,7 +30,8 @@ CIncEulerVariable::CIncEulerVariable(su2double pressure, const su2double *velocity, su2double temperature, unsigned long npoint, unsigned long ndim, unsigned long nvar, const CConfig *config) - : CFlowVariable(npoint, ndim, nvar, ndim + 9, ndim + 4, config), + : CFlowVariable(npoint, ndim, nvar, ndim + 9, + ndim + (config->GetKind_ConvNumScheme_Flow() == SPACE_CENTERED ? 2 : 4), config), indices(ndim, 0) { const bool dual_time = (config->GetTime_Marching() == TIME_MARCHING::DT_STEPPING_1ST) || diff --git a/TestCases/TestCase.py b/TestCases/TestCase.py index 81ab3fb6895..320c913ebd2 100644 --- a/TestCases/TestCase.py +++ b/TestCases/TestCase.py @@ -464,6 +464,9 @@ def run_filediff(self, with_tsan=False, with_asan=False): print('Ignored entries: ' + str(ignore_counter)) print('Maximum difference: ' + str(max_delta) + '%') + if not passed: + print(open(self.test_file).readlines()) + print('==================== End Test: %s ====================\n'%self.tag) sys.stdout.flush() 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 51bda5370df..8ef5d9598b7 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.00767644 , 0.0001 - 1 , 0.00498358 , 0.0001 - 2 , 0.00246134 , 0.0001 - 3 , 0.000893054 , 0.0001 + 0 , 0.00770904 , 0.0001 + 1 , 0.00500468 , 0.0001 + 2 , 0.00247269 , 0.0001 + 3 , 0.000899035 , 0.0001 diff --git a/TestCases/disc_adj_fsi/config.cfg b/TestCases/disc_adj_fsi/config.cfg index 044f409302c..f9729cb5adb 100644 --- a/TestCases/disc_adj_fsi/config.cfg +++ b/TestCases/disc_adj_fsi/config.cfg @@ -1,5 +1,5 @@ SOLVER= MULTIPHYSICS -MATH_PROBLEM= DISCRETE_ADJOINT +RESTART_SOL= NO CONFIG_LIST=(configFlow.cfg, configFEA.cfg) MARKER_ZONE_INTERFACE = (UpperWall, UpperWallS, LowerWall, LowerWallS) diff --git a/TestCases/disc_adj_fsi/configFEA.cfg b/TestCases/disc_adj_fsi/configFEA.cfg index 4c93a30bb76..800853567ec 100644 --- a/TestCases/disc_adj_fsi/configFEA.cfg +++ b/TestCases/disc_adj_fsi/configFEA.cfg @@ -4,15 +4,11 @@ % Author: R.Sanchez % % Institution: Imperial College London % % Date: 2017.11.29 % -% File Version 8.1.0 "Harrier" % +% File Version 8.1.0 "Harrier" % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% SOLVER= ELASTICITY -MATH_PROBLEM= DISCRETE_ADJOINT - -RESTART_SOL= NO - PRESTRETCH = YES PRESTRETCH_FILENAME = prestretch.dat @@ -27,8 +23,6 @@ REFERENCE_GEOMETRY_FORMAT = SU2 % Consider only the surface REFERENCE_GEOMETRY_SURFACE = NO -READ_BINARY_RESTART=NO - STAT_RELAX_PARAMETER= 1.0 BGS_RELAXATION = FIXED_PARAMETER PREDICTOR_ORDER=0 @@ -49,13 +43,13 @@ MARKER_CLAMPED = ( Clamped_Right, Clamped_Left ) MARKER_FLUID_LOAD= ( LowerWallS, UpperWallS) -LINEAR_SOLVER= CONJUGATE_GRADIENT -LINEAR_SOLVER_PREC= JACOBI +LINEAR_SOLVER= FGMRES +LINEAR_SOLVER_PREC= ILU LINEAR_SOLVER_ERROR= 1E-9 -LINEAR_SOLVER_ITER= 50000 +LINEAR_SOLVER_ITER= 100 -DISCADJ_LIN_SOLVER = CONJUGATE_GRADIENT -DISCADJ_LIN_PREC = JACOBI +DISCADJ_LIN_SOLVER = FGMRES +DISCADJ_LIN_PREC = ILU CONV_RESIDUAL_MINVAL= -10 CONV_STARTITER= 10 diff --git a/TestCases/disc_adj_fsi/configFlow.cfg b/TestCases/disc_adj_fsi/configFlow.cfg index 7fd45fb741a..aefe11f453d 100644 --- a/TestCases/disc_adj_fsi/configFlow.cfg +++ b/TestCases/disc_adj_fsi/configFlow.cfg @@ -4,20 +4,14 @@ % Author: R.Sanchez % % Institution: Imperial College London % % Date: 2017.11.29 % -% File Version 8.1.0 "Harrier" % +% File Version 8.1.0 "Harrier" % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% SOLVER= NAVIER_STOKES -MATH_PROBLEM= DISCRETE_ADJOINT - -RESTART_SOL= NO - -READ_BINARY_RESTART=NO - INNER_ITER= 50 -STAT_RELAX_PARAMETER= 1.0 +STAT_RELAX_PARAMETER= 1 BGS_RELAXATION = FIXED_PARAMETER PREDICTOR_ORDER=0 @@ -48,7 +42,6 @@ MARKER_MONITORING= ( UpperWall, LowerWall, Wall) DEFORM_MESH= YES MARKER_DEFORM_MESH= ( UpperWall, LowerWall ) - DEFORM_STIFFNESS_TYPE = INVERSE_VOLUME DEFORM_POISSONS_RATIO = 1e6 DEFORM_LINEAR_SOLVER = CONJUGATE_GRADIENT diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg index c3dc5d2824c..dbba09585da 100644 --- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg +++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sa.cfg @@ -45,6 +45,7 @@ MARKER_MONITORING= ( airfoil ) % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------% % NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES +NUM_METHOD_GRAD_RECON= LEAST_SQUARES CFL_NUMBER= 10.0 MAX_DELTA_TIME= 1E10 CFL_ADAPT= NO @@ -67,7 +68,6 @@ LINEAR_SOLVER_ITER= 5 % CONV_NUM_METHOD_FLOW= ROE MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -88,7 +88,7 @@ CONV_CAUCHY_EPS= 1E-6 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------% % -MESH_FILENAME= n0012_113-33.su2 +MESH_FILENAME= n0012_225-65.su2 MESH_FORMAT= SU2 MESH_OUT_FILENAME= mesh_out.su2 SOLUTION_FILENAME= solution_flow_sa.dat @@ -103,4 +103,4 @@ GRAD_OBJFUNC_FILENAME= of_grad.dat SURFACE_FILENAME= surface_flow SURFACE_ADJ_FILENAME= surface_adjoint OUTPUT_WRT_FREQ= 1000 -SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_NU_TILDE, SENS_PRESS, SENS_AOA RMS_DENSITY RMS_NU_TILDE LIFT DRAG LINSOL_ITER LINSOL_RESIDUAL LINSOL_ITER_TURB LINSOL_RESIDUAL_TURB) \ No newline at end of file +SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_NU_TILDE, SENS_PRESS, SENS_AOA RMS_DENSITY RMS_NU_TILDE LIFT DRAG LINSOL_ITER LINSOL_RESIDUAL LINSOL_ITER_TURB LINSOL_RESIDUAL_TURB) diff --git a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg index 977ae827ec2..c86c22adc69 100644 --- a/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg +++ b/TestCases/disc_adj_rans/naca0012/turb_NACA0012_sst.cfg @@ -13,9 +13,11 @@ % ------------- DIRECT, ADJOINT, AND LINEARIZED PROBLEM DEFINITION ------------% % SOLVER= RANS +SST_OPTIONS= V1994m KIND_TURB_MODEL= SST MATH_PROBLEM= DISCRETE_ADJOINT RESTART_SOL= NO +READ_BINARY_RESTART= NO % -------------------- COMPRESSIBLE FREE-STREAM DEFINITION --------------------% % @@ -44,7 +46,8 @@ MARKER_MONITORING= ( airfoil ) % ------------- COMMON PARAMETERS DEFINING THE NUMERICAL METHOD ---------------% % NUM_METHOD_GRAD= WEIGHTED_LEAST_SQUARES -CFL_NUMBER= 10.0 +NUM_METHOD_GRAD_RECON= LEAST_SQUARES +CFL_NUMBER= 1000.0 MAX_DELTA_TIME= 1E10 CFL_ADAPT= YES CFL_ADAPT_PARAM= ( 0.1, 1.2, 1.0, 100.0 ) @@ -66,7 +69,7 @@ LINEAR_SOLVER_ITER= 10 % CONV_NUM_METHOD_FLOW= ROE MUSCL_FLOW= YES -SLOPE_LIMITER_FLOW= VENKATAKRISHNAN +SLOPE_LIMITER_FLOW= NONE JST_SENSOR_COEFF= ( 0.5, 0.02 ) TIME_DISCRE_FLOW= EULER_IMPLICIT @@ -74,7 +77,7 @@ TIME_DISCRE_FLOW= EULER_IMPLICIT % CONV_NUM_METHOD_TURB= SCALAR_UPWIND MUSCL_TURB= NO -SLOPE_LIMITER_TURB= VENKATAKRISHNAN +SLOPE_LIMITER_TURB= NONE TIME_DISCRE_TURB= EULER_IMPLICIT CFL_REDUCTION_TURB= 1.0 @@ -87,7 +90,7 @@ CONV_CAUCHY_EPS= 1E-6 % ------------------------- INPUT/OUTPUT INFORMATION --------------------------% % -MESH_FILENAME= n0012_113-33.su2 +MESH_FILENAME= n0012_225-65.su2 MESH_FORMAT= SU2 MESH_OUT_FILENAME= mesh_out.su2 SOLUTION_FILENAME= solution_flow_sst.dat @@ -102,4 +105,4 @@ GRAD_OBJFUNC_FILENAME= of_grad.dat SURFACE_FILENAME= surface_flow SURFACE_ADJ_FILENAME= surface_adjoint OUTPUT_WRT_FREQ= 1000 -SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_TKE, SENS_PRESS, SENS_AOA RMS_DENSITY RMS_TKE LIFT DRAG) \ No newline at end of file +SCREEN_OUTPUT = (INNER_ITER, RMS_ADJ_DENSITY, RMS_ADJ_TKE, SENS_PRESS, SENS_AOA RMS_DENSITY RMS_TKE LIFT DRAG) diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py index 23ccc566755..06075fae558 100644 --- a/TestCases/hybrid_regression.py +++ b/TestCases/hybrid_regression.py @@ -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.444945, -3.941041, 0.318999, 0.022365] + naca0012.test_vals = [-4.431337, -3.970066, 0.319205, 0.022299] test_list.append(naca0012) # Supersonic wedge @@ -103,8 +103,7 @@ def main(): flatplate.cfg_dir = "navierstokes/flatplate" flatplate.cfg_file = "lam_flatplate.cfg" flatplate.test_iter = 100 - flatplate.test_vals = [-7.700620, -2.229886, 0.001084, 0.036235, 2.361500, -2.325300, -1.823400, -1.823400] - flatplate.test_vals_aarch64 = [-9.154130, -3.663197, 0.001112, 0.036277, 2.361500, -2.325300, -2.278800, -2.278800] + flatplate.test_vals = [-7.679131, -2.206953, 0.001084, 0.036233, 2.361500, -2.325300, -1.984700, -1.984700] test_list.append(flatplate) # Laminar cylinder (steady) @@ -112,8 +111,7 @@ def main(): cylinder.cfg_dir = "navierstokes/cylinder" cylinder.cfg_file = "lam_cylinder.cfg" cylinder.test_iter = 25 - cylinder.test_vals = [-8.265865, -2.783635, -0.019914, 1.614879, -0.010191] - cylinder.test_vals_aarch64 = [-6.765429, -1.297425, 0.019571, 0.310231, 0.123270] + cylinder.test_vals = [-8.266513, -2.783904, -0.019899, 1.615668, -0.010207] test_list.append(cylinder) # Laminar cylinder (low Mach correction) @@ -130,8 +128,7 @@ def main(): poiseuille.cfg_dir = "navierstokes/poiseuille" poiseuille.cfg_file = "lam_poiseuille.cfg" poiseuille.test_iter = 10 - poiseuille.test_vals = [-5.048283, 0.650813, 0.008713, 13.677671, -2.054800] - poiseuille.test_vals_aarch64 = [-5.048282, 0.650814, 0.008713, 13.677691, -2.054800] + poiseuille.test_vals = [-5.046131, 0.652984, 0.008355, 13.735818, -2.142500] test_list.append(poiseuille) # 2D Poiseuille flow (inlet profile file) @@ -139,8 +136,8 @@ 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.485957, -7.612048, -0.000000, 2.085796] - poiseuille_profile.test_vals_aarch64 = [-12.485957, -7.612048, -0.000000, 2.085796] + poiseuille_profile.test_vals = [-12.053563, -6.378250, -0.000000, 2.085790] + poiseuille_profile.test_vals_aarch64 = [-12.053563, -6.378250, -0.000000, 2.085790] test_list.append(poiseuille_profile) # 2D Rotational Periodic @@ -148,8 +145,7 @@ def main(): periodic2d.cfg_dir = "navierstokes/periodic2D" periodic2d.cfg_file = "config.cfg" periodic2d.test_iter = 1400 - periodic2d.test_vals = [-10.818509, -8.363386, -8.287481, -5.334812, -1.087925, -2945.200000] - periodic2d.test_vals_aarch64 = [-10.818510, -8.363388, -8.287480, -5.334814, -1.087922, -2945.2] + periodic2d.test_vals = [-10.817611, -8.363544, -8.287460, -5.334104, -1.088411, -2945.2] test_list.append(periodic2d) ########################## @@ -185,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.156553, -6.736064, -0.176184, 0.057478] + turb_flatplate.test_vals = [-4.312826, -6.736053, -0.187467, 0.057454] test_list.append(turb_flatplate) # ONERA M6 Wing @@ -193,7 +189,7 @@ def main(): turb_oneram6.cfg_dir = "rans/oneram6" turb_oneram6.cfg_file = "turb_ONERAM6.cfg" turb_oneram6.test_iter = 10 - turb_oneram6.test_vals = [-2.392863, -6.689822, 0.230745, 0.158812, -33786.000000] + turb_oneram6.test_vals = [-2.408523, -6.662833, 0.238333, 0.158910, -52718] test_list.append(turb_oneram6) # NACA0012 (SA, FUN3D finest grid results: CL=1.0983, CD=0.01242) @@ -201,8 +197,8 @@ 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 = [-10.451625, -13.859808, 1.057622, 0.022916, 20.000000, -1.358306, 20.000000, -2.512316, -44.540000] - turb_naca0012_sa.test_vals_aarch64 = [-10.451625, -13.859809, 1.057622, 0.022916, 20.000000, -1.358307, 20.000000, -2.512316, -44.540000] + turb_naca0012_sa.test_vals = [-12.098325, -14.149988, 1.057665, 0.022971, 20.000000, -2.292707, 0.000000, -12.068169, -44.871000] + turb_naca0012_sa.test_vals_aarch64 = [-12.098325, -14.149988, 1.057665, 0.022971, 20.000000, -2.292707, 0.000000, -12.068169, -44.871000] test_list.append(turb_naca0012_sa) # NACA0012 (SST, FUN3D finest grid results: CL=1.0840, CD=0.01253) @@ -210,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.216989, -14.439370, -7.108639, 1.050109, 0.019148, -1.483537, -38.510000] + turb_naca0012_sst.test_vals = [-12.105781, -15.277738, -6.210248, 1.049757, 0.019249, -2.807857, -38.976000] test_list.append(turb_naca0012_sst) # NACA0012 (SST_SUST, FUN3D finest grid results: CL=1.0840, CD=0.01253) @@ -218,7 +214,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.148204, -14.755890, -6.342986, 1.001189, 0.019384, -1.432333] + turb_naca0012_sst_sust.test_vals = [-12.082157, -14.827303, -6.061342, 1.000276, 0.019495, -1.762311] test_list.append(turb_naca0012_sst_sust) # NACA0012 (SST, fixed values for turbulence quantities) @@ -226,8 +222,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.192598, -10.042489, -1.617721, 1.022073, 0.040198, -2.381138] - turb_naca0012_sst_fixedvalues.test_vals_aarch64 = [-5.192599, -10.042490, -1.617720, 1.022073, 0.040198, -2.381138] + turb_naca0012_sst_fixedvalues.test_vals = [-5.192504, -10.035367, -1.617698, 1.022029, 0.040310, -2.381926] test_list.append(turb_naca0012_sst_fixedvalues) # NACA0012 (SST, explicit Euler for flow and turbulence equations) @@ -235,7 +230,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.532289, -3.157766, 3.364024, 1.122901, 0.500798, -float("inf")] + turb_naca0012_sst_expliciteuler.test_vals = [-3.533827, -3.157766, 3.364024, 1.122856, 0.500771, -float("inf")] test_list.append(turb_naca0012_sst_expliciteuler) # PROPELLER @@ -243,7 +238,7 @@ def main(): propeller.cfg_dir = "rans/propeller" propeller.cfg_file = "propeller.cfg" propeller.test_iter = 10 - propeller.test_vals = [-3.389575, -8.409251, 0.000048, 0.056329] + propeller.test_vals = [-3.389724, -8.409223, 0.000048, 0.056344] test_list.append(propeller) ####################################### @@ -255,7 +250,7 @@ def main(): axi_rans_air_nozzle_restart.cfg_dir = "axisymmetric_rans/air_nozzle" axi_rans_air_nozzle_restart.cfg_file = "air_nozzle_restart.cfg" axi_rans_air_nozzle_restart.test_iter = 10 - axi_rans_air_nozzle_restart.test_vals = [-12.155957, -6.610384, -9.237797, -4.532605, -2019.700000] + axi_rans_air_nozzle_restart.test_vals = [-12.070954, -7.407644, -8.698118, -4.008751, -3572.100000] test_list.append(axi_rans_air_nozzle_restart) ################################# @@ -280,7 +275,7 @@ def main(): turb_naca0012_1c.cfg_dir = "rans_uq/naca0012" turb_naca0012_1c.cfg_file = "turb_NACA0012_uq_1c.cfg" turb_naca0012_1c.test_iter = 10 - turb_naca0012_1c.test_vals = [-4.980878, 1.138865, 0.247731, -0.117335] + turb_naca0012_1c.test_vals = [-4.976788, 1.141064, 0.246262, -0.116795] turb_naca0012_1c.test_vals_aarch64 = [-4.981105, 1.138873, 0.248013, -0.117248] test_list.append(turb_naca0012_1c) @@ -289,7 +284,7 @@ def main(): turb_naca0012_2c.cfg_dir = "rans_uq/naca0012" turb_naca0012_2c.cfg_file = "turb_NACA0012_uq_2c.cfg" turb_naca0012_2c.test_iter = 10 - turb_naca0012_2c.test_vals = [-5.483313, 0.968731, 0.215420, -0.124767] + turb_naca0012_2c.test_vals = [-5.485942, 0.967831, 0.236638, -0.119183] turb_naca0012_2c.test_vals_aarch64 = [-5.483345, 0.968720, 0.214914, -0.124932] test_list.append(turb_naca0012_2c) @@ -298,7 +293,7 @@ def main(): turb_naca0012_3c.cfg_dir = "rans_uq/naca0012" turb_naca0012_3c.cfg_file = "turb_NACA0012_uq_3c.cfg" turb_naca0012_3c.test_iter = 10 - turb_naca0012_3c.test_vals = [-5.584300, 0.931293, 0.207446, -0.125692] + turb_naca0012_3c.test_vals = [-5.584306, 0.931276, 0.226035, -0.120956] turb_naca0012_3c.test_vals_aarch64 = [-5.584300, 0.931293, 0.207447, -0.125691] test_list.append(turb_naca0012_3c) @@ -307,7 +302,7 @@ def main(): turb_naca0012_p1c1.cfg_dir = "rans_uq/naca0012" turb_naca0012_p1c1.cfg_file = "turb_NACA0012_uq_p1c1.cfg" turb_naca0012_p1c1.test_iter = 10 - turb_naca0012_p1c1.test_vals = [-5.132363, 1.075634, 0.337251, -0.082829] + turb_naca0012_p1c1.test_vals = [-5.114413, 1.076465, 0.227286, -0.123574] turb_naca0012_p1c1.test_vals_aarch64 = [-5.132358, 1.075658, 0.337268, -0.082827] test_list.append(turb_naca0012_p1c1) @@ -316,7 +311,7 @@ def main(): turb_naca0012_p1c2.cfg_dir = "rans_uq/naca0012" turb_naca0012_p1c2.cfg_file = "turb_NACA0012_uq_p1c2.cfg" turb_naca0012_p1c2.test_iter = 10 - turb_naca0012_p1c2.test_vals = [-5.554392, 0.943703, 0.229483, -0.121058] + turb_naca0012_p1c2.test_vals = [-5.548780, 0.945778, 0.213968, -0.126040] turb_naca0012_p1c2.test_vals_aarch64 = [-5.554425, 0.943683, 0.229293, -0.121125] test_list.append(turb_naca0012_p1c2) @@ -436,7 +431,7 @@ def main(): cavity.cfg_dir = "moving_wall/cavity" cavity.cfg_file = "lam_cavity.cfg" cavity.test_iter = 25 - cavity.test_vals = [-5.627868, -0.164404, 0.053310, 2.545839] + cavity.test_vals = [-5.627869, -0.164403, 0.054734, 2.545856] test_list.append(cavity) # Spinning cylinder @@ -444,7 +439,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 = [-8.006541, -2.609759, 1.495662, 1.486341] + spinning_cylinder.test_vals = [-8.008048, -2.611074, 1.497289, 1.487468] spinning_cylinder.test_vals_aarch64 = [-8.006541, -2.609759, 1.495662, 1.486341] test_list.append(spinning_cylinder) @@ -457,7 +452,7 @@ def main(): square_cylinder.cfg_dir = "unsteady/square_cylinder" square_cylinder.cfg_file = "turb_square.cfg" square_cylinder.test_iter = 3 - square_cylinder.test_vals = [-2.557949, -1.173575, 0.058030, 1.399794, 2.220402, 1.399748, 2.218603, -0.453270] + square_cylinder.test_vals = [-2.560839, -1.173497, 0.061188, 1.399403, 2.220575, 1.399351, 2.218781, -0.584690] square_cylinder.test_vals_aarch64 = [-2.557902, -1.173574, 0.058050, 1.399794, 2.220402, 1.399748, 2.218604, -0.453270] square_cylinder.unsteady = True test_list.append(square_cylinder) @@ -569,7 +564,7 @@ def main(): axial_stage2D.cfg_dir = "turbomachinery/axial_stage_2D" axial_stage2D.cfg_file = "Axial_stage2D.cfg" axial_stage2D.test_iter = 20 - axial_stage2D.test_vals = [0.983739, 1.534333, -2.888521, 2.606770, -2.418339, 3.087275, 106380.000000, 106380.000000, 5.732600, 64.711000] + axial_stage2D.test_vals = [0.987667, 1.531950, -2.888460, 2.606789, -2.418222, 3.087180, 106380.000000, 106380.000000, 5.733000, 64.728000] axial_stage2D.test_vals_aarch64 = [0.983739, 1.534333, -2.888521, 2.606770, -2.418339, 3.087275, 106380, 106380, 5.7325, 64.711] test_list.append(axial_stage2D) @@ -600,7 +595,7 @@ def main(): uniform_flow.cfg_dir = "sliding_interface/uniform_flow" uniform_flow.cfg_file = "uniform_NN.cfg" uniform_flow.test_iter = 5 - uniform_flow.test_vals = [5.000000, 0.000000, -0.185381, -10.631535] + uniform_flow.test_vals = [5.000000, 0.000000, -0.186037, -10.624438] uniform_flow.unsteady = True uniform_flow.multizone = True test_list.append(uniform_flow) @@ -610,7 +605,7 @@ def main(): channel_2D.cfg_dir = "sliding_interface/channel_2D" channel_2D.cfg_file = "channel_2D_WA.cfg" channel_2D.test_iter = 2 - channel_2D.test_vals = [2.000000, 0.000000, 0.419762, 0.352170, 0.404385] + channel_2D.test_vals = [2.000000, 0.000000, 0.417392, 0.350483, 0.401514] channel_2D.unsteady = True channel_2D.multizone = True test_list.append(channel_2D) @@ -620,7 +615,7 @@ def main(): channel_3D.cfg_dir = "sliding_interface/channel_3D" channel_3D.cfg_file = "channel_3D_WA.cfg" channel_3D.test_iter = 2 - channel_3D.test_vals = [2.000000, 0.000000, 0.623108, 0.505077, 0.412801] + channel_3D.test_vals = [2.000000, 0.000000, 0.622653, 0.506145, 0.410984] channel_3D.test_vals_aarch64 = [2.000000, 0.000000, 0.620558, 0.504323, 0.412729] channel_3D.unsteady = True channel_3D.multizone = True @@ -632,7 +627,7 @@ def main(): pipe.cfg_dir = "sliding_interface/pipe" pipe.cfg_file = "pipe_NN.cfg" pipe.test_iter = 2 - pipe.test_vals = [0.116650, 0.481386, 0.648698, 0.982997, 1.018359] + pipe.test_vals = [0.121511, 0.477625, 0.641343, 0.983342, 1.018866] pipe.unsteady = True pipe.multizone = True test_list.append(pipe) @@ -652,7 +647,7 @@ def main(): supersonic_vortex_shedding.cfg_dir = "sliding_interface/supersonic_vortex_shedding" supersonic_vortex_shedding.cfg_file = "sup_vor_shed_WA.cfg" supersonic_vortex_shedding.test_iter = 5 - supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.207949, 1.036083] + supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.206774, 1.053443] supersonic_vortex_shedding.unsteady = True supersonic_vortex_shedding.multizone = True test_list.append(supersonic_vortex_shedding) @@ -703,28 +698,18 @@ def main(): fsi2d.cfg_dir = "fea_fsi/WallChannel_2d" fsi2d.cfg_file = "configFSI.cfg" fsi2d.test_iter = 4 - fsi2d.test_vals = [4.000000, 0.000000, -3.729243, -4.153954] + fsi2d.test_vals = [4.000000, 0.000000, -3.726064, -4.277803] fsi2d.multizone= True fsi2d.unsteady = True fsi2d.enabled_with_tsan = False test_list.append(fsi2d) - # FSI, Static, 2D, new mesh solver - stat_fsi = TestCase('stat_fsi') - stat_fsi.cfg_dir = "fea_fsi/stat_fsi" - stat_fsi.cfg_file = "config.cfg" - stat_fsi.test_iter = 7 - stat_fsi.test_vals = [-5.425896, -5.797242, 0.000000, 6.000000] - stat_fsi.test_vals_aarch64 = [-5.423016, -5.753459, 0.000000, 10.000000] - stat_fsi.multizone = True - test_list.append(stat_fsi) - # FSI, Dynamic, 2D, new mesh solver dyn_fsi = TestCase('dyn_fsi') dyn_fsi.cfg_dir = "fea_fsi/dyn_fsi" dyn_fsi.cfg_file = "config.cfg" dyn_fsi.test_iter = 4 - dyn_fsi.test_vals = [-4.330441, -4.057994, 0.000000, 103.000000] + dyn_fsi.test_vals = [-4.330905, -4.153024, 0.000000, 103.000000] dyn_fsi.test_vals_aarch64 = [-4.332167, -4.057742, 0.000000, 102.000000] dyn_fsi.multizone = True dyn_fsi.unsteady = True @@ -735,7 +720,7 @@ def main(): stat_fsi_restart.cfg_dir = "fea_fsi/stat_fsi" stat_fsi_restart.cfg_file = "config_restart.cfg" stat_fsi_restart.test_iter = 1 - stat_fsi_restart.test_vals = [-3.463348, -4.232710, 0.000000, 37.000000] + stat_fsi_restart.test_vals = [-3.468782, -4.271197, 0.000000, 36.000000] stat_fsi_restart.test_vals_aarch64 = [-3.442878, -4.228058, 0.000000, 37.000000] stat_fsi_restart.multizone = True test_list.append(stat_fsi_restart) @@ -749,7 +734,7 @@ def main(): mms_fvm_ns.cfg_dir = "mms/fvm_navierstokes" mms_fvm_ns.cfg_file = "lam_mms_roe.cfg" mms_fvm_ns.test_iter = 20 - mms_fvm_ns.test_vals = [-2.851428, 2.192348, 0.000000, 0.000000] + mms_fvm_ns.test_vals = [-2.808514, 2.152655, 0.000000, 0.000000] test_list.append(mms_fvm_ns) # FVM, incompressible, euler diff --git a/TestCases/hybrid_regression_AD.py b/TestCases/hybrid_regression_AD.py index 54809a89b26..a0e29d54c84 100644 --- a/TestCases/hybrid_regression_AD.py +++ b/TestCases/hybrid_regression_AD.py @@ -78,7 +78,7 @@ def main(): discadj_rans_naca0012_sa.cfg_dir = "disc_adj_rans/naca0012" discadj_rans_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" discadj_rans_naca0012_sa.test_iter = 10 - discadj_rans_naca0012_sa.test_vals = [-2.230621, 0.644162, 0.177890, -0.000016, 5.000000, -3.007652, 5.000000, -7.728093] + discadj_rans_naca0012_sa.test_vals = [-2.997064, -0.196172, 0.000003, -0.000000, 5.000000, -2.919675, 5.000000, -7.323218] test_list.append(discadj_rans_naca0012_sa) # Adjoint turbulent NACA0012 SST @@ -86,7 +86,7 @@ def main(): discadj_rans_naca0012_sst.cfg_dir = "disc_adj_rans/naca0012" discadj_rans_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" discadj_rans_naca0012_sst.test_iter = 10 - discadj_rans_naca0012_sst.test_vals = [-2.221846, -0.491928, 0.182000, -0.000018] + discadj_rans_naca0012_sst.test_vals = [-2.234104, -0.198500, 2.763900, -0.039720] test_list.append(discadj_rans_naca0012_sst) ####################################### @@ -143,7 +143,7 @@ def main(): discadj_cylinder.cfg_dir = "disc_adj_rans/cylinder" discadj_cylinder.cfg_file = "cylinder.cfg" discadj_cylinder.test_iter = 9 - discadj_cylinder.test_vals = [3.746907, -1.544883, -0.008321, 0.000014] + discadj_cylinder.test_vals = [1.639345, -2.834279, -0.009538, 0.000020] discadj_cylinder.unsteady = True discadj_cylinder.enabled_with_tsan = False test_list.append(discadj_cylinder) @@ -157,7 +157,7 @@ def main(): discadj_cylinder.cfg_dir = "disc_adj_rans/cylinder" discadj_cylinder.cfg_file = "cylinder_Windowing_AD.cfg" discadj_cylinder.test_iter = 9 - discadj_cylinder.test_vals = [3.004402] + discadj_cylinder.test_vals = [2.183376] discadj_cylinder.unsteady = True discadj_cylinder.enabled_with_tsan = False test_list.append(discadj_cylinder) @@ -171,7 +171,7 @@ def main(): discadj_DT_1ST_cylinder.cfg_dir = "disc_adj_rans/cylinder_DT_1ST" discadj_DT_1ST_cylinder.cfg_file = "cylinder.cfg" discadj_DT_1ST_cylinder.test_iter = 9 - discadj_DT_1ST_cylinder.test_vals = [3.698167, -1.607051, -0.002159, 0.000028] + discadj_DT_1ST_cylinder.test_vals = [1.196346, -3.339016, -0.006212, 0.000020] discadj_DT_1ST_cylinder.unsteady = True discadj_DT_1ST_cylinder.enabled_with_tsan = False test_list.append(discadj_DT_1ST_cylinder) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index d6aee618cb9..edf4a11ccd0 100644 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -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.322128, -3.813578, 0.321660, 0.022547] + naca0012.test_vals = [-4.319811, -3.867353, 0.321947, 0.022489] test_list.append(naca0012) # Supersonic wedge @@ -303,7 +303,7 @@ def main(): flatplate.cfg_dir = "navierstokes/flatplate" flatplate.cfg_file = "lam_flatplate.cfg" flatplate.test_iter = 100 - flatplate.test_vals = [-7.621750, -2.149876, 0.001084, 0.036232, 2.361500, -2.325300, -1.815200, -1.815200] + flatplate.test_vals = [-7.613122, -2.140941, 0.001084, 0.036230, 2.361500, -2.325300, -1.975600, -1.975600] test_list.append(flatplate) # Custom objective function @@ -311,7 +311,7 @@ def main(): flatplate_udobj.cfg_dir = "user_defined_functions" flatplate_udobj.cfg_file = "lam_flatplate.cfg" flatplate_udobj.test_iter = 20 - flatplate_udobj.test_vals = [-6.664134, -1.190073, -0.954366, 0.000641, -0.000633, 0.000548, -0.001181, 596.940000, 300.020000, 296.920000, 22.201000, 0.525750, 37.278000, 2.347900] + flatplate_udobj.test_vals = [-6.661084, -1.186974, -0.956148, 0.000640, -0.000642, 0.000539, -0.001181, 596.990000, 300.070000, 296.920000, 22.250000, 0.522670, 37.278000, 2.342900] test_list.append(flatplate_udobj) # Laminar cylinder (steady) @@ -319,7 +319,7 @@ def main(): cylinder.cfg_dir = "navierstokes/cylinder" cylinder.cfg_file = "lam_cylinder.cfg" cylinder.test_iter = 25 - cylinder.test_vals = [-8.421986, -2.931138, -0.003382, 1.607685, -0.009905] + cylinder.test_vals = [-8.422091, -2.930561, -0.003396, 1.608418, -0.009920] test_list.append(cylinder) # Laminar cylinder (low Mach correction) @@ -335,7 +335,7 @@ def main(): poiseuille.cfg_dir = "navierstokes/poiseuille" poiseuille.cfg_file = "lam_poiseuille.cfg" poiseuille.test_iter = 10 - poiseuille.test_vals = [-5.050847, 0.648238, 0.000200, 13.639839, -2.047000] + poiseuille.test_vals = [-5.050889, 0.648196, 0.000199, 13.639173, -2.114500] poiseuille.tol = 0.001 test_list.append(poiseuille) @@ -344,8 +344,8 @@ 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.483967, -7.577331, -0.000000, 2.085796] - poiseuille_profile.test_vals_aarch64 = [-12.483967, -7.577331, -0.000000, 2.085796] + poiseuille_profile.test_vals = [-12.027089, -6.349320, -0.000000, 2.085790] + poiseuille_profile.test_vals_aarch64 = [-12.027089, -6.349320, -0.000000, 2.085790] test_list.append(poiseuille_profile) ########################## @@ -381,7 +381,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.147387, -6.728398, -0.176234, 0.057709] + turb_flatplate.test_vals = [-4.293562, -6.728390, -0.187643, 0.057686] test_list.append(turb_flatplate) # Flat plate (compressible) with species inlet @@ -389,7 +389,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.120225, -0.634021, -1.706720, 1.363240, -3.250204, 9.000000, -6.697079, 5.000000, -6.978731, 10.000000, -6.013196, 0.996237, 0.996237] + turb_flatplate_species.test_vals = [-4.243136, -0.634954, -1.706721, 1.231179, -3.266212, 9.000000, -6.632862, 5.000000, -6.979197, 10.000000, -6.007240, 0.996237, 0.996237] test_list.append(turb_flatplate_species) # Flat plate SST compressibility correction Wilcox @@ -413,7 +413,7 @@ def main(): turb_oneram6.cfg_dir = "rans/oneram6" turb_oneram6.cfg_file = "turb_ONERAM6.cfg" turb_oneram6.test_iter = 10 - turb_oneram6.test_vals = [-2.392865, -6.689822, 0.230746, 0.158811, -33786.000000] + turb_oneram6.test_vals = [-2.408532, -6.662836, 0.238334, 0.158910, -52718] turb_oneram6.timeout = 3200 test_list.append(turb_oneram6) @@ -422,7 +422,7 @@ def main(): turb_oneram6_vc.cfg_dir = "rans/oneram6" turb_oneram6_vc.cfg_file = "turb_ONERAM6_vc.cfg" turb_oneram6_vc.test_iter = 15 - turb_oneram6_vc.test_vals = [-2.266212, -6.628059, 0.228692, 0.142105, -28396.000000] + turb_oneram6_vc.test_vals = [-2.281896, -6.614616, 0.233785, 0.142861, -47942] turb_oneram6_vc.timeout = 3200 test_list.append(turb_oneram6_vc) @@ -431,7 +431,7 @@ def main(): turb_oneram6_nk.cfg_dir = "rans/oneram6" turb_oneram6_nk.cfg_file = "turb_ONERAM6_nk.cfg" turb_oneram6_nk.test_iter = 20 - turb_oneram6_nk.test_vals = [-4.803402, -4.393783, -11.445194, 0.218505, 0.048793, 4.000000, -0.607076, 25.924000] + turb_oneram6_nk.test_vals = [-4.843772, -4.444210, -11.473964, 0.216337, 0.049646, 5.000000, -0.613234, 23.568000] turb_oneram6_nk.timeout = 600 turb_oneram6_nk.tol = 0.0001 test_list.append(turb_oneram6_nk) @@ -441,7 +441,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 = [-10.453509, -13.866376, 1.057622, 0.022916, 20.000000, -1.867547, 20.000000, -3.632893, -44.540000] + turb_naca0012_sa.test_vals = [-12.094721, -14.685268, 1.057665, 0.022971, 20.000000, -1.692925, 20.000000, -4.037672, -44.871000] turb_naca0012_sa.timeout = 3200 test_list.append(turb_naca0012_sa) @@ -450,8 +450,8 @@ 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.219694, -14.440925, -7.107551, 1.050109, 0.019148, -1.601287, -38.510000] - turb_naca0012_sst.test_vals_aarch64 = [-12.219735, -14.440925, -7.107550, 1.050109, 0.019148, -1.601262, -38.510000] + turb_naca0012_sst.test_vals = [-12.107692, -15.277743, -6.210238, 1.049757, 0.019249, -2.357984, -38.976000] + turb_naca0012_sst.test_vals_aarch64 = [-12.107692, -15.277743, -6.210238, 1.049757, 0.019249, -2.357984, -38.976000] turb_naca0012_sst.timeout = 3200 test_list.append(turb_naca0012_sst) @@ -460,8 +460,8 @@ 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.148637, -14.756583, -6.342201, 1.001189, 0.019384, -1.579100] - turb_naca0012_sst_sust.test_vals_aarch64 = [-12.148716, -14.756582, -6.342200, 1.001189, 0.019384, -1.579104] + turb_naca0012_sst_sust.test_vals = [-12.087234, -14.827336, -6.062338, 1.000276, 0.019495, -1.779654] + turb_naca0012_sst_sust.test_vals_aarch64 = [-12.087234, -14.827336, -6.062338, 1.000276, 0.019495, -1.779654] turb_naca0012_sst_sust.timeout = 3200 test_list.append(turb_naca0012_sst_sust) @@ -470,7 +470,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.664806, -10.014760, -3.358584, 1.048643, 0.019718, -2.067883] + turb_naca0012_sst_2003_Vm.test_vals = [-7.662107, -10.010518, -3.354064, 1.048299, 0.019832, -2.071125] turb_naca0012_sst_2003_Vm.timeout = 3200 test_list.append(turb_naca0012_sst_2003_Vm) @@ -479,7 +479,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 = [-8.570837, -10.805211, -3.997146, 1.049397, 0.019183, -1.805750] + turb_naca0012_sst_1994_KLm.test_vals = [-8.560764, -10.801276, -3.996309, 1.049043, 0.019285, -1.809924] turb_naca0012_sst_1994_KLm.timeout = 3200 test_list.append(turb_naca0012_sst_1994_KLm) @@ -489,7 +489,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.216737, -10.025507, -1.615166, 1.021891, 0.040213, -3.731060] + turb_naca0012_sst_fixedvalues.test_vals = [-5.216625, -10.018477, -1.615201, 1.021842, 0.040325, -3.728658] turb_naca0012_sst_fixedvalues.timeout = 3200 test_list.append(turb_naca0012_sst_fixedvalues) @@ -498,7 +498,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.532289, -3.157766, 3.364024, 1.122901, 0.500798, -float("inf")] + turb_naca0012_sst_expliciteuler.test_vals = [-3.533827, -3.157766, 3.364024, 1.122856, 0.500771, -float("inf")] turb_naca0012_sst_expliciteuler.timeout = 3200 test_list.append(turb_naca0012_sst_expliciteuler) @@ -507,7 +507,7 @@ def main(): propeller.cfg_dir = "rans/propeller" propeller.cfg_file = "propeller.cfg" propeller.test_iter = 10 - propeller.test_vals = [-3.389575, -8.409251, 0.000048, 0.056329] + propeller.test_vals = [-3.389724, -8.409223, 0.000048, 0.056344] propeller.timeout = 3200 test_list.append(propeller) @@ -516,7 +516,7 @@ def main(): actuatordisk_bem.cfg_dir = "rans/actuatordisk_bem" actuatordisk_bem.cfg_file = "actuatordisk_bem.cfg" actuatordisk_bem.test_iter = 15 - actuatordisk_bem.test_vals = [-5.282249, -10.335140, 0.001383, -0.375718] + actuatordisk_bem.test_vals = [-5.388943, -10.318617, 0.001362, -0.376520] actuatordisk_bem.timeout = 3200 actuatordisk_bem.tol = 0.001 test_list.append(actuatordisk_bem) @@ -530,7 +530,7 @@ def main(): axi_rans_air_nozzle_restart.cfg_dir = "axisymmetric_rans/air_nozzle" axi_rans_air_nozzle_restart.cfg_file = "air_nozzle_restart.cfg" axi_rans_air_nozzle_restart.test_iter = 10 - axi_rans_air_nozzle_restart.test_vals = [-12.150822, -6.604726, -9.187292, -4.518261, -2019.700000] + axi_rans_air_nozzle_restart.test_vals = [-12.071395, -7.467871, -8.649076, -3.995810, -3572.100000] axi_rans_air_nozzle_restart.tol = 0.0001 test_list.append(axi_rans_air_nozzle_restart) @@ -881,8 +881,7 @@ def main(): turb_naca0012_1c.cfg_dir = "rans_uq/naca0012" turb_naca0012_1c.cfg_file = "turb_NACA0012_uq_1c.cfg" turb_naca0012_1c.test_iter = 10 - turb_naca0012_1c.test_vals = [-4.976284, 1.141136, 0.463115, -0.083307] - turb_naca0012_1c.test_vals_aarch64 = [-4.983453, 1.138491, 0.459947, -0.084114] + turb_naca0012_1c.test_vals = [-4.980989, 1.139850, 0.469677, -0.081426] test_list.append(turb_naca0012_1c) # NACA0012 2c @@ -890,8 +889,7 @@ def main(): turb_naca0012_2c.cfg_dir = "rans_uq/naca0012" turb_naca0012_2c.cfg_file = "turb_NACA0012_uq_2c.cfg" turb_naca0012_2c.test_iter = 10 - turb_naca0012_2c.test_vals = [-5.483317, 0.968654, 0.307611, -0.118062] - turb_naca0012_2c.test_vals_aarch64 = [-5.483338, 0.968646, 0.308055, -0.117915] + turb_naca0012_2c.test_vals = [-5.484979, 0.968118, 0.320621, -0.114603] test_list.append(turb_naca0012_2c) # NACA0012 3c @@ -899,7 +897,7 @@ def main(): turb_naca0012_3c.cfg_dir = "rans_uq/naca0012" turb_naca0012_3c.cfg_file = "turb_NACA0012_uq_3c.cfg" turb_naca0012_3c.test_iter = 10 - turb_naca0012_3c.test_vals = [-5.584309, 0.931259, 0.281831, -0.117821] + turb_naca0012_3c.test_vals = [-5.584315, 0.931258, 0.277047, -0.118255] test_list.append(turb_naca0012_3c) # NACA0012 p1c1 @@ -907,8 +905,7 @@ def main(): turb_naca0012_p1c1.cfg_dir = "rans_uq/naca0012" turb_naca0012_p1c1.cfg_file = "turb_NACA0012_uq_p1c1.cfg" turb_naca0012_p1c1.test_iter = 10 - turb_naca0012_p1c1.test_vals = [-5.128887, 1.076846, 0.589839, -0.051939] - turb_naca0012_p1c1.test_vals_aarch64 = [-5.128883, 1.076873, 0.590376, -0.051754] + turb_naca0012_p1c1.test_vals = [-5.122398, 1.074022, 0.415368, -0.096185] test_list.append(turb_naca0012_p1c1) # NACA0012 p1c2 @@ -916,8 +913,7 @@ def main(): turb_naca0012_p1c2.cfg_dir = "rans_uq/naca0012" turb_naca0012_p1c2.cfg_file = "turb_NACA0012_uq_p1c2.cfg" turb_naca0012_p1c2.test_iter = 10 - turb_naca0012_p1c2.test_vals = [-5.554633, 0.943626, 0.402263, -0.100275] - turb_naca0012_p1c2.test_vals_aarch64 = [-5.554636, 0.943621, 0.401650, -0.100495] + turb_naca0012_p1c2.test_vals = [-5.549595, 0.945508, 0.287359, -0.117019] test_list.append(turb_naca0012_p1c2) ###################################### @@ -958,7 +954,7 @@ def main(): cavity.cfg_dir = "moving_wall/cavity" cavity.cfg_file = "lam_cavity.cfg" cavity.test_iter = 25 - cavity.test_vals = [-5.610928, -0.146749, 1.114461, 1.490381] + cavity.test_vals = [-5.610923, -0.146741, 1.115860, 1.490430] test_list.append(cavity) # Spinning cylinder @@ -966,7 +962,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.806016, -2.364954, 1.683365, 1.517059] + spinning_cylinder.test_vals = [-7.806056, -2.364884, 1.685228, 1.518276] test_list.append(spinning_cylinder) ###################################### @@ -978,7 +974,7 @@ def main(): square_cylinder.cfg_dir = "unsteady/square_cylinder" square_cylinder.cfg_file = "turb_square.cfg" square_cylinder.test_iter = 3 - square_cylinder.test_vals = [-1.173603, 0.058045, 1.399795, 2.220404, 1.399749, 2.218605, -0.453330] + square_cylinder.test_vals = [-1.173495, 0.061186, 1.399404, 2.220578, 1.399352, 2.218783, -0.584750] square_cylinder.unsteady = True test_list.append(square_cylinder) @@ -1023,7 +1019,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 = [0.000008, -8.876477, -8.249920, -6.294138, -5.468911, -3.398657, 0.002075, -0.324341] + flatplate_unsteady.test_vals = [0.000008, -8.874953, -8.250030, -6.306009, -5.468992, -3.398179, 0.002075, -0.326075] flatplate_unsteady.unsteady = True test_list.append(flatplate_unsteady) @@ -1099,8 +1095,7 @@ def main(): axial_stage2D.cfg_dir = "turbomachinery/axial_stage_2D" axial_stage2D.cfg_file = "Axial_stage2D.cfg" axial_stage2D.test_iter = 20 - axial_stage2D.test_vals = [0.983754, 1.534455, -2.888523, 2.606770, -2.418403, 3.087203, 106380, 106380, 5.7325, 64.711] - axial_stage2D.test_vals_aarch64 = [0.983754, 1.534455, -2.888523, 2.606770, -2.418403, 3.087203, 106380, 106380, 5.7325, 64.711] + axial_stage2D.test_vals = [0.987681, 1.532093, -2.888460, 2.606791, -2.418287, 3.087104, 106380, 106380, 5.7329, 64.728] test_list.append(axial_stage2D) # 2D transonic stator restart @@ -1130,7 +1125,7 @@ def main(): uniform_flow.cfg_dir = "sliding_interface/uniform_flow" uniform_flow.cfg_file = "uniform_NN.cfg" uniform_flow.test_iter = 5 - uniform_flow.test_vals = [5.000000, 0.000000, -0.185381, -10.631539] + uniform_flow.test_vals = [5.000000, 0.000000, -0.186036, -10.624450] uniform_flow.unsteady = True uniform_flow.multizone = True test_list.append(uniform_flow) @@ -1140,8 +1135,7 @@ def main(): channel_2D.cfg_dir = "sliding_interface/channel_2D" channel_2D.cfg_file = "channel_2D_WA.cfg" channel_2D.test_iter = 2 - channel_2D.test_vals = [2.000000, 0.000000, 0.419792, 0.352177, 0.404446] - channel_2D.test_vals_aarch64 = [2.000000, 0.000000, 0.398036, 0.352783, 0.405462] + channel_2D.test_vals = [2.000000, 0.000000, 0.417418, 0.350499, 0.401527] channel_2D.timeout = 100 channel_2D.unsteady = True channel_2D.multizone = True @@ -1152,8 +1146,7 @@ def main(): channel_3D.cfg_dir = "sliding_interface/channel_3D" channel_3D.cfg_file = "channel_3D_WA.cfg" channel_3D.test_iter = 2 - channel_3D.test_vals = [2.000000, 0.000000, 0.623113, 0.505078, 0.412774] - channel_3D.test_vals_aarch64 = [2.000000, 0.000000, 0.620182, 0.505302, 0.415257] + channel_3D.test_vals = [2.000000, 0.000000, 0.622666, 0.506173, 0.410911] channel_3D.unsteady = True channel_3D.multizone = True test_list.append(channel_3D) @@ -1163,7 +1156,7 @@ def main(): pipe.cfg_dir = "sliding_interface/pipe" pipe.cfg_file = "pipe_NN.cfg" pipe.test_iter = 2 - pipe.test_vals = [0.116649, 0.481389, 0.648696, 0.982990, 1.018349] + pipe.test_vals = [0.121512, 0.477629, 0.641341, 0.983336, 1.018856] pipe.unsteady = True pipe.multizone = True test_list.append(pipe) @@ -1183,7 +1176,7 @@ def main(): supersonic_vortex_shedding.cfg_dir = "sliding_interface/supersonic_vortex_shedding" supersonic_vortex_shedding.cfg_file = "sup_vor_shed_WA.cfg" supersonic_vortex_shedding.test_iter = 5 - supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.207949, 1.036090] + supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.206774, 1.053450] supersonic_vortex_shedding.unsteady = True supersonic_vortex_shedding.multizone = True test_list.append(supersonic_vortex_shedding) @@ -1247,7 +1240,7 @@ def main(): fsi2d.cfg_dir = "fea_fsi/WallChannel_2d" fsi2d.cfg_file = "configFSI.cfg" fsi2d.test_iter = 4 - fsi2d.test_vals = [4.000000, 0.000000, -3.729224, -4.153951] + fsi2d.test_vals = [4.000000, 0.000000, -3.726049, -4.277801] fsi2d.command = TestCase.Command(exec = "parallel_computation_fsi.py", param = "-f") fsi2d.multizone= True fsi2d.unsteady = True @@ -1258,7 +1251,7 @@ def main(): stat_fsi.cfg_dir = "fea_fsi/stat_fsi" stat_fsi.cfg_file = "config.cfg" stat_fsi.test_iter = 7 - stat_fsi.test_vals = [-3.311842, -4.950580, 0.000000, 8.000000] + stat_fsi.test_vals = [-3.309522, -4.948620, 0.000000, 8] stat_fsi.multizone = True test_list.append(stat_fsi) @@ -1267,7 +1260,7 @@ def main(): dyn_fsi.cfg_dir = "fea_fsi/dyn_fsi" dyn_fsi.cfg_file = "config.cfg" dyn_fsi.test_iter = 4 - dyn_fsi.test_vals = [-4.330462, -4.058005, 0.000000, 97.000000] + dyn_fsi.test_vals = [-4.330921, -4.153040, 0.000000, 96] dyn_fsi.multizone = True dyn_fsi.unsteady = True test_list.append(dyn_fsi) @@ -1277,7 +1270,7 @@ def main(): stat_fsi_restart.cfg_dir = "fea_fsi/stat_fsi" stat_fsi_restart.cfg_file = "config_restart.cfg" stat_fsi_restart.test_iter = 1 - stat_fsi_restart.test_vals = [-3.445617, -4.243213, 0.000000, 28.000000] + stat_fsi_restart.test_vals = [-3.450744, -4.279403, 0.000000, 27] stat_fsi_restart.multizone = True test_list.append(stat_fsi_restart) @@ -1358,7 +1351,7 @@ def main(): pywrapper_naca0012.cfg_dir = "euler/naca0012" pywrapper_naca0012.cfg_file = "inv_NACA0012_Roe.cfg" pywrapper_naca0012.test_iter = 100 - pywrapper_naca0012.test_vals = [-9.569885, -8.966579, 0.335418, 0.023332] + pywrapper_naca0012.test_vals = [-8.461085, -7.758356, 0.335769, 0.023275] pywrapper_naca0012.command = TestCase.Command("mpirun -np 2", "SU2_CFD.py", "--parallel -f") test_list.append(pywrapper_naca0012) @@ -1367,8 +1360,8 @@ 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.219694, -14.440925, -7.107551, 1.050109, 0.019148, -1.601287, -38.510000] - pywrapper_turb_naca0012_sst.test_vals_aarch64 = [-12.219735, -14.440925, -7.107550, 1.050109, 0.019148, -1.601262, -38.510000] + pywrapper_turb_naca0012_sst.test_vals = [-12.107692, -15.277743, -6.210238, 1.049757, 0.019249, -2.357984, -38.976000] + pywrapper_turb_naca0012_sst.test_vals_aarch64 = [-12.107692, -15.277743, -6.210238, 1.049757, 0.019249, -2.357984, -38.976000] pywrapper_turb_naca0012_sst.command = TestCase.Command("mpirun -np 2", "SU2_CFD.py", "--parallel -f") pywrapper_turb_naca0012_sst.timeout = 3200 test_list.append(pywrapper_turb_naca0012_sst) @@ -1378,8 +1371,7 @@ def main(): pywrapper_square_cylinder.cfg_dir = "unsteady/square_cylinder" pywrapper_square_cylinder.cfg_file = "turb_square.cfg" pywrapper_square_cylinder.test_iter = 10 - pywrapper_square_cylinder.test_vals = [-1.175619, -0.352238, 1.408450, 2.360729, 1.404693, 2.302284, -0.347980] - pywrapper_square_cylinder.test_vals_aarch64 = [-1.175617, -0.352079, 1.408450, 2.360729, 1.404693, 2.302284, -0.347980] + pywrapper_square_cylinder.test_vals = [-1.176405, -0.354027, 1.407859, 2.360784, 1.404715, 2.302615, -0.394750] pywrapper_square_cylinder.command = TestCase.Command("mpirun -np 2", "SU2_CFD.py", "--parallel -f") pywrapper_square_cylinder.unsteady = True test_list.append(pywrapper_square_cylinder) @@ -1409,7 +1401,7 @@ def main(): pywrapper_fsi2d.cfg_dir = "fea_fsi/WallChannel_2d" pywrapper_fsi2d.cfg_file = "configFSI.cfg" pywrapper_fsi2d.test_iter = 4 - pywrapper_fsi2d.test_vals = [4.000000, 0.000000, -3.729224, -4.153951] + pywrapper_fsi2d.test_vals = [4.000000, 0.000000, -3.726049, -4.277801] pywrapper_fsi2d.command = TestCase.Command("mpirun -np 2", "SU2_CFD.py", "--nZone 2 --fsi True --parallel -f") pywrapper_fsi2d.unsteady = True pywrapper_fsi2d.multizone = True @@ -1420,7 +1412,7 @@ def main(): pywrapper_unsteadyFSI.cfg_dir = "py_wrapper/dyn_fsi" pywrapper_unsteadyFSI.cfg_file = "config.cfg" pywrapper_unsteadyFSI.test_iter = 4 - pywrapper_unsteadyFSI.test_vals = [0.000000, 49.000000, 5.000000, 44.000000, -0.589089, -2.800967, -2.603174, -6.722478, 0.000209] + pywrapper_unsteadyFSI.test_vals = [0.000000, 49.000000, 5.000000, 55.000000, -0.709822, -3.429271, -2.524625, -7.938341, 0.001514] pywrapper_unsteadyFSI.command = TestCase.Command("mpirun -np 2", "python", "run.py") pywrapper_unsteadyFSI.unsteady = True pywrapper_unsteadyFSI.multizone = True @@ -1451,7 +1443,7 @@ def main(): pywrapper_deformingBump.cfg_dir = "py_wrapper/deforming_bump_in_channel" pywrapper_deformingBump.cfg_file = "config.cfg" pywrapper_deformingBump.test_iter = 1 - pywrapper_deformingBump.test_vals = [0.500000, 0.000000, -3.037857, -1.603573, -2.074205, 2.424288, 7.765352, -0.220502] + pywrapper_deformingBump.test_vals = [0.500000, 0.000000, -3.037859, -1.603563, -2.074259, 2.424288, 7.762848, -0.220436] pywrapper_deformingBump.command = TestCase.Command("mpirun -np 2", "python", "run.py") pywrapper_deformingBump.unsteady = True test_list.append(pywrapper_deformingBump) @@ -1465,7 +1457,7 @@ def main(): mms_fvm_ns.cfg_dir = "mms/fvm_navierstokes" mms_fvm_ns.cfg_file = "lam_mms_roe.cfg" mms_fvm_ns.test_iter = 20 - mms_fvm_ns.test_vals = [-2.851428, 2.192348, 0.000000, 0.000000] + mms_fvm_ns.test_vals = [-2.808514, 2.152654, 0.000000, 0.000000] mms_fvm_ns.tol = 0.0001 test_list.append(mms_fvm_ns) diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py index af50a43b1da..9ad6fa21f8e 100644 --- a/TestCases/parallel_regression_AD.py +++ b/TestCases/parallel_regression_AD.py @@ -83,7 +83,7 @@ def main(): discadj_rans_naca0012_sa.cfg_dir = "disc_adj_rans/naca0012" discadj_rans_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" discadj_rans_naca0012_sa.test_iter = 10 - discadj_rans_naca0012_sa.test_vals = [-2.230568, 0.644202, 0.181590, -0.000018, 5.000000, -3.421717, 5.000000, -6.769530] + discadj_rans_naca0012_sa.test_vals = [-2.996963, -0.196020, 0.000004, -0.000000, 5.000000, -3.430615, 5.000000, -7.411396] test_list.append(discadj_rans_naca0012_sa) # Adjoint turbulent NACA0012 SST @@ -91,8 +91,8 @@ def main(): discadj_rans_naca0012_sst.cfg_dir = "disc_adj_rans/naca0012" discadj_rans_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" discadj_rans_naca0012_sst.test_iter = 10 - discadj_rans_naca0012_sst.test_vals = [-2.221848, -0.502430, 0.182000, -0.000018] - discadj_rans_naca0012_sst.test_vals_aarch64 = [-2.221848, -0.502430, 0.182000, -0.000018] + discadj_rans_naca0012_sst.test_vals = [-2.274779, -0.278440, -2.255500, -0.003160] + discadj_rans_naca0012_sst.test_vals_aarch64 = [-2.274779, -0.278440, -2.255500, -0.003160] test_list.append(discadj_rans_naca0012_sst) ####################################### @@ -150,7 +150,7 @@ def main(): discadj_axisymmetric_rans_nozzle.cfg_dir = "axisymmetric_rans/air_nozzle" discadj_axisymmetric_rans_nozzle.cfg_file = "air_nozzle_restart.cfg" discadj_axisymmetric_rans_nozzle.test_iter = 10 - discadj_axisymmetric_rans_nozzle.test_vals = [9.550040, 4.937865, 7.377284, 2.748846] + discadj_axisymmetric_rans_nozzle.test_vals = [9.550294, 4.938499, 7.387346, 2.733061] discadj_axisymmetric_rans_nozzle.no_restart = True test_list.append(discadj_axisymmetric_rans_nozzle) @@ -163,7 +163,7 @@ def main(): discadj_cylinder.cfg_dir = "disc_adj_rans/cylinder" discadj_cylinder.cfg_file = "cylinder.cfg" discadj_cylinder.test_iter = 9 - discadj_cylinder.test_vals = [3.746909, -1.544883, -0.008321, 0.000014] #last 4 columns + discadj_cylinder.test_vals = [1.639372, -2.834295, -0.009538, 0.000020] #last 4 columns discadj_cylinder.unsteady = True test_list.append(discadj_cylinder) @@ -176,7 +176,7 @@ def main(): discadj_cylinder.cfg_dir = "disc_adj_rans/cylinder" discadj_cylinder.cfg_file = "cylinder_Windowing_AD.cfg" discadj_cylinder.test_iter = 9 - discadj_cylinder.test_vals = [3.004406] #last column + discadj_cylinder.test_vals = [2.183366] #last column discadj_cylinder.unsteady = True test_list.append(discadj_cylinder) @@ -189,7 +189,7 @@ def main(): discadj_cylinder.cfg_dir = "disc_adj_rans/cylinder" discadj_cylinder.cfg_file = "cylinder_Windowing.cfg" discadj_cylinder.test_iter = 6 - discadj_cylinder.test_vals = [0.202349, -0.000119, 1.899933, -0.000050, 1.067900] + discadj_cylinder.test_vals = [0.238134, -0.000245, 1.926672, -0.000097, 1.062800] discadj_cylinder.tol = 0.0001 discadj_cylinder.command = TestCase.Command("mpirun -n 2", "SU2_CFD_DIRECTDIFF") discadj_cylinder.unsteady = True @@ -204,7 +204,7 @@ def main(): discadj_DT_1ST_cylinder.cfg_dir = "disc_adj_rans/cylinder_DT_1ST" discadj_DT_1ST_cylinder.cfg_file = "cylinder.cfg" discadj_DT_1ST_cylinder.test_iter = 9 - discadj_DT_1ST_cylinder.test_vals = [3.698168, -1.607050, -0.002159, 0.000028] #last 4 columns + discadj_DT_1ST_cylinder.test_vals = [1.196413, -3.339027, -0.006212, 0.000020] #last 4 columns discadj_DT_1ST_cylinder.unsteady = True test_list.append(discadj_DT_1ST_cylinder) @@ -269,7 +269,7 @@ def main(): discadj_fsi.cfg_dir = "disc_adj_fsi" discadj_fsi.cfg_file = "config.cfg" discadj_fsi.test_iter = 6 - discadj_fsi.test_vals = [6.000000, -1.949946, -3.080711, 0.000440, -1.063100] + discadj_fsi.test_vals = [6.000000, -7.017319, -7.872545, 3.9968e-09, -2.4097e-05] test_list.append(discadj_fsi) # Multi physics framework @@ -524,7 +524,7 @@ def main(): pywrapper_wavy_wall_steady.cfg_dir = "py_wrapper/wavy_wall" pywrapper_wavy_wall_steady.cfg_file = "run_steady.py" pywrapper_wavy_wall_steady.test_iter = 100 - pywrapper_wavy_wall_steady.test_vals = [-1.360044, 2.580709, -2.892473] + pywrapper_wavy_wall_steady.test_vals = [-1.353293, 2.579229, -2.898115] pywrapper_wavy_wall_steady.command = TestCase.Command("mpirun -n 2", "python", "run_steady.py") pywrapper_wavy_wall_steady.timeout = 1600 pywrapper_wavy_wall_steady.tol = 0.00001 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 2e4f90bda43..4eacedc90ef 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, -1.01, -0.00, 0.00 -0, -2.98, 20.50, 0.00 -1, -3.99, 27.46, 0.00 -2, -5.22, 36.06, 0.00 -3, -6.10, 42.20, 0.00 -4, -6.90, 47.88, 0.00 -5, -7.54, 52.52, 0.00 -6, -8.08, 56.52, 0.00 -7, -8.50, 59.69, 0.00 -8, -8.79, 62.11, 0.00 -9, -8.98, 63.80, 0.00 -10, -9.06, 64.81, 0.00 -11, -9.06, 65.22, 0.00 -12, -8.95, 64.94, 0.00 -13, -8.75, 64.06, 0.00 -14, -8.48, 62.56, 0.00 -15, -8.12, 60.48, 0.00 -16, -7.70, 57.92, 0.00 -17, -7.21, 54.81, 0.00 -18, -6.66, 51.20, 0.00 -19, -6.07, 47.12, 0.00 -20, -5.42, 42.57, 0.00 -21, -4.73, 37.59, 0.00 -22, -4.00, 32.19, 0.00 -23, -3.23, 26.37, 0.00 -24, -2.44, 20.21, 0.00 -25, -1.63, 13.66, 0.00 -26, -0.79, 6.76, 0.00 -27, 0.05, -0.45, 0.00 -28, 0.91, -7.99, 0.00 -29, 1.77, -15.81, 0.00 -30, 2.64, -23.91, 0.00 -31, 3.50, -32.27, 0.00 -32, 4.36, -40.90, 0.00 -33, 5.20, -49.76, 0.00 -34, 6.03, -58.80, 0.00 -35, 6.84, -68.06, 0.00 -36, 7.63, -77.50, 0.00 -37, 8.37, -87.04, 0.00 -38, 9.09, -96.70, 0.00 -39, 9.76, -106.43, 0.00 -40, 10.37, -116.12, 0.00 -41, 10.91, -125.73, 0.00 -42, 11.39, -135.21, 0.00 -43, 11.77, -144.39, 0.00 -44, 12.05, -153.08, 0.00 -45, 12.21, -161.05, 0.00 -46, 12.22, -167.88, 0.00 -47, 12.01, -172.51, 0.00 -48, 11.61, -175.12, 0.00 -49, 11.25, -179.01, 0.00 -50, 10.12, -170.90, 0.00 -51, 6.24, -112.75, 0.00 -52, 6.61, -128.63, 0.00 -53, 20.84, -441.83, 0.00 -54, 25.65, -599.65, 0.00 -55, 21.77, -570.80, 0.00 -56, 18.66, -560.26, 0.00 -57, 15.64, -554.49, 0.00 -58, 12.51, -546.85, 0.00 -59, 9.28, -537.57, 0.00 -60, 6.01, -527.15, 0.00 -61, 2.70, -515.89, 0.00 -62, -0.62, -503.33, 0.00 -63, -3.92, -489.55, 0.00 -64, -7.19, -475.11, 0.00 -65, -10.39, -459.75, 0.00 -66, -13.50, -443.31, 0.00 -67, -16.49, -426.20, 0.00 -68, -19.33, -408.27, 0.00 -69, -22.00, -389.78, 0.00 -70, -24.49, -370.85, 0.00 -71, -26.76, -351.39, 0.00 +199, -0.96, -0.00, 0.00 +0, -2.92, 20.12, 0.00 +1, -4.12, 28.38, 0.00 +2, -5.19, 35.79, 0.00 +3, -6.11, 42.26, 0.00 +4, -6.91, 47.93, 0.00 +5, -7.55, 52.59, 0.00 +6, -8.09, 56.59, 0.00 +7, -8.51, 59.77, 0.00 +8, -8.81, 62.19, 0.00 +9, -8.99, 63.88, 0.00 +10, -9.08, 64.90, 0.00 +11, -9.07, 65.31, 0.00 +12, -8.96, 65.04, 0.00 +13, -8.77, 64.16, 0.00 +14, -8.49, 62.66, 0.00 +15, -8.13, 60.58, 0.00 +16, -7.71, 58.02, 0.00 +17, -7.23, 54.91, 0.00 +18, -6.68, 51.30, 0.00 +19, -6.08, 47.23, 0.00 +20, -5.43, 42.67, 0.00 +21, -4.74, 37.69, 0.00 +22, -4.01, 32.30, 0.00 +23, -3.24, 26.47, 0.00 +24, -2.46, 20.31, 0.00 +25, -1.64, 13.76, 0.00 +26, -0.81, 6.86, 0.00 +27, 0.04, -0.35, 0.00 +28, 0.90, -7.89, 0.00 +29, 1.76, -15.72, 0.00 +30, 2.63, -23.81, 0.00 +31, 3.49, -32.17, 0.00 +32, 4.35, -40.81, 0.00 +33, 5.19, -49.67, 0.00 +34, 6.02, -58.71, 0.00 +35, 6.83, -67.98, 0.00 +36, 7.62, -77.42, 0.00 +37, 8.37, -86.96, 0.00 +38, 9.08, -96.64, 0.00 +39, 9.75, -106.37, 0.00 +40, 10.36, -116.07, 0.00 +41, 10.91, -125.70, 0.00 +42, 11.38, -135.20, 0.00 +43, 11.77, -144.41, 0.00 +44, 12.06, -153.14, 0.00 +45, 12.22, -161.12, 0.00 +46, 12.23, -168.00, 0.00 +47, 12.04, -172.93, 0.00 +48, 11.64, -175.62, 0.00 +49, 11.16, -177.56, 0.00 +50, 10.14, -171.34, 0.00 +51, 7.30, -131.80, 0.00 +52, 6.53, -127.05, 0.00 +53, 19.34, -410.00, 0.00 +54, 25.58, -598.18, 0.00 +55, 21.94, -575.15, 0.00 +56, 18.63, -559.59, 0.00 +57, 15.63, -554.21, 0.00 +58, 12.51, -546.77, 0.00 +59, 9.28, -537.48, 0.00 +60, 6.01, -527.06, 0.00 +61, 2.70, -515.82, 0.00 +62, -0.62, -503.27, 0.00 +63, -3.92, -489.49, 0.00 +64, -7.19, -475.06, 0.00 +65, -10.39, -459.70, 0.00 +66, -13.50, -443.27, 0.00 +67, -16.48, -426.16, 0.00 +68, -19.32, -408.24, 0.00 +69, -22.00, -389.76, 0.00 +70, -24.49, -370.83, 0.00 +71, -26.76, -351.38, 0.00 72, -28.78, -331.47, 0.00 -73, -30.52, -311.04, 0.00 -74, -31.97, -290.33, 0.00 -75, -33.11, -269.42, 0.00 -76, -33.86, -248.08, 0.00 -77, -34.24, -226.61, 0.00 -78, -34.22, -205.20, 0.00 -79, -33.74, -183.64, 0.00 -80, -32.78, -162.19, 0.00 -81, -31.29, -140.79, 0.00 -82, -29.21, -119.49, 0.00 -83, -26.48, -98.43, 0.00 -84, -23.02, -77.63, 0.00 -85, -18.75, -57.22, 0.00 -86, -13.54, -37.28, 0.00 -87, -7.23, -17.89, 0.00 -88, 0.32, 0.71, 0.00 -89, 9.35, 18.28, 0.00 -90, 20.02, 34.35, 0.00 -91, 32.65, 48.54, 0.00 -92, 47.34, 59.96, 0.00 -93, 64.24, 67.74, 0.00 -94, 83.11, 70.60, 0.00 -95, 102.71, 66.90, 0.00 -96, 121.38, 55.64, 0.00 -97, 137.08, 37.10, 0.00 -98, 106.89, 14.34, 0.00 -99, 69.93, -0.00, 0.00 -100, 104.81, -14.06, 0.00 -101, 129.39, -35.02, 0.00 -102, 108.98, -49.95, 0.00 -103, 86.90, -56.60, 0.00 -104, 64.97, -55.19, 0.00 -105, 44.71, -47.14, 0.00 -106, 27.08, -34.30, 0.00 -107, 12.21, -18.16, 0.00 -108, -0.23, 0.39, 0.00 -109, -10.50, 20.54, 0.00 -110, -18.96, 41.85, 0.00 -111, -25.82, 63.84, 0.00 -112, -31.39, 86.44, 0.00 -113, -35.84, 109.39, 0.00 -114, -39.33, 132.66, 0.00 -115, -42.01, 156.16, 0.00 -116, -43.95, 179.80, 0.00 -117, -45.26, 203.64, 0.00 -118, -45.98, 227.47, 0.00 -119, -46.16, 251.27, 0.00 -120, -45.89, 275.14, 0.00 -121, -45.14, 298.74, 0.00 -122, -44.00, 322.34, 0.00 -123, -42.49, 345.71, 0.00 -124, -40.58, 368.50, 0.00 -125, -38.39, 391.21, 0.00 -126, -35.94, 413.88, 0.00 -127, -33.21, 436.09, 0.00 -128, -30.22, 457.70, 0.00 -129, -27.02, 478.65, 0.00 -130, -23.62, 499.09, 0.00 -131, -20.08, 519.03, 0.00 -132, -16.39, 538.22, 0.00 -133, -12.59, 556.86, 0.00 -134, -8.70, 574.51, 0.00 -135, -4.74, 591.34, 0.00 -136, -0.75, 607.73, 0.00 -137, 3.26, 623.00, 0.00 -138, 7.26, 637.13, 0.00 -139, 11.24, 650.73, 0.00 -140, 15.17, 663.34, 0.00 -141, 19.03, 674.54, 0.00 -142, 22.81, 684.95, 0.00 -143, 26.50, 694.58, 0.00 -144, 30.06, 702.94, 0.00 -145, 33.49, 710.01, 0.00 -146, 36.79, 716.23, 0.00 -147, 39.95, 721.39, 0.00 -148, 42.93, 725.31, 0.00 -149, 45.77, 728.51, 0.00 -150, 48.44, 730.59, 0.00 -151, 50.61, 726.85, 0.00 -152, 53.86, 739.83, 0.00 -153, 53.31, 702.96, 0.00 -154, 8.15, 103.49, 0.00 -155, -2.34, -28.69, 0.00 -156, 3.10, 36.88, 0.00 -157, 3.81, 43.93, 0.00 -158, 3.88, 43.46, 0.00 -159, 4.18, 45.56, 0.00 -160, 4.24, 45.15, 0.00 -161, 4.13, 42.94, 0.00 -162, 3.90, 39.62, 0.00 -163, 3.56, 35.42, 0.00 -164, 3.14, 30.58, 0.00 -165, 2.64, 25.27, 0.00 -166, 2.09, 19.60, 0.00 -167, 1.48, 13.68, 0.00 -168, 0.84, 7.64, 0.00 -169, 0.17, 1.53, 0.00 -170, -0.52, -4.58, 0.00 -171, -1.23, -10.62, 0.00 -172, -1.94, -16.53, 0.00 -173, -2.66, -22.30, 0.00 -174, -3.37, -27.85, 0.00 -175, -4.06, -33.13, 0.00 -176, -4.74, -38.17, 0.00 -177, -5.39, -42.87, 0.00 -178, -6.01, -47.21, 0.00 +73, -30.53, -311.04, 0.00 +74, -31.98, -290.35, 0.00 +75, -33.11, -269.46, 0.00 +76, -33.87, -248.14, 0.00 +77, -34.25, -226.70, 0.00 +78, -34.24, -205.31, 0.00 +79, -33.76, -183.76, 0.00 +80, -32.81, -162.32, 0.00 +81, -31.32, -140.93, 0.00 +82, -29.24, -119.65, 0.00 +83, -26.52, -98.60, 0.00 +84, -23.07, -77.82, 0.00 +85, -18.81, -57.42, 0.00 +86, -13.61, -37.46, 0.00 +87, -7.31, -18.07, 0.00 +88, 0.25, 0.55, 0.00 +89, 9.28, 18.15, 0.00 +90, 20.00, 34.31, 0.00 +91, 32.69, 48.60, 0.00 +92, 47.51, 60.17, 0.00 +93, 64.67, 68.19, 0.00 +94, 84.00, 71.35, 0.00 +95, 104.26, 67.91, 0.00 +96, 123.59, 56.65, 0.00 +97, 139.79, 37.83, 0.00 +98, 109.03, 14.63, 0.00 +99, 71.37, -0.00, 0.00 +100, 106.71, -14.32, 0.00 +101, 131.85, -35.68, 0.00 +102, 110.88, -50.82, 0.00 +103, 88.07, -57.36, 0.00 +104, 65.47, -55.62, 0.00 +105, 44.83, -47.26, 0.00 +106, 27.03, -34.23, 0.00 +107, 12.07, -17.95, 0.00 +108, -0.39, 0.67, 0.00 +109, -10.68, 20.88, 0.00 +110, -19.12, 42.19, 0.00 +111, -25.97, 64.20, 0.00 +112, -31.53, 86.81, 0.00 +113, -35.96, 109.75, 0.00 +114, -39.44, 133.01, 0.00 +115, -42.10, 156.51, 0.00 +116, -44.03, 180.14, 0.00 +117, -45.33, 203.94, 0.00 +118, -46.04, 227.76, 0.00 +119, -46.21, 251.54, 0.00 +120, -45.93, 275.39, 0.00 +121, -45.17, 298.97, 0.00 +122, -44.03, 322.56, 0.00 +123, -42.51, 345.93, 0.00 +124, -40.61, 368.71, 0.00 +125, -38.41, 391.41, 0.00 +126, -35.95, 414.07, 0.00 +127, -33.22, 436.26, 0.00 +128, -30.23, 457.86, 0.00 +129, -27.02, 478.79, 0.00 +130, -23.63, 499.23, 0.00 +131, -20.08, 519.16, 0.00 +132, -16.39, 538.35, 0.00 +133, -12.59, 557.00, 0.00 +134, -8.70, 574.66, 0.00 +135, -4.74, 591.49, 0.00 +136, -0.75, 607.88, 0.00 +137, 3.26, 623.17, 0.00 +138, 7.26, 637.30, 0.00 +139, 11.24, 650.91, 0.00 +140, 15.18, 663.54, 0.00 +141, 19.03, 674.74, 0.00 +142, 22.82, 685.17, 0.00 +143, 26.50, 694.80, 0.00 +144, 30.07, 703.15, 0.00 +145, 33.50, 710.22, 0.00 +146, 36.80, 716.44, 0.00 +147, 39.96, 721.63, 0.00 +148, 42.95, 725.58, 0.00 +149, 45.78, 728.71, 0.00 +150, 48.38, 729.69, 0.00 +151, 50.59, 726.67, 0.00 +152, 54.68, 751.14, 0.00 +153, 51.25, 675.81, 0.00 +154, 6.97, 88.47, 0.00 +155, -0.21, -2.53, 0.00 +156, 3.40, 40.39, 0.00 +157, 3.83, 44.10, 0.00 +158, 4.05, 45.38, 0.00 +159, 4.28, 46.69, 0.00 +160, 4.30, 45.78, 0.00 +161, 4.17, 43.39, 0.00 +162, 3.93, 39.96, 0.00 +163, 3.59, 35.69, 0.00 +164, 3.16, 30.80, 0.00 +165, 2.66, 25.45, 0.00 +166, 2.10, 19.75, 0.00 +167, 1.50, 13.82, 0.00 +168, 0.86, 7.76, 0.00 +169, 0.18, 1.63, 0.00 +170, -0.51, -4.49, 0.00 +171, -1.22, -10.54, 0.00 +172, -1.93, -16.46, 0.00 +173, -2.65, -22.24, 0.00 +174, -3.36, -27.80, 0.00 +175, -4.05, -33.09, 0.00 +176, -4.73, -38.14, 0.00 +177, -5.39, -42.85, 0.00 +178, -6.01, -47.20, 0.00 179, -6.59, -51.20, 0.00 180, -7.13, -54.76, 0.00 -181, -7.62, -57.90, 0.00 -182, -8.05, -60.58, 0.00 -183, -8.42, -62.75, 0.00 -184, -8.74, -64.48, 0.00 -185, -8.97, -65.65, 0.00 -186, -9.13, -66.23, 0.00 -187, -9.20, -66.23, 0.00 -188, -9.17, -65.58, 0.00 -189, -9.06, -64.33, 0.00 -190, -8.84, -62.44, 0.00 -191, -8.52, -59.84, 0.00 -192, -8.08, -56.51, 0.00 +181, -7.62, -57.91, 0.00 +182, -8.06, -60.60, 0.00 +183, -8.43, -62.77, 0.00 +184, -8.74, -64.50, 0.00 +185, -8.98, -65.68, 0.00 +186, -9.13, -66.26, 0.00 +187, -9.20, -66.26, 0.00 +188, -9.17, -65.60, 0.00 +189, -9.06, -64.36, 0.00 +190, -8.84, -62.46, 0.00 +191, -8.52, -59.85, 0.00 +192, -8.08, -56.52, 0.00 193, -7.52, -52.37, 0.00 -194, -6.86, -47.60, 0.00 +194, -6.86, -47.59, 0.00 195, -6.05, -41.82, 0.00 -196, -5.16, -35.60, 0.00 -197, -3.91, -26.94, 0.00 -198, -2.89, -19.92, 0.00 +196, -5.11, -35.27, 0.00 +197, -4.04, -27.82, 0.00 +198, -2.82, -19.44, 0.00 diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index e5825f786e1..5703330af18 100644 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -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.444941, -3.941038, 0.318998, 0.022365] + naca0012.test_vals = [-4.431325, -3.970055, 0.319205, 0.022299] test_list.append(naca0012) # Supersonic wedge @@ -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.122306, 0.357174, 0.001311, 0.028230, 2.361600, -2.333300, -2.629100, -2.629100] + flatplate.test_vals = [-5.097707, 0.381809, 0.001324, 0.027932, 2.361600, -2.333600, -2.845200, -2.845200] 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.363068, -2.882163, -0.017777, 1.607222, -0.010064] + cylinder.test_vals = [-8.363995, -2.882536, -0.017780, 1.607979, -0.010080] test_list.append(cylinder) # Laminar cylinder (low Mach correction) @@ -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.050732, 0.648355, 0.012273, 13.643219, -2.047100] + poiseuille.test_vals = [-5.050753, 0.648333, 0.012273, 13.643141, -2.114700] test_list.append(poiseuille) # 2D Poiseuille flow (inlet profile file) @@ -198,8 +198,8 @@ 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.485974, -7.612341, -0.000000, 2.085796] - poiseuille_profile.test_vals_aarch64 = [-12.485974, -7.612341, -0.000000, 2.085796] + poiseuille_profile.test_vals = [-12.053706, -6.378351, -0.000000, 2.085790] + poiseuille_profile.test_vals_aarch64 = [-12.053706, -6.378351, -0.000000, 2.085790] test_list.append(poiseuille_profile) ########################## @@ -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.156553, -6.736064, -0.176184, 0.057478] + turb_flatplate.test_vals = [-4.312826, -6.736053, -0.187467, 0.057454] test_list.append(turb_flatplate) # FLAT PLATE, WALL FUNCTIONS, COMPRESSIBLE SST @@ -250,7 +250,7 @@ def main(): turb_wallfunction_flatplate_sst.cfg_dir = "wallfunctions/flatplate/compressible_SST" turb_wallfunction_flatplate_sst.cfg_file = "turb_SST_flatplate.cfg" turb_wallfunction_flatplate_sst.test_iter = 10 - turb_wallfunction_flatplate_sst.test_vals = [-4.177397, -1.880811, -1.943377, 1.263787, -1.254740, 1.538892, 10.000000, -2.097623, 0.074673, 0.002932] + turb_wallfunction_flatplate_sst.test_vals = [-4.394471, -1.877558, -1.960378, 0.983694, -1.255671, 1.566842, 10.000000, -1.763190, 0.034806, 0.002921] test_list.append(turb_wallfunction_flatplate_sst) # FLAT PLATE, WALL FUNCTIONS, COMPRESSIBLE SA @@ -258,7 +258,7 @@ def main(): turb_wallfunction_flatplate_sa.cfg_dir = "wallfunctions/flatplate/compressible_SA" turb_wallfunction_flatplate_sa.cfg_file = "turb_SA_flatplate.cfg" turb_wallfunction_flatplate_sa.test_iter = 10 - turb_wallfunction_flatplate_sa.test_vals = [-4.414833, -2.031596, -2.120806, 1.007586, -5.386444, 10.000000, -1.635112, 0.068983, 0.002640] + turb_wallfunction_flatplate_sa.test_vals = [-4.460537, -2.033605, -2.117564, 0.889626, -5.381903, 10.000000, -1.517487, 0.034212, 0.002636] test_list.append(turb_wallfunction_flatplate_sa) # ONERA M6 Wing @@ -266,7 +266,7 @@ def main(): turb_oneram6.cfg_dir = "rans/oneram6" turb_oneram6.cfg_file = "turb_ONERAM6.cfg" turb_oneram6.test_iter = 10 - turb_oneram6.test_vals = [-2.392867, -6.689823, 0.230746, 0.158811, -33786.000000] + turb_oneram6.test_vals = [-2.408533, -6.662837, 0.238334, 0.158910, -52718] turb_oneram6.timeout = 3200 test_list.append(turb_oneram6) @@ -275,7 +275,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 = [-10.451742, -13.864841, 1.057622, 0.022916, 20.000000, -1.588482, 20.000000, -2.963093, -44.540000] + turb_naca0012_sa.test_vals = [-12.091696, -14.685322, 1.057665, 0.022971, 20.000000, -2.686306, 20.000000, -4.459916, -44.871000] turb_naca0012_sa.timeout = 3200 test_list.append(turb_naca0012_sa) @@ -284,8 +284,8 @@ 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.213755, -14.439873, -7.108062, 1.050109, 0.019148, -1.875539, -38.510000] - turb_naca0012_sst.test_vals_aarch64 = [-12.213728, -14.439873, -7.108062, 1.050109, 0.019148, -1.875538, -38.510000] + turb_naca0012_sst.test_vals = [-12.107132, -15.277740, -6.210248, 1.049757, 0.019249, -3.173936, -38.97600] + turb_naca0012_sst.test_vals_aarch64 = [-12.107132, -15.277740, -6.210248, 1.049757, 0.019249, -3.173936, -38.97600] turb_naca0012_sst.timeout = 3200 test_list.append(turb_naca0012_sst) @@ -294,7 +294,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.690803, -10.049843, -3.414020, 1.049314, 0.019686, -2.207421, -45.199000] + turb_naca0012_sst_2003m.test_vals = [-7.688139, -10.046053, -3.410061, 1.048970, 0.019798, -2.208236, -45.678000] turb_naca0012_sst_2003m.timeout = 3200 test_list.append(turb_naca0012_sst_2003m) @@ -303,8 +303,8 @@ 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.153015, -14.756601, -6.342509, 1.001189, 0.019384, -1.820009] - turb_naca0012_sst_sust_restart.test_vals_aarch64 = [-12.153059, -14.756601, -6.342509, 1.001189, 0.019384, -1.819999] + turb_naca0012_sst_sust_restart.test_vals = [-12.084326, -14.827365, -6.062398, 1.000276, 0.019495, -2.201517] + turb_naca0012_sst_sust_restart.test_vals_aarch64 = [-12.084326, -14.827365, -6.062398, 1.000276, 0.019495, -2.201517] turb_naca0012_sst_sust_restart.timeout = 3200 test_list.append(turb_naca0012_sst_sust_restart) @@ -313,7 +313,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.206797, -10.023481, -1.616002, 1.021528, 0.040220, -3.480532] + turb_naca0012_sst_fixedvalues.test_vals = [-5.206694, -10.016428, -1.616043, 1.021479, 0.040333, -3.478142] turb_naca0012_sst_fixedvalues.timeout = 3200 test_list.append(turb_naca0012_sst_fixedvalues) @@ -322,7 +322,7 @@ def main(): propeller.cfg_dir = "rans/propeller" propeller.cfg_file = "propeller.cfg" propeller.test_iter = 10 - propeller.test_vals = [-3.389575, -8.409251, 0.000048, 0.056329] + propeller.test_vals = [-3.389724, -8.409223, 0.000048, 0.056344] propeller.timeout = 3200 test_list.append(propeller) @@ -335,8 +335,8 @@ def main(): axi_rans_air_nozzle_restart.cfg_dir = "axisymmetric_rans/air_nozzle" axi_rans_air_nozzle_restart.cfg_file = "air_nozzle_restart.cfg" axi_rans_air_nozzle_restart.test_iter = 10 - axi_rans_air_nozzle_restart.test_vals = [-12.151701, -6.605756, -9.188910, -4.516059, -2019.700000] - axi_rans_air_nozzle_restart.test_vals_aarch64 = [-12.063354, -7.004772, -8.705740, -4.036824, -2019.800000] + axi_rans_air_nozzle_restart.test_vals = [-12.071702, -7.474599, -8.646498, -3.988633, -3572.100000] + axi_rans_air_nozzle_restart.test_vals_aarch64 = [-12.071702, -7.474599, -8.646498, -3.988633, -3572.100000] axi_rans_air_nozzle_restart.tol = 0.0001 test_list.append(axi_rans_air_nozzle_restart) @@ -677,8 +677,7 @@ def main(): turb_naca0012_1c.cfg_dir = "rans_uq/naca0012" turb_naca0012_1c.cfg_file = "turb_NACA0012_uq_1c.cfg" turb_naca0012_1c.test_iter = 10 - turb_naca0012_1c.test_vals = [-4.986094, 1.137009, 0.378604, -0.083526] - turb_naca0012_1c.test_vals_aarch64 = [-4.986054, 1.137073, 0.378618, -0.083513] + turb_naca0012_1c.test_vals = [-4.992120, 1.134926, 0.356004, -0.089085] test_list.append(turb_naca0012_1c) # NACA0012 2c @@ -686,8 +685,7 @@ def main(): turb_naca0012_2c.cfg_dir = "rans_uq/naca0012" turb_naca0012_2c.cfg_file = "turb_NACA0012_uq_2c.cfg" turb_naca0012_2c.test_iter = 10 - turb_naca0012_2c.test_vals = [-5.483291, 0.968701, 0.258168, -0.114217] - turb_naca0012_2c.test_vals_aarch64 = [-5.483307, 0.968694, 0.258049, -0.114260] #last 4 columns + turb_naca0012_2c.test_vals = [-5.485136, 0.968075, 0.273236, -0.110320] test_list.append(turb_naca0012_2c) # NACA0012 3c @@ -695,7 +693,7 @@ def main(): turb_naca0012_3c.cfg_dir = "rans_uq/naca0012" turb_naca0012_3c.cfg_file = "turb_NACA0012_uq_3c.cfg" turb_naca0012_3c.test_iter = 10 - turb_naca0012_3c.test_vals = [-5.584299, 0.931258, 0.251298, -0.114232] + turb_naca0012_3c.test_vals = [-5.584305, 0.931248, 0.250749, -0.113574] test_list.append(turb_naca0012_3c) # NACA0012 p1c1 @@ -703,8 +701,7 @@ def main(): turb_naca0012_p1c1.cfg_dir = "rans_uq/naca0012" turb_naca0012_p1c1.cfg_file = "turb_NACA0012_uq_p1c1.cfg" turb_naca0012_p1c1.test_iter = 10 - turb_naca0012_p1c1.test_vals = [-5.127497, 1.077175, 0.546823, -0.023191] - turb_naca0012_p1c1.test_vals_aarch64 = [-5.127510, 1.077107, 0.546893, -0.023166] #last 4 columns + turb_naca0012_p1c1.test_vals = [-5.120263, 1.074826, 0.294764, -0.109420] test_list.append(turb_naca0012_p1c1) # NACA0012 p1c2 @@ -712,8 +709,7 @@ def main(): turb_naca0012_p1c2.cfg_dir = "rans_uq/naca0012" turb_naca0012_p1c2.cfg_file = "turb_NACA0012_uq_p1c2.cfg" turb_naca0012_p1c2.test_iter = 10 - turb_naca0012_p1c2.test_vals = [-5.554412, 0.943562, 0.322803, -0.095946] - turb_naca0012_p1c2.test_vals_aarch64 = [-5.554381, 0.943577, 0.322676, -0.095989] #last 4 columns + turb_naca0012_p1c2.test_vals = [-5.549132, 0.945637, 0.252403, -0.117491] test_list.append(turb_naca0012_p1c2) ###################################### @@ -753,7 +749,7 @@ def main(): cavity.cfg_dir = "moving_wall/cavity" cavity.cfg_file = "lam_cavity.cfg" cavity.test_iter = 25 - cavity.test_vals = [-5.627868, -0.164405, 0.053283, 2.545817] + cavity.test_vals = [-5.627870, -0.164404, 0.054706, 2.545833] test_list.append(cavity) # Spinning cylinder @@ -761,7 +757,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.892807, -2.467378, 1.702819, 1.669208] + spinning_cylinder.test_vals = [-7.894516, -2.469078, 1.703821, 1.670411] test_list.append(spinning_cylinder) ###################################### @@ -773,7 +769,7 @@ def main(): square_cylinder.cfg_dir = "unsteady/square_cylinder" square_cylinder.cfg_file = "turb_square.cfg" square_cylinder.test_iter = 3 - square_cylinder.test_vals = [-2.557884, -1.173573, 0.058052, 1.399794, 2.220411, 1.399748, 2.218612, -0.453340] + square_cylinder.test_vals = [-2.560840, -1.173495, 0.061186, 1.399403, 2.220585, 1.399351, 2.218790, -0.584750] square_cylinder.unsteady = True test_list.append(square_cylinder) @@ -876,8 +872,7 @@ def main(): axial_stage2D.cfg_dir = "turbomachinery/axial_stage_2D" axial_stage2D.cfg_file = "Axial_stage2D.cfg" axial_stage2D.test_iter = 20 - axial_stage2D.test_vals = [0.983751, 1.534480, -2.888520, 2.606773, -2.418421, 3.087187, 106380.000000, 106380.000000, 5.732500, 64.711000] - axial_stage2D.test_vals_aarch64 = [0.983751, 1.534480, -2.888520, 2.606773, -2.418421, 3.087187, 106380, 106380, 5.7325, 64.711] + axial_stage2D.test_vals = [0.987679, 1.532118, -2.888457, 2.606793, -2.418303, 3.087091, 106380.000000, 106380.000000, 5.732900, 64.728000] test_list.append(axial_stage2D) # 2D transonic stator restart @@ -915,8 +910,7 @@ def main(): uniform_flow.cfg_dir = "sliding_interface/uniform_flow" uniform_flow.cfg_file = "uniform_NN.cfg" uniform_flow.test_iter = 2 - uniform_flow.test_vals = [2.000000, 0.000000, -0.202697, -13.249572] - uniform_flow.test_vals_aarch64 = [2.000000, 0.000000, -0.205134, -13.250720] #last 4 columns + uniform_flow.test_vals = [2.000000, 0.000000, -0.202598, -13.248144] uniform_flow.tol = 0.000001 uniform_flow.unsteady = True uniform_flow.multizone = True @@ -927,8 +921,7 @@ def main(): channel_2D.cfg_dir = "sliding_interface/channel_2D" channel_2D.cfg_file = "channel_2D_WA.cfg" channel_2D.test_iter = 2 - channel_2D.test_vals = [2.000000, 0.000000, 0.419778, 0.352185, 0.404395] - channel_2D.test_vals_aarch64 = [2.000000, 0.000000, 0.398053, 0.352788, 0.405474] #last 5 columns + channel_2D.test_vals = [2.000000, 0.000000, 0.417404, 0.350501, 0.401519] channel_2D.timeout = 100 channel_2D.unsteady = True channel_2D.multizone = True @@ -939,8 +932,7 @@ def main(): channel_3D.cfg_dir = "sliding_interface/channel_3D" channel_3D.cfg_file = "channel_3D_WA.cfg" channel_3D.test_iter = 1 - channel_3D.test_vals = [1.000000, 0.000000, 0.657678, 0.767752, 0.692208] - channel_3D.test_vals_aarch64 = [1.000000, 0.000000, 0.661408, 0.769902, 0.695663] #last 5 columns + channel_3D.test_vals = [1.000000, 0.000000, 0.656358, 0.766909, 0.690972] channel_3D.unsteady = True channel_3D.multizone = True test_list.append(channel_3D) @@ -950,7 +942,7 @@ def main(): pipe.cfg_dir = "sliding_interface/pipe" pipe.cfg_file = "pipe_NN.cfg" pipe.test_iter = 2 - pipe.test_vals = [0.481390, 0.648695, 0.982990, 1.018349] + pipe.test_vals = [0.477630, 0.641341, 0.983336, 1.018856] pipe.unsteady = True pipe.multizone = True test_list.append(pipe) @@ -970,7 +962,7 @@ def main(): supersonic_vortex_shedding.cfg_dir = "sliding_interface/supersonic_vortex_shedding" supersonic_vortex_shedding.cfg_file = "sup_vor_shed_WA.cfg" supersonic_vortex_shedding.test_iter = 5 - supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.207949, 1.036092] + supersonic_vortex_shedding.test_vals = [5.000000, 0.000000, 1.206774, 1.053444] supersonic_vortex_shedding.unsteady = True supersonic_vortex_shedding.multizone = True test_list.append(supersonic_vortex_shedding) @@ -1048,7 +1040,7 @@ def main(): fsi2d.cfg_dir = "fea_fsi/WallChannel_2d" fsi2d.cfg_file = "configFSI.cfg" fsi2d.test_iter = 4 - fsi2d.test_vals = [4.000000, 0.000000, -3.729228, -4.153949] + fsi2d.test_vals = [4.000000, 0.000000, -3.726050, -4.277800] fsi2d.multizone = True fsi2d.unsteady = True test_list.append(fsi2d) @@ -1058,7 +1050,7 @@ def main(): stat_fsi.cfg_dir = "fea_fsi/stat_fsi" stat_fsi.cfg_file = "config.cfg" stat_fsi.test_iter = 7 - stat_fsi.test_vals = [-3.345064, -4.996078, 0.000000, 7.000000] + stat_fsi.test_vals = [-3.343487, -4.993604, 0.000000, 7.000000] stat_fsi.multizone = True test_list.append(stat_fsi) @@ -1067,7 +1059,7 @@ def main(): stat_fsi_restart.cfg_dir = "fea_fsi/stat_fsi" stat_fsi_restart.cfg_file = "config_restart.cfg" stat_fsi_restart.test_iter = 1 - stat_fsi_restart.test_vals = [-3.404628, -4.288921, 0.000000, 27.000000] + stat_fsi_restart.test_vals = [-3.405333, -4.327317, 0.000000, 26.000000] stat_fsi_restart.multizone = True test_list.append(stat_fsi_restart) @@ -1076,8 +1068,7 @@ def main(): dyn_fsi.cfg_dir = "fea_fsi/dyn_fsi" dyn_fsi.cfg_file = "config.cfg" dyn_fsi.test_iter = 4 - dyn_fsi.test_vals = [-4.330444, -4.058003, 0.000000, 86.000000] - dyn_fsi.test_vals_aarch64 = [-4.355809, -4.060588, 0.000000, 86.000000] #last 4 columns + dyn_fsi.test_vals = [-4.330908, -4.153034, 0.000000, 86.000000] dyn_fsi.multizone = True dyn_fsi.unsteady = True test_list.append(dyn_fsi) @@ -1143,7 +1134,7 @@ def main(): mms_fvm_ns.cfg_dir = "mms/fvm_navierstokes" mms_fvm_ns.cfg_file = "lam_mms_roe.cfg" mms_fvm_ns.test_iter = 20 - mms_fvm_ns.test_vals = [-2.851428, 2.192348, 0.000000, 0.000000] + mms_fvm_ns.test_vals = [-2.808514, 2.152654, 0.000000, 0.000000] mms_fvm_ns.tol = 0.0001 test_list.append(mms_fvm_ns) @@ -1486,7 +1477,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.117740, 4.438036] + opt_multiobj1surf_py.test_vals = [1.000000, 1.000000, 36.139240, 4.307073] 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 @@ -1499,7 +1490,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.005219, 0.000369] + opt_2surf1obj_py.test_vals = [1.000000, 1.000000, 2.005099, 0.000358] 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 @@ -1516,7 +1507,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.444941, -3.941038, 0.318998, 0.022365] + pywrapper_naca0012.test_vals = [-4.431325, -3.970055, 0.319205, 0.022299] pywrapper_naca0012.command = TestCase.Command(exec = "SU2_CFD.py", param = "-f") pywrapper_naca0012.timeout = 1600 pywrapper_naca0012.tol = 0.00001 @@ -1529,8 +1520,8 @@ 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.213755, -14.439873, -7.108062, 1.050109, 0.019148, -1.875539, -38.510000] - pywrapper_turb_naca0012_sst.test_vals_aarch64 = [-12.213728, -14.439873, -7.108062, 1.050109, 0.019148, -1.875538, -38.510000] + pywrapper_turb_naca0012_sst.test_vals = [-12.107132, -15.277740, -6.210248, 1.049757, 0.019249, -3.173936, -38.976000] + pywrapper_turb_naca0012_sst.test_vals_aarch64 = [-12.107132, -15.277740, -6.210248, 1.049757, 0.019249, -3.173936, -38.976000] pywrapper_turb_naca0012_sst.command = TestCase.Command(exec = "SU2_CFD.py", param = "-f") pywrapper_turb_naca0012_sst.timeout = 3200 pywrapper_turb_naca0012_sst.tol = 0.00001 @@ -1543,7 +1534,7 @@ def main(): pywrapper_square_cylinder.cfg_dir = "unsteady/square_cylinder" pywrapper_square_cylinder.cfg_file = "turb_square.cfg" pywrapper_square_cylinder.test_iter = 3 - pywrapper_square_cylinder.test_vals = [-2.557884, -1.173573, 0.058052, 1.399794, 2.220411, 1.399748, 2.218612, -0.453340] + pywrapper_square_cylinder.test_vals = [-2.560840, -1.173495, 0.061186, 1.399403, 2.220585, 1.399351, 2.218790, -0.584750] pywrapper_square_cylinder.command = TestCase.Command(exec = "SU2_CFD.py", param = "-f") pywrapper_square_cylinder.timeout = 1600 pywrapper_square_cylinder.tol = 0.00001 @@ -1571,7 +1562,7 @@ def main(): pywrapper_fsi2d.cfg_dir = "fea_fsi/WallChannel_2d" pywrapper_fsi2d.cfg_file = "configFSI.cfg" pywrapper_fsi2d.test_iter = 4 - pywrapper_fsi2d.test_vals = [4.000000, 0.000000, -3.729228, -4.153949] + pywrapper_fsi2d.test_vals = [4.000000, 0.000000, -3.726050, -4.277800] pywrapper_fsi2d.command = TestCase.Command(exec = "SU2_CFD.py", param = "--nZone 2 --fsi True -f") pywrapper_fsi2d.unsteady = True pywrapper_fsi2d.multizone = True @@ -1614,7 +1605,7 @@ def main(): pywrapper_custom_inlet.cfg_dir = "py_wrapper/custom_inlet" pywrapper_custom_inlet.cfg_file = "lam_flatplate.cfg" pywrapper_custom_inlet.test_iter = 20 - pywrapper_custom_inlet.test_vals = [-4.120494, -1.540195, -3.566114, 1.342509, -0.748827, 0.161349, -0.013214, 0.516000, -0.529220] + pywrapper_custom_inlet.test_vals = [-4.120585, -1.540325, -3.560392, 1.342419, -0.748768, 0.161248, -0.013208, 0.515780, -0.528990] pywrapper_custom_inlet.command = TestCase.Command(exec = "python", param = "run.py") pywrapper_custom_inlet.timeout = 1600 pywrapper_custom_inlet.tol = 0.0001 diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py index 09043e19eb8..9817708b300 100644 --- a/TestCases/serial_regression_AD.py +++ b/TestCases/serial_regression_AD.py @@ -78,7 +78,7 @@ def main(): discadj_rans_naca0012_sa.cfg_dir = "disc_adj_rans/naca0012" discadj_rans_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" discadj_rans_naca0012_sa.test_iter = 10 - discadj_rans_naca0012_sa.test_vals = [-2.230545, 0.644224, 0.180740, -0.000018, 5.000000, -4.275182, 5.000000, -10.051224] + discadj_rans_naca0012_sa.test_vals = [-2.996976, -0.196055, 0.000004, -0.000000, 5.000000, -3.971736, 5.000000, -10.464337] test_list.append(discadj_rans_naca0012_sa) # Adjoint turbulent NACA0012 SST @@ -86,7 +86,7 @@ def main(): discadj_rans_naca0012_sst.cfg_dir = "disc_adj_rans/naca0012" discadj_rans_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" discadj_rans_naca0012_sst.test_iter = 10 - discadj_rans_naca0012_sst.test_vals = [-2.221845, -0.491927, 0.182000, -0.000018] + discadj_rans_naca0012_sst.test_vals = [-2.127041, -0.204660, 0.335320, -0.022055] test_list.append(discadj_rans_naca0012_sst) ####################################### @@ -122,7 +122,7 @@ def main(): discadj_cylinder.cfg_dir = "disc_adj_rans/cylinder" discadj_cylinder.cfg_file = "cylinder.cfg" discadj_cylinder.test_iter = 9 - discadj_cylinder.test_vals = [3.746909, -1.544883, -0.008321, 0.000014] + discadj_cylinder.test_vals = [1.639372, -2.834285, -0.009538, 0.000020] discadj_cylinder.unsteady = True test_list.append(discadj_cylinder) @@ -135,7 +135,7 @@ def main(): discadj_DT_1ST_cylinder.cfg_dir = "disc_adj_rans/cylinder_DT_1ST" discadj_DT_1ST_cylinder.cfg_file = "cylinder.cfg" discadj_DT_1ST_cylinder.test_iter = 9 - discadj_DT_1ST_cylinder.test_vals = [3.698168, -1.607050, -0.002159, 0.000028] + discadj_DT_1ST_cylinder.test_vals = [1.196420, -3.339046, -0.006211, 0.000020] discadj_DT_1ST_cylinder.unsteady = True test_list.append(discadj_DT_1ST_cylinder) @@ -195,7 +195,7 @@ def main(): discadj_fsi.cfg_dir = "disc_adj_fsi" discadj_fsi.cfg_file = "config.cfg" discadj_fsi.test_iter = 6 - discadj_fsi.test_vals = [6.000000, -1.965877, -3.084381, 0.000440, -1.063100] + discadj_fsi.test_vals = [6.000000, -8.928327, -10.009868, 3.1056e-11, -1.7613e-06] test_list.append(discadj_fsi) ################################### diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 59e0f298a53..eb018f65e73 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -172,7 +172,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.125776, 69.613563] + tutorial_lam_cylinder.test_vals = [-6.162141, -0.699617, 0.126007, 69.619462] tutorial_lam_cylinder.no_restart = True test_list.append(tutorial_lam_cylinder) @@ -228,7 +228,7 @@ def main(): tutorial_trans_e387_sa.cfg_dir = "../Tutorials/compressible_flow/Transitional_Airfoil/Langtry_and_Menter/E387" tutorial_trans_e387_sa.cfg_file = "transitional_SA_LM_model_ConfigFile.cfg" tutorial_trans_e387_sa.test_iter = 20 - tutorial_trans_e387_sa.test_vals = [-6.527027, -5.081560, -0.795267, 1.022556, 0.150189, 2.000000, -9.580669] + tutorial_trans_e387_sa.test_vals = [-6.527027, -5.081558, -0.795261, 1.022606, 0.150125, 2.000000, -9.580659] tutorial_trans_e387_sa.no_restart = True test_list.append(tutorial_trans_e387_sa) @@ -237,7 +237,7 @@ def main(): tutorial_trans_e387_sst.cfg_dir = "../Tutorials/compressible_flow/Transitional_Airfoil/Langtry_and_Menter/E387" tutorial_trans_e387_sst.cfg_file = "transitional_SST_LM_model_ConfigFile.cfg" tutorial_trans_e387_sst.test_iter = 20 - tutorial_trans_e387_sst.test_vals = [-6.532424, -5.085816, -0.789725, 1.078014, 0.188274, 2.000000, -9.567012] + tutorial_trans_e387_sst.test_vals = [-6.532424, -2.932985, 0.401483, 1.078077, 0.188212, 2.000000, -10.005652] tutorial_trans_e387_sst.no_restart = True test_list.append(tutorial_trans_e387_sst) diff --git a/TestCases/vandv.py b/TestCases/vandv.py index ec07fbad290..01359163885 100644 --- a/TestCases/vandv.py +++ b/TestCases/vandv.py @@ -45,8 +45,8 @@ def main(): p30n30.cfg_dir = "vandv/rans/30p30n" p30n30.cfg_file = "config.cfg" p30n30.test_iter = 20 - p30n30.test_vals = [-10.806343, -10.326374, -10.559106, -10.432754, -13.517105, 0.050962, 2.828563, 1.317849, -0.228843] - p30n30.test_vals_aarch64 = [-10.801521, -10.325747, -10.557163, -10.427274, -13.517118, 0.050962, 2.828563, 1.317849, -0.207763] + p30n30.test_vals = [-10.582171, -10.106603, -10.474926, -10.182536, -12.679336, 0.052181, 2.829820, 1.318613, -0.221214] + p30n30.test_vals_aarch64 = [-10.582171, -10.106603, -10.474926, -10.182536, -12.679336, 0.052181, 2.829820, 1.318613, -0.221214] test_list.append(p30n30) # flat plate - sst-v1994m @@ -54,8 +54,8 @@ def main(): flatplate_sst1994m.cfg_dir = "vandv/rans/flatplate" flatplate_sst1994m.cfg_file = "turb_flatplate_sst.cfg" flatplate_sst1994m.test_iter = 5 - flatplate_sst1994m.test_vals = [-13.027926, -10.276119, -11.311717, -8.137517, -10.520065, -5.127385, 0.002775] - flatplate_sst1994m.test_vals_aarch64 = [-13.028095, -11.271115, -11.532461, -8.387610, -11.417974, -5.116988, 0.002808] + flatplate_sst1994m.test_vals = [-13.045864, -10.962894, -11.543805, -8.355270, -11.200467, -5.084711, 0.002786] + flatplate_sst1994m.test_vals_aarch64 = [-13.045864, -10.962894, -11.543805, -8.355270, -11.200467, -5.084711, 0.002786] test_list.append(flatplate_sst1994m) # bump in channel - sst-v1994m @@ -63,8 +63,8 @@ def main(): bump_sst1994m.cfg_dir = "vandv/rans/bump_in_channel" bump_sst1994m.cfg_file = "turb_bump_sst.cfg" bump_sst1994m.test_iter = 5 - bump_sst1994m.test_vals = [-13.022054, -9.882710, -10.557148, -7.605034, -10.172437, -5.549948, 0.004904] - bump_sst1994m.test_vals_aarch64 = [-13.034665, -10.510699, -10.627802, -7.661320, -10.680337, -5.749566, 0.004972] + bump_sst1994m.test_vals = [-13.000658, -10.449108, -10.585058, -7.531737, -10.468414, -5.695067, 0.004904] + bump_sst1994m.test_vals_aarch64 = [-13.000658, -10.449108, -10.585058, -7.531737, -10.468414, -5.695067, 0.004904] test_list.append(bump_sst1994m) # SWBLI SA @@ -72,8 +72,8 @@ def main(): swbli_sa.cfg_dir = "vandv/rans/swbli" swbli_sa.cfg_file = "config_sa.cfg" swbli_sa.test_iter = 5 - swbli_sa.test_vals = [-11.564511, -10.836187, -11.792765, -10.383947, -15.718717, 0.002212, -2.993991, 1.340100] - swbli_sa.test_vals_aarch64 = [-11.564511, -10.836187, -11.792765, -10.383947, -15.718717, 0.002212, -2.993991, 1.340100] + swbli_sa.test_vals = [-11.511278, -10.750583, -11.854073, -10.320108, -14.316261, 0.002238, -1.585354, 1.276300] + swbli_sa.test_vals_aarch64 = [-11.511278, -10.750583, -11.854073, -10.320108, -14.316261, 0.002238, -1.585354, 1.276300] test_list.append(swbli_sa) @@ -82,7 +82,7 @@ def main(): swbli_sst.cfg_dir = "vandv/rans/swbli" swbli_sst.cfg_file = "config_sst.cfg" swbli_sst.test_iter = 5 - swbli_sst.test_vals = [-11.528112, -10.961624, -11.903226, -10.630539, -11.117619, -4.573066, 0.002318, -2.905628, -4.037947, 1.340100] + swbli_sst.test_vals = [-11.505404, -10.756847, -11.931456, -10.349754, -11.606988, -4.851901, 0.002280, -1.521436, -3.777949, 1.340100] test_list.append(swbli_sst) ########################## diff --git a/TestCases/vandv/rans/swbli/config_sa.cfg b/TestCases/vandv/rans/swbli/config_sa.cfg index 93ad793255c..9c5e1ac0d0f 100644 --- a/TestCases/vandv/rans/swbli/config_sa.cfg +++ b/TestCases/vandv/rans/swbli/config_sa.cfg @@ -69,12 +69,12 @@ TIME_DISCRE_TURB= EULER_IMPLICIT CFL_NUMBER= 1 CFL_REDUCTION_TURB= 1 CFL_ADAPT= YES -CFL_ADAPT_PARAM= ( 1.0, 1.05, 1, 100, 0.8 ) +CFL_ADAPT_PARAM= ( 1.0, 1.05, 1, 50, 0.8 ) % LINEAR_SOLVER= FGMRES LINEAR_SOLVER_PREC= ILU -LINEAR_SOLVER_ERROR= 0.0001 -LINEAR_SOLVER_ITER= 3 +LINEAR_SOLVER_ERROR= 0.1 +LINEAR_SOLVER_ITER= 10 % NEWTON_KRYLOV= YES NEWTON_KRYLOV_IPARAM= ( 0, 3, 1 ) % n0, np, ft diff --git a/TestCases/vandv/rans/swbli/config_sst.cfg b/TestCases/vandv/rans/swbli/config_sst.cfg index f2af3e18ec0..efd2de11350 100644 --- a/TestCases/vandv/rans/swbli/config_sst.cfg +++ b/TestCases/vandv/rans/swbli/config_sst.cfg @@ -71,12 +71,12 @@ TIME_DISCRE_TURB= EULER_IMPLICIT CFL_NUMBER= 1 CFL_REDUCTION_TURB= 1 CFL_ADAPT= YES -CFL_ADAPT_PARAM= ( 1.0, 1.05, 1, 100, 0.8 ) +CFL_ADAPT_PARAM= ( 1.0, 1.05, 1, 50, 0.8 ) % LINEAR_SOLVER= FGMRES LINEAR_SOLVER_PREC= ILU -LINEAR_SOLVER_ERROR= 0.0001 -LINEAR_SOLVER_ITER= 3 +LINEAR_SOLVER_ERROR= 0.1 +LINEAR_SOLVER_ITER= 10 % NEWTON_KRYLOV= YES NEWTON_KRYLOV_IPARAM= ( 0, 3, 1 ) % n0, np, ft