From 585db673b56201a0a0f17a8e13641b30ef9c583e Mon Sep 17 00:00:00 2001 From: AMLattanzi Date: Wed, 23 Oct 2024 15:33:29 -0700 Subject: [PATCH] Compiled with ABL in debug mode. Need to remove some unused params and test. --- Exec/ABL/ERF_prob.cpp | 10 ---------- Exec/ABL/inputs_GABLS1_mynn25 | 2 +- Exec/ABL/inputs_GABLS1_ysu | 2 +- Exec/ABL_input_sounding/ERF_prob.H | 2 +- Exec/ABL_input_sounding/ERF_prob.cpp | 6 +++--- Exec/AWAKEN/ERF_prob.H | 2 +- Exec/AWAKEN/ERF_prob.cpp | 6 +++--- Exec/AWAKEN/inputs_All_EWP | 2 +- Exec/AWAKEN/inputs_KingPlains_EWP | 2 +- Exec/AWAKEN/inputs_KingPlains_Fitch | 2 +- Exec/AWAKEN/inputs_KingPlains_SimpleAD | 2 +- Exec/DevTests/ABL_with_WW3/ERF_prob.H | 1 - Exec/DevTests/ABL_with_WW3/ERF_prob.cpp | 11 ----------- Exec/DevTests/LandSurfaceModel/inputs | 2 +- Exec/DevTests/TemperatureSource/ERF_prob.H | 2 +- Exec/DevTests/TemperatureSource/ERF_prob.cpp | 6 +++--- Exec/DevTests/TropicalCyclone/ERF_prob.H | 2 +- Exec/DevTests/TropicalCyclone/ERF_prob.cpp | 8 ++++---- Exec/DevTests/TropicalCyclone/inputs | 6 +++--- Exec/EWP/ERF_prob.H | 2 +- Exec/EWP/ERF_prob.cpp | 6 +++--- Exec/EWP/inputs_1WT_lat_lon | 2 +- Exec/EWP/inputs_1WT_x_y | 2 +- Exec/EWP/inputs_WindFarm_lat_lon | 2 +- Exec/EWP/inputs_WindFarm_x_y | 2 +- Exec/RegTests/Bomex/ERF_prob.cpp | 4 ++-- Exec/RegTests/TurbulentInflow/ERF_prob.H | 1 - Exec/RegTests/TurbulentInflow/ERF_prob.cpp | 11 ----------- Exec/SimpleActuatorDisk/ERF_prob.H | 2 +- Exec/SimpleActuatorDisk/ERF_prob.cpp | 6 +++--- Exec/SimpleActuatorDisk/inputs_1WT_lat_lon | 2 +- Exec/SimpleActuatorDisk/inputs_1WT_x_y | 2 +- Exec/SimpleActuatorDisk/inputs_WindFarm_lat_lon | 2 +- Exec/SimpleActuatorDisk/inputs_WindFarm_x_y | 2 +- Source/Diffusion/ERF_Diffusion.H | 6 ------ Source/Diffusion/ERF_DiffusionSrcForState_N.cpp | 5 +---- Source/Diffusion/ERF_DiffusionSrcForState_T.cpp | 5 +---- Source/Diffusion/ERF_EddyViscosity.H | 2 +- Source/ERF.H | 2 +- Source/IO/ERF_Plotfile.cpp | 4 ++-- Source/IO/ERF_Write1DProfiles.cpp | 2 +- Source/IO/ERF_Write1DProfiles_stag.cpp | 2 +- Source/SourceTerms/ERF_make_sources.cpp | 2 +- Source/TimeIntegration/ERF_slow_rhs_post.cpp | 13 +++++++------ Source/TimeIntegration/ERF_slow_rhs_pre.cpp | 8 ++++---- 45 files changed, 65 insertions(+), 110 deletions(-) diff --git a/Exec/ABL/ERF_prob.cpp b/Exec/ABL/ERF_prob.cpp index 99808abcb..2d04b9222 100644 --- a/Exec/ABL/ERF_prob.cpp +++ b/Exec/ABL/ERF_prob.cpp @@ -134,16 +134,6 @@ Problem::init_custom_pert( 1e-12); } } - if (state_pert.nComp() > RhoQKE_comp) { - // PBL - state_pert(i, j, k, RhoQKE_comp) = r_hse(i,j,k) * 2.0 * parms_d.KE_0; - if (parms_d.KE_decay_height > 0) { - // scale initial SGS kinetic energy with height - state_pert(i, j, k, RhoQKE_comp) *= max( - std::pow(1 - min(z/parms_d.KE_decay_height,1.0), parms_d.KE_decay_order), - 1e-12); - } - } if (use_moisture) { state_pert(i, j, k, RhoQ1_comp) = 0.0; diff --git a/Exec/ABL/inputs_GABLS1_mynn25 b/Exec/ABL/inputs_GABLS1_mynn25 index 3612bc9b3..bd4afb195 100644 --- a/Exec/ABL/inputs_GABLS1_mynn25 +++ b/Exec/ABL/inputs_GABLS1_mynn25 @@ -44,7 +44,7 @@ erf.check_int = -1 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 300 # number of timesteps between plotfiles -erf.plot_vars_1 = density x_velocity y_velocity z_velocity pressure theta rhoQKE Kmv Khv +erf.plot_vars_1 = density x_velocity y_velocity z_velocity pressure theta rhoKE Kmv Khv # SOLVER CHOICE diff --git a/Exec/ABL/inputs_GABLS1_ysu b/Exec/ABL/inputs_GABLS1_ysu index 96889dbce..3b65f0ae6 100644 --- a/Exec/ABL/inputs_GABLS1_ysu +++ b/Exec/ABL/inputs_GABLS1_ysu @@ -45,7 +45,7 @@ erf.check_int = -1 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 300 # number of timesteps between plotfiles -erf.plot_vars_1 = density x_velocity y_velocity z_velocity pressure theta rhoQKE Kmv Khv Lpbl +erf.plot_vars_1 = density x_velocity y_velocity z_velocity pressure theta rhoKE Kmv Khv Lpbl # SOLVER CHOICE diff --git a/Exec/ABL_input_sounding/ERF_prob.H b/Exec/ABL_input_sounding/ERF_prob.H index 1c59364b9..58b9594a7 100644 --- a/Exec/ABL_input_sounding/ERF_prob.H +++ b/Exec/ABL_input_sounding/ERF_prob.H @@ -11,7 +11,7 @@ struct ProbParm : ProbParmDefaults { amrex::Real rho_0 = 0.0; amrex::Real T_0 = 0.0; amrex::Real A_0 = 1.0; - amrex::Real QKE_0 = 0.1; + amrex::Real KE_0 = 0.1; amrex::Real U_0 = 0.0; amrex::Real V_0 = 0.0; diff --git a/Exec/ABL_input_sounding/ERF_prob.cpp b/Exec/ABL_input_sounding/ERF_prob.cpp index 73355dd84..6b3cf46d1 100644 --- a/Exec/ABL_input_sounding/ERF_prob.cpp +++ b/Exec/ABL_input_sounding/ERF_prob.cpp @@ -16,7 +16,7 @@ Problem::Problem(const amrex::Real* problo, const amrex::Real* probhi) pp.query("rho_0", parms.rho_0); pp.query("T_0", parms.T_0); pp.query("A_0", parms.A_0); - pp.query("QKE_0", parms.QKE_0); + pp.query("KE_0", parms.KE_0); pp.query("U_0", parms.U_0); pp.query("V_0", parms.V_0); @@ -80,8 +80,8 @@ Problem::init_custom_pert( // Set scalar = A_0*exp(-10r^2), where r is distance from center of domain state_pert(i, j, k, RhoScalar_comp) = parms_d.A_0 * exp(-10.*r*r); - // Set an initial value for QKE - state_pert(i, j, k, RhoQKE_comp) = parms_d.QKE_0; + // Set an initial value for KE + state_pert(i, j, k, RhoKE_comp) = parms_d.KE_0; if (use_moisture) { state_pert(i, j, k, RhoQ1_comp) = 0.0; diff --git a/Exec/AWAKEN/ERF_prob.H b/Exec/AWAKEN/ERF_prob.H index b509c8d45..b587046f4 100644 --- a/Exec/AWAKEN/ERF_prob.H +++ b/Exec/AWAKEN/ERF_prob.H @@ -11,7 +11,7 @@ struct ProbParm : ProbParmDefaults { amrex::Real rho_0 = 0.0; amrex::Real T_0 = 0.0; amrex::Real A_0 = 1.0; - amrex::Real QKE_0 = 0.1; + amrex::Real KE_0 = 0.1; amrex::Real U_0 = 0.0; amrex::Real V_0 = 0.0; diff --git a/Exec/AWAKEN/ERF_prob.cpp b/Exec/AWAKEN/ERF_prob.cpp index 7f5fdda42..75514b1d1 100644 --- a/Exec/AWAKEN/ERF_prob.cpp +++ b/Exec/AWAKEN/ERF_prob.cpp @@ -16,7 +16,7 @@ Problem::Problem(const amrex::Real* problo, const amrex::Real* probhi) pp.query("rho_0", parms.rho_0); pp.query("T_0", parms.T_0); pp.query("A_0", parms.A_0); - pp.query("QKE_0", parms.QKE_0); + pp.query("KE_0", parms.KE_0); pp.query("U_0", parms.U_0); pp.query("V_0", parms.V_0); @@ -90,8 +90,8 @@ Problem::init_custom_pert( // Set scalar = A_0*exp(-10r^2), where r is distance from center of domain state_pert(i, j, k, RhoScalar_comp) = parms_d.A_0 * exp(-10.*r*r); - // Set an initial value for QKE - state_pert(i, j, k, RhoQKE_comp) = parms_d.QKE_0; + // Set an initial value for KE + state_pert(i, j, k, RhoKE_comp) = parms_d.KE_0; if (use_moisture) { state_pert(i, j, k, RhoQ1_comp) = 0.0; diff --git a/Exec/AWAKEN/inputs_All_EWP b/Exec/AWAKEN/inputs_All_EWP index cda4dff42..87cc49fc1 100644 --- a/Exec/AWAKEN/inputs_All_EWP +++ b/Exec/AWAKEN/inputs_All_EWP @@ -68,7 +68,7 @@ erf.check_int = 10000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 1200 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE vorticity SMark +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE vorticity SMark # SOLVER CHOICE erf.alpha_T = 0.0 diff --git a/Exec/AWAKEN/inputs_KingPlains_EWP b/Exec/AWAKEN/inputs_KingPlains_EWP index 653b75e3c..912911ae7 100644 --- a/Exec/AWAKEN/inputs_KingPlains_EWP +++ b/Exec/AWAKEN/inputs_KingPlains_EWP @@ -58,7 +58,7 @@ erf.check_int = 10000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 100 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE vorticity SMark +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE vorticity SMark # SOLVER CHOICE erf.alpha_T = 0.0 diff --git a/Exec/AWAKEN/inputs_KingPlains_Fitch b/Exec/AWAKEN/inputs_KingPlains_Fitch index 169f2a8d5..d356cbbd0 100644 --- a/Exec/AWAKEN/inputs_KingPlains_Fitch +++ b/Exec/AWAKEN/inputs_KingPlains_Fitch @@ -58,7 +58,7 @@ erf.check_int = 10000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 100 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE vorticity SMark +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE vorticity SMark # SOLVER CHOICE erf.alpha_T = 0.0 diff --git a/Exec/AWAKEN/inputs_KingPlains_SimpleAD b/Exec/AWAKEN/inputs_KingPlains_SimpleAD index 9b1822545..949916782 100644 --- a/Exec/AWAKEN/inputs_KingPlains_SimpleAD +++ b/Exec/AWAKEN/inputs_KingPlains_SimpleAD @@ -60,7 +60,7 @@ erf.check_int = 10000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 100 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE vorticity SMark +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE vorticity SMark # SOLVER CHOICE erf.alpha_T = 0.0 diff --git a/Exec/DevTests/ABL_with_WW3/ERF_prob.H b/Exec/DevTests/ABL_with_WW3/ERF_prob.H index 67077f6e5..aaedb9c7b 100644 --- a/Exec/DevTests/ABL_with_WW3/ERF_prob.H +++ b/Exec/DevTests/ABL_with_WW3/ERF_prob.H @@ -12,7 +12,6 @@ struct ProbParm : ProbParmDefaults { amrex::Real T_0 = 0.0; amrex::Real A_0 = 1.0; amrex::Real KE_0 = 0.1; - amrex::Real QKE_0 = 0.1; amrex::Real KE_decay_height = -1; amrex::Real KE_decay_order = 1; diff --git a/Exec/DevTests/ABL_with_WW3/ERF_prob.cpp b/Exec/DevTests/ABL_with_WW3/ERF_prob.cpp index 8790b3ebf..2d04b9222 100644 --- a/Exec/DevTests/ABL_with_WW3/ERF_prob.cpp +++ b/Exec/DevTests/ABL_with_WW3/ERF_prob.cpp @@ -17,7 +17,6 @@ Problem::Problem(const amrex::Real* problo, const amrex::Real* probhi) pp.query("T_0", parms.T_0); pp.query("A_0", parms.A_0); pp.query("KE_0", parms.KE_0); - pp.query("QKE_0", parms.QKE_0); pp.query("KE_decay_height", parms.KE_decay_height); pp.query("KE_decay_order", parms.KE_decay_order); @@ -135,16 +134,6 @@ Problem::init_custom_pert( 1e-12); } } - if (state_pert.nComp() > RhoQKE_comp) { - // PBL - state_pert(i, j, k, RhoQKE_comp) = r_hse(i,j,k) * parms_d.QKE_0; - if (parms_d.KE_decay_height > 0) { - // scale initial SGS kinetic energy with height - state_pert(i, j, k, RhoQKE_comp) *= max( - std::pow(1 - min(z/parms_d.KE_decay_height,1.0), parms_d.KE_decay_order), - 1e-12); - } - } if (use_moisture) { state_pert(i, j, k, RhoQ1_comp) = 0.0; diff --git a/Exec/DevTests/LandSurfaceModel/inputs b/Exec/DevTests/LandSurfaceModel/inputs index cb29c9132..de93aa53d 100644 --- a/Exec/DevTests/LandSurfaceModel/inputs +++ b/Exec/DevTests/LandSurfaceModel/inputs @@ -55,7 +55,7 @@ erf.molec_diff_type = "None" erf.les_type = "Smagorinsky" erf.Cs = 0.1 #erf.pbl_type = "MYNN2.5" -#erf.QKE_0 = 0.5 +#erf.KE_0 = 0.5 erf.use_terrain = true erf.terrain_smoothing = 2 diff --git a/Exec/DevTests/TemperatureSource/ERF_prob.H b/Exec/DevTests/TemperatureSource/ERF_prob.H index df04de7c6..036f331ef 100644 --- a/Exec/DevTests/TemperatureSource/ERF_prob.H +++ b/Exec/DevTests/TemperatureSource/ERF_prob.H @@ -11,7 +11,7 @@ struct ProbParm : ProbParmDefaults { amrex::Real rho_0 = 0.0; amrex::Real T_0 = 0.0; amrex::Real A_0 = 1.0; - amrex::Real QKE_0 = 0.1; + amrex::Real KE_0 = 0.1; amrex::Real U_0 = 0.0; amrex::Real V_0 = 0.0; diff --git a/Exec/DevTests/TemperatureSource/ERF_prob.cpp b/Exec/DevTests/TemperatureSource/ERF_prob.cpp index 80e83a867..1b096f21a 100644 --- a/Exec/DevTests/TemperatureSource/ERF_prob.cpp +++ b/Exec/DevTests/TemperatureSource/ERF_prob.cpp @@ -17,7 +17,7 @@ Problem::Problem(const amrex::Real* problo, const amrex::Real* probhi) pp.query("rho_0", parms.rho_0); pp.query("T_0", parms.T_0); pp.query("A_0", parms.A_0); - pp.query("QKE_0", parms.QKE_0); + pp.query("KE_0", parms.KE_0); pp.query("U_0", parms.U_0); pp.query("V_0", parms.V_0); @@ -96,8 +96,8 @@ Problem::init_custom_pert( // Set scalar = A_0*exp(-10r^2), where r is distance from center of domain state_pert(i, j, k, RhoScalar_comp) = parms_d.A_0 * exp(-10.*r*r); - // Set an initial value for QKE - state_pert(i, j, k, RhoQKE_comp) = parms_d.QKE_0; + // Set an initial value for KE + state_pert(i, j, k, RhoKE_comp) = parms_d.KE_0; if (use_moisture) { state_pert(i, j, k, RhoQ1_comp) = 0.0; diff --git a/Exec/DevTests/TropicalCyclone/ERF_prob.H b/Exec/DevTests/TropicalCyclone/ERF_prob.H index 3c0a0319f..faf57a918 100644 --- a/Exec/DevTests/TropicalCyclone/ERF_prob.H +++ b/Exec/DevTests/TropicalCyclone/ERF_prob.H @@ -8,7 +8,7 @@ #include "ERF_prob_common.H" struct ProbParm : ProbParmDefaults { - amrex::Real QKE_0 = 0.1; + amrex::Real KE_0 = 0.1; amrex::Real Xc_0 = 0.0; amrex::Real Yc_0 = 0.0; diff --git a/Exec/DevTests/TropicalCyclone/ERF_prob.cpp b/Exec/DevTests/TropicalCyclone/ERF_prob.cpp index 5e51e818a..e28f156a3 100644 --- a/Exec/DevTests/TropicalCyclone/ERF_prob.cpp +++ b/Exec/DevTests/TropicalCyclone/ERF_prob.cpp @@ -19,7 +19,7 @@ Problem::Problem() pp.query("U_0", parms.U_0); // for Rayleigh damping pp.query("V_0", parms.V_0); // for Rayleigh damping pp.query("W_0", parms.W_0); // for Rayleigh damping - pp.query("QKE_0", parms.QKE_0); + pp.query("KE_0", parms.KE_0); pp.query("Xc_0", parms.Xc_0); pp.query("Yc_0", parms.Yc_0); @@ -60,11 +60,11 @@ Problem::init_custom_pert( // and/or set initial values for other scalars // - // QKE for PBL - Real QKE_0 = parms.QKE_0; + // KE for MYNN or Deardorff + Real KE_0 = parms.KE_0; amrex::ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept { - state_pert(i, j, k, RhoQKE_comp) = r_hse(i,j,k) * QKE_0; + state_pert(i, j, k, RhoKE_comp) = r_hse(i,j,k) * KE_0; }); // diff --git a/Exec/DevTests/TropicalCyclone/inputs b/Exec/DevTests/TropicalCyclone/inputs index 66994811b..7373205bc 100644 --- a/Exec/DevTests/TropicalCyclone/inputs +++ b/Exec/DevTests/TropicalCyclone/inputs @@ -57,12 +57,12 @@ erf.check_int = 1000 # number of timesteps between checkpoints #erf.plotfile_type = netcdf erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 200 # number of timesteps between plotfiles -erf.plot_vars_1 = density x_velocity y_velocity z_velocity pressure theta QKE Kmv Khv +erf.plot_vars_1 = density x_velocity y_velocity z_velocity pressure theta KE Kmv Khv # SOLVER CHOICE erf.use_gravity = true erf.pbl_type = "MYNN2.5" -erf.advect_QKE = false +erf.advect_KE = false erf.les_type = "None" erf.molec_diff_type = "None" #erf.molec_diff_type = "Constant" @@ -92,7 +92,7 @@ prob.RZERO = 100e3 prob.ZZERO = 5e3 prob.RMAX = 20e3 prob.VMAX = 15. -prob.QKE_0 = 0.5 +prob.KE_0 = 0.5 # INITIALIZATION WITH ATM DATA erf.init_type = "input_sounding" diff --git a/Exec/EWP/ERF_prob.H b/Exec/EWP/ERF_prob.H index afbc3736f..777be4724 100644 --- a/Exec/EWP/ERF_prob.H +++ b/Exec/EWP/ERF_prob.H @@ -11,7 +11,7 @@ struct ProbParm : ProbParmDefaults { amrex::Real rho_0 = 0.0; amrex::Real T_0 = 0.0; amrex::Real A_0 = 1.0; - amrex::Real QKE_0 = 0.1; + amrex::Real KE_0 = 0.1; amrex::Real U_0 = 0.0; amrex::Real V_0 = 0.0; diff --git a/Exec/EWP/ERF_prob.cpp b/Exec/EWP/ERF_prob.cpp index adce92fe8..145f66ad6 100644 --- a/Exec/EWP/ERF_prob.cpp +++ b/Exec/EWP/ERF_prob.cpp @@ -16,7 +16,7 @@ Problem::Problem(const amrex::Real* problo, const amrex::Real* probhi) pp.query("rho_0", parms.rho_0); pp.query("T_0", parms.T_0); pp.query("A_0", parms.A_0); - pp.query("QKE_0", parms.QKE_0); + pp.query("KE_0", parms.KE_0); pp.query("U_0", parms.U_0); pp.query("V_0", parms.V_0); @@ -87,8 +87,8 @@ Problem::init_custom_pert( // Set scalar = A_0*exp(-10r^2), where r is distance from center of domain state_pert(i, j, k, RhoScalar_comp) = parms_d.A_0 * exp(-10.*r*r); - // Set an initial value for QKE - state_pert(i, j, k, RhoQKE_comp) = parms_d.QKE_0; + // Set an initial value for KE + state_pert(i, j, k, RhoKE_comp) = parms_d.KE_0; if (use_moisture) { state_pert(i, j, k, RhoQ1_comp) = 0.0; diff --git a/Exec/EWP/inputs_1WT_lat_lon b/Exec/EWP/inputs_1WT_lat_lon index 215618298..73acdfc52 100644 --- a/Exec/EWP/inputs_1WT_lat_lon +++ b/Exec/EWP/inputs_1WT_lat_lon @@ -70,7 +70,7 @@ erf.check_int = 1000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 100 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE num_turb vorticity +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE num_turb vorticity # ADVECTION SCHEMES erf.dycore_horiz_adv_type = "Centered_2nd" diff --git a/Exec/EWP/inputs_1WT_x_y b/Exec/EWP/inputs_1WT_x_y index e9c1296ef..7c0b067f1 100644 --- a/Exec/EWP/inputs_1WT_x_y +++ b/Exec/EWP/inputs_1WT_x_y @@ -68,7 +68,7 @@ erf.check_int = 1000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 100 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE num_turb vorticity +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE num_turb vorticity # ADVECTION SCHEMES erf.dycore_horiz_adv_type = "Centered_2nd" diff --git a/Exec/EWP/inputs_WindFarm_lat_lon b/Exec/EWP/inputs_WindFarm_lat_lon index 0b4b92a4b..6bb90ce8e 100644 --- a/Exec/EWP/inputs_WindFarm_lat_lon +++ b/Exec/EWP/inputs_WindFarm_lat_lon @@ -55,7 +55,7 @@ erf.check_int = 10000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 1000 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE num_turb vorticity +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE num_turb vorticity # SOLVER CHOICE erf.alpha_T = 0.0 diff --git a/Exec/EWP/inputs_WindFarm_x_y b/Exec/EWP/inputs_WindFarm_x_y index 1f102dc4d..198eece95 100644 --- a/Exec/EWP/inputs_WindFarm_x_y +++ b/Exec/EWP/inputs_WindFarm_x_y @@ -53,7 +53,7 @@ erf.check_int = 10000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 1000 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE num_turb vorticity +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE num_turb vorticity # SOLVER CHOICE erf.alpha_T = 0.0 diff --git a/Exec/RegTests/Bomex/ERF_prob.cpp b/Exec/RegTests/Bomex/ERF_prob.cpp index 078b7709b..9f77ee875 100644 --- a/Exec/RegTests/Bomex/ERF_prob.cpp +++ b/Exec/RegTests/Bomex/ERF_prob.cpp @@ -17,7 +17,7 @@ Problem::Problem (const Real* problo, const Real* probhi) pp.query("rho_0", parms.rho_0); pp.query("T_0", parms.T_0); pp.query("A_0", parms.A_0); - pp.query("QKE_0", parms.KE_0); + pp.query("KE_0", parms.KE_0); pp.query("U_0", parms.U_0); pp.query("V_0", parms.V_0); @@ -129,7 +129,7 @@ Problem::init_custom_pert ( // Set scalar = A_0*exp(-10r^2), where r is distance from center of domain state_pert(i, j, k, RhoScalar_comp) = parms_d.A_0 * exp(-10.*r*r); - // Set an initial value for QKE + // Set an initial value for KE if (parms_d.custom_TKE) { state_pert(i, j, k, RhoKE_comp) = (1.0 - z/prob_hi[2]) * r_hse(i,j,k); } else { diff --git a/Exec/RegTests/TurbulentInflow/ERF_prob.H b/Exec/RegTests/TurbulentInflow/ERF_prob.H index e24b1b914..5cf575dae 100644 --- a/Exec/RegTests/TurbulentInflow/ERF_prob.H +++ b/Exec/RegTests/TurbulentInflow/ERF_prob.H @@ -12,7 +12,6 @@ struct ProbParm : ProbParmDefaults { amrex::Real T_0 = 300.0; amrex::Real A_0 = 1.0; amrex::Real KE_0 = 0.1; - amrex::Real QKE_0 = 0.1; amrex::Real KE_decay_height = -1; amrex::Real KE_decay_order = 1; diff --git a/Exec/RegTests/TurbulentInflow/ERF_prob.cpp b/Exec/RegTests/TurbulentInflow/ERF_prob.cpp index 8790b3ebf..2d04b9222 100644 --- a/Exec/RegTests/TurbulentInflow/ERF_prob.cpp +++ b/Exec/RegTests/TurbulentInflow/ERF_prob.cpp @@ -17,7 +17,6 @@ Problem::Problem(const amrex::Real* problo, const amrex::Real* probhi) pp.query("T_0", parms.T_0); pp.query("A_0", parms.A_0); pp.query("KE_0", parms.KE_0); - pp.query("QKE_0", parms.QKE_0); pp.query("KE_decay_height", parms.KE_decay_height); pp.query("KE_decay_order", parms.KE_decay_order); @@ -135,16 +134,6 @@ Problem::init_custom_pert( 1e-12); } } - if (state_pert.nComp() > RhoQKE_comp) { - // PBL - state_pert(i, j, k, RhoQKE_comp) = r_hse(i,j,k) * parms_d.QKE_0; - if (parms_d.KE_decay_height > 0) { - // scale initial SGS kinetic energy with height - state_pert(i, j, k, RhoQKE_comp) *= max( - std::pow(1 - min(z/parms_d.KE_decay_height,1.0), parms_d.KE_decay_order), - 1e-12); - } - } if (use_moisture) { state_pert(i, j, k, RhoQ1_comp) = 0.0; diff --git a/Exec/SimpleActuatorDisk/ERF_prob.H b/Exec/SimpleActuatorDisk/ERF_prob.H index afbc3736f..777be4724 100644 --- a/Exec/SimpleActuatorDisk/ERF_prob.H +++ b/Exec/SimpleActuatorDisk/ERF_prob.H @@ -11,7 +11,7 @@ struct ProbParm : ProbParmDefaults { amrex::Real rho_0 = 0.0; amrex::Real T_0 = 0.0; amrex::Real A_0 = 1.0; - amrex::Real QKE_0 = 0.1; + amrex::Real KE_0 = 0.1; amrex::Real U_0 = 0.0; amrex::Real V_0 = 0.0; diff --git a/Exec/SimpleActuatorDisk/ERF_prob.cpp b/Exec/SimpleActuatorDisk/ERF_prob.cpp index adce92fe8..145f66ad6 100644 --- a/Exec/SimpleActuatorDisk/ERF_prob.cpp +++ b/Exec/SimpleActuatorDisk/ERF_prob.cpp @@ -16,7 +16,7 @@ Problem::Problem(const amrex::Real* problo, const amrex::Real* probhi) pp.query("rho_0", parms.rho_0); pp.query("T_0", parms.T_0); pp.query("A_0", parms.A_0); - pp.query("QKE_0", parms.QKE_0); + pp.query("KE_0", parms.KE_0); pp.query("U_0", parms.U_0); pp.query("V_0", parms.V_0); @@ -87,8 +87,8 @@ Problem::init_custom_pert( // Set scalar = A_0*exp(-10r^2), where r is distance from center of domain state_pert(i, j, k, RhoScalar_comp) = parms_d.A_0 * exp(-10.*r*r); - // Set an initial value for QKE - state_pert(i, j, k, RhoQKE_comp) = parms_d.QKE_0; + // Set an initial value for KE + state_pert(i, j, k, RhoKE_comp) = parms_d.KE_0; if (use_moisture) { state_pert(i, j, k, RhoQ1_comp) = 0.0; diff --git a/Exec/SimpleActuatorDisk/inputs_1WT_lat_lon b/Exec/SimpleActuatorDisk/inputs_1WT_lat_lon index ff237b1cc..4781b7b8a 100644 --- a/Exec/SimpleActuatorDisk/inputs_1WT_lat_lon +++ b/Exec/SimpleActuatorDisk/inputs_1WT_lat_lon @@ -70,7 +70,7 @@ erf.check_int = 1000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 100 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE num_turb vorticity +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE num_turb vorticity # ADVECTION SCHEMES erf.dycore_horiz_adv_type = "Centered_2nd" diff --git a/Exec/SimpleActuatorDisk/inputs_1WT_x_y b/Exec/SimpleActuatorDisk/inputs_1WT_x_y index 4796a2cf4..56be43a86 100644 --- a/Exec/SimpleActuatorDisk/inputs_1WT_x_y +++ b/Exec/SimpleActuatorDisk/inputs_1WT_x_y @@ -68,7 +68,7 @@ erf.check_int = 1000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 10 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE num_turb vorticity_x vorticity_y vorticity_z +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE num_turb vorticity_x vorticity_y vorticity_z # ADVECTION SCHEMES erf.dycore_horiz_adv_type = "Centered_2nd" diff --git a/Exec/SimpleActuatorDisk/inputs_WindFarm_lat_lon b/Exec/SimpleActuatorDisk/inputs_WindFarm_lat_lon index 8fe3e2e82..8c6e9c77d 100644 --- a/Exec/SimpleActuatorDisk/inputs_WindFarm_lat_lon +++ b/Exec/SimpleActuatorDisk/inputs_WindFarm_lat_lon @@ -55,7 +55,7 @@ erf.check_int = 10000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 1000 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE num_turb vorticity +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE num_turb vorticity # SOLVER CHOICE erf.alpha_T = 0.0 diff --git a/Exec/SimpleActuatorDisk/inputs_WindFarm_x_y b/Exec/SimpleActuatorDisk/inputs_WindFarm_x_y index 72e9af156..1733cfe54 100644 --- a/Exec/SimpleActuatorDisk/inputs_WindFarm_x_y +++ b/Exec/SimpleActuatorDisk/inputs_WindFarm_x_y @@ -53,7 +53,7 @@ erf.check_int = 10000 # number of timesteps between checkpoints # PLOTFILES erf.plot_file_1 = plt # prefix of plotfile name erf.plot_int_1 = 1000 # number of timesteps between plotfiles -erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta QKE num_turb vorticity +erf.plot_vars_1 = density rhoadv_0 x_velocity y_velocity z_velocity pressure temp theta KE num_turb vorticity # SOLVER CHOICE erf.alpha_T = 0.0 diff --git a/Source/Diffusion/ERF_Diffusion.H b/Source/Diffusion/ERF_Diffusion.H index e316194d0..c1b7a0ec4 100644 --- a/Source/Diffusion/ERF_Diffusion.H +++ b/Source/Diffusion/ERF_Diffusion.H @@ -43,8 +43,6 @@ void DiffusionSrcForMom_T (const amrex::Box& bxx, const amrex::Box& bxy, const a void DiffusionSrcForState_N (const amrex::Box& bx, const amrex::Box& domain, int start_comp, int num_comp, const bool& exp_most, - const amrex::Array4& u, - const amrex::Array4& v, const amrex::Array4& cell_data, const amrex::Array4& cell_prim, const amrex::Array4& cell_rhs, @@ -63,7 +61,6 @@ void DiffusionSrcForState_N (const amrex::Box& bx, const amrex::Box& domain, const amrex::Array4& mu_turb, const SolverChoice& solverChoice, const int level, - const amrex::Array4& tm_arr, const amrex::GpuArray grav_gpu, const amrex::BCRec* bc_ptr, const bool use_most); @@ -72,8 +69,6 @@ void DiffusionSrcForState_T (const amrex::Box& bx, const amrex::Box& domain, int start_comp, int num_comp, const bool& exp_most, const bool& rot_most, - const amrex::Array4& u, - const amrex::Array4& v, const amrex::Array4& cell_data, const amrex::Array4& cell_prim, const amrex::Array4& cell_rhs, @@ -101,7 +96,6 @@ void DiffusionSrcForState_T (const amrex::Box& bx, const amrex::Box& domain, const amrex::Array4& mu_turb, const SolverChoice& solverChoice, const int level, - const amrex::Array4& tm_arr, const amrex::GpuArray grav_gpu, const amrex::BCRec* bc_ptr, const bool use_most); diff --git a/Source/Diffusion/ERF_DiffusionSrcForState_N.cpp b/Source/Diffusion/ERF_DiffusionSrcForState_N.cpp index 10b27ea95..e870f9c4c 100644 --- a/Source/Diffusion/ERF_DiffusionSrcForState_N.cpp +++ b/Source/Diffusion/ERF_DiffusionSrcForState_N.cpp @@ -40,8 +40,6 @@ void DiffusionSrcForState_N (const Box& bx, const Box& domain, int start_comp, int num_comp, const bool& exp_most, - const Array4& u, - const Array4& v, const Array4& cell_data, const Array4& cell_prim, const Array4& cell_rhs, @@ -60,7 +58,6 @@ DiffusionSrcForState_N (const Box& bx, const Box& domain, const Array4& mu_turb, const SolverChoice &solverChoice, const int level, - const Array4& tm_arr, const GpuArray grav_gpu, const BCRec* bc_ptr, const bool use_most) @@ -83,7 +80,7 @@ DiffusionSrcForState_N (const Box& bx, const Box& domain, Real l_abs_g = std::abs(grav_gpu[2]); bool l_use_KE = ( (turbChoice.les_type == LESType::Deardorff) || - (turbChoice.pbl_type == PBLType::MYNN) ); + (turbChoice.pbl_type == PBLType::MYNN25) ); bool l_consA = (diffChoice.molec_diff_type == MolecDiffType::ConstantAlpha); bool l_turb = ( (turbChoice.les_type == LESType::Smagorinsky) || (turbChoice.les_type == LESType::Deardorff ) || diff --git a/Source/Diffusion/ERF_DiffusionSrcForState_T.cpp b/Source/Diffusion/ERF_DiffusionSrcForState_T.cpp index eb8ea8743..7c935a49a 100644 --- a/Source/Diffusion/ERF_DiffusionSrcForState_T.cpp +++ b/Source/Diffusion/ERF_DiffusionSrcForState_T.cpp @@ -44,8 +44,6 @@ DiffusionSrcForState_T (const Box& bx, const Box& domain, int start_comp, int num_comp, const bool& exp_most, const bool& rot_most, - const Array4& u, - const Array4& v, const Array4& cell_data, const Array4& cell_prim, const Array4& cell_rhs, @@ -73,7 +71,6 @@ DiffusionSrcForState_T (const Box& bx, const Box& domain, const Array4& mu_turb, const SolverChoice &solverChoice, const int level, - const Array4& tm_arr, const GpuArray grav_gpu, const BCRec* bc_ptr, const bool use_most) @@ -95,7 +92,7 @@ DiffusionSrcForState_T (const Box& bx, const Box& domain, Real l_abs_g = std::abs(grav_gpu[2]); bool l_use_KE = ( (turbChoice.les_type == LESType::Deardorff) || - (turbChoice.pbl_type == PBLType::MYNN) ); + (turbChoice.pbl_type == PBLType::MYNN25) ); bool l_consA = (diffChoice.molec_diff_type == MolecDiffType::ConstantAlpha); bool l_turb = ( (turbChoice.les_type == LESType::Smagorinsky) || (turbChoice.les_type == LESType::Deardorff ) || diff --git a/Source/Diffusion/ERF_EddyViscosity.H b/Source/Diffusion/ERF_EddyViscosity.H index 008a39d20..47cbb9503 100644 --- a/Source/Diffusion/ERF_EddyViscosity.H +++ b/Source/Diffusion/ERF_EddyViscosity.H @@ -72,7 +72,7 @@ ComputeSmnSmn (int& i, int& j, int& k, } amrex::Real s11bar(0.), s22bar(0.), s33bar(0.), s12bar(0.); - if (!use_pbl) { + if (!only_pbl) { s11bar = tau11(i,j,k); s22bar = tau22(i,j,k); s33bar = tau33(i,j,k); diff --git a/Source/ERF.H b/Source/ERF.H index e10ba5edf..b2a0237a1 100644 --- a/Source/ERF.H +++ b/Source/ERF.H @@ -906,7 +906,7 @@ private: // eddy diffusivity of heat "Khv","Khh", // mynn pbl lengthscale - "Lpbl", + "Lturb", // moisture vars "qt", "qv", "qc", "qi", "qp", "qrain", "qsnow", "qgraup", "qsat", "rain_accum", "snow_accum", "graup_accum" diff --git a/Source/IO/ERF_Plotfile.cpp b/Source/IO/ERF_Plotfile.cpp index 402e9fa47..01fcf481e 100644 --- a/Source/IO/ERF_Plotfile.cpp +++ b/Source/IO/ERF_Plotfile.cpp @@ -971,8 +971,8 @@ ERF::WritePlotFile (int which, Vector plot_var_names) MultiFab::Copy(mf[lev],*eddyDiffs_lev[lev],EddyDiff::Theta_h,mf_comp,1,0); mf_comp ++; } - if (containerHasElement(plot_var_names, "Lpbl")) { - MultiFab::Copy(mf[lev],*eddyDiffs_lev[lev],EddyDiff::PBL_lengthscale,mf_comp,1,0); + if (containerHasElement(plot_var_names, "Lturb")) { + MultiFab::Copy(mf[lev],*eddyDiffs_lev[lev],EddyDiff::Turb_lengthscale,mf_comp,1,0); mf_comp ++; } diff --git a/Source/IO/ERF_Write1DProfiles.cpp b/Source/IO/ERF_Write1DProfiles.cpp index e7a33ff6f..e4d28e90e 100644 --- a/Source/IO/ERF_Write1DProfiles.cpp +++ b/Source/IO/ERF_Write1DProfiles.cpp @@ -211,7 +211,7 @@ ERF::derive_diag_profiles(Real /*time*/, bool l_use_kturb = ((solverChoice.turbChoice[lev].les_type != LESType::None) || (solverChoice.turbChoice[lev].pbl_type != PBLType::None)); bool l_use_KE = ( (solverChoice.turbChoice[lev].les_type == LESType::Deardorff) || - (solverChoice.turbChoice[lev].pbl_type == PBLType::MYNN) ); + (solverChoice.turbChoice[lev].pbl_type == PBLType::MYNN25) ); // This will hold rho, theta, ksgs, Kmh, Kmv, uu, uv, uw, vv, vw, ww, uth, vth, wth, // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 diff --git a/Source/IO/ERF_Write1DProfiles_stag.cpp b/Source/IO/ERF_Write1DProfiles_stag.cpp index 3f06b2199..49db4d864 100644 --- a/Source/IO/ERF_Write1DProfiles_stag.cpp +++ b/Source/IO/ERF_Write1DProfiles_stag.cpp @@ -317,7 +317,7 @@ ERF::derive_diag_profiles_stag (Real /*time*/, bool l_use_kturb = ((solverChoice.turbChoice[lev].les_type != LESType::None) || (solverChoice.turbChoice[lev].pbl_type != PBLType::None)); bool l_use_KE = ( (solverChoice.turbChoice[lev].les_type == LESType::Deardorff) || - (solverChoice.turbChoice[lev].pbl_type == PBLType::MYNN) ); + (solverChoice.turbChoice[lev].pbl_type == PBLType::MYNN25) ); // Note: "uiui" == u_i*u_i = u*u + v*v + w*w // This will hold rho, theta, ksgs, Kmh, Kmv, uu, uv, vv, uth, vth, diff --git a/Source/SourceTerms/ERF_make_sources.cpp b/Source/SourceTerms/ERF_make_sources.cpp index 959b9c24d..fcbcd5536 100644 --- a/Source/SourceTerms/ERF_make_sources.cpp +++ b/Source/SourceTerms/ERF_make_sources.cpp @@ -61,7 +61,7 @@ void make_sources (int level, TurbChoice tc = solverChoice.turbChoice[level]; const bool l_use_KE = ( (tc.les_type == LESType::Deardorff) || - (tc.pbl_type == PBLType::MYNN) ); + (tc.pbl_type == PBLType::MYNN25) ); const Box& domain = geom.Domain(); diff --git a/Source/TimeIntegration/ERF_slow_rhs_post.cpp b/Source/TimeIntegration/ERF_slow_rhs_post.cpp index 6ca0bd9df..482b94203 100644 --- a/Source/TimeIntegration/ERF_slow_rhs_post.cpp +++ b/Source/TimeIntegration/ERF_slow_rhs_post.cpp @@ -121,7 +121,7 @@ void erf_slow_rhs_post (int level, int finest_level, const bool l_use_mono_adv = solverChoice.use_mono_adv; const bool l_use_KE = ( (tc.les_type == LESType::Deardorff) || - (tc.pbl_type == PBLType::MYNN) ); + (tc.pbl_type == PBLType::MYNN25) ); const bool l_use_diff = ((dc.molec_diff_type != MolecDiffType::None) || (tc.les_type != LESType::None) || (tc.pbl_type != PBLType::None) ); @@ -395,25 +395,26 @@ void erf_slow_rhs_post (int level, int finest_level, if (l_use_diff) { - const Array4 tm_arr = t_mean_mf ? t_mean_mf->const_array(mfi) : Array4{}; + const Array4 tm_arr = t_mean_mf ? t_mean_mf->const_array(mfi) : + Array4{}; if (l_use_terrain) { - DiffusionSrcForState_T(tbx, domain, start_comp, num_comp, exp_most, rot_most, u, v, + DiffusionSrcForState_T(tbx, domain, start_comp, num_comp, exp_most, rot_most, new_cons, cur_prim, cell_rhs, diffflux_x, diffflux_y, diffflux_z, z_nd, ax_arr, ay_arr, az_arr, detJ_arr, dxInv, SmnSmn_a, mf_m, mf_u, mf_v, hfx_x, hfx_y, hfx_z, q1fx_x, q1fx_y, q1fx_z,q2fx_z, diss, mu_turb, solverChoice, level, - tm_arr, grav_gpu, bc_ptr_d, use_most); + grav_gpu, bc_ptr_d, use_most); } else { - DiffusionSrcForState_N(tbx, domain, start_comp, num_comp, exp_most, u, v, + DiffusionSrcForState_N(tbx, domain, start_comp, num_comp, exp_most, new_cons, cur_prim, cell_rhs, diffflux_x, diffflux_y, diffflux_z, dxInv, SmnSmn_a, mf_m, mf_u, mf_v, hfx_z, q1fx_z, q2fx_z, diss, mu_turb, solverChoice, level, - tm_arr, grav_gpu, bc_ptr_d, use_most); + grav_gpu, bc_ptr_d, use_most); } } // use_diff } // valid slow var diff --git a/Source/TimeIntegration/ERF_slow_rhs_pre.cpp b/Source/TimeIntegration/ERF_slow_rhs_pre.cpp index 7ec8b392c..ee0fb135a 100644 --- a/Source/TimeIntegration/ERF_slow_rhs_pre.cpp +++ b/Source/TimeIntegration/ERF_slow_rhs_pre.cpp @@ -500,22 +500,22 @@ void erf_slow_rhs_pre (int level, int finest_level, int n_comp = end_comp - n_start + 1; if (l_use_terrain) { - DiffusionSrcForState_T(bx, domain, n_start, n_comp, l_exp_most, l_rot_most, u, v, + DiffusionSrcForState_T(bx, domain, n_start, n_comp, l_exp_most, l_rot_most, cell_data, cell_prim, cell_rhs, diffflux_x, diffflux_y, diffflux_z, z_nd, ax_arr, ay_arr, az_arr, detJ_arr, dxInv, SmnSmn_a, mf_m, mf_u, mf_v, hfx_x, hfx_y, hfx_z, q1fx_x, q1fx_y, q1fx_z, q2fx_z, diss, mu_turb, solverChoice, level, - tm_arr, grav_gpu, bc_ptr_d, l_use_most); + grav_gpu, bc_ptr_d, l_use_most); } else { - DiffusionSrcForState_N(bx, domain, n_start, n_comp, l_exp_most, u, v, + DiffusionSrcForState_N(bx, domain, n_start, n_comp, l_exp_most, cell_data, cell_prim, cell_rhs, diffflux_x, diffflux_y, diffflux_z, dxInv, SmnSmn_a, mf_m, mf_u, mf_v, hfx_z, q1fx_z, q2fx_z, diss, mu_turb, solverChoice, level, - tm_arr, grav_gpu, bc_ptr_d, l_use_most); + grav_gpu, bc_ptr_d, l_use_most); } }