diff --git a/.github/workflows/regression.yml b/.github/workflows/regression.yml index 899b2cc50155..31aaed6f6930 100644 --- a/.github/workflows/regression.yml +++ b/.github/workflows/regression.yml @@ -26,25 +26,25 @@ jobs: config_set: [BaseMPI, ReverseMPI, ForwardMPI, BaseNoMPI, ReverseNoMPI, ForwardNoMPI, ReverseTagNoMPI, BaseOMP, ReverseOMP, ForwardOMP] include: - config_set: BaseMPI - flags: '-Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Dinstall-mpp=true -Denable-mlpcpp=true -Denable-tests=true --warnlevel=2' + flags: '-Dcpu-arch=skylake -Denable-pywrapper=true -Denable-coolprop=true -Denable-mpp=true -Dinstall-mpp=true -Denable-mlpcpp=true -Denable-tests=true --warnlevel=2' - config_set: ReverseMPI - flags: '-Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 --werror' + flags: '-Dcpu-arch=skylake -Denable-autodiff=true -Denable-normal=false -Denable-pywrapper=true -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 --werror' - config_set: ForwardMPI - flags: '-Denable-directdiff=true -Denable-normal=false -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 --werror' + flags: '-Dcpu-arch=skylake -Denable-directdiff=true -Denable-normal=false -Denable-tests=true -Denable-mlpcpp=true --warnlevel=3 --werror' - config_set: BaseNoMPI - flags: '-Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true -Denable-tests=true --warnlevel=3 --werror' + flags: '-Dcpu-arch=skylake -Denable-pywrapper=true -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true -Denable-tests=true --warnlevel=3 --werror' - config_set: ReverseNoMPI - flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror' + flags: '-Dcpu-arch=skylake -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror' - config_set: ForwardNoMPI - flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror' + flags: '-Dcpu-arch=skylake -Denable-directdiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-tests=true --warnlevel=3 --werror' - config_set: ReverseTagNoMPI - flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror -Dcodi-tape=Tag' + flags: '-Dcpu-arch=skylake -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled -Denable-pywrapper=true -Denable-tests=true --warnlevel=3 --werror -Dcodi-tape=Tag' - config_set: BaseOMP - flags: '-Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror' + flags: '-Dcpu-arch=skylake -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror' - config_set: ReverseOMP - flags: '-Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror' + flags: '-Dcpu-arch=skylake -Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror' - config_set: ForwardOMP - flags: '-Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror' + flags: '-Dcpu-arch=skylake -Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror' runs-on: ${{ inputs.runner || 'ubuntu-latest' }} steps: - name: Cache Object Files @@ -83,11 +83,11 @@ jobs: config_set: [BaseOMP-tsan, ReverseOMP-tsan] #ForwardOMP-tsan include: - config_set: BaseOMP-tsan - flags: '--buildtype=debugoptimized -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3' + flags: '--buildtype=debugoptimized -Dcpu-arch=skylake -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3' - config_set: ReverseOMP-tsan - flags: '--buildtype=debugoptimized -Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3' + flags: '--buildtype=debugoptimized -Dcpu-arch=skylake -Denable-autodiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-tecio=false --warnlevel=3' #- config_set: ForwardOMP-tsan - # flags: '--buildtype=debug -Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror' + # flags: '--buildtype=debug -Dcpu-arch=skylake -Denable-directdiff=true -Denable-normal=false -Dwith-omp=true -Denable-mixedprec=true -Denable-pywrapper=true -Denable-tecio=false --warnlevel=3 --werror' runs-on: ${{ inputs.runner || 'ubuntu-latest' }} steps: - name: Cache Object Files @@ -125,9 +125,9 @@ jobs: config_set: [BaseNoMPI-asan, ReverseNoMPI-asan] include: - config_set: BaseNoMPI-asan - flags: '--buildtype=debugoptimized -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true --warnlevel=3 --werror' + flags: '--buildtype=debugoptimized -Dcpu-arch=skylake -Denable-openblas=true -Dwith-mpi=disabled -Denable-mlpcpp=true --warnlevel=3 --werror' - config_set: ReverseNoMPI-asan - flags: '--buildtype=debugoptimized --optimization=1 -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled --warnlevel=3 --werror' + flags: '--buildtype=debugoptimized -Dcpu-arch=skylake --optimization=1 -Denable-autodiff=true -Denable-normal=false -Dwith-mpi=disabled --warnlevel=3 --werror' runs-on: ${{ inputs.runner || 'ubuntu-latest' }} steps: - name: Cache Object Files diff --git a/.github/workflows/release-management.yml b/.github/workflows/release-management.yml index b2e393d58245..cb9dd60b98e0 100644 --- a/.github/workflows/release-management.yml +++ b/.github/workflows/release-management.yml @@ -12,20 +12,20 @@ jobs: strategy: fail-fast: false matrix: - os_bin: [macos64-omp, macos64-mpi, linux64-omp, linux64-mpi, win64-omp, win64-mpi] + os_bin: [macos64, macos64-mpi, linux64-omp, linux64-mpi, win64-omp, win64-mpi] include: - os_bin: win64-omp - flags: '-Dwith-omp=true -Dwith-mpi=disabled --cross-file=/hostfiles/hostfile_windows' + flags: '-Dcpu-arch=haswell -Dwith-omp=true -Dwith-mpi=disabled --cross-file=/hostfiles/hostfile_windows' - os_bin: win64-mpi - flags: '-Dcustom-mpi=true --cross-file=/hostfiles/hostfile_windows_mpi' - - os_bin: macos64-omp - flags: '-Dwith-omp=true -Dwith-mpi=disabled --cross-file=/hostfiles/hostfile_darwin' + flags: '-Dcpu-arch=haswell -Dcustom-mpi=true --cross-file=/hostfiles/hostfile_windows_mpi' + - os_bin: macos64 + flags: '-Dcpu-arch= -Dwith-mpi=disabled --cross-file=/hostfiles/hostfile_darwin' - os_bin: macos64-mpi - flags: '-Dcustom-mpi=true --cross-file=/hostfiles/hostfile_darwin_mpi' + flags: '-Dcpu-arch= -Dcustom-mpi=true --cross-file=/hostfiles/hostfile_darwin_mpi' - os_bin: linux64-omp - flags: '-Dwith-omp=true -Dwith-mpi=disabled -Dstatic-cgns-deps=true --cross-file=/hostfiles/hostfile_linux' + flags: '-Dcpu-arch=haswell -Dwith-omp=true -Dwith-mpi=disabled -Dstatic-cgns-deps=true --cross-file=/hostfiles/hostfile_linux' - os_bin: linux64-mpi - flags: '-Dcustom-mpi=true --cross-file=/hostfiles/hostfile_linux_mpi' + flags: '-Dcpu-arch=haswell -Dcustom-mpi=true --cross-file=/hostfiles/hostfile_linux_mpi' runs-on: ubuntu-latest steps: - name: Cache Object Files diff --git a/SU2_CFD/include/solvers/CHeatSolver.hpp b/SU2_CFD/include/solvers/CHeatSolver.hpp index 7607114dff4c..077d058b9498 100644 --- a/SU2_CFD/include/solvers/CHeatSolver.hpp +++ b/SU2_CFD/include/solvers/CHeatSolver.hpp @@ -88,8 +88,8 @@ class CHeatSolver final : public CScalarSolver { LinSysRes(iPoint, 0) -= thermal_diffusivity * dTdn * Area; if (implicit) { - su2double Jacobian_i[] = {-thermal_diffusivity / dist_ij * Area}; - Jacobian.SubtractBlock2Diag(iPoint, &Jacobian_i); + su2double Jacobian_i[1][1] = {{-thermal_diffusivity / dist_ij * Area}}; + Jacobian.SubtractBlock2Diag(iPoint, Jacobian_i); } } diff --git a/SU2_CFD/src/solvers/CGradientSmoothingSolver.cpp b/SU2_CFD/src/solvers/CGradientSmoothingSolver.cpp index 44f3bbb59818..644cd029d6e8 100644 --- a/SU2_CFD/src/solvers/CGradientSmoothingSolver.cpp +++ b/SU2_CFD/src/solvers/CGradientSmoothingSolver.cpp @@ -550,8 +550,6 @@ void CGradientSmoothingSolver::Compute_Surface_Residual(CGeometry* geometry, con int EL_KIND = 0; std::array indexNode; std::array indexVertex; - su2double Weight, Jac_X, norm, val_Coord, normalSens = 0.0, Residual=0.0; - su2double normal[MAXNDIM]; for (iElem = 0; iElem < geometry->GetnElem_Bound(val_marker); iElem++) { /*--- Identify the kind of boundary element ---*/ @@ -562,7 +560,7 @@ void CGradientSmoothingSolver::Compute_Surface_Residual(CGeometry* geometry, con indexNode[iNode] = geometry->bound[val_marker][iElem]->GetNode(iNode); for (iDim = 0; iDim < nDim; iDim++) { - val_Coord = Get_ValCoord(geometry, indexNode[iNode], iDim); + const su2double val_Coord = Get_ValCoord(geometry, indexNode[iNode], iDim); element_container[GRAD_TERM][EL_KIND]->SetRef_Coord(iNode, iDim, val_Coord); } } @@ -575,31 +573,27 @@ void CGradientSmoothingSolver::Compute_Surface_Residual(CGeometry* geometry, con } } - element_container[GRAD_TERM][EL_KIND] - ->ClearElement(); /*--- Restarts the element: avoids adding over previous results in other elements --*/ + /*--- Restarts the element: avoids adding over previous results in other elements --*/ + element_container[GRAD_TERM][EL_KIND]->ClearElement(); element_container[GRAD_TERM][EL_KIND]->ComputeGrad_SurfaceEmbedded(); unsigned int nGauss = element_container[GRAD_TERM][EL_KIND]->GetnGaussPoints(); for (unsigned int iGauss = 0; iGauss < nGauss; iGauss++) { - Weight = element_container[GRAD_TERM][EL_KIND]->GetWeight(iGauss); - Jac_X = element_container[GRAD_TERM][EL_KIND]->GetJ_X(iGauss); + const su2double Weight = element_container[GRAD_TERM][EL_KIND]->GetWeight(iGauss); + const su2double Jac_X = element_container[GRAD_TERM][EL_KIND]->GetJ_X(iGauss); for (unsigned int iNode = 0; iNode < nNodes; iNode++) { + su2double normal[MAXNDIM] = {}; geometry->vertex[val_marker][indexVertex[iNode]]->GetNormal(normal); - norm = GeometryToolbox::Norm(nDim, normal); + const su2double norm = GeometryToolbox::Norm(nDim, normal); for (iDim = 0; iDim < nDim; iDim++) { normal[iDim] = normal[iDim] / norm; } - + su2double normalSens = 0; for (iDim = 0; iDim < nDim; iDim++) { normalSens += normal[iDim] * nodes->GetSensitivity(indexNode[iNode], iDim); } - - Residual += Weight * Jac_X * element_container[GRAD_TERM][EL_KIND]->GetNi(iNode, iGauss) * normalSens; - LinSysRes.AddBlock(indexNode[iNode], &Residual); - - Residual = 0; - normalSens = 0; + LinSysRes(indexNode[iNode], 0) += Weight * Jac_X * element_container[GRAD_TERM][EL_KIND]->GetNi(iNode, iGauss) * normalSens; } } } diff --git a/SU2_CFD/src/solvers/CHeatSolver.cpp b/SU2_CFD/src/solvers/CHeatSolver.cpp index c4c19244fc79..6e127a984485 100644 --- a/SU2_CFD/src/solvers/CHeatSolver.cpp +++ b/SU2_CFD/src/solvers/CHeatSolver.cpp @@ -594,8 +594,8 @@ void CHeatSolver::BC_ConjugateHeat_Interface(CGeometry *geometry, CSolver **solv HeatFlux = HeatFluxDensity * Area; if (implicit) { - su2double Jacobian_i[] = {-thermal_diffusivity*Area}; - Jacobian.SubtractBlock2Diag(iPoint, &Jacobian_i); + su2double Jacobian_i[1][1] = {{-thermal_diffusivity*Area}}; + Jacobian.SubtractBlock2Diag(iPoint, Jacobian_i); } } else { diff --git a/SU2_CFD/src/solvers/CTurbSASolver.cpp b/SU2_CFD/src/solvers/CTurbSASolver.cpp index 7e0ebaed9d81..00d3009faa75 100644 --- a/SU2_CFD/src/solvers/CTurbSASolver.cpp +++ b/SU2_CFD/src/solvers/CTurbSASolver.cpp @@ -503,9 +503,8 @@ void CTurbSASolver::BC_HeatFlux_Wall(CGeometry *geometry, CSolver **solver_conta su2double coeff = (nu_total/sigma); su2double RoughWallBC = nodes->GetSolution(iPoint,0)/(0.03*Roughness_Height); - su2double Res_Wall;// = new su2double [nVar]; - Res_Wall = coeff*RoughWallBC*Area; - LinSysRes.SubtractBlock(iPoint, &Res_Wall); + su2double Res_Wall = coeff*RoughWallBC*Area; + LinSysRes(iPoint, 0) -= Res_Wall; su2double Jacobian_i = (laminar_viscosity /density *Area)/(0.03*Roughness_Height*sigma); Jacobian_i += 2.0*RoughWallBC*Area/sigma; diff --git a/SU2_PY/pySU2/meson.build b/SU2_PY/pySU2/meson.build index 3d9abc747ec5..436eb4b0d56a 100644 --- a/SU2_PY/pySU2/meson.build +++ b/SU2_PY/pySU2/meson.build @@ -19,10 +19,17 @@ else mpi4py_include = '' endif +su2_swig_args = [] +foreach arg : su2_cpp_args + if not arg.startswith('-f') and not arg.startswith('-m') + su2_swig_args += arg + endif +endforeach + swig_gen = generator( swig, output: ['@BASENAME@.cxx'], - arguments: su2_cpp_args + + arguments: su2_swig_args + [ '-c++', '-python', '-I'+mpi4py_include, '-outdir', meson.current_build_dir(), '-o', './@OUTPUT@', '@INPUT@'], depfile: '@BASENAME@.d', ) @@ -43,7 +50,7 @@ if get_option('enable-normal') ], install: true, include_directories : mpi4py_include, - cpp_args : [default_warning_flags,su2_cpp_args], + cpp_args : [default_warning_flags, su2_swig_args], name_prefix : '', install_dir: 'bin' ) @@ -62,7 +69,7 @@ if get_option('enable-autodiff') ], install: true, include_directories : mpi4py_include, - cpp_args : [default_warning_flags, su2_cpp_args, codi_rev_args], + cpp_args : [default_warning_flags, su2_swig_args, codi_rev_args], name_prefix : '', install_dir: 'bin' ) diff --git a/TestCases/disc_adj_fsi/dyn_fsi/grad_dv.opt.ref b/TestCases/disc_adj_fsi/dyn_fsi/grad_dv.opt.ref index e6641b705464..aeefa8f67249 100644 --- a/TestCases/disc_adj_fsi/dyn_fsi/grad_dv.opt.ref +++ b/TestCases/disc_adj_fsi/dyn_fsi/grad_dv.opt.ref @@ -1,9 +1,9 @@ INDEX GRAD -0 -4.570880056076276e-04 -1 -2.401474032110094e-04 -2 -9.134741314806565e-05 -3 -1.628103414800329e-05 -4 -1.741046937496715e-05 -5 -9.462481743926707e-05 -6 -2.452469742444662e-04 -7 -4.635498236376295e-04 +0 -4.570880237875418e-04 +1 -2.401474145411196e-04 +2 -9.134741927897237e-05 +3 -1.628103641919142e-05 +4 -1.741046901352254e-05 +5 -9.462481564764888e-05 +6 -2.452469723327466e-04 +7 -4.635498231799566e-04 diff --git a/TestCases/fea_topology/grad_ref_node.dat.ref b/TestCases/fea_topology/grad_ref_node.dat.ref index 15afff813c19..6f3a4d4a6854 100644 --- a/TestCases/fea_topology/grad_ref_node.dat.ref +++ b/TestCases/fea_topology/grad_ref_node.dat.ref @@ -6157,7 +6157,7 @@ -9.57383e-11 -2.60763e-10 -2.54078e-10 --1.57599e-10 +-1.57598e-10 -8.68931e-12 -4.26927e-13 0 diff --git a/TestCases/grad_smooth/oneram6/of_hess.dat.ref b/TestCases/grad_smooth/oneram6/of_hess.dat.ref index 02ba06109cbc..682bd0f2a1e0 100644 --- a/TestCases/grad_smooth/oneram6/of_hess.dat.ref +++ b/TestCases/grad_smooth/oneram6/of_hess.dat.ref @@ -15,7 +15,7 @@ -0.006467631847, 0.01474899148, 0.0307974965, 0.03133667011, 0.02135868557, 0.009195956631, 0.0005679148628, -0.002979438869, -0.002888704019, -0.001484322831, -0.0003805028717, -0.009749017792, 0.01377275078, 0.03561910891, 0.04068759244, 0.0320229057, 0.01832378646, 0.006777110935, 0.0003821410305, -0.001496252596, -0.001086366199, -0.0003216351645, -0.01012802391, 0.007372771691, 0.02569386609, 0.03132552458, 0.02570124608, 0.01539133323, 0.006215280913, 0.0008558831252, -0.0009273533675, -0.0007809529487, -0.0002425068128, -0.007928394398, 0.002070266239, 0.01378665724, 0.01798985944, 0.01513337149, 0.009153182312, 0.003674859753, 0.0004413598218, -0.0006244703773, -0.0005081859495, -0.0001571494848, -0.00493051489, -0.0002396568334, 0.005968682259, 0.008479468465, 0.007312783546, 0.004440065636, 0.001738824884, 0.0001397731457, -0.0003689708236, -0.0002823875978, -8.620744834e-05, -0.002478600059, -0.0006748885187, 0.002066013325, 0.00329433432, 0.002922916564, 0.001777630095, 0.000670671817, 1.535797359e-05, -0.0001827231234, -0.0001317267916, -3.964414261e-05, -0.0009841254633, -0.0004506363067, 0.0005147597333, 0.0009923057147, 0.0009141133046, 0.0005556425743, 0.0001975206881, -1.383923076e-05, -7.288723647e-05, -4.94869802e-05, -1.465635953e-05, -0.0002831321015, -0.0001786709401, 6.58272751e-05, 0.0002003390218, 0.0001961592109, 0.0001186688731, 3.753024261e-05, -9.935156589e-06, -2.138473898e-05, -1.360348147e-05, -3.950343144e-06, -4.554004401e-05, -3.672960965e-05, -3.041622561e-06, 1.799427418e-05, 2.027636727e-05, 1.203767729e-05, 2.649508268e-06, -2.70794393e-06, -3.56862514e-06, -2.10310099e-06, -5.947698304e-07, -0.005601649597, 0.003663315053, 0.008855155937, 0.008270418905, 0.005211846044, 0.002051209138, -0.0001730054338, -0.001205865676, -0.001233422859, -0.0007264792759, -0.0002174226404, -0.007611210873, 0.003301523038, 0.01118961161, 0.01201887408, 0.008994275876, 0.005067326541, 0.001833086624, -9.887411615e-05, -0.0007523705682, -0.0005808730526, -0.0001951220177, -0.007441046689, 0.001266593828, 0.008546193153, 0.009942656219, 0.007784066575, 0.004587745773, 0.001826453307, 0.0001135955779, -0.0005216994588, -0.0004414338999, -0.0001526936251, -0.00566661019, -0.0002874917326, 0.004841980873, 0.006139790065, 0.004941019791, 0.002931034371, 0.001147951918, 3.99276224e-05, -0.0003614638394, -0.0002968331893, -0.0001015819715, -0.003509714631, -0.0007811220973, 0.002197881102, 0.003108937626, 0.002572038857, 0.001525852968, 0.0005747115186, -1.373152539e-05, -0.000217106601, -0.0001698282856, -5.711344335e-05, -0.001781565969, -0.0006509595582, 0.0007793958023, 0.001287368927, 0.001099822422, 0.0006508662134, 0.0002316669047, -2.598766996e-05, -0.0001095788854, -8.151575035e-05, -2.690163744e-05, -0.0007189181431, -0.0003579820769, 0.0001868971594, 0.0004081475535, 0.000364234654, 0.0002142863145, 6.953286088e-05, -1.862504208e-05, -4.465908933e-05, -3.149481547e-05, -1.01801397e-05, -0.0002107020059, -0.0001331894618, 1.56490951e-05, 8.471984511e-05, 8.140117857e-05, 4.72137792e-05, 1.254545578e-05, -8.249903837e-06, -1.340571874e-05, -8.898200035e-06, -2.806655401e-06, -3.452670376e-05, -2.680888144e-05, -4.675239333e-06, 7.211143304e-06, 8.385674347e-06, 4.644500619e-06, 4.785389695e-07, -1.936902476e-06, -2.29051854e-06, -1.412826127e-06, -4.319034967e-07 -0.00418760099, 0.003164939048, 0.01686793413, 0.02679089038, 0.02741825725, 0.01985460031, 0.009261368916, 0.0008577314648, -0.002885697698, -0.002698422059, -0.001034333935, -0.005893646974, 0.001358321342, 0.01786175342, 0.0320229057, 0.03605854345, 0.02956944193, 0.01763318488, 0.006508745883, 1.535739201e-05, -0.001671934291, -0.0008468199082, -0.005842296384, -0.001372995249, 0.01139007538, 0.0233103281, 0.02769196454, 0.02359158545, 0.01466512077, 0.00586859374, 0.0004649327871, -0.001142965089, -0.0006355786285, -0.004443360253, -0.002568527442, 0.004976334012, 0.01255500631, 0.01578204326, 0.01379058138, 0.008663801363, 0.003434228438, 0.0001824184137, -0.000766154093, -0.0004152490589, -0.002720813517, -0.002223407514, 0.001469849657, 0.005458152309, 0.007364170805, 0.006606937245, 0.004173466333, 0.001606282661, 1.302051153e-06, -0.0004428899124, -0.0002300480739, -0.001357785599, -0.00135052352, 0.0001523202354, 0.001901908621, 0.002824336773, 0.002613207731, 0.001656887003, 0.0006101845972, -4.613409803e-05, -0.0002145347863, -0.0001068251748, -0.0005374507601, -0.0006149211624, -0.0001325918779, 0.000480019629, 0.0008346787878, 0.0008052744253, 0.0005117203452, 0.0001753724531, -3.56282835e-05, -8.36777944e-05, -3.988970627e-05, -0.0001544528154, -0.0001985035547, -9.03814922e-05, 6.387161394e-05, 0.0001626042288, 0.0001684732315, 0.0001070018665, 3.161302023e-05, -1.548965707e-05, -2.394938367e-05, -1.087091282e-05, -2.482684585e-05, -3.550562621e-05, -2.321071949e-05, -2.098772021e-06, 1.315056181e-05, 1.639844586e-05, 1.030443163e-05, 1.767206972e-06, -3.477078918e-06, -3.879505205e-06, -1.658464571e-06, -0.002332386684, 0.0001731063128, 0.004156773864, 0.006700696045, 0.006975098395, 0.005319517708, 0.002597905565, -5.337653038e-05, -0.001581482699, -0.001597395865, -0.0006987381646, -0.003217682667, -0.0004937642035, 0.004858098239, 0.008991340113, 0.01035025827, 0.008980809821, 0.005801567361, 0.002223062703, -0.0003254417609, -0.001118357965, -0.0006066660815, -0.003175450391, -0.001311369598, 0.003216991658, 0.007015501908, 0.008527140965, 0.007646060766, 0.005113396083, 0.002135316235, -5.664233672e-05, -0.0008146858677, -0.0004693986212, -0.002443739799, -0.001535685769, 0.001405278873, 0.004041864154, 0.005209590155, 0.004766305172, 0.003193478799, 0.001302274629, -8.810153125e-05, -0.0005534997008, -0.000311742948, -0.001533684497, -0.001219118062, 0.0003620943734, 0.001874099921, 0.002603869995, 0.002434314603, 0.001625550092, 0.0006316182562, -9.413097892e-05, -0.0003222779581, -0.0001752139621, -0.0007904665151, -0.0007365990626, -3.314496397e-05, 0.0006861381042, 0.001061324463, 0.00102003623, 0.0006779220326, 0.0002458588143, -6.713443329e-05, -0.0001574809661, -8.252286937e-05, -0.0003242514253, -0.0003428550827, -9.66628515e-05, 0.0001753122948, 0.0003287895655, 0.0003295666681, 0.0002176299511, 7.045310021e-05, -3.524440465e-05, -6.204457248e-05, -3.124617503e-05, -9.66489852e-05, -0.0001143430224, -5.399518557e-05, 1.974863887e-05, 6.521110548e-05, 7.09006824e-05, 4.629322104e-05, 1.157616121e-05, -1.308835212e-05, -1.794621429e-05, -8.630616542e-06, -1.610454588e-05, -2.121832512e-05, -1.359809775e-05, -2.743865465e-06, 4.722924621e-06, 6.674976952e-06, 4.212310826e-06, 1.286530318e-07, -2.717102838e-06, -2.937567447e-06, -1.333576142e-06 -0.002130269292, -0.0009470248424, 0.006198968944, 0.01650667643, 0.0242776469, 0.02510692083, 0.01866511639, 0.008598949539, 3.066027671e-05, -0.003585882953, -0.002415614232, -0.002873002519, -0.002360072921, 0.005497126651, 0.01832378646, 0.02956944193, 0.03324963907, 0.02771776374, 0.01632591269, 0.005021183573, -0.00136192865, -0.001904990318, -0.002763511045, -0.00326365331, 0.002176842328, 0.01216954461, 0.02163728519, 0.02553859047, 0.02208188166, 0.01355252933, 0.004596807657, -0.0007380980325, -0.001422981608, -0.002058984672, -0.003004041845, -0.0002345506762, 0.005678043385, 0.01168083116, 0.01453075018, 0.01289175512, 0.007990537832, 0.002644759726, -0.0005765236419, -0.0009397935261, -0.001244150507, -0.002064054463, -0.0009529820605, 0.001939655982, 0.005087711266, 0.006762775544, 0.006166774863, 0.003839572126, 0.001202466122, -0.0003930505741, -0.0005271495476, -0.0006155379537, -0.001114242331, -0.0007749195492, 0.0004004800683, 0.001775710074, 0.002583203131, 0.00243322122, 0.0015187114, 0.0004377670186, -0.0002169140172, -0.0002477113511, -0.0002421627681, -0.0004695369247, -0.0004065268476, -3.024935204e-05, 0.0004486222037, 0.0007578387235, 0.0007464496678, 0.0004660052955, 0.0001165863637, -9.453997177e-05, -9.360915074e-05, -6.925851305e-05, -0.0001427748728, -0.0001439851029, -6.003664253e-05, 5.957467067e-05, 0.0001452298563, 0.0001546509558, 9.611782424e-05, 1.722891546e-05, -3.001319127e-05, -2.584398217e-05, -1.108514438e-05, -2.426182197e-05, -2.766914936e-05, -1.822466935e-05, -2.063701419e-06, 1.107754621e-05, 1.463543492e-05, 8.896110651e-06, -1.337865412e-07, -5.394843993e-06, -4.003366888e-06, -0.0008961637852, -0.0006318362772, 0.001265848706, 0.004065775474, 0.006615816591, 0.00772020146, 0.006549029486, 0.003285793928, -0.0005144192803, -0.002619112791, -0.001899826304, -0.001237307202, -0.001144112402, 0.001198131022, 0.00506698014, 0.008983044508, 0.01127134701, 0.01064330558, 0.007030351153, 0.002114940086, -0.001347897805, -0.001590974548, -0.001222654803, -0.001439427558, 0.0003233341816, 0.003555143319, 0.00699087439, 0.009153298412, 0.008891319035, 0.0060806853, 0.002065905007, -0.0008764269721, -0.001218031963, -0.000943828967, -0.001309683533, -0.0003284733114, 0.001723559563, 0.004003074319, 0.005503526376, 0.005443375014, 0.00372535344, 0.001211192105, -0.0006306497244, -0.0008097825114, -0.0005952893392, -0.000922588182, -0.0004887007143, 0.0005894353338, 0.001844725347, 0.002706044331, 0.002731195401, 0.001859718564, 0.0005543160343, -0.0003948358104, -0.0004562345055, -0.0003087129688, -0.0005193158905, -0.0003723620957, 9.625265565e-05, 0.0006720964148, 0.001085047454, 0.001125361861, 0.0007609981511, 0.0001989179733, -0.0002058654276, -0.0002153916015, -0.0001274946781, -0.0002297719152, -0.0001984490251, -3.887294326e-05, 0.0001712579124, 0.0003301061973, 0.0003576340951, 0.0002395963219, 4.923527571e-05, -8.627232957e-05, -8.178924288e-05, -3.826847211e-05, -7.352251721e-05, -7.298808994e-05, -3.539178282e-05, 1.938963243e-05, 6.377702276e-05, 7.55296883e-05, 4.97977011e-05, 4.870135848e-06, -2.660491312e-05, -2.26852285e-05, -6.421053274e-06, -1.314939389e-05, -1.467832248e-05, -1.027237718e-05, -2.604807932e-06, 4.263335781e-06, 6.899978488e-06, 4.341053853e-06, -1.025171358e-06, -4.675195282e-06, -3.528138143e-06 --0.0009194723854, -0.00151188807, 0.0006785118074, 0.006878870864, 0.01548300253, 0.02250961605, 0.02385746086, 0.01795751975, 0.007232852953, -0.002506096839, -0.00492027402, -0.001200449871, -0.002315962107, -0.0003127143132, 0.006777110935, 0.01763318488, 0.02771776374, 0.03167775197, 0.0266401318, 0.01446817599, 0.001660550464, -0.003684116049, -0.001127395713, -0.002499038125, -0.001607517431, 0.003428789439, 0.0119086742, 0.02037223604, 0.0243928221, 0.02127467655, 0.012084934, 0.001848892289, -0.002730733078, -0.0008254641523, -0.002020555424, -0.00197471335, 0.0006677780142, 0.005685548809, 0.01104205114, 0.0139288644, 0.01247441309, 0.007127675556, 0.0009298370812, -0.001829329973, -0.0004926986346, -0.001290382847, -0.001533427374, -0.000426009673, 0.002026914899, 0.004831855958, 0.006510409503, 0.005998181189, 0.003420986136, 0.0003126434026, -0.001042502943, -0.000241579101, -0.0006646142371, -0.0008864110522, -0.000522540032, 0.0004722857031, 0.001695451617, 0.002498205923, 0.002379926524, 0.001349188806, 5.170490287e-05, -0.0004970883464, -9.434934994e-05, -0.0002703361475, -0.0003917160444, -0.0003105960361, 6.614310016e-06, 0.0004313722813, 0.000736591389, 0.0007346404414, 0.000411324883, -1.726046648e-05, -0.0001905630072, -2.680669821e-05, -7.975468264e-05, -0.0001237967997, -0.0001176334718, -4.744790859e-05, 5.814707256e-05, 0.0001420488021, 0.0001534039817, 8.355448033e-05, -1.610533148e-05, -5.343149652e-05, -4.262872608e-06, -1.317446976e-05, -2.178325842e-05, -2.366395623e-05, -1.592339722e-05, -1.780757659e-06, 1.096995205e-05, 1.471970969e-05, 7.362398796e-06, -4.628824149e-06, -8.428700767e-06, -0.0003196345825, -0.0005491602195, -4.420644074e-05, 0.001677068774, 0.004627769947, 0.007988843742, 0.01000450135, 0.008714133733, 0.003623122184, -0.002590835523, -0.004398319472, -0.000439288785, -0.0008433726809, -0.0003316461397, 0.001836300625, 0.005808425866, 0.01064988607, 0.01416111641, 0.01368955308, 0.008141857626, 0.0002286407359, -0.003513205016, -0.0004326969064, -0.0009333805399, -0.0007233874422, 0.0008921528996, 0.004106633202, 0.008190616147, 0.01133153106, 0.01128068905, 0.007001657995, 0.0005751065378, -0.002657191594, -0.0003335522058, -0.0007858047181, -0.0008218277649, 5.996991719e-05, 0.002028620818, 0.004639058756, 0.006728549851, 0.00682914596, 0.004227124212, 0.0002140956921, -0.001774432295, -0.0002104144685, -0.0005279248986, -0.0006465234253, -0.0002655246717, 0.0007315096934, 0.002118491489, 0.003271774969, 0.003392173197, 0.002074949316, -6.185624458e-06, -0.001005734161, -0.0001092319184, -0.0002876395163, -0.0003893507636, -0.0002641123818, 0.0001534241879, 0.0007684123984, 0.001301011896, 0.001386844258, 0.0008341565713, -6.342482166e-05, -0.0004774478702, -4.516803105e-05, -0.0001240015452, -0.0001810210676, -0.0001560350856, -1.974927265e-05, 0.0001971196294, 0.0003944597625, 0.0004390147895, 0.0002574579703, -4.871563613e-05, -0.0001823611564, -1.357247914e-05, -3.876415008e-05, -6.037553359e-05, -6.08599144e-05, -3.058893676e-05, 2.384513571e-05, 7.6846757e-05, 9.312886239e-05, 5.207943827e-05, -2.151376195e-05, -5.095077691e-05, -2.278941453e-06, -6.777500225e-06, -1.121758959e-05, -1.274962751e-05, -9.583457423e-06, -2.325633557e-06, 5.516554517e-06, 8.804223533e-06, 4.267115521e-06, -4.928847632e-06, -8.005343201e-06 +-0.0009194723854, -0.00151188807, 0.0006785118074, 0.006878870864, 0.01548300253, 0.02250961605, 0.02385746086, 0.01795751975, 0.007232852953, -0.002506096839, -0.00492027402, -0.001200449871, -0.002315962107, -0.0003127143132, 0.006777110935, 0.01763318488, 0.02771776374, 0.03167775197, 0.0266401318, 0.01446817599, 0.001660550464, -0.003684116049, -0.001127395713, -0.002499038125, -0.001607517431, 0.003428789439, 0.0119086742, 0.02037223604, 0.0243928221, 0.02127467655, 0.012084934, 0.001848892289, -0.002730733078, -0.0008254641523, -0.002020555424, -0.00197471335, 0.0006677780142, 0.005685548809, 0.01104205114, 0.0139288644, 0.01247441309, 0.007127675556, 0.0009298370812, -0.001829329973, -0.0004926986346, -0.001290382847, -0.001533427374, -0.000426009673, 0.002026914899, 0.004831855958, 0.006510409503, 0.005998181189, 0.003420986136, 0.0003126434026, -0.001042502943, -0.000241579101, -0.0006646142371, -0.0008864110522, -0.000522540032, 0.0004722857031, 0.001695451617, 0.002498205923, 0.002379926524, 0.001349188806, 5.170490287e-05, -0.0004970883464, -9.434934994e-05, -0.0002703361475, -0.0003917160444, -0.0003105960361, 6.614310016e-06, 0.0004313722813, 0.000736591389, 0.0007346404414, 0.000411324883, -1.726046648e-05, -0.0001905630072, -2.680669821e-05, -7.975468264e-05, -0.0001237967997, -0.0001176334718, -4.744790859e-05, 5.814707256e-05, 0.0001420488021, 0.0001534039817, 8.355448033e-05, -1.610533148e-05, -5.343149652e-05, -4.262872608e-06, -1.317446976e-05, -2.178325842e-05, -2.366395623e-05, -1.592339722e-05, -1.780757659e-06, 1.096995205e-05, 1.471970969e-05, 7.362398796e-06, -4.628824149e-06, -8.428700767e-06, -0.0003196345825, -0.0005491602195, -4.420644074e-05, 0.001677068774, 0.004627769947, 0.007988843742, 0.01000450135, 0.008714133733, 0.003623122184, -0.002590835523, -0.004398319472, -0.000439288785, -0.000843372681, -0.0003316461397, 0.001836300625, 0.005808425866, 0.01064988607, 0.01416111641, 0.01368955308, 0.008141857626, 0.0002286407359, -0.003513205016, -0.0004326969064, -0.0009333805399, -0.0007233874422, 0.0008921528996, 0.004106633202, 0.008190616147, 0.01133153106, 0.01128068905, 0.007001657995, 0.0005751065378, -0.002657191594, -0.0003335522058, -0.0007858047181, -0.0008218277649, 5.996991719e-05, 0.002028620818, 0.004639058756, 0.006728549851, 0.00682914596, 0.004227124212, 0.0002140956921, -0.001774432295, -0.0002104144685, -0.0005279248986, -0.0006465234253, -0.0002655246717, 0.0007315096934, 0.002118491489, 0.003271774969, 0.003392173197, 0.002074949316, -6.185624458e-06, -0.001005734161, -0.0001092319184, -0.0002876395163, -0.0003893507636, -0.0002641123818, 0.0001534241879, 0.0007684123984, 0.001301011896, 0.001386844258, 0.0008341565713, -6.342482166e-05, -0.0004774478702, -4.516803105e-05, -0.0001240015452, -0.0001810210676, -0.0001560350856, -1.974927265e-05, 0.0001971196294, 0.0003944597625, 0.0004390147895, 0.0002574579703, -4.871563613e-05, -0.0001823611564, -1.357247914e-05, -3.876415008e-05, -6.037553359e-05, -6.08599144e-05, -3.058893676e-05, 2.384513571e-05, 7.6846757e-05, 9.312886239e-05, 5.207943827e-05, -2.151376195e-05, -5.095077691e-05, -2.278941453e-06, -6.777500225e-06, -1.121758959e-05, -1.274962751e-05, -9.583457423e-06, -2.325633557e-06, 5.516554517e-06, 8.804223533e-06, 4.267115521e-06, -4.928847632e-06, -8.005343201e-06 -0.000332406675, -0.0009751414679, -0.001011325471, 0.00108303197, 0.006354573024, 0.01414496246, 0.02155870137, 0.02414496474, 0.01788009288, 0.003158003625, -0.008088545279, -0.0004228284638, -0.001333515417, -0.00170531222, 0.0003821410305, 0.006508745883, 0.01632591269, 0.0266401318, 0.03193311942, 0.02660943827, 0.009891837894, -0.005394668765, -0.0003893208294, -0.001318292995, -0.002033083352, -0.0009423762749, 0.003425356039, 0.01107661426, 0.01965947857, 0.02470867841, 0.02136901927, 0.00848174129, -0.003901388198, -0.0002808430928, -0.001005284547, -0.001752118178, -0.001500740791, 0.0007914979483, 0.005308045005, 0.01072136847, 0.01423961239, 0.01262986959, 0.004891331195, -0.002684957159, -0.0001658160762, -0.0006179878797, -0.001163699492, -0.001259525423, -0.0003006089289, 0.001900889012, 0.004729031473, 0.006732582414, 0.006128348482, 0.002258750871, -0.001576070467, -8.063434211e-05, -0.000309902587, -0.0006156404184, -0.0007567105896, -0.0004435816409, 0.0004455091174, 0.001676016175, 0.002618783685, 0.002455503175, 0.0008422490177, -0.0007713025575, -3.127235825e-05, -0.0001233880456, -0.0002557888453, -0.0003430295368, -0.0002746454663, 6.839749098e-06, 0.0004328558328, 0.0007861406334, 0.0007668009792, 0.0002339538592, -0.0003031109467, -8.826644306e-06, -3.570742307e-05, -7.690879937e-05, -0.0001106079136, -0.0001062313091, -4.479602684e-05, 6.059049262e-05, 0.000156259558, 0.000162818494, 3.873178304e-05, -8.726800847e-05, -1.394138483e-06, -5.787555166e-06, -1.294200917e-05, -1.980976667e-05, -2.1685802e-05, -1.51250928e-05, -1.136466793e-06, 1.31506817e-05, 1.618315884e-05, 1.168733738e-06, -1.42006883e-05, -0.0001036313013, -0.0003153157545, -0.0004126006321, 0.0001205000102, 0.002006507005, 0.005711108611, 0.01056057453, 0.01391211912, 0.01148885884, 0.001127604191, -0.008005536767, -0.0001410328392, -0.0004524158732, -0.0006621241967, -9.435486086e-05, 0.00223251727, 0.007043195616, 0.0136999121, 0.01907968483, 0.01777234372, 0.006339332434, -0.005807751173, -0.0001378435203, -0.0004704185682, -0.0007938080293, -0.000543537641, 0.001133468381, 0.004920899052, 0.01041011122, 0.01511764382, 0.01454462819, 0.005616446238, -0.004289800734, -0.0001056624185, -0.0003788780062, -0.0007054335704, -0.000720048938, 0.0001525850414, 0.002405187769, 0.005845772812, 0.008932209965, 0.008755207352, 0.003245513982, -0.002904526167, -6.639894632e-05, -0.0002468996939, -0.0004896878735, -0.0005968206007, -0.0002440047602, 0.000861909237, 0.002654252444, 0.004332501487, 0.004327249968, 0.001488532326, -0.001673919072, -3.437113185e-05, -0.0001314852752, -0.0002726636864, -0.0003679897768, -0.0002641965162, 0.0001839265272, 0.0009629686583, 0.001725426381, 0.001763264689, 0.0005444704303, -0.0008066439465, -1.417601938e-05, -5.559678902e-05, -0.0001195497072, -0.0001734005669, -0.0001588999505, -1.81533723e-05, 0.0002508998385, 0.0005282837273, 0.0005583014377, 0.0001437108265, -0.0003127703327, -4.247982583e-06, -1.706808637e-05, -3.794401822e-05, -5.838467352e-05, -6.227748151e-05, -3.268450615e-05, 3.328946692e-05, 0.0001062333226, 0.0001194778658, 1.983134952e-05, -8.892718743e-05, -7.109442177e-07, -2.930206376e-06, -6.735699715e-06, -1.093618079e-05, -1.305622226e-05, -1.029974137e-05, -1.758426815e-06, 8.762700387e-06, 1.174619874e-05, -7.877723272e-07, -1.429114974e-05 -9.573144147e-05, -0.0004193987586, -0.0008874204343, -0.0009222384053, 0.0005899383351, 0.004906653823, 0.01253055361, 0.02168069672, 0.02592343965, 0.01470154691, -0.006718605375, -0.000119182369, -0.0005425621065, -0.001220383624, -0.001496252596, 1.535739201e-05, 0.005021183573, 0.01446817599, 0.02660943827, 0.03397909979, 0.02349575137, -0.001666883827, -0.0001079254225, -0.0005115791315, -0.001233868867, -0.00180054378, -0.001085742141, 0.002410553775, 0.009697381766, 0.01964745624, 0.02634825762, 0.01895339641, -0.0007176117448, -7.686549691e-05, -0.0003767524364, -0.0009594794226, -0.00156848079, -0.001497098699, 0.000272339201, 0.004531796804, 0.01075474221, 0.01527808394, 0.01109357876, -0.0008206071416, -4.495501999e-05, -0.0002260353957, -0.0005983764135, -0.001049881085, -0.001212231479, -0.0005148758468, 0.00153834558, 0.004766063683, 0.00727564042, 0.005302058477, -0.0006900594921, -2.17022937e-05, -0.0001113416768, -0.0003034513204, -0.0005589176745, -0.0007178212346, -0.0005146547716, 0.0003029461894, 0.001696984897, 0.00285115865, 0.002080241431, -0.0004255420333, -8.364115454e-06, -4.367811268e-05, -0.0001220047854, -0.0002335356076, -0.0003229973719, -0.0002917320665, -3.819575833e-05, 0.0004402321068, 0.0008633302375, 0.0006291035303, -0.0001995032275, -2.346509237e-06, -1.246634874e-05, -3.563705758e-05, -7.059996163e-05, -0.0001036876487, -0.0001083519618, -5.500824789e-05, 6.194201633e-05, 0.0001738907321, 0.0001259398364, -6.711078364e-05, -3.682533313e-07, -1.992187764e-06, -5.831179943e-06, -1.194536208e-05, -1.851511546e-05, -2.158957014e-05, -1.636416048e-05, -1.126570534e-06, 1.515105522e-05, 1.068706349e-05, -1.270865963e-05, -2.905262831e-05, -0.0001380988818, -0.000344535128, -0.0004956131234, -5.989779894e-05, 0.001987925967, 0.006796054729, 0.01411467366, 0.01900863273, 0.01080192366, -0.007611802676, -3.890384449e-05, -0.0001890485356, -0.0004852210787, -0.0007489552665, -0.0003173462395, 0.002129003274, 0.008159779044, 0.01778681444, 0.02546414123, 0.01830003941, -0.003100015592, -3.753362749e-05, -0.0001880859778, -0.0005071291456, -0.0008800966145, -0.0007836933603, 0.0008865767082, 0.005522447818, 0.01333070536, 0.01997659391, 0.0149283658, -0.001877634612, -2.847592633e-05, -0.0001463971686, -0.0004104333245, -0.0007725321398, -0.0009154056356, -0.000120663826, 0.002567865214, 0.007401633633, 0.01171233043, 0.008773457375, -0.001502630222, -1.77505325e-05, -9.299649422e-05, -0.0002677872265, -0.0005300567539, -0.0007192575844, -0.0004449457049, 0.0008379171059, 0.003323757749, 0.005638469025, 0.004202398189, -0.001018832025, -9.127237647e-06, -4.852870816e-05, -0.0001424961044, -0.0002918269254, -0.0004286048872, -0.0003750121263, 0.0001279388357, 0.001193432959, 0.002229958508, 0.001647718428, -0.0005571258415, -3.741497216e-06, -2.015698103e-05, -6.017555007e-05, -0.0001266016808, -0.0001966822581, -0.000205455505, -5.41382689e-05, 0.0003081693632, 0.0006790709751, 0.0004948028187, -0.0002411957946, -1.114368204e-06, -6.083887898e-06, -1.845737697e-05, -3.979450246e-05, -6.475095387e-05, -7.614433299e-05, -4.649684091e-05, 4.073345998e-05, 0.0001364149187, 9.667116899e-05, -7.644734189e-05, -1.852919823e-07, -1.026578244e-06, -3.168931561e-06, -7.00315716e-06, -1.188864592e-05, -1.532571722e-05, -1.30435833e-05, -2.017055732e-06, 1.146756318e-05, 7.399052492e-06, -1.380453085e-05 -1.976281487e-05, -0.000119929093, -0.0003832317689, -0.0008193276355, -0.001184576568, -0.000740606229, 0.001961864464, 0.00880360968, 0.01944650149, 0.02479784472, 0.01200569583, -2.41636591e-05, -0.0001498393743, -0.0004910437387, -0.001086366199, -0.001671934291, -0.00136192865, 0.001660550464, 0.009891837894, 0.02349575137, 0.03230169181, 0.01894189611, -2.157285826e-05, -0.0001370104018, -0.0004636476867, -0.001077337876, -0.00182128211, -0.002019958297, -0.0001747726612, 0.005913673255, 0.01679240411, 0.02477770546, 0.01546958561, -1.51959815e-05, -9.853332103e-05, -0.0003427302948, -0.0008290247177, -0.001501974056, -0.001969962858, -0.001274182347, 0.002091133007, 0.008739029065, 0.014170093, 0.009269111611, -8.814446886e-06, -5.810388986e-05, -0.0002064144178, -0.0005141192066, -0.000975399129, -0.001403490265, -0.001288489574, 0.0002223894141, 0.003591394987, 0.00663714058, 0.00457052095, -4.228198699e-06, -2.825019022e-05, -0.0001020603328, -0.0002599601627, -0.0005098159877, -0.0007783998722, -0.0008397601999, -0.0002928267357, 0.001127670534, 0.002547498897, 0.001867767062, -1.620566333e-06, -1.095995703e-05, -4.018747145e-05, -0.0001043462284, -0.0002102637114, -0.0003357718436, -0.0004010398187, -0.0002552688171, 0.000219010407, 0.0007485325543, 0.0005990304751, -4.52176023e-07, -3.094993405e-06, -1.151330776e-05, -3.044287345e-05, -6.288356728e-05, -0.0001043688862, -0.0001346378767, -0.0001125350289, -6.900924322e-07, 0.0001426219445, 0.0001327264159, -7.054494777e-08, -4.890572217e-07, -1.846924846e-06, -4.975286507e-06, -1.05325287e-05, -1.812654831e-05, -2.496375626e-05, -2.480700587e-05, -1.102285939e-05, 1.047560949e-05, 1.445443851e-05, -6.294720089e-06, -4.339846478e-05, -0.0001648983392, -0.0004348211352, -0.000819086322, -0.0009119433482, 0.0005010665138, 0.005548985328, 0.01489762049, 0.02074136497, 0.01020373633, -8.24785923e-06, -5.713853778e-05, -0.0002179637437, -0.0005793094034, -0.001113968774, -0.001338258044, 0.0002456231312, 0.006362574438, 0.01832049119, 0.02752447735, 0.01674280098, -7.81877121e-06, -5.482721266e-05, -0.0002125436378, -0.0005806128242, -0.001181183719, -0.001671938736, -0.0008540754457, 0.003586544332, 0.01306187944, 0.0211768986, 0.01376219692, -5.846614997e-06, -4.143030057e-05, -0.0001628460099, -0.000455112021, -0.0009672305076, -0.00152275495, -0.00137925936, 0.0009948730236, 0.006716564564, 0.01210330506, 0.008257678788, -3.60140989e-06, -2.57079602e-05, -0.0001019878945, -0.0002893732362, -0.0006325919265, -0.001059786331, -0.001187281677, -0.0001710278609, 0.002694728905, 0.005657245287, 0.004074931592, -1.833143152e-06, -1.315671913e-05, -5.2533706e-05, -0.0001506203341, -0.0003356709453, -0.0005854183767, -0.0007340161974, -0.0003929497448, 0.0008012009728, 0.00216127672, 0.001665575678, -7.445226858e-07, -5.370044831e-06, -2.156184434e-05, -6.235365998e-05, -0.0001411081033, -0.0002537120655, -0.0003430243538, -0.0002656238753, 0.0001274185119, 0.0006280902136, 0.0005333980672, -2.197559377e-07, -1.593728528e-06, -6.43714209e-06, -1.877384749e-05, -4.309381387e-05, -7.956706732e-05, -0.0001141411126, -0.0001083557871, -1.766414735e-05, 0.0001161438671, 0.0001175004506, -3.620122712e-08, -2.643286359e-07, -1.075362355e-06, -3.166445643e-06, -7.376669711e-06, -1.397399547e-05, -2.111271192e-05, -2.307371212e-05, -1.235250468e-05, 7.441673776e-06, 1.255415275e-05 diff --git a/TestCases/hybrid_regression.py b/TestCases/hybrid_regression.py index 18ea54aeb92a..378cf419ff48 100644 --- a/TestCases/hybrid_regression.py +++ b/TestCases/hybrid_regression.py @@ -136,7 +136,7 @@ def main(): poiseuille_profile.cfg_dir = "navierstokes/poiseuille" poiseuille_profile.cfg_file = "profile_poiseuille.cfg" poiseuille_profile.test_iter = 10 - poiseuille_profile.test_vals = [-12.012587, -7.691028, -0.000000, 2.089953] + poiseuille_profile.test_vals = [-12.012575, -7.696236, -0.000000, 2.089953] poiseuille_profile.test_vals_aarch64 = [-12.009012, -7.262530, -0.000000, 2.089953] test_list.append(poiseuille_profile) @@ -197,7 +197,7 @@ def main(): turb_naca0012_sa.cfg_dir = "rans/naca0012" turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" turb_naca0012_sa.test_iter = 5 - turb_naca0012_sa.test_vals = [-12.038066, -16.332090, 1.080346, 0.018385, 20.000000, -2.873343, 0.000000, -14.250271, 0.000000] + turb_naca0012_sa.test_vals = [-12.038153, -16.332090, 1.080346, 0.018385, 20, -2.872824, 0, -14.250271, 0] turb_naca0012_sa.test_vals_aarch64 = [-12.038091, -16.332090, 1.080346, 0.018385, 20.000000, -2.873236, 0.000000, -14.250271, 0.000000] test_list.append(turb_naca0012_sa) @@ -206,8 +206,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.093897, -15.251080, -5.906326, 1.070413, 0.015775, -2.855557, 0] - turb_naca0012_sst.test_vals_aarch64 = [-12.075928, -15.246732, -5.861249, 1.070036, 0.015841, -2.835263, 0.000000] + turb_naca0012_sst.test_vals = [-12.093892, -15.251078, -5.906327, 1.070413, 0.015775, -2.855348, 0] + turb_naca0012_sst.test_vals_aarch64 = [-12.075928, -15.246732, -5.861249, 1.070036, 0.015841, -2.835263, 0] test_list.append(turb_naca0012_sst) # NACA0012 (SST_SUST, FUN3D finest grid results: CL=1.0840, CD=0.01253) @@ -215,7 +215,7 @@ def main(): turb_naca0012_sst_sust.cfg_dir = "rans/naca0012" turb_naca0012_sst_sust.cfg_file = "turb_NACA0012_sst_sust.cfg" turb_naca0012_sst_sust.test_iter = 10 - turb_naca0012_sst_sust.test_vals = [-12.080804, -14.837176, -5.732917, 1.000893, 0.019109, -2.120148] + turb_naca0012_sst_sust.test_vals = [-12.080757, -14.837176, -5.732917, 1.000893, 0.019109, -2.120437] turb_naca0012_sst_sust.test_vals_aarch64 = [-12.073210, -14.836724, -5.732627, 1.000050, 0.019144, -2.629689] test_list.append(turb_naca0012_sst_sust) @@ -252,7 +252,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.066674, -7.446485, -8.813457, -3.730648, 0] + axi_rans_air_nozzle_restart.test_vals = [-12.066224, -7.425808, -8.815859, -3.732773, 0] axi_rans_air_nozzle_restart.test_vals_aarch64 = [-14.140441, -9.154674, -10.886121, -5.806594, 0.000000] test_list.append(axi_rans_air_nozzle_restart) @@ -278,7 +278,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.979765, 1.343317, 0.445160, -0.028835] + turb_naca0012_1c.test_vals = [-4.976782, 1.343831, 0.443889, -0.029247] turb_naca0012_1c.test_vals_aarch64 = [-4.976620, 1.345983, 0.433171, -0.033685] test_list.append(turb_naca0012_1c) @@ -287,7 +287,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.482873, 1.260834, 0.398789, -0.041781] + turb_naca0012_2c.test_vals = [-5.482862, 1.260869, 0.405097, -0.040169] turb_naca0012_2c.test_vals_aarch64 = [-5.485484, 1.263406, 0.411442, -0.040859] test_list.append(turb_naca0012_2c) @@ -305,7 +305,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.133798, 1.283504, 0.548676, 0.010882] + turb_naca0012_p1c1.test_vals = [-5.133998, 1.283519, 0.548341, 0.010772] turb_naca0012_p1c1.test_vals_aarch64 = [-5.114189, 1.285037, 0.406851, -0.043003] test_list.append(turb_naca0012_p1c1) @@ -355,7 +355,7 @@ def main(): inc_nozzle.cfg_dir = "incomp_euler/nozzle" inc_nozzle.cfg_file = "inv_nozzle.cfg" inc_nozzle.test_iter = 20 - inc_nozzle.test_vals = [-4.395589, -4.054885, 0.035472, 0.090901] + inc_nozzle.test_vals = [-4.177986, -3.716749, 0.151721, 0.152945] test_list.append(inc_nozzle) ############################# @@ -404,7 +404,7 @@ def main(): inc_turb_naca0012.cfg_dir = "incomp_rans/naca0012" inc_turb_naca0012.cfg_file = "naca0012.cfg" inc_turb_naca0012.test_iter = 20 - inc_turb_naca0012.test_vals = [-4.758063, -10.974497, -0.000004, -0.028654, 4, -5.405154, 2, -5.032677] + inc_turb_naca0012.test_vals = [-4.758063, -10.974497, -0.000004, -0.028654, 4, -5.402309, 2, -5.032668] test_list.append(inc_turb_naca0012) # NACA0012, SST_SUST @@ -420,7 +420,7 @@ def main(): inc_weakly_coupled.cfg_dir = "disc_adj_heat" inc_weakly_coupled.cfg_file = "primal.cfg" inc_weakly_coupled.test_iter = 10 - inc_weakly_coupled.test_vals = [-18.204006, -16.304263, -16.482688, -15.007166, -17.858118, -14.025082, 5.609100] + inc_weakly_coupled.test_vals = [-18.121422, -16.304159, -16.482315, -15.007167, -17.858118, -14.024885, 5.609100] test_list.append(inc_weakly_coupled) ###################################### @@ -614,7 +614,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.629106, 0.524897, 0.422366] + channel_3D.test_vals = [2.000000, 0.000000, 0.629091, 0.524932, 0.422527] channel_3D.test_vals_aarch64 = [2.000000, 0.000000, 0.629112, 0.524948, 0.422396] channel_3D.unsteady = True channel_3D.multizone = True @@ -679,7 +679,7 @@ def main(): statbeam3d.cfg_dir = "fea_fsi/StatBeam_3d" statbeam3d.cfg_file = "configBeam_3d.cfg" statbeam3d.test_iter = 0 - statbeam3d.test_vals = [-2.787802, -1.721974, -2.438436, 110350] + statbeam3d.test_vals = [-2.777602, -1.710976, -2.445072, 110350] statbeam3d.test_vals_aarch64 = [-2.777602, -1.710976, -2.445072, 110350] test_list.append(statbeam3d) diff --git a/TestCases/hybrid_regression_AD.py b/TestCases/hybrid_regression_AD.py index 3393182ad6ff..7a6abd83c225 100644 --- a/TestCases/hybrid_regression_AD.py +++ b/TestCases/hybrid_regression_AD.py @@ -202,7 +202,7 @@ def main(): discadj_fea.cfg_dir = "disc_adj_fea" discadj_fea.cfg_file = "configAD_fem.cfg" discadj_fea.test_iter = 4 - discadj_fea.test_vals = [1.774569, 1.928023, -0.000364, -8.690300] + discadj_fea.test_vals = [2.149620, 2.014985, -0.000364, -8.767900] discadj_fea.test_vals_aarch64 = [1.794371, 2.005865, -0.000365, -8.718100] test_list.append(discadj_fea) diff --git a/TestCases/parallel_regression.py b/TestCases/parallel_regression.py index cbbf7dad1f74..f55b4a1e15e4 100755 --- a/TestCases/parallel_regression.py +++ b/TestCases/parallel_regression.py @@ -87,7 +87,7 @@ def main(): thermalbath.cfg_dir = "nonequilibrium/thermalbath/finitechemistry" thermalbath.cfg_file = "thermalbath.cfg" thermalbath.test_iter = 10 - thermalbath.test_vals = [0.945997, 0.945997, -12.039262, -12.171767, -32.000000, 10.013239] + thermalbath.test_vals = [0.945997, 0.945997, -11.860991, -11.857906, -32.000000, 10.013239] test_list.append(thermalbath) # Adiabatic thermal bath @@ -95,7 +95,7 @@ def main(): ionized.cfg_dir = "nonequilibrium/thermalbath/finitechemistry" ionized.cfg_file = "weakly_ionized.cfg" ionized.test_iter = 10 - ionized.test_vals = [-29.806157, -11.130797, -11.337264, -17.235059, -17.578729, -15.190274, -25.013626, -32.000000, -5.174887, 0.000000, 0.000000] + ionized.test_vals = [-28.173855, -10.350260, -11.719875, -16.100105, -16.850783, -13.485322, -23.431375, -32.000000, -4.558277, 0.000000, 0.000000] ionized.test_vals_aarch64 = [-29.816386, -10.729986, -11.720016, -17.484469, -18.237891, -15.241605, -24.956918, -32.000000, -5.727244, 0.000000, 0.000000] test_list.append(ionized) @@ -104,7 +104,7 @@ def main(): thermalbath_frozen.cfg_dir = "nonequilibrium/thermalbath/frozen" thermalbath_frozen.cfg_file = "thermalbath_frozen.cfg" thermalbath_frozen.test_iter = 10 - thermalbath_frozen.test_vals = [-32.000000, -32.000000, -11.962477, -11.962477, -32.000000, 10.013545] + thermalbath_frozen.test_vals = [-32.000000, -32.000000, -11.818647, -11.857909, -32.000000, 10.013545] test_list.append(thermalbath_frozen) # Inviscid single wedge, ausm, implicit @@ -112,7 +112,7 @@ def main(): invwedge_a.cfg_dir = "nonequilibrium/invwedge" invwedge_a.cfg_file = "invwedge_ausm.cfg" invwedge_a.test_iter = 10 - invwedge_a.test_vals = [-1.069675, -1.594438, -18.299923, -18.627316, -18.573325, 2.245721, 1.874105, 5.290285, 0.847729] + invwedge_a.test_vals = [-1.069669, -1.594432, -18.299010, -18.626399, -18.572410, 2.245727, 1.874088, 5.290291, 0.847735] invwedge_a.test_vals_aarch64 = [-1.069675, -1.594438, -18.299736, -18.627126, -18.573137, 2.245721, 1.874105, 5.290285, 0.847729] test_list.append(invwedge_a) @@ -130,7 +130,7 @@ def main(): invwedge_msw.cfg_dir = "nonequilibrium/invwedge" invwedge_msw.cfg_file = "invwedge_msw.cfg" invwedge_msw.test_iter = 10 - invwedge_msw.test_vals = [-1.212335, -1.737098, -18.299220, -18.626618, -18.572623, 2.106171, 1.651949, 5.143958, 0.704444] + invwedge_msw.test_vals = [-1.212335, -1.737098, -18.299375, -18.626782, -18.572771, 2.106171, 1.651949, 5.143958, 0.704444] invwedge_msw.test_vals_aarch64 = [-1.212335, -1.737098, -18.299279, -18.626656, -18.572683, 2.106171, 1.651949, 5.143958, 0.704444] test_list.append(invwedge_msw) @@ -139,7 +139,7 @@ def main(): invwedge_roe.cfg_dir = "nonequilibrium/invwedge" invwedge_roe.cfg_file = "invwedge_roe.cfg" invwedge_roe.test_iter = 10 - invwedge_roe.test_vals = [-1.063535, -1.588299, -17.208084, -17.537836, -17.481214, 2.254713, 1.854802, 5.292805, 0.890122] + invwedge_roe.test_vals = [-1.054108, -1.578871, -17.782421, -18.111535, -18.055538, 2.264661, 1.841727, 5.302630, 0.897714] invwedge_roe.test_vals_aarch64 = [-1.052398, -1.577160, -17.794015, -18.122997, -18.067131, 2.266042, 1.849686, 5.304700, 0.899584] test_list.append(invwedge_roe) @@ -175,7 +175,7 @@ def main(): visc_cone.cfg_dir = "nonequilibrium/visc_wedge" visc_cone.cfg_file = "axi_visccone.cfg" visc_cone.test_iter = 10 - visc_cone.test_vals = [-5.222270, -5.746525, -20.560278, -20.510152, -20.409102, 1.255758, -3.208382, -0.016014, 0.093462, 32619.000000] + visc_cone.test_vals = [-5.222269, -5.746523, -20.560216, -20.510119, -20.409089, 1.255762, -3.208384, -0.016011, 0.093461, 32619] visc_cone.test_vals_aarch64 = [-5.222270, -5.746525, -20.560286, -20.510152, -20.409101, 1.255758, -3.208382, -0.016014, 0.093462, 32619.000000] test_list.append(visc_cone) @@ -290,7 +290,7 @@ def main(): ramp.cfg_dir = "euler/ramp" ramp.cfg_file = "inv_ramp.cfg" ramp.test_iter = 10 - ramp.test_vals = [-13.649760, -8.012144, -0.076277, 0.054839] + ramp.test_vals = [-13.646937, -8.006398, -0.076277, 0.054839] ramp.test_vals_aarch64 = [-13.648406, -8.014579, -0.076277, 0.054839] test_list.append(ramp) @@ -369,7 +369,7 @@ def main(): poiseuille_profile.cfg_dir = "navierstokes/poiseuille" poiseuille_profile.cfg_file = "profile_poiseuille.cfg" poiseuille_profile.test_iter = 10 - poiseuille_profile.test_vals = [-12.011758, -7.669453, -0.000000, 2.089953] + poiseuille_profile.test_vals = [-12.011765, -7.670052, -0.000000, 2.089953] poiseuille_profile.test_vals_aarch64 = [-12.007498, -7.226926, -0.000000, 2.089953] test_list.append(poiseuille_profile) @@ -482,7 +482,7 @@ def main(): turb_naca0012_sa.cfg_dir = "rans/naca0012" turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" turb_naca0012_sa.test_iter = 5 - turb_naca0012_sa.test_vals = [-12.037442, -16.376949, 1.080346, 0.018385, 20.000000, -1.564214, 20.000000, -4.180956, 0.000000] + turb_naca0012_sa.test_vals = [-12.037476, -16.376950, 1.080346, 0.018385, 20, -1.564171, 20, -4.180937, 0] turb_naca0012_sa.test_vals_aarch64 = [-12.037489, -16.376949, 1.080346, 0.018385, 20.000000, -1.564143, 20.000000, -4.180945, 0.000000] turb_naca0012_sa.timeout = 3200 test_list.append(turb_naca0012_sa) @@ -492,7 +492,7 @@ def main(): turb_naca0012_sst.cfg_dir = "rans/naca0012" turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" turb_naca0012_sst.test_iter = 10 - turb_naca0012_sst.test_vals = [-12.094710, -15.251093, -5.906365, 1.070413, 0.015775, -2.376172, 0.000000] + turb_naca0012_sst.test_vals = [-12.094714, -15.251093, -5.906365, 1.070413, 0.015775, -2.376111, 0] turb_naca0012_sst.test_vals_aarch64 = [-12.075620, -15.246688, -5.861276, 1.070036, 0.015841, -1.991001, 0.000000] turb_naca0012_sst.timeout = 3200 test_list.append(turb_naca0012_sst) @@ -502,7 +502,7 @@ def main(): turb_naca0012_sst_sust.cfg_dir = "rans/naca0012" turb_naca0012_sst_sust.cfg_file = "turb_NACA0012_sst_sust.cfg" turb_naca0012_sst_sust.test_iter = 10 - turb_naca0012_sst_sust.test_vals = [-12.082096, -14.837177, -5.733436, 1.000893, 0.019109, -2.240955] + turb_naca0012_sst_sust.test_vals = [-12.082149, -14.837177, -5.733436, 1.000893, 0.019109, -2.240949] turb_naca0012_sst_sust.test_vals_aarch64 = [-12.073964, -14.836726, -5.732390, 1.000050, 0.019144, -2.229074] turb_naca0012_sst_sust.timeout = 3200 test_list.append(turb_naca0012_sst_sust) @@ -571,7 +571,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.069728, -7.537071, -8.812516, -3.731961, 0.000000] + axi_rans_air_nozzle_restart.test_vals = [-12.069349, -7.508309, -8.813361, -3.732852, 0] axi_rans_air_nozzle_restart.test_vals_aarch64 = [-14.143310, -9.163287, -10.858232, -5.787715, 0.000000] axi_rans_air_nozzle_restart.tol = 0.0001 test_list.append(axi_rans_air_nozzle_restart) @@ -782,7 +782,7 @@ def main(): turbmod_sa_neg_rae2822.cfg_dir = "turbulence_models/sa/rae2822" turbmod_sa_neg_rae2822.cfg_file = "turb_SA_NEG_RAE2822.cfg" turbmod_sa_neg_rae2822.test_iter = 10 - turbmod_sa_neg_rae2822.test_vals = [-1.345454, 1.448536, 1.208684, -0.846029, 1.257859, 0.492608, 0.000000] + turbmod_sa_neg_rae2822.test_vals = [-1.345560, 1.448328, 1.208614, -0.846773, 1.277698, 0.499718, 0] turbmod_sa_neg_rae2822.test_vals_aarch64 = [-1.345593, 1.448310, 1.208721, -0.846597, 1.248410, 0.489117, 0.000000] test_list.append(turbmod_sa_neg_rae2822) @@ -839,7 +839,7 @@ def main(): contadj_naca0012.cfg_dir = "cont_adj_euler/naca0012" contadj_naca0012.cfg_file = "inv_NACA0012.cfg" contadj_naca0012.test_iter = 5 - contadj_naca0012.test_vals = [-9.583470, -15.035052, -0.726250, 0.020280] + contadj_naca0012.test_vals = [-9.583496, -15.034977, -0.726250, 0.020280] contadj_naca0012.test_vals_aarch64 = [-9.662546, -14.998818, -0.726250, 0.020280] test_list.append(contadj_naca0012) @@ -932,7 +932,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.975126, 1.344885, 0.670937, 0.011460] + turb_naca0012_1c.test_vals = [-4.982630, 1.343638, 0.664182, 0.009490] turb_naca0012_1c.test_vals_aarch64 = [-4.981036, 1.345868, 0.673232, 0.010091] test_list.append(turb_naca0012_1c) @@ -941,7 +941,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.482702, 1.262642, 0.496508, -0.032494] + turb_naca0012_2c.test_vals = [-5.482693, 1.262634, 0.495712, -0.032734] turb_naca0012_2c.test_vals_aarch64 = [-5.484365, 1.264701, 0.501741, -0.033109] test_list.append(turb_naca0012_2c) @@ -958,7 +958,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.129515, 1.283834, 0.806734, 0.047571] + turb_naca0012_p1c1.test_vals = [-5.129475, 1.283940, 0.807012, 0.047519] turb_naca0012_p1c1.test_vals_aarch64 = [-5.122100, 1.284478, 0.608744, -0.008593] test_list.append(turb_naca0012_p1c1) @@ -967,7 +967,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.553987, 1.234480, 0.603750, -0.008508] + turb_naca0012_p1c2.test_vals = [-5.553963, 1.234481, 0.604361, -0.008431] test_list.append(turb_naca0012_p1c2) ###################################### @@ -1094,7 +1094,7 @@ def main(): edge_PPR.cfg_dir = "nicf/edge" edge_PPR.cfg_file = "edge_PPR.cfg" edge_PPR.test_iter = 50 - edge_PPR.test_vals = [-12.063546, -5.872923, -0.000034, 0.000000] + edge_PPR.test_vals = [-12.063410, -5.872787, -0.000034, 0.000000] test_list.append(edge_PPR) # Rarefaction Q1D nozzle, include CoolProp fluid model @@ -1200,7 +1200,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.629113, 0.524906, 0.422425] + channel_3D.test_vals = [2.000000, 0.000000, 0.629098, 0.524941, 0.422526] channel_3D.test_vals_aarch64 = [2.000000, 0.000000, 0.629119, 0.524959, 0.422390] channel_3D.unsteady = True channel_3D.multizone = True @@ -1276,7 +1276,7 @@ def main(): statbeam3d.cfg_dir = "fea_fsi/StatBeam_3d" statbeam3d.cfg_file = "configBeam_3d.cfg" statbeam3d.test_iter = 0 - statbeam3d.test_vals = [-6.058758, -5.750933, -5.892188, 110190] + statbeam3d.test_vals = [-6.047457, -5.730708, -5.926093, 110190] statbeam3d.test_vals_aarch64 = [-6.062693, -5.769132, -5.891190, 110190] test_list.append(statbeam3d) @@ -1285,7 +1285,7 @@ def main(): thermal_beam_3d.cfg_dir = "fea_fsi/ThermalBeam_3d" thermal_beam_3d.cfg_file = "configBeam_3d.cfg" thermal_beam_3d.test_iter = 4 - thermal_beam_3d.test_vals = [-8.137623, -7.840833, -7.903285, -13.978110, 217, -4.093241, 39, -4.072614, 1.3676e+05, 75.0] + thermal_beam_3d.test_vals = [-8.147213, -7.841446, -7.904153, -13.978110, 217, -4.095071, 39, -4.072614, 136760, 75] test_list.append(thermal_beam_3d) # Static beam, 3d with coupled temperature, nonlinear elasticity @@ -1313,7 +1313,7 @@ def main(): linear_plane_strain.cfg_dir = "fea_fsi/VonMissesVerif" linear_plane_strain.cfg_file = "linear_plane_strain_2d.cfg" linear_plane_strain.test_iter = 0 - linear_plane_strain.test_vals = [-6.157686, -6.051735, 0, 120140, 325, -8.105017] + linear_plane_strain.test_vals = [-6.036048, -6.001905, 0, 120140, 325, -8.025024] test_list.append(linear_plane_strain) # 2D beam in plain stress with thermal expansion. This tests fixes to the 2D von Mises stress calculation, @@ -1322,7 +1322,7 @@ def main(): nonlinear_plane_stress.cfg_dir = "fea_fsi/VonMissesVerif" nonlinear_plane_stress.cfg_file = "nonlinear_plane_stress_2d.cfg" nonlinear_plane_stress.test_iter = 19 - nonlinear_plane_stress.test_vals = [-7.433102, -3.355151, -13.983258, 162480, 43, -4.071408] + nonlinear_plane_stress.test_vals = [-7.432129, -3.354513, -13.982310, 162480, 43, -4.072960] test_list.append(nonlinear_plane_stress) # Dynamic beam, 2d @@ -1395,7 +1395,7 @@ def main(): solid_periodic_pins.cfg_dir = "solid_heat_conduction/periodic_pins" solid_periodic_pins.cfg_file = "configSolid.cfg" solid_periodic_pins.test_iter = 750 - solid_periodic_pins.test_vals = [-15.878977, -14.569206, 300.900000, 425.320000, 5.000000, -1.672737] + solid_periodic_pins.test_vals = [-15.878973, -14.569206, 300.900000, 425.320000, 5.000000, -1.672670] solid_periodic_pins.test_vals_aarch64 = [-15.879016, -14.569206, 300.900000, 425.320000, 5.000000, -1.672666] test_list.append(solid_periodic_pins) @@ -1458,7 +1458,7 @@ def main(): pywrapper_turb_naca0012_sst.cfg_dir = "rans/naca0012" pywrapper_turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" pywrapper_turb_naca0012_sst.test_iter = 10 - pywrapper_turb_naca0012_sst.test_vals = [-12.094710, -15.251093, -5.906365, 1.070413, 0.015775, -2.376172, 0] + pywrapper_turb_naca0012_sst.test_vals = [-12.094714, -15.251093, -5.906365, 1.070413, 0.015775, -2.376111, 0] pywrapper_turb_naca0012_sst.test_vals_aarch64 = [-12.075620, -15.246688, -5.861276, 1.070036, 0.015841, -1.991001, 0.000000] pywrapper_turb_naca0012_sst.command = TestCase.Command("mpirun -np 2", "SU2_CFD.py", "--parallel -f") pywrapper_turb_naca0012_sst.timeout = 3200 @@ -1489,7 +1489,7 @@ def main(): pywrapper_custom_fea_load.cfg_dir = "py_wrapper/custom_load_fea" pywrapper_custom_fea_load.cfg_file = "config.cfg" pywrapper_custom_fea_load.test_iter = 13 - pywrapper_custom_fea_load.test_vals = [-7.262040, -4.945686, -14.163208, 34, -6.009642, 362.23] + pywrapper_custom_fea_load.test_vals = [-7.262040, -4.945686, -14.163208, 34, -6.029883, 362.230000] pywrapper_custom_fea_load.command = TestCase.Command("mpirun -np 2", "python", "run.py") test_list.append(pywrapper_custom_fea_load) @@ -1748,7 +1748,7 @@ def main(): species_passive_val.cfg_dir = "species_transport/passive_transport_validation" species_passive_val.cfg_file = "passive_transport.cfg" species_passive_val.test_iter = 50 - species_passive_val.test_vals = [-16.602539, -16.343775, -16.937083, -4.257599, 10, -4.277976, 8, -5.193350, 0.186610, 0] + species_passive_val.test_vals = [-16.590103, -16.350880, -16.915685, -4.257599, 10, -4.296538, 8, -5.193350, 0.186610, 0] species_passive_val.test_vals_aarch64 = [-16.517744, -16.282420, -16.871663, -4.257599, 10.000000, -4.278151, 8.000000, -5.193350, 0.186610, 0.000000] test_list.append(species_passive_val) diff --git a/TestCases/parallel_regression_AD.py b/TestCases/parallel_regression_AD.py index cb127ed7d2e3..5a6bbef85a62 100644 --- a/TestCases/parallel_regression_AD.py +++ b/TestCases/parallel_regression_AD.py @@ -231,7 +231,7 @@ def main(): discadj_trans_stator.cfg_dir = "disc_adj_turbomachinery/transonic_stator_2D" discadj_trans_stator.cfg_file = "transonic_stator.cfg" discadj_trans_stator.test_iter = 79 - discadj_trans_stator.test_vals = [79.000000, 0.667037, 0.483920, 0.518405, -1.013536] + discadj_trans_stator.test_vals = [79.000000, 0.697136, 0.459036, 0.536525, -0.995531] discadj_trans_stator.test_vals_aarch64 = [79.000000, 0.696755, 0.485950, 0.569475, -0.990065] test_list.append(discadj_trans_stator) @@ -244,7 +244,7 @@ def main(): discadj_fea.cfg_dir = "disc_adj_fea" discadj_fea.cfg_file = "configAD_fem.cfg" discadj_fea.test_iter = 4 - discadj_fea.test_vals = [-2.849453, -3.238429, -0.000364, -8.708700] #last 4 columns + discadj_fea.test_vals = [-2.849687, -3.238608, -0.000364, -8.708700] #last 4 columns discadj_fea.test_vals_aarch64 = [-2.849646, -3.238577, -0.000364, -8.708700] #last 4 columns test_list.append(discadj_fea) @@ -254,7 +254,7 @@ def main(): discadj_thermoelastic.cfg_dir = "fea_fsi/ThermalBeam_3d" discadj_thermoelastic.cfg_file = "configBeamNonlinear_3d_ad.cfg" discadj_thermoelastic.test_iter = 10 - discadj_thermoelastic.test_vals = [-5.355510, -5.293378, -6.164317, -6.433862, 43, -4.049556, 27, -4.164192, 0, 0.192640, 0] + discadj_thermoelastic.test_vals = [-5.355531, -5.293380, -6.164482, -6.433863, 43, -4.049760, 27, -4.164183, 0, 0.192640, 0] test_list.append(discadj_thermoelastic) ################################### @@ -286,7 +286,7 @@ def main(): discadj_fsi2.cfg_dir = "disc_adj_fsi/Airfoil_2d" discadj_fsi2.cfg_file = "config.cfg" discadj_fsi2.test_iter = 8 - discadj_fsi2.test_vals = [-4.772641, 0.917601, -3.863369, 0.295450, 3.839800] + discadj_fsi2.test_vals = [-4.773024, 0.915849, -3.863369, 0.295450, 3.839800] discadj_fsi2.test_vals_aarch64 = [-4.772641, 0.917601, -3.863369, 0.295450, 3.839800] discadj_fsi2.tol = 0.00001 test_list.append(discadj_fsi2) @@ -308,7 +308,7 @@ def main(): da_sp_pinArray_cht_2d_dp_hf.cfg_dir = "incomp_navierstokes/streamwise_periodic/chtPinArray_2d" da_sp_pinArray_cht_2d_dp_hf.cfg_file = "DA_configMaster.cfg" da_sp_pinArray_cht_2d_dp_hf.test_iter = 100 - da_sp_pinArray_cht_2d_dp_hf.test_vals = [-2.508527, -3.227843, -2.608921] + da_sp_pinArray_cht_2d_dp_hf.test_vals = [-2.687303, -3.218852, -2.653738] da_sp_pinArray_cht_2d_dp_hf.multizone = True test_list.append(da_sp_pinArray_cht_2d_dp_hf) diff --git a/TestCases/py_wrapper/translating_NACA0012/forces_0.csv.ref b/TestCases/py_wrapper/translating_NACA0012/forces_0.csv.ref index 542d13f1d126..d715ec6cdcc1 100644 --- a/TestCases/py_wrapper/translating_NACA0012/forces_0.csv.ref +++ b/TestCases/py_wrapper/translating_NACA0012/forces_0.csv.ref @@ -1,200 +1,200 @@ -199, -0.88, -0.00, 0.00 -0, -2.67, 18.39, 0.00 -1, -3.79, 26.10, 0.00 -2, -4.70, 32.45, 0.00 -3, -5.54, 38.34, 0.00 -4, -6.26, 43.40, 0.00 -5, -6.83, 47.52, 0.00 -6, -7.31, 51.12, 0.00 -7, -7.71, 54.13, 0.00 -8, -7.98, 56.36, 0.00 -9, -8.14, 57.85, 0.00 -10, -8.21, 58.69, 0.00 -11, -8.24, 59.34, 0.00 -12, -8.13, 59.02, 0.00 -13, -7.94, 58.09, 0.00 -14, -7.68, 56.68, 0.00 -15, -7.37, 54.90, 0.00 -16, -6.96, 52.39, 0.00 -17, -6.52, 49.56, 0.00 -18, -5.99, 46.04, 0.00 -19, -5.45, 42.32, 0.00 -20, -4.83, 37.98, 0.00 -21, -4.18, 33.24, 0.00 -22, -3.46, 27.88, 0.00 -23, -2.72, 22.22, 0.00 -24, -1.96, 16.24, 0.00 -25, -1.22, 10.20, 0.00 -26, -0.37, 3.17, 0.00 -27, 0.46, -3.95, 0.00 -28, 1.32, -11.54, 0.00 -29, 2.11, -18.78, 0.00 -30, 2.93, -26.51, 0.00 -31, 3.74, -34.50, 0.00 -32, 4.58, -42.97, 0.00 -33, 5.31, -50.75, 0.00 -34, 6.16, -60.02, 0.00 -35, 6.96, -69.23, 0.00 -36, 7.79, -79.18, 0.00 -37, 8.49, -88.24, 0.00 -38, 9.31, -99.04, 0.00 -39, 10.00, -109.14, 0.00 -40, 10.71, -119.95, 0.00 -41, 11.15, -128.44, 0.00 -42, 11.87, -141.00, 0.00 -43, 12.46, -152.82, 0.00 -44, 13.05, -165.68, 0.00 -45, 13.36, -176.13, 0.00 -46, 13.74, -188.72, 0.00 -47, 14.04, -201.70, 0.00 -48, 14.40, -217.16, 0.00 -49, 14.62, -232.68, 0.00 -50, 14.76, -249.30, 0.00 -51, 14.87, -268.47, 0.00 -52, 14.58, -283.81, 0.00 -53, 14.45, -306.34, 0.00 -54, 13.71, -320.59, 0.00 -55, 12.92, -338.59, 0.00 -56, 11.24, -337.52, 0.00 -57, 9.40, -333.11, 0.00 -58, 7.49, -327.34, 0.00 -59, 6.54, -378.95, 0.00 -60, 5.15, -451.70, 0.00 -61, 2.42, -462.33, 0.00 -62, -0.56, -454.47, 0.00 -63, -3.51, -437.34, 0.00 -64, -6.46, -426.71, 0.00 -65, -9.20, -407.04, 0.00 -66, -11.99, -393.94, 0.00 -67, -14.66, -379.06, 0.00 -68, -17.19, -363.19, 0.00 -69, -19.48, -345.11, 0.00 -70, -21.73, -329.12, 0.00 -71, -23.63, -310.27, 0.00 -72, -25.13, -289.40, 0.00 -73, -26.10, -265.91, 0.00 -74, -27.83, -252.70, 0.00 -75, -28.86, -234.86, 0.00 -76, -29.42, -215.52, 0.00 -77, -28.58, -189.15, 0.00 -78, -29.03, -174.07, 0.00 -79, -28.32, -154.17, 0.00 -80, -27.54, -136.23, 0.00 -81, -26.12, -117.53, 0.00 -82, -25.36, -103.75, 0.00 -83, -24.89, -92.52, 0.00 -84, -23.34, -78.71, 0.00 -85, -21.24, -64.82, 0.00 -86, -14.20, -39.11, 0.00 -87, -11.57, -28.61, 0.00 -88, -2.44, -5.38, 0.00 -89, 7.65, 14.96, 0.00 -90, 12.16, 20.85, 0.00 -91, 23.73, 35.28, 0.00 -92, 23.23, 29.42, 0.00 -93, 36.16, 38.12, 0.00 -94, 49.31, 41.89, 0.00 -95, 30.26, 19.71, 0.00 -96, 48.43, 22.20, 0.00 -97, 40.70, 11.01, 0.00 -98, 11.92, 1.60, 0.00 -99, 30.54, -0.00, 0.00 -100, 24.05, -3.23, 0.00 -101, 54.99, -14.88, 0.00 -102, 15.54, -7.12, 0.00 -103, -17.50, 11.40, 0.00 -104, -24.54, 20.85, 0.00 -105, -24.69, 26.03, 0.00 -106, -41.95, 53.13, 0.00 -107, -47.40, 70.46, 0.00 -108, -56.86, 97.56, 0.00 -109, -51.67, 101.05, 0.00 -110, -56.97, 125.74, 0.00 -111, -56.02, 138.50, 0.00 -112, -54.86, 151.04, 0.00 -113, -55.26, 168.69, 0.00 -114, -59.25, 199.83, 0.00 -115, -60.58, 225.21, 0.00 -116, -60.47, 247.41, 0.00 -117, -59.92, 269.58, 0.00 -118, -59.43, 294.00, 0.00 -119, -58.44, 318.08, 0.00 -120, -56.74, 340.20, 0.00 -121, -55.10, 364.65, 0.00 -122, -52.85, 387.19, 0.00 -123, -50.28, 409.17, 0.00 -124, -47.47, 430.99, 0.00 -125, -44.69, 455.36, 0.00 -126, -41.46, 477.47, 0.00 -127, -38.06, 499.80, 0.00 -128, -34.43, 521.44, 0.00 -129, -30.72, 544.23, 0.00 -130, -26.73, 564.60, 0.00 -131, -22.61, 584.47, 0.00 -132, -18.37, 603.28, 0.00 -133, -14.09, 623.31, 0.00 -134, -9.69, 640.38, 0.00 -135, -5.27, 657.77, 0.00 -136, -0.83, 673.72, 0.00 -137, 3.62, 691.31, 0.00 -138, 8.04, 705.16, 0.00 -139, 12.44, 720.48, 0.00 -140, 16.77, 733.03, 0.00 -141, 21.01, 744.66, 0.00 -142, 25.13, 754.73, 0.00 -143, 29.14, 763.81, 0.00 -144, 33.02, 771.98, 0.00 -145, 36.80, 780.20, 0.00 -146, 40.40, 786.36, 0.00 -147, 43.83, 791.56, 0.00 -148, 47.08, 795.50, 0.00 -149, 50.26, 799.95, 0.00 -150, 53.19, 802.25, 0.00 -151, 56.05, 805.05, 0.00 -152, 58.58, 804.66, 0.00 -153, 60.89, 803.02, 0.00 -154, 62.81, 797.64, 0.00 -155, 63.58, 779.88, 0.00 -156, 70.83, 841.11, 0.00 -157, 73.83, 850.73, 0.00 -158, 26.45, 296.32, 0.00 -159, 20.38, 222.34, 0.00 -160, 18.50, 196.84, 0.00 -161, 8.19, 85.12, 0.00 -162, 6.54, 66.45, 0.00 -163, 4.60, 45.80, 0.00 -164, 3.51, 34.20, 0.00 -165, 2.46, 23.51, 0.00 -166, 1.74, 16.30, 0.00 -167, 0.83, 7.65, 0.00 -168, 0.12, 1.08, 0.00 -169, -0.46, -4.14, 0.00 -170, -1.22, -10.66, 0.00 -171, -1.90, -16.42, 0.00 -172, -2.60, -22.10, 0.00 -173, -3.04, -25.51, 0.00 -174, -3.69, -30.53, 0.00 -175, -4.27, -34.83, 0.00 -176, -4.93, -39.70, 0.00 -177, -5.37, -42.70, 0.00 -178, -5.93, -46.60, 0.00 -179, -6.37, -49.51, 0.00 -180, -6.88, -52.82, 0.00 -181, -7.24, -55.06, 0.00 -182, -7.61, -57.23, 0.00 -183, -7.90, -58.87, 0.00 -184, -8.18, -60.37, 0.00 -185, -8.31, -60.83, 0.00 -186, -8.44, -61.22, 0.00 -187, -8.44, -60.79, 0.00 -188, -8.43, -60.25, 0.00 -189, -8.31, -59.05, 0.00 -190, -8.10, -57.18, 0.00 -191, -7.75, -54.46, 0.00 -192, -7.33, -51.26, 0.00 -193, -6.81, -47.41, 0.00 -194, -6.19, -42.96, 0.00 -195, -5.43, -37.58, 0.00 -196, -4.59, -31.65, 0.00 -197, -3.64, -25.11, 0.00 -198, -2.52, -17.37, 0.00 +199, -0.86, -0.00, 0.00 +0, -2.65, 18.23, 0.00 +1, -3.76, 25.89, 0.00 +2, -4.65, 32.09, 0.00 +3, -5.46, 37.74, 0.00 +4, -6.13, 42.56, 0.00 +5, -6.71, 46.69, 0.00 +6, -7.16, 50.07, 0.00 +7, -7.53, 52.90, 0.00 +8, -7.76, 54.82, 0.00 +9, -7.90, 56.13, 0.00 +10, -7.93, 56.70, 0.00 +11, -7.90, 56.91, 0.00 +12, -7.75, 56.22, 0.00 +13, -7.57, 55.39, 0.00 +14, -7.26, 53.59, 0.00 +15, -6.89, 51.30, 0.00 +16, -6.44, 48.47, 0.00 +17, -5.99, 45.51, 0.00 +18, -5.40, 41.51, 0.00 +19, -4.79, 37.20, 0.00 +20, -4.13, 32.43, 0.00 +21, -3.45, 27.41, 0.00 +22, -2.67, 21.54, 0.00 +23, -1.89, 15.41, 0.00 +24, -1.09, 9.05, 0.00 +25, -0.31, 2.56, 0.00 +26, 0.57, -4.88, 0.00 +27, 1.43, -12.39, 0.00 +28, 2.29, -20.08, 0.00 +29, 3.06, -27.24, 0.00 +30, 3.89, -35.25, 0.00 +31, 4.75, -43.77, 0.00 +32, 5.63, -52.86, 0.00 +33, 6.43, -61.46, 0.00 +34, 7.32, -71.39, 0.00 +35, 8.22, -81.78, 0.00 +36, 9.08, -92.31, 0.00 +37, 9.89, -102.78, 0.00 +38, 10.69, -113.72, 0.00 +39, 11.47, -125.13, 0.00 +40, 12.18, -136.48, 0.00 +41, 12.94, -149.09, 0.00 +42, 13.63, -161.87, 0.00 +43, 14.33, -175.75, 0.00 +44, 14.84, -188.45, 0.00 +45, 15.37, -202.73, 0.00 +46, 15.64, -214.91, 0.00 +47, 16.02, -230.07, 0.00 +48, 16.07, -242.38, 0.00 +49, 16.04, -255.31, 0.00 +50, 15.75, -266.07, 0.00 +51, 15.41, -278.35, 0.00 +52, 14.99, -291.85, 0.00 +53, 14.69, -311.51, 0.00 +54, 14.03, -328.05, 0.00 +55, 13.22, -346.63, 0.00 +56, 11.58, -347.88, 0.00 +57, 9.48, -336.06, 0.00 +58, 7.63, -333.70, 0.00 +59, 6.69, -387.45, 0.00 +60, 5.25, -460.90, 0.00 +61, 2.49, -475.82, 0.00 +62, -0.58, -468.44, 0.00 +63, -3.64, -454.65, 0.00 +64, -6.73, -444.52, 0.00 +65, -9.62, -425.48, 0.00 +66, -12.57, -412.95, 0.00 +67, -15.42, -398.58, 0.00 +68, -18.20, -384.41, 0.00 +69, -20.74, -367.51, 0.00 +70, -23.30, -352.80, 0.00 +71, -25.57, -335.76, 0.00 +72, -27.15, -312.68, 0.00 +73, -28.23, -287.64, 0.00 +74, -30.47, -276.68, 0.00 +75, -32.56, -264.93, 0.00 +76, -32.95, -241.41, 0.00 +77, -33.96, -224.77, 0.00 +78, -35.35, -211.94, 0.00 +79, -35.57, -193.60, 0.00 +80, -33.74, -166.92, 0.00 +81, -37.96, -170.78, 0.00 +82, -35.41, -144.86, 0.00 +83, -35.53, -132.10, 0.00 +84, -30.07, -101.42, 0.00 +85, -26.51, -80.93, 0.00 +86, -20.60, -56.73, 0.00 +87, -16.53, -40.87, 0.00 +88, -10.32, -22.78, 0.00 +89, -1.78, -3.49, 0.00 +90, 5.56, 9.54, 0.00 +91, 13.08, 19.45, 0.00 +92, 20.82, 26.37, 0.00 +93, 41.34, 43.59, 0.00 +94, 56.70, 48.17, 0.00 +95, 86.67, 56.45, 0.00 +96, 94.24, 43.20, 0.00 +97, 124.52, 33.70, 0.00 +98, 95.89, 12.87, 0.00 +99, 56.96, -0.00, 0.00 +100, 87.55, -11.75, 0.00 +101, 76.99, -20.84, 0.00 +102, 46.64, -21.38, 0.00 +103, 27.47, -17.89, 0.00 +104, 9.68, -8.22, 0.00 +105, -19.36, 20.42, 0.00 +106, -24.54, 31.07, 0.00 +107, -36.12, 53.70, 0.00 +108, -39.92, 68.49, 0.00 +109, -46.04, 90.04, 0.00 +110, -50.48, 111.42, 0.00 +111, -53.58, 132.47, 0.00 +112, -55.98, 154.13, 0.00 +113, -58.11, 177.39, 0.00 +114, -61.20, 206.40, 0.00 +115, -62.47, 232.26, 0.00 +116, -62.39, 255.28, 0.00 +117, -62.07, 279.29, 0.00 +118, -61.73, 305.38, 0.00 +119, -60.90, 331.50, 0.00 +120, -59.52, 356.86, 0.00 +121, -57.20, 378.58, 0.00 +122, -54.90, 402.16, 0.00 +123, -52.07, 423.70, 0.00 +124, -49.20, 446.69, 0.00 +125, -45.88, 467.53, 0.00 +126, -42.63, 490.92, 0.00 +127, -39.04, 512.69, 0.00 +128, -35.26, 534.03, 0.00 +129, -31.36, 555.63, 0.00 +130, -27.27, 576.05, 0.00 +131, -23.01, 594.86, 0.00 +132, -18.68, 613.47, 0.00 +133, -14.28, 631.83, 0.00 +134, -9.82, 648.99, 0.00 +135, -5.33, 665.19, 0.00 +136, -0.84, 680.91, 0.00 +137, 3.65, 697.90, 0.00 +138, 8.11, 711.95, 0.00 +139, 12.54, 725.96, 0.00 +140, 16.89, 738.46, 0.00 +141, 21.14, 749.55, 0.00 +142, 25.30, 759.68, 0.00 +143, 29.32, 768.68, 0.00 +144, 33.23, 776.92, 0.00 +145, 37.07, 785.93, 0.00 +146, 40.69, 791.99, 0.00 +147, 44.12, 796.75, 0.00 +148, 47.39, 800.59, 0.00 +149, 50.60, 805.39, 0.00 +150, 53.53, 807.33, 0.00 +151, 56.24, 807.80, 0.00 +152, 58.72, 806.69, 0.00 +153, 61.82, 815.20, 0.00 +154, 64.19, 815.25, 0.00 +155, 67.21, 824.40, 0.00 +156, 71.43, 848.24, 0.00 +157, 39.92, 460.00, 0.00 +158, 4.29, 48.09, 0.00 +159, 17.77, 193.92, 0.00 +160, 21.23, 225.97, 0.00 +161, 10.74, 111.65, 0.00 +162, 9.33, 94.79, 0.00 +163, 6.98, 69.42, 0.00 +164, 6.08, 59.32, 0.00 +165, 4.35, 41.60, 0.00 +166, 3.64, 34.13, 0.00 +167, 2.62, 24.13, 0.00 +168, 1.95, 17.64, 0.00 +169, 1.16, 10.32, 0.00 +170, 0.46, 4.05, 0.00 +171, -0.36, -3.14, 0.00 +172, -1.08, -9.18, 0.00 +173, -1.74, -14.63, 0.00 +174, -2.38, -19.72, 0.00 +175, -3.04, -24.84, 0.00 +176, -3.71, -29.86, 0.00 +177, -4.30, -34.19, 0.00 +178, -4.90, -38.47, 0.00 +179, -5.43, -42.17, 0.00 +180, -5.99, -46.01, 0.00 +181, -6.42, -48.81, 0.00 +182, -6.86, -51.59, 0.00 +183, -7.19, -53.60, 0.00 +184, -7.54, -55.68, 0.00 +185, -7.71, -56.39, 0.00 +186, -7.94, -57.63, 0.00 +187, -7.98, -57.50, 0.00 +188, -8.00, -57.19, 0.00 +189, -7.94, -56.41, 0.00 +190, -7.77, -54.88, 0.00 +191, -7.47, -52.50, 0.00 +192, -7.09, -49.57, 0.00 +193, -6.59, -45.88, 0.00 +194, -6.01, -41.72, 0.00 +195, -5.29, -36.63, 0.00 +196, -4.48, -30.94, 0.00 +197, -3.58, -24.65, 0.00 +198, -2.49, -17.12, 0.00 diff --git a/TestCases/py_wrapper/updated_moving_frame_NACA12/forces_0.csv.ref b/TestCases/py_wrapper/updated_moving_frame_NACA12/forces_0.csv.ref index 5f1ec6e4b041..4e95fa24a0e5 100644 --- a/TestCases/py_wrapper/updated_moving_frame_NACA12/forces_0.csv.ref +++ b/TestCases/py_wrapper/updated_moving_frame_NACA12/forces_0.csv.ref @@ -1,200 +1,200 @@ -199, -0.97, -0.00, 0.00 -0, -2.86, 19.71, 0.00 -1, -4.10, 28.25, 0.00 -2, -5.21, 35.95, 0.00 -3, -6.19, 42.79, 0.00 -4, -7.06, 48.95, 0.00 -5, -7.76, 54.03, 0.00 -6, -8.38, 58.59, 0.00 -7, -8.86, 62.22, 0.00 -8, -9.24, 65.25, 0.00 -9, -9.49, 67.40, 0.00 -10, -9.65, 69.03, 0.00 -11, -9.70, 69.89, 0.00 -12, -9.68, 70.22, 0.00 -13, -9.53, 69.76, 0.00 -14, -9.32, 68.83, 0.00 -15, -9.00, 67.08, 0.00 -16, -8.64, 64.99, 0.00 -17, -8.18, 62.19, 0.00 -18, -7.69, 59.07, 0.00 -19, -7.11, 55.21, 0.00 -20, -6.49, 51.01, 0.00 -21, -5.80, 46.18, 0.00 -22, -5.10, 41.07, 0.00 -23, -4.33, 35.30, 0.00 -24, -3.55, 29.37, 0.00 -25, -2.73, 22.90, 0.00 -26, -1.90, 16.21, 0.00 -27, -1.06, 9.19, 0.00 -28, -0.22, 1.97, 0.00 -29, 0.66, -5.88, 0.00 -30, 1.54, -13.99, 0.00 -31, 2.44, -22.51, 0.00 -32, 3.29, -30.89, 0.00 -33, 4.14, -39.60, 0.00 -34, 4.95, -48.22, 0.00 -35, 5.76, -57.27, 0.00 -36, 6.50, -66.07, 0.00 -37, 7.24, -75.26, 0.00 -38, 7.90, -84.06, 0.00 -39, 8.54, -93.22, 0.00 -40, 9.09, -101.81, 0.00 -41, 9.52, -109.76, 0.00 -42, 9.88, -117.33, 0.00 -43, 10.13, -124.25, 0.00 -44, 10.36, -131.59, 0.00 -45, 10.46, -137.98, 0.00 -46, 10.42, -143.13, 0.00 -47, 9.88, -141.91, 0.00 -48, 9.21, -138.94, 0.00 -49, 7.72, -122.90, 0.00 -50, 6.88, -116.25, 0.00 -51, 5.67, -102.42, 0.00 -52, 7.31, -142.26, 0.00 -53, 19.42, -411.71, 0.00 -54, 25.10, -586.85, 0.00 -55, 21.04, -551.60, 0.00 -56, 17.73, -532.36, 0.00 -57, 15.09, -534.95, 0.00 -58, 12.09, -528.53, 0.00 -59, 8.96, -518.77, 0.00 -60, 5.78, -507.56, 0.00 -61, 2.60, -496.51, 0.00 -62, -0.60, -483.30, 0.00 -63, -3.77, -469.73, 0.00 -64, -6.88, -454.52, 0.00 -65, -9.94, -439.65, 0.00 -66, -12.87, -422.69, 0.00 -67, -15.69, -405.66, 0.00 -68, -18.31, -386.86, 0.00 -69, -20.80, -368.44, 0.00 -70, -23.01, -348.42, 0.00 -71, -25.02, -328.52, 0.00 -72, -26.69, -307.34, 0.00 -73, -28.28, -288.18, 0.00 -74, -29.30, -266.00, 0.00 -75, -29.97, -243.86, 0.00 -76, -30.15, -220.85, 0.00 -77, -30.19, -199.81, 0.00 -78, -29.56, -177.25, 0.00 -79, -28.60, -155.66, 0.00 -80, -26.92, -133.16, 0.00 -81, -25.00, -112.47, 0.00 -82, -21.80, -89.21, 0.00 -83, -18.54, -68.92, 0.00 -84, -13.74, -46.35, 0.00 -85, -8.89, -27.14, 0.00 -86, -1.64, -4.52, 0.00 -87, 4.39, 10.85, 0.00 -88, 13.83, 30.52, 0.00 -89, 21.16, 41.38, 0.00 -90, 34.57, 59.31, 0.00 -91, 45.05, 66.97, 0.00 -92, 66.65, 84.41, 0.00 -93, 69.69, 73.48, 0.00 -94, 93.94, 79.80, 0.00 -95, 148.33, 96.61, 0.00 -96, 164.88, 75.58, 0.00 -97, 208.90, 56.54, 0.00 -98, 167.16, 22.43, 0.00 -99, 113.32, -0.00, 0.00 -100, 159.48, -21.40, 0.00 -101, 172.64, -46.73, 0.00 -102, 133.23, -61.07, 0.00 -103, 107.21, -69.83, 0.00 -104, 74.94, -63.66, 0.00 -105, 61.84, -65.20, 0.00 -106, 40.24, -50.96, 0.00 -107, 27.30, -40.58, 0.00 -108, 12.76, -21.89, 0.00 -109, 1.07, -2.08, 0.00 -110, -7.69, 16.96, 0.00 -111, -15.74, 38.92, 0.00 -112, -22.53, 62.04, 0.00 -113, -27.90, 85.18, 0.00 -114, -32.82, 110.68, 0.00 -115, -36.02, 133.90, 0.00 -116, -38.83, 158.85, 0.00 -117, -40.54, 182.41, 0.00 -118, -42.01, 207.84, 0.00 -119, -42.60, 231.87, 0.00 -120, -42.81, 256.72, 0.00 -121, -42.14, 278.89, 0.00 -122, -41.42, 303.42, 0.00 -123, -40.14, 326.64, 0.00 -124, -38.55, 350.04, 0.00 -125, -36.44, 371.36, 0.00 -126, -34.25, 394.45, 0.00 -127, -31.75, 416.96, 0.00 -128, -29.00, 439.11, 0.00 -129, -25.94, 459.63, 0.00 -130, -22.75, 480.66, 0.00 -131, -19.36, 500.47, 0.00 -132, -15.84, 520.18, 0.00 -133, -12.17, 538.40, 0.00 -134, -8.43, 556.78, 0.00 -135, -4.60, 573.59, 0.00 -136, -0.73, 590.67, 0.00 -137, 3.17, 605.92, 0.00 -138, 7.07, 620.55, 0.00 -139, 10.95, 634.10, 0.00 -140, 14.80, 647.26, 0.00 -141, 18.58, 658.55, 0.00 -142, 22.30, 669.55, 0.00 -143, 25.92, 679.48, 0.00 -144, 29.44, 688.36, 0.00 -145, 32.77, 694.62, 0.00 -146, 36.03, 701.29, 0.00 -147, 39.11, 706.33, 0.00 -148, 42.09, 711.15, 0.00 -149, 44.92, 714.94, 0.00 -150, 47.50, 716.43, 0.00 -151, 48.94, 702.88, 0.00 -152, 53.10, 729.38, 0.00 -153, 51.97, 685.39, 0.00 -154, 17.10, 217.16, 0.00 -155, -5.11, -62.69, 0.00 -156, -5.62, -66.74, 0.00 -157, -1.38, -15.85, 0.00 -158, -0.02, -0.22, 0.00 -159, 1.17, 12.77, 0.00 -160, 1.40, 14.95, 0.00 -161, 1.65, 17.10, 0.00 -162, 1.59, 16.14, 0.00 -163, 1.45, 14.39, 0.00 -164, 1.14, 11.11, 0.00 -165, 0.76, 7.29, 0.00 -166, 0.29, 2.71, 0.00 -167, -0.23, -2.16, 0.00 -168, -0.81, -7.32, 0.00 -169, -1.42, -12.61, 0.00 -170, -2.05, -17.96, 0.00 -171, -2.72, -23.48, 0.00 -172, -3.40, -28.92, 0.00 -173, -4.11, -34.50, 0.00 -174, -4.78, -39.56, 0.00 -175, -5.44, -44.39, 0.00 -176, -6.07, -48.93, 0.00 -177, -6.71, -53.35, 0.00 -178, -7.28, -57.23, 0.00 -179, -7.85, -60.97, 0.00 -180, -8.33, -64.03, 0.00 -181, -8.80, -66.87, 0.00 -182, -9.17, -68.95, 0.00 -183, -9.49, -70.71, 0.00 -184, -9.72, -71.77, 0.00 -185, -9.93, -72.64, 0.00 -186, -9.98, -72.43, 0.00 -187, -10.00, -72.02, 0.00 -188, -9.86, -70.53, 0.00 -189, -9.66, -68.65, 0.00 -190, -9.35, -66.05, 0.00 -191, -8.96, -62.96, 0.00 -192, -8.44, -58.99, 0.00 -193, -7.81, -54.38, 0.00 -194, -7.06, -48.99, 0.00 -195, -6.18, -42.77, 0.00 -196, -5.17, -35.72, 0.00 -197, -4.05, -27.93, 0.00 -198, -2.79, -19.19, 0.00 +199, -0.86, -0.00, 0.00 +0, -2.63, 18.11, 0.00 +1, -3.63, 25.00, 0.00 +2, -4.49, 31.01, 0.00 +3, -5.27, 36.45, 0.00 +4, -5.94, 41.20, 0.00 +5, -6.49, 45.19, 0.00 +6, -6.94, 48.51, 0.00 +7, -7.30, 51.25, 0.00 +8, -7.53, 53.19, 0.00 +9, -7.69, 54.61, 0.00 +10, -7.73, 55.29, 0.00 +11, -7.72, 55.60, 0.00 +12, -7.59, 55.07, 0.00 +13, -7.40, 54.17, 0.00 +14, -7.11, 52.49, 0.00 +15, -6.79, 50.55, 0.00 +16, -6.37, 47.90, 0.00 +17, -5.91, 44.92, 0.00 +18, -5.36, 41.14, 0.00 +19, -4.80, 37.28, 0.00 +20, -4.15, 32.62, 0.00 +21, -3.50, 27.86, 0.00 +22, -2.78, 22.37, 0.00 +23, -2.06, 16.81, 0.00 +24, -1.27, 10.52, 0.00 +25, -0.50, 4.21, 0.00 +26, 0.33, -2.80, 0.00 +27, 1.15, -9.97, 0.00 +28, 2.04, -17.86, 0.00 +29, 2.85, -25.42, 0.00 +30, 3.69, -33.44, 0.00 +31, 4.48, -41.33, 0.00 +32, 5.36, -50.31, 0.00 +33, 6.18, -59.06, 0.00 +34, 7.05, -68.72, 0.00 +35, 7.84, -78.03, 0.00 +36, 8.69, -88.33, 0.00 +37, 9.43, -98.01, 0.00 +38, 10.23, -108.84, 0.00 +39, 10.92, -119.14, 0.00 +40, 11.63, -130.32, 0.00 +41, 12.28, -141.50, 0.00 +42, 12.91, -153.33, 0.00 +43, 13.43, -164.72, 0.00 +44, 13.81, -175.34, 0.00 +45, 14.01, -184.69, 0.00 +46, 14.17, -194.64, 0.00 +47, 14.35, -206.11, 0.00 +48, 14.35, -216.45, 0.00 +49, 14.66, -233.35, 0.00 +50, 14.44, -243.91, 0.00 +51, 13.23, -239.01, 0.00 +52, 9.28, -180.73, 0.00 +53, 10.93, -231.67, 0.00 +54, 22.42, -524.14, 0.00 +55, 23.41, -613.61, 0.00 +56, 19.80, -594.50, 0.00 +57, 16.27, -576.89, 0.00 +58, 13.02, -569.14, 0.00 +59, 9.66, -559.58, 0.00 +60, 6.26, -549.57, 0.00 +61, 2.81, -536.89, 0.00 +62, -0.65, -524.68, 0.00 +63, -4.08, -509.47, 0.00 +64, -7.50, -495.51, 0.00 +65, -10.82, -478.63, 0.00 +66, -14.09, -462.77, 0.00 +67, -17.20, -444.59, 0.00 +68, -20.22, -427.15, 0.00 +69, -22.98, -407.10, 0.00 +70, -25.67, -388.75, 0.00 +71, -27.98, -367.48, 0.00 +72, -30.23, -348.11, 0.00 +73, -31.93, -325.35, 0.00 +74, -33.71, -306.06, 0.00 +75, -34.92, -284.17, 0.00 +76, -36.03, -263.97, 0.00 +77, -36.59, -242.17, 0.00 +78, -37.19, -222.97, 0.00 +79, -36.76, -200.07, 0.00 +80, -36.54, -180.76, 0.00 +81, -35.69, -160.58, 0.00 +82, -34.73, -142.08, 0.00 +83, -32.59, -121.17, 0.00 +84, -30.29, -102.16, 0.00 +85, -26.60, -81.19, 0.00 +86, -22.96, -63.22, 0.00 +87, -15.77, -38.98, 0.00 +88, -10.68, -23.57, 0.00 +89, -2.62, -5.11, 0.00 +90, 2.96, 5.08, 0.00 +91, 10.30, 15.31, 0.00 +92, 19.77, 25.04, 0.00 +93, 17.81, 18.78, 0.00 +94, 23.65, 20.09, 0.00 +95, 12.09, 7.87, 0.00 +96, 11.10, 5.09, 0.00 +97, 33.12, 8.96, 0.00 +98, 30.07, 4.03, 0.00 +99, 6.42, -0.00, 0.00 +100, 26.15, -3.51, 0.00 +101, 36.45, -9.86, 0.00 +102, 30.00, -13.75, 0.00 +103, 31.67, -20.63, 0.00 +104, 13.92, -11.83, 0.00 +105, 11.86, -12.50, 0.00 +106, -3.05, 3.86, 0.00 +107, -9.48, 14.09, 0.00 +108, -15.43, 26.47, 0.00 +109, -23.77, 46.48, 0.00 +110, -29.37, 64.83, 0.00 +111, -36.14, 89.36, 0.00 +112, -39.14, 107.77, 0.00 +113, -43.76, 133.57, 0.00 +114, -46.73, 157.62, 0.00 +115, -48.66, 180.91, 0.00 +116, -49.42, 202.21, 0.00 +117, -50.43, 226.88, 0.00 +118, -50.47, 249.70, 0.00 +119, -50.38, 274.24, 0.00 +120, -49.39, 296.15, 0.00 +121, -48.36, 320.09, 0.00 +122, -46.69, 342.06, 0.00 +123, -44.98, 365.99, 0.00 +124, -42.69, 387.65, 0.00 +125, -40.38, 411.42, 0.00 +126, -37.70, 434.15, 0.00 +127, -34.80, 457.05, 0.00 +128, -31.59, 478.33, 0.00 +129, -28.21, 499.82, 0.00 +130, -24.60, 519.72, 0.00 +131, -20.90, 540.34, 0.00 +132, -17.01, 558.78, 0.00 +133, -13.08, 578.82, 0.00 +134, -9.02, 595.64, 0.00 +135, -4.92, 613.62, 0.00 +136, -0.78, 629.39, 0.00 +137, 3.38, 645.30, 0.00 +138, 7.51, 658.91, 0.00 +139, 11.63, 673.17, 0.00 +140, 15.67, 685.03, 0.00 +141, 19.64, 696.34, 0.00 +142, 23.51, 705.94, 0.00 +143, 27.29, 715.50, 0.00 +144, 30.93, 723.09, 0.00 +145, 34.51, 731.63, 0.00 +146, 37.87, 737.15, 0.00 +147, 41.12, 742.64, 0.00 +148, 44.13, 745.57, 0.00 +149, 47.11, 749.74, 0.00 +150, 49.67, 749.17, 0.00 +151, 52.81, 758.54, 0.00 +152, 56.11, 770.82, 0.00 +153, 31.65, 417.42, 0.00 +154, 3.15, 40.06, 0.00 +155, 10.66, 130.75, 0.00 +156, 12.98, 154.17, 0.00 +157, 9.56, 110.13, 0.00 +158, 8.57, 96.03, 0.00 +159, 7.81, 85.17, 0.00 +160, 7.42, 78.98, 0.00 +161, 6.93, 72.03, 0.00 +162, 6.41, 65.19, 0.00 +163, 5.87, 58.43, 0.00 +164, 5.27, 51.40, 0.00 +165, 4.67, 44.62, 0.00 +166, 3.99, 37.44, 0.00 +167, 3.31, 30.56, 0.00 +168, 2.58, 23.38, 0.00 +169, 1.85, 16.52, 0.00 +170, 1.09, 9.54, 0.00 +171, 0.38, 3.32, 0.00 +172, -0.36, -3.08, 0.00 +173, -1.06, -8.86, 0.00 +174, -1.80, -14.86, 0.00 +175, -2.49, -20.35, 0.00 +176, -3.20, -25.78, 0.00 +177, -3.83, -30.43, 0.00 +178, -4.46, -35.04, 0.00 +179, -5.01, -38.95, 0.00 +180, -5.56, -42.75, 0.00 +181, -6.03, -45.86, 0.00 +182, -6.49, -48.84, 0.00 +183, -6.85, -51.00, 0.00 +184, -7.19, -53.04, 0.00 +185, -7.40, -54.18, 0.00 +186, -7.60, -55.14, 0.00 +187, -7.66, -55.16, 0.00 +188, -7.69, -54.99, 0.00 +189, -7.63, -54.19, 0.00 +190, -7.48, -52.85, 0.00 +191, -7.21, -50.64, 0.00 +192, -6.86, -47.97, 0.00 +193, -6.39, -44.48, 0.00 +194, -5.85, -40.57, 0.00 +195, -5.16, -35.70, 0.00 +196, -4.39, -30.33, 0.00 +197, -3.53, -24.31, 0.00 +198, -2.53, -17.43, 0.00 diff --git a/TestCases/serial_regression.py b/TestCases/serial_regression.py index 59caea21e66d..ca83cca21ef4 100755 --- a/TestCases/serial_regression.py +++ b/TestCases/serial_regression.py @@ -48,7 +48,7 @@ def main(): thermalbath.cfg_dir = "nonequilibrium/thermalbath/finitechemistry" thermalbath.cfg_file = "thermalbath.cfg" thermalbath.test_iter = 10 - thermalbath.test_vals = [0.945997, 0.945997, -12.018025, -12.217291, -32.000000, 10.013239] + thermalbath.test_vals = [0.945997, 0.945997, -11.897761, -11.867806, -32.000000, 10.013239] test_list.append(thermalbath) # Adiabatic frozen thermal bath @@ -56,7 +56,7 @@ def main(): thermalbath_frozen.cfg_dir = "nonequilibrium/thermalbath/frozen" thermalbath_frozen.cfg_file = "thermalbath_frozen.cfg" thermalbath_frozen.test_iter = 10 - thermalbath_frozen.test_vals = [-32.000000, -32.000000, -12.018022, -11.978730, -32.000000, 10.013545] + thermalbath_frozen.test_vals = [-32.000000, -32.000000, -11.810719, -11.867806, -32.000000, 10.013545] test_list.append(thermalbath_frozen) # Inviscid single wedge, implicit @@ -64,7 +64,7 @@ def main(): invwedge.cfg_dir = "nonequilibrium/invwedge" invwedge.cfg_file = "invwedge_ausm.cfg" invwedge.test_iter = 10 - invwedge.test_vals = [-1.073699, -1.598462, -18.299911, -18.627322, -18.573334, 2.241760, 1.868575, 5.286072, 0.843741] + invwedge.test_vals = [-1.073693, -1.598456, -18.298997, -18.626405, -18.572419, 2.241766, 1.868557, 5.286079, 0.843747] invwedge.test_vals_aarch64 = [-1.073699, -1.598462, -18.299723, -18.627132, -18.573146, 2.241760, 1.868575, 5.286072, 0.843741] test_list.append(invwedge) @@ -73,7 +73,7 @@ def main(): visc_cone.cfg_dir = "nonequilibrium/visc_wedge" visc_cone.cfg_file = "axi_visccone.cfg" visc_cone.test_iter = 10 - visc_cone.test_vals = [-5.215239, -5.739373, -20.560910, -20.517094, -20.406632, 1.262779, -3.205484, -0.015695, 0.093205, 32641.000000] + visc_cone.test_vals = [-5.215230, -5.739367, -20.560781, -20.516922, -20.406516, 1.262782, -3.205476, -0.015696, 0.093206, 32641] visc_cone.test_vals_aarch64 = [-5.215250, -5.739384, -20.560917, -20.517096, -20.406630, 1.262772, -3.205492, -0.015695, 0.093205, 32641.000000] test_list.append(visc_cone) @@ -198,7 +198,7 @@ def main(): poiseuille_profile.cfg_dir = "navierstokes/poiseuille" poiseuille_profile.cfg_file = "profile_poiseuille.cfg" poiseuille_profile.test_iter = 10 - poiseuille_profile.test_vals = [-12.012574, -7.691705, -0.000000, 2.089953] + poiseuille_profile.test_vals = [-12.012556, -7.696221, -0.000000, 2.089953] poiseuille_profile.test_vals_aarch64 = [-12.009012, -7.262299, -0.000000, 2.089953] #last 4 columns test_list.append(poiseuille_profile) @@ -283,7 +283,7 @@ def main(): turb_naca0012_sa.cfg_dir = "rans/naca0012" turb_naca0012_sa.cfg_file = "turb_NACA0012_sa.cfg" turb_naca0012_sa.test_iter = 5 - turb_naca0012_sa.test_vals = [-12.037386, -16.384158, 1.080346, 0.018385, 20.000000, -3.455861, 20.000000, -4.641245, 0.000000] + turb_naca0012_sa.test_vals = [-12.037240, -16.384159, 1.080346, 0.018385, 20, -3.455187, 20, -4.641267, 0] turb_naca0012_sa.test_vals_aarch64 = [-12.037297, -16.384158, 1.080346, 0.018385, 20.000000, -3.455886, 20.000000, -4.641247, 0.000000] turb_naca0012_sa.timeout = 3200 test_list.append(turb_naca0012_sa) @@ -293,7 +293,7 @@ def main(): turb_naca0012_sst.cfg_dir = "rans/naca0012" turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" turb_naca0012_sst.test_iter = 10 - turb_naca0012_sst.test_vals = [-12.094423, -15.251083, -5.906366, 1.070413, 0.015775, -3.178803, 0.000000] + turb_naca0012_sst.test_vals = [-12.094475, -15.251083, -5.906366, 1.070413, 0.015775, -3.178930, 0] turb_naca0012_sst.test_vals_aarch64 = [-12.076068, -15.246740, -5.861280, 1.070036, 0.015841, -3.297854, 0.000000] turb_naca0012_sst.timeout = 3200 test_list.append(turb_naca0012_sst) @@ -312,7 +312,7 @@ def main(): turb_naca0012_sst_sust_restart.cfg_dir = "rans/naca0012" turb_naca0012_sst_sust_restart.cfg_file = "turb_NACA0012_sst_sust.cfg" turb_naca0012_sst_sust_restart.test_iter = 10 - turb_naca0012_sst_sust_restart.test_vals = [-12.080463, -14.837169, -5.733461, 1.000893, 0.019109, -2.634206] + turb_naca0012_sst_sust_restart.test_vals = [-12.080392, -14.837169, -5.733461, 1.000893, 0.019109, -2.634226] turb_naca0012_sst_sust_restart.test_vals_aarch64 = [-12.074189, -14.836725, -5.732398, 1.000050, 0.019144, -3.315560] turb_naca0012_sst_sust_restart.timeout = 3200 test_list.append(turb_naca0012_sst_sust_restart) @@ -344,7 +344,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.067967, -7.554256, -8.815999, -3.734660, 0.000000] + axi_rans_air_nozzle_restart.test_vals = [-12.067609, -7.525629, -8.817136, -3.735731, 0] axi_rans_air_nozzle_restart.test_vals_aarch64 = [-14.143715, -9.170705, -10.848554, -5.776746, 0.000000] axi_rans_air_nozzle_restart.tol = 0.0001 test_list.append(axi_rans_air_nozzle_restart) @@ -388,7 +388,7 @@ def main(): inc_nozzle.cfg_dir = "incomp_euler/nozzle" inc_nozzle.cfg_file = "inv_nozzle.cfg" inc_nozzle.test_iter = 20 - inc_nozzle.test_vals = [-3.991840, -3.514388, -0.030614, 0.085106] + inc_nozzle.test_vals = [-3.936023, -3.470470, -0.012281, 0.120981] test_list.append(inc_nozzle) ############################# @@ -686,7 +686,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.985495, 1.342937, 0.597198, 0.017227] + turb_naca0012_1c.test_vals = [-4.979967, 1.343850, 0.597508, 0.017311] turb_naca0012_1c.test_vals_aarch64 = [-4.992791, 1.342873, 0.557941, 0.003269] test_list.append(turb_naca0012_1c) @@ -695,7 +695,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.482890, 1.261919, 0.441153, -0.029540] + turb_naca0012_2c.test_vals = [-5.482898, 1.261918, 0.440874, -0.029636] test_list.append(turb_naca0012_2c) # NACA0012 3c @@ -711,7 +711,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.127664, 1.284882, 0.779857, 0.086313] + turb_naca0012_p1c1.test_vals = [-5.127708, 1.284871, 0.779462, 0.086168] turb_naca0012_p1c1.test_vals_aarch64 = [-5.119942, 1.283920, 0.486264, -0.021518] test_list.append(turb_naca0012_p1c1) @@ -720,7 +720,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.554000, 1.234649, 0.503815, -0.016267] + turb_naca0012_p1c2.test_vals = [-5.554059, 1.235065, 0.521498, -0.004382] test_list.append(turb_naca0012_p1c2) ###################################### @@ -945,7 +945,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.230641, -13.245776] + uniform_flow.test_vals = [2.000000, 0.000000, -0.230641, -13.250662] uniform_flow.test_vals_aarch64 = [2.000000, 0.000000, -0.230641, -13.249000] uniform_flow.tol = 0.000001 uniform_flow.unsteady = True @@ -968,7 +968,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.611989, 0.798999, 0.702438] + channel_3D.test_vals = [1.000000, 0.000000, 0.611998, 0.798899, 0.702676] channel_3D.test_vals_aarch64 = [1.000000, 0.000000, 0.611996, 0.798988, 0.702357] channel_3D.unsteady = True channel_3D.multizone = True @@ -1049,7 +1049,7 @@ def main(): statbeam3d.cfg_dir = "fea_fsi/StatBeam_3d" statbeam3d.cfg_file = "configBeam_3d.cfg" statbeam3d.test_iter = 0 - statbeam3d.test_vals = [-6.168640, -5.939035, -6.071159, 110190] + statbeam3d.test_vals = [-6.175086, -5.939313, -6.084188, 110190] statbeam3d.test_vals_aarch64 = [-6.166287, -5.938291, -6.069768, 110190] #last 4 columns test_list.append(statbeam3d) @@ -1058,7 +1058,7 @@ def main(): knowlesbeam.cfg_dir = "fea_fsi/MixElemsKnowles" knowlesbeam.cfg_file = "config.cfg" knowlesbeam.test_iter = 0 - knowlesbeam.test_vals = [-14.513598, -13.577350, -28.126416, 0.445030, 9.730600] + knowlesbeam.test_vals = [-14.472698, -13.540078, -28.049079, 0.445030, 9.730600] knowlesbeam.test_vals_aarch64 = [-14.475326, -13.54641, -28.057487, 0.44503, 9.7306] #last 5 columns knowlesbeam.tol = 0.0001 test_list.append(knowlesbeam) @@ -1566,7 +1566,7 @@ def main(): pywrapper_turb_naca0012_sst.cfg_dir = "rans/naca0012" pywrapper_turb_naca0012_sst.cfg_file = "turb_NACA0012_sst.cfg" pywrapper_turb_naca0012_sst.test_iter = 10 - pywrapper_turb_naca0012_sst.test_vals = [-12.094423, -15.251083, -5.906366, 1.070413, 0.015775, -3.178803, 0.000000] + pywrapper_turb_naca0012_sst.test_vals = [-12.094475, -15.251083, -5.906366, 1.070413, 0.015775, -3.178930, 0] pywrapper_turb_naca0012_sst.test_vals_aarch64 = [-12.076068, -15.246740, -5.861280, 1.070036, 0.015841, -3.297854, 0.000000] pywrapper_turb_naca0012_sst.command = TestCase.Command(exec = "SU2_CFD.py", param = "-f") pywrapper_turb_naca0012_sst.timeout = 3200 diff --git a/TestCases/serial_regression_AD.py b/TestCases/serial_regression_AD.py index 1feaa7cfa105..13b7984ab1d7 100644 --- a/TestCases/serial_regression_AD.py +++ b/TestCases/serial_regression_AD.py @@ -180,7 +180,7 @@ def main(): discadj_fea.cfg_dir = "disc_adj_fea" discadj_fea.cfg_file = "configAD_fem.cfg" discadj_fea.test_iter = 4 - discadj_fea.test_vals = [-2.849844, -3.238713, -0.000364, -8.708700] + discadj_fea.test_vals = [-2.849719, -3.238637, -0.000364, -8.708700] discadj_fea.test_vals_aarch64 = [-2.849588, -3.238523, -0.000364, -8.708700] discadj_fea.tol = 0.00007 test_list.append(discadj_fea) @@ -206,7 +206,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, -8.928820, -10.067497, 3.1052e-11, -1.7613e-06] + discadj_fsi.test_vals = [6, -8.929655, -10.097091, 3.0939e-11, -1.7573e-06] discadj_fsi.test_vals_aarch64 = [6, -8.928820, -10.067497, 3.0979e-11, -1.7585e-06] test_list.append(discadj_fsi) diff --git a/TestCases/tutorials.py b/TestCases/tutorials.py index 9b275dd808de..cf0968e2a9de 100644 --- a/TestCases/tutorials.py +++ b/TestCases/tutorials.py @@ -237,7 +237,7 @@ def main(): tutorial_trans_flatplate_T3A.cfg_dir = "../Tutorials/compressible_flow/Transitional_Flat_Plate/Langtry_and_Menter/T3A" tutorial_trans_flatplate_T3A.cfg_file = "transitional_LM_model_ConfigFile.cfg" tutorial_trans_flatplate_T3A.test_iter = 20 - tutorial_trans_flatplate_T3A.test_vals = [-5.790137, -2.054834, -3.894661, -0.255074, -1.747145, 5.119341, -3.493237, 0.393262] + tutorial_trans_flatplate_T3A.test_vals = [-5.790137, -2.054834, -3.894661, -0.255074, -1.747007, 5.119341, -3.493237, 0.393262] tutorial_trans_flatplate_T3A.test_vals_aarch64 = [-5.808996, -2.070606, -3.969765, -0.277943, -1.953289, 1.708472, -3.514943, 0.357411] tutorial_trans_flatplate_T3A.no_restart = True test_list.append(tutorial_trans_flatplate_T3A) @@ -247,7 +247,7 @@ def main(): tutorial_trans_flatplate_T3Am.cfg_dir = "../Tutorials/compressible_flow/Transitional_Flat_Plate/Langtry_and_Menter/T3A-" tutorial_trans_flatplate_T3Am.cfg_file = "transitional_LM_model_ConfigFile.cfg" tutorial_trans_flatplate_T3Am.test_iter = 20 - tutorial_trans_flatplate_T3Am.test_vals = [-5.590359, -1.700867, -3.099309, -0.105449, -3.750523, 3.287643, -2.394576, 1.119623] + tutorial_trans_flatplate_T3Am.test_vals = [-5.591088, -1.700867, -3.100341, -0.106090, -3.750523, 3.287643, -2.394576, 1.119623] tutorial_trans_flatplate_T3Am.test_vals_aarch64 = [-5.540938, -1.681627, -2.878831, -0.058224, -3.695533, 3.413628, -2.385345, 1.103633] tutorial_trans_flatplate_T3Am.no_restart = True test_list.append(tutorial_trans_flatplate_T3Am) @@ -302,7 +302,7 @@ def main(): tutorial_unst_naca0012.cfg_dir = "../Tutorials/compressible_flow/Unsteady_NACA0012" tutorial_unst_naca0012.cfg_file = "unsteady_naca0012.cfg" tutorial_unst_naca0012.test_iter = 520 - tutorial_unst_naca0012.test_vals = [520, 0, -5.298821, 0, 0.269405, 0.724098, 0.002630, 0.015827] + tutorial_unst_naca0012.test_vals = [520, 0, -5.293168, 0, 0.301651, 0.772998, 0.002171, 0.012763] tutorial_unst_naca0012.test_vals_aarch64 = [520, 0, -5.292359, 0, 0.284720, 0.766329, 0.000954, 0.007565] tutorial_unst_naca0012.unsteady = True test_list.append(tutorial_unst_naca0012) @@ -354,7 +354,7 @@ def main(): pywrapper_psi.command = TestCase.Command("mpirun -np 2", "python", "run.py") test_list.append(pywrapper_psi) - # custom source: including source term for enthalpy equations + # custom source: including source term for enthalpy equations pywrapper_psi_hl = TestCase('psi_enthalpy') pywrapper_psi_hl.cfg_dir = "../Tutorials/multiphysics/TFC_python/enthalpy" pywrapper_psi_hl.cfg_file = "psi.cfg" @@ -363,7 +363,7 @@ def main(): pywrapper_psi_hl.command = TestCase.Command("mpirun -np 2", "python", "run.py") test_list.append(pywrapper_psi_hl) - # custom source: including custom BC and source term + # custom source: including custom BC and source term pywrapper_psi_quench = TestCase('psi_quench') pywrapper_psi_quench.cfg_dir = "../Tutorials/multiphysics/TFC_python/quench" pywrapper_psi_quench.cfg_file = "psi.cfg" diff --git a/TestCases/vandv.py b/TestCases/vandv.py index a361b083a180..d207912bbfa9 100644 --- a/TestCases/vandv.py +++ b/TestCases/vandv.py @@ -53,7 +53,7 @@ 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.041770, -10.137183, -10.939993, -7.992281, -10.323862, -4.732832, 0.002801] + flatplate_sst1994m.test_vals = [-13.040613, -10.136941, -10.940824, -7.982363, -10.323879, -4.732619, 0.002801] flatplate_sst1994m.test_vals_aarch64 = [-13.021715, -9.534786, -10.401912, -7.501836, -9.750800, -4.850665, 0.002807] test_list.append(flatplate_sst1994m) @@ -62,7 +62,7 @@ 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.025922, -11.014048, -10.634022, -7.540700, -11.769195, -6.978039, 0.004931] + bump_sst1994m.test_vals = [-11.928363, -10.095978, -9.513649, -6.445700, -11.773659, -6.990340, 0.004931] bump_sst1994m.test_vals_aarch64 = [-13.042689, -10.812982, -10.604523, -7.655547, -10.816257, -5.308083, 0.004911] test_list.append(bump_sst1994m) @@ -89,7 +89,7 @@ def main(): dsma661_sa.cfg_dir = "vandv/rans/dsma661" dsma661_sa.cfg_file = "dsma661_sa_config.cfg" dsma661_sa.test_iter = 5 - dsma661_sa.test_vals = [-11.230903, -8.242025, -9.022553, -5.871551, -10.737683, 0.155687, 0.024232] + dsma661_sa.test_vals = [-11.230865, -8.242970, -8.982056, -5.877960, -10.737687, 0.155687, 0.024232] dsma661_sa.test_vals_aarch64 = [-11.293183, -8.241775, -9.083761, -6.011398, -10.737680, 0.155687, 0.024232] test_list.append(dsma661_sa) @@ -98,7 +98,7 @@ def main(): dsma661_sst.cfg_dir = "vandv/rans/dsma661" dsma661_sst.cfg_file = "dsma661_sst_config.cfg" dsma661_sst.test_iter = 5 - dsma661_sst.test_vals = [-11.017795, -8.156464, -9.007731, -5.893887, -10.650405, -7.860166, 0.155882, 0.023344] + dsma661_sst.test_vals = [-11.017110, -8.156868, -9.048400, -5.895204, -10.649930, -7.839740, 0.155882, 0.023344] dsma661_sst.test_vals_aarch64 = [-10.977195, -8.403731, -8.747068, -5.808899, -10.522786, -7.369851, 0.155875, 0.023353] test_list.append(dsma661_sst) diff --git a/meson.build b/meson.build index 16edb96eba74..5a46b12431f5 100644 --- a/meson.build +++ b/meson.build @@ -27,10 +27,8 @@ su2_deps = [declare_dependency(include_directories: 'externals/CLI11')] default_warning_flags = [] if build_machine.system() != 'windows' - if meson.get_compiler('cpp').get_id() != 'intel' - default_warning_flags += ['-Wno-empty-body'] - endif - desired_warnings = ['-Wno-ignored-qualifiers', + desired_warnings = ['-Wno-empty-body', + '-Wno-ignored-qualifiers', '-Wno-unused-parameter', '-Wno-deprecated-declarations', '-Wno-error=cast-function-type', @@ -55,6 +53,15 @@ if build_machine.system() != 'windows' endif endif +if get_option('cpu-arch') != '' + su2_cpp_args += ['-march=' + get_option('cpu-arch')] +endif + +# Fast math to allow pow(x, 2) -> x * x. +if meson.get_compiler('cpp').has_argument('-fno-finite-math-only') + su2_cpp_args += ['-ffast-math', '-fno-finite-math-only'] +endif + # Handle assertions: default is b_ndebug=true (assertions disabled) # but for debug builds, we want to enable assertions if get_option('buildtype') == 'debug' @@ -306,6 +313,11 @@ if get_option('enable-coolprop') if build_machine.cpu_family() == 'x86' or build_machine.cpu_family() == 'x86_64' cmake = import('cmake') cmake_opts = cmake.subproject_options() + if get_option('cpu-arch') != '' + cmake_opts.add_cmake_defines({ + 'CMAKE_CXX_FLAGS': '-march=' + get_option('cpu-arch') + }) + endif cmake_opts.set_override_option('warning_level', '0') cmake_opts.add_cmake_defines({ 'COOLPROP_STATIC_LIBRARY': true, diff --git a/meson_options.txt b/meson_options.txt index 66cd441cccd6..f460f6b1e139 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,11 +1,12 @@ -option('with-mpi', type : 'feature', value : 'auto', description: 'enable MPI support') -option('with-omp', type : 'boolean', value : false, description: 'enable OpenMP support') +option('with-mpi', type : 'feature', value : 'auto', description: 'enable MPI support') +option('with-omp', type : 'boolean', value : false, description: 'enable OpenMP support') +option('cpu-arch', type : 'string', value : 'native', description: 'CPU architecture optimization, important for vectorization') option('enable-tecio', type : 'boolean', value : true, description: 'enable TECIO support') -option('enable-cgns', type : 'boolean', value : true, description: 'enable CGNS support') -option('enable-autodiff', type : 'boolean', value : false, description: 'enable AD (reverse) support') -option('enable-directdiff', type : 'boolean', value : false, description: 'enable AD (forward) support') -option('enable-pywrapper', type : 'boolean', value : false, description: 'enable Python wrapper support') -option('enable-normal', type : 'boolean', value : true, description: 'enable normal build') +option('enable-cgns', type : 'boolean', value : true, description: 'enable CGNS support') +option('enable-autodiff', type : 'boolean', value : false, description: 'enable AD (reverse) support') +option('enable-directdiff', type : 'boolean', value : false, description: 'enable AD (forward) support') +option('enable-pywrapper', type : 'boolean', value : false, description: 'enable Python wrapper support') +option('enable-normal', type : 'boolean', value : true, description: 'enable normal build') option('enable-mkl', type : 'boolean', value : false, description: 'enable Intel-MKL support') option('mkl_root', type : 'string', value : '/opt/intel/mkl', description: 'root of Intel-MKL installation (only for non-intel compilers)') option('enable-openblas', type : 'boolean', value : false, description: 'enable BLAS and LAPACK support via OpenBLAS') @@ -16,9 +17,9 @@ option('custom-mpi', type : 'boolean', value : false, description: 'enable MPI option('enable-tests', type : 'boolean', value : false, description: 'compile Unit Tests') option('enable-mixedprec', type : 'boolean', value : false, description: 'use single precision floating point arithmetic for sparse algebra') option('extra-deps', type : 'string', value : '', description: 'comma-separated list of extra (custom) dependencies to add for compilation') -option('enable-mpp', type : 'boolean', value : false, description: 'enable Mutation++ support') +option('enable-mpp', type : 'boolean', value : false, description: 'enable Mutation++ support') option('install-mpp', type : 'boolean', value : false, description: 'install Mutation++ in the directory defined with --prefix') -option('enable-coolprop', type : 'boolean', value : false, description: 'enable CoolProp support') +option('enable-coolprop', type : 'boolean', value : false, description: 'enable CoolProp support') option('enable-mlpcpp', type : 'boolean', value : false, description: 'enable MLPCpp support') option('enable-gprof', type : 'boolean', value : false, description: 'enable profiling through gprof') option('opdi-backend', type : 'combo', choices : ['auto', 'macro', 'ompt'], value : 'auto', description: 'OpDiLib backend choice')