From 89f00bb675e4d7096f6fcf157040123948d4de03 Mon Sep 17 00:00:00 2001 From: Ann Almgren Date: Tue, 14 Nov 2023 19:18:24 -0800 Subject: [PATCH] fix bug in avg_zmom (#1297) --- Exec/RegTests/WPS_Test/inputs_real_ChisholmView | 2 +- Source/TimeIntegration/ERF_MRI.H | 5 ----- Source/TimeIntegration/ERF_slow_rhs_pre.cpp | 6 ------ 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/Exec/RegTests/WPS_Test/inputs_real_ChisholmView b/Exec/RegTests/WPS_Test/inputs_real_ChisholmView index a4d896ed3..8c3c14032 100644 --- a/Exec/RegTests/WPS_Test/inputs_real_ChisholmView +++ b/Exec/RegTests/WPS_Test/inputs_real_ChisholmView @@ -43,7 +43,7 @@ erf.check_int = -100 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 1 # number of timesteps between plotfiles -erf.plot_vars_1 = density x_velocity y_velocity z_velocity pressure temp theta pres_hse z_phys qt qp qv qc +erf.plot_vars_1 = density rhoQt x_velocity y_velocity z_velocity pressure temp theta pres_hse z_phys qt qp qv qc # SOLVER CHOICE erf.alpha_T = 0.0 diff --git a/Source/TimeIntegration/ERF_MRI.H b/Source/TimeIntegration/ERF_MRI.H index 38e00811f..07d2d5cf7 100644 --- a/Source/TimeIntegration/ERF_MRI.H +++ b/Source/TimeIntegration/ERF_MRI.H @@ -215,11 +215,6 @@ public: { // Copy old -> new MultiFab::Copy(S_new[i],S_old[i],0,0,num_vars[i],S_old[i].nGrowVect()); - - // Copy old momentum -> scratch momentum - if (i>=1) { - MultiFab::Copy((*S_scratch)[i],S_old[i],0,0,num_vars[i],S_old[i].nGrowVect()); - } } // Timestep taken by the fast integrator diff --git a/Source/TimeIntegration/ERF_slow_rhs_pre.cpp b/Source/TimeIntegration/ERF_slow_rhs_pre.cpp index b8b97a54a..08f4396d5 100644 --- a/Source/TimeIntegration/ERF_slow_rhs_pre.cpp +++ b/Source/TimeIntegration/ERF_slow_rhs_pre.cpp @@ -463,12 +463,6 @@ void erf_slow_rhs_pre (int level, int finest_level, } // MFIter } // l_use_diff - - // We must initialize these to zero each RK step - S_scratch[IntVar::xmom].setVal(0.); - S_scratch[IntVar::ymom].setVal(0.); - S_scratch[IntVar::zmom].setVal(0.); - // ************************************************************************* // Define updates and fluxes in the current RK stage // *************************************************************************