From a151e25c6bb1f0849db1c8991c9899289b01af3b Mon Sep 17 00:00:00 2001 From: Michael Zingale Date: Sat, 18 Nov 2023 10:43:43 -0500 Subject: [PATCH] some nse_test cleaning quiet clang-tidy warnings redirect convergence output into files --- .../nse_test/convergence_simplified_sdc_w_vel.sh | 8 ++++---- .../nse_test/problem_initialize_state_data.H | 13 ++++++------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/Exec/reacting_tests/nse_test/convergence_simplified_sdc_w_vel.sh b/Exec/reacting_tests/nse_test/convergence_simplified_sdc_w_vel.sh index 9d118c0718..0ada5f661f 100755 --- a/Exec/reacting_tests/nse_test/convergence_simplified_sdc_w_vel.sh +++ b/Exec/reacting_tests/nse_test/convergence_simplified_sdc_w_vel.sh @@ -10,13 +10,13 @@ problem.u0=1.e8 problem.v0=1.e8 " -mpiexec -n 8 ${EXEC} inputs.64 ${RUNPARAMS} >& /dev/null -mpiexec -n 8 ${EXEC} inputs.128 ${RUNPARAMS} >& /dev/null -mpiexec -n 8 ${EXEC} inputs.256 ${RUNPARAMS} >& /dev/null +mpiexec -n 8 ${EXEC} inputs.64 ${RUNPARAMS} >& 64.out +mpiexec -n 8 ${EXEC} inputs.128 ${RUNPARAMS} >& 128.out +mpiexec -n 8 ${EXEC} inputs.256 ${RUNPARAMS} >& 256.out RichardsonConvergenceTest2d.gnu.ex coarFile=nse_test_64_plt00125 mediFile=nse_test_128_plt00250 fineFile=nse_test_256_plt00500 >& nse_convergence_simple_sdc_lo.out -mpiexec -n 8 ${EXEC} inputs.512 ${RUNPARAMS} >& /dev/null +mpiexec -n 8 ${EXEC} inputs.512 ${RUNPARAMS} >& 512.out RichardsonConvergenceTest2d.gnu.ex coarFile=nse_test_128_plt00250 mediFile=nse_test_256_plt00500 fineFile=nse_test_512_plt01000 >& nse_convergence_simple_sdc_hi.out diff --git a/Exec/reacting_tests/nse_test/problem_initialize_state_data.H b/Exec/reacting_tests/nse_test/problem_initialize_state_data.H index 43b6666355..97c160c3b4 100644 --- a/Exec/reacting_tests/nse_test/problem_initialize_state_data.H +++ b/Exec/reacting_tests/nse_test/problem_initialize_state_data.H @@ -15,7 +15,6 @@ void problem_initialize_state_data (int i, int j, int k, Array4 const& state, const GeometryData& geomdata) { - int coord_type = geomdata.Coord(); const Real* dx = geomdata.CellSize(); const Real* problo = geomdata.ProbLo(); @@ -99,18 +98,18 @@ void problem_initialize_state_data (int i, int j, int k, // since the species are interpolated, normalize them Real sumX = 0.0_rt; - for (int n = 0; n < NumSpec; n++) { - sumX += burn_state.xn[n]; + for (auto X : burn_state.xn) { + sumX += X; } - for (int n = 0; n < NumSpec; n++) { - burn_state.xn[n] /= sumX; + for (auto & X : burn_state.xn) { + X /= sumX; } - + #ifdef NSE_NET state(i,j,k,UMUP) = burn_state.mu_p; state(i,j,k,UMUN) = burn_state.mu_n; #endif - + #ifdef AUX_THERMO burn_state.aux[AuxZero::iye] = ye; burn_state.aux[AuxZero::iabar] = abar;