From ba6770a3a959b439bbf49cedf76475615c920acc Mon Sep 17 00:00:00 2001 From: Mahesh Natarajan Date: Mon, 2 Dec 2024 16:01:21 -0800 Subject: [PATCH 1/5] Power output for all wind models (#1991) Co-authored-by: Mahesh Natarajan --- Source/IO/ERF_Plotfile.cpp | 5 +- Source/Initialization/ERF_init_windfarm.cpp | 11 ++- .../ERF_InitWindFarm.cpp | 78 +++++++++++++++---- Source/WindFarmParametrization/ERF_WindFarm.H | 7 +- .../EWP/ERF_AdvanceEWP.cpp | 68 +++++++++++++++- Source/WindFarmParametrization/EWP/ERF_EWP.H | 11 ++- .../Fitch/ERF_AdvanceFitch.cpp | 63 ++++++++++++++- .../WindFarmParametrization/Fitch/ERF_Fitch.H | 8 ++ .../ERF_AdvanceGeneralAD.cpp | 42 ++++++++-- .../GeneralActuatorDisk/ERF_GeneralAD.H | 2 + .../ERF_AdvanceSimpleAD.cpp | 2 +- 11 files changed, 270 insertions(+), 27 deletions(-) diff --git a/Source/IO/ERF_Plotfile.cpp b/Source/IO/ERF_Plotfile.cpp index ea7ef0287..01a79c1cd 100644 --- a/Source/IO/ERF_Plotfile.cpp +++ b/Source/IO/ERF_Plotfile.cpp @@ -97,7 +97,7 @@ ERF::setPlotVariables (const std::string& pp_plot_var_names, Vector for (int i = 0; i < derived_names.size(); ++i) { if ( containerHasElement(plot_var_names, derived_names[i]) ) { if(solverChoice.windfarm_type == WindFarmType::Fitch or solverChoice.windfarm_type == WindFarmType::EWP) { - if(derived_names[i] == "num_turb") { + if(derived_names[i] == "num_turb" or derived_names[i] == "SMark0") { tmp_plot_names.push_back(derived_names[i]); } } @@ -510,7 +510,8 @@ ERF::WritePlotFile (int which, PlotFileType plotfile_type, Vector p } if( containerHasElement(plot_var_names, "SMark0") and - (solverChoice.windfarm_type == WindFarmType::SimpleAD or solverChoice.windfarm_type == WindFarmType::GeneralAD) ) { + (solverChoice.windfarm_type == WindFarmType::Fitch or solverChoice.windfarm_type == WindFarmType::EWP or + solverChoice.windfarm_type == WindFarmType::SimpleAD or solverChoice.windfarm_type == WindFarmType::GeneralAD) ) { for ( MFIter mfi(mf[lev],TilingIfNotGPU()); mfi.isValid(); ++mfi) { const Box& bx = mfi.tilebox(); diff --git a/Source/Initialization/ERF_init_windfarm.cpp b/Source/Initialization/ERF_init_windfarm.cpp index bdaae7bdf..ab46ed327 100644 --- a/Source/Initialization/ERF_init_windfarm.cpp +++ b/Source/Initialization/ERF_init_windfarm.cpp @@ -29,10 +29,19 @@ ERF::init_windfarm (int lev) true, false); } - windfarm->fill_Nturb_multifab(geom[lev], Nturb[lev], z_phys_cc[lev]); + windfarm->fill_Nturb_multifab(geom[lev], Nturb[lev], z_phys_nd[lev]); windfarm->write_turbine_locations_vtk(); + + if(solverChoice.windfarm_type == WindFarmType::Fitch or + solverChoice.windfarm_type == WindFarmType::EWP) { + windfarm->fill_SMark_multifab_mesoscale_models(geom[lev], + SMark[lev], + Nturb[lev], + z_phys_nd[lev]); + } + if(solverChoice.windfarm_type == WindFarmType::SimpleAD or solverChoice.windfarm_type == WindFarmType::GeneralAD) { windfarm->fill_SMark_multifab(geom[lev], SMark[lev], diff --git a/Source/WindFarmParametrization/ERF_InitWindFarm.cpp b/Source/WindFarmParametrization/ERF_InitWindFarm.cpp index 482a39379..e4dea885e 100644 --- a/Source/WindFarmParametrization/ERF_InitWindFarm.cpp +++ b/Source/WindFarmParametrization/ERF_InitWindFarm.cpp @@ -352,7 +352,7 @@ WindFarm::read_windfarm_airfoil_tables (const std::string windfarm_airfoil_table void WindFarm::gatherKeyValuePairs(const std::vector>& localData, - std::vector>& globalData) + std::vector>& globalData) { int myRank = amrex::ParallelDescriptor::MyProc(); int nProcs = amrex::ParallelDescriptor::NProcs(); @@ -419,17 +419,13 @@ WindFarm::gatherKeyValuePairs(const std::vector>& localDa amrex::ParallelDescriptor::Bcast(&globalData[i].first, 1, 0); amrex::ParallelDescriptor::Bcast(&globalData[i].second, 1, 0); } - - for (const auto& kv : globalData) { - std::cout << "Rank " << myRank << "Key: " << kv.first << ", Value: " << kv.second << std::endl; - } } void WindFarm::fill_Nturb_multifab (const Geometry& geom, MultiFab& mf_Nturb, - std::unique_ptr& z_phys_cc) + std::unique_ptr& z_phys_nd) { zloc.resize(xloc.size(),-1.0); @@ -461,13 +457,13 @@ WindFarm::fill_Nturb_multifab (const Geometry& geom, auto ProbLoArr = geom.ProbLoArray(); int num_turb = xloc.size(); - bool is_terrain = z_phys_cc ? true: false; + bool is_terrain = z_phys_nd ? true: false; // Initialize wind farm for ( MFIter mfi(mf_Nturb,TilingIfNotGPU()); mfi.isValid(); ++mfi) { const Box& bx = mfi.tilebox(); auto Nturb_array = mf_Nturb.array(mfi); - const Array4& z_cc_arr = (z_phys_cc) ? z_phys_cc->const_array(mfi) : Array4{}; + const Array4& z_nd_arr = (z_phys_nd) ? z_phys_nd->const_array(mfi) : Array4{}; int k0 = bx.smallEnd()[2]; ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept { int li = amrex::min(amrex::max(i, i_lo), i_hi); @@ -483,7 +479,7 @@ WindFarm::fill_Nturb_multifab (const Geometry& geom, d_yloc_ptr[it]+1e-3 > y1 and d_yloc_ptr[it]+1e-3 < y2){ Nturb_array(i,j,k,0) = Nturb_array(i,j,k,0) + 1; if(is_terrain) { - d_zloc_ptr[it] = z_cc_arr(i,j,k0); + d_zloc_ptr[it] = z_nd_arr(i,j,k0); d_turb_index_ptr[it] = it; } else { @@ -498,8 +494,6 @@ WindFarm::fill_Nturb_multifab (const Geometry& geom, Gpu::copy(Gpu::deviceToHost, d_zloc.begin(), d_zloc.end(), zloc.begin()); Gpu::copy(Gpu::deviceToHost, d_turb_index.begin(), d_turb_index.end(), turb_index.begin()); - if(is_terrain) { - std::vector> turb_index_zloc; for(int it=0;it& z_phys_nd) +{ + mf_SMark.setVal(-1.0); + + Real d_hub_height = hub_height; + + amrex::Gpu::DeviceVector d_xloc(xloc.size()); + amrex::Gpu::DeviceVector d_yloc(yloc.size()); + amrex::Gpu::DeviceVector d_zloc(xloc.size()); + amrex::Gpu::copyAsync(amrex::Gpu::hostToDevice, xloc.begin(), xloc.end(), d_xloc.begin()); + amrex::Gpu::copyAsync(amrex::Gpu::hostToDevice, yloc.begin(), yloc.end(), d_yloc.begin()); + amrex::Gpu::copyAsync(amrex::Gpu::hostToDevice, zloc.begin(), zloc.end(), d_zloc.begin()); + + int i_lo = geom.Domain().smallEnd(0); int i_hi = geom.Domain().bigEnd(0); + int j_lo = geom.Domain().smallEnd(1); int j_hi = geom.Domain().bigEnd(1); + int k_lo = geom.Domain().smallEnd(2); int k_hi = geom.Domain().bigEnd(2); + + auto dx = geom.CellSizeArray(); + auto ProbLoArr = geom.ProbLoArray(); + + // Initialize wind farm + for ( MFIter mfi(mf_SMark,TilingIfNotGPU()); mfi.isValid(); ++mfi) { + + const Box& bx = mfi.tilebox(); + auto SMark_array = mf_SMark.array(mfi); + auto Nturb_array = mf_Nturb.array(mfi); + const Array4& z_nd_arr = (z_phys_nd) ? z_phys_nd->const_array(mfi) : Array4{}; + int k0 = bx.smallEnd()[2]; + + ParallelFor(bx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept { + if(Nturb_array(i,j,k,0) > 0) { + int li = amrex::min(amrex::max(i, i_lo), i_hi); + int lj = amrex::min(amrex::max(j, j_lo), j_hi); + int lk = amrex::min(amrex::max(k, k_lo), k_hi); + + Real z1 = (z_nd_arr) ? z_nd_arr(li,lj,lk) : ProbLoArr[2] + lk * dx[2]; + Real z2 = (z_nd_arr) ? z_nd_arr(li,lj,lk+1) : ProbLoArr[2] + (lk+1) * dx[2]; + + Real zturb; + if(z_nd_arr) { + zturb = z_nd_arr(li,lj,k0) + d_hub_height; + } else { + zturb = d_hub_height; + } + if(zturb+1e-3 > z1 and zturb+1e-3 < z2) { + SMark_array(i,j,k,0) = 1.0; + } + } + }); } } @@ -571,12 +620,15 @@ WindFarm::fill_SMark_multifab (const Geometry& geom, int jj = amrex::min(amrex::max(j, j_lo), j_hi); int kk = amrex::min(amrex::max(k, k_lo), k_hi); + // The x and y extents of the current mesh cell + Real x1 = ProbLoArr[0] + ii*dx[0]; Real x2 = ProbLoArr[0] + (ii+1)*dx[0]; Real y1 = ProbLoArr[1] + jj*dx[1]; Real y2 = ProbLoArr[1] + (jj+1)*dx[1]; - //Real z = ProbLoArr[2] + (kk+0.5) * dx[2]; + // The mesh cell centered z value + Real z = (z_cc_arr) ? z_cc_arr(ii,jj,kk) : ProbLoArr[2] + (kk+0.5) * dx[2]; int turb_indices_overlap[2]; diff --git a/Source/WindFarmParametrization/ERF_WindFarm.H b/Source/WindFarmParametrization/ERF_WindFarm.H index 68265a6db..71edd8acf 100644 --- a/Source/WindFarmParametrization/ERF_WindFarm.H +++ b/Source/WindFarmParametrization/ERF_WindFarm.H @@ -72,7 +72,7 @@ public: void fill_Nturb_multifab (const amrex::Geometry& geom, amrex::MultiFab& mf_Nturb, - std::unique_ptr& z_phys_cc); + std::unique_ptr& z_phys_nd); void fill_SMark_multifab (const amrex::Geometry& geom, amrex::MultiFab& mf_SMark, @@ -80,6 +80,11 @@ public: const amrex::Real& turb_disk_angle, std::unique_ptr& z_phys_cc); + void fill_SMark_multifab_mesoscale_models (const amrex::Geometry& geom, + amrex::MultiFab& mf_SMark, + const amrex::MultiFab& mf_Nturb, + std::unique_ptr& z_phys_cc); + void write_turbine_locations_vtk (); void write_actuator_disks_vtk (const amrex::Geometry& geom, diff --git a/Source/WindFarmParametrization/EWP/ERF_AdvanceEWP.cpp b/Source/WindFarmParametrization/EWP/ERF_AdvanceEWP.cpp index 8ba23af86..8bcff6486 100644 --- a/Source/WindFarmParametrization/EWP/ERF_AdvanceEWP.cpp +++ b/Source/WindFarmParametrization/EWP/ERF_AdvanceEWP.cpp @@ -21,9 +21,75 @@ EWP::advance (const Geometry& geom, AMREX_ALWAYS_ASSERT(time > -1.0); source_terms_cellcentered(geom, cons_in, mf_vars_ewp, U_old, V_old, W_old, mf_Nturb); update(dt_advance, cons_in, U_old, V_old, mf_vars_ewp); + compute_power_output(cons_in, U_old, V_old, W_old, mf_SMark, mf_Nturb, time); } +void +EWP::compute_power_output (const MultiFab& cons_in, + const MultiFab& U_old, + const MultiFab& V_old, + const MultiFab& W_old, + const MultiFab& mf_SMark, + const MultiFab& mf_Nturb, + const Real& time) +{ + get_turb_loc(xloc, yloc); + get_turb_spec(rotor_rad, hub_height, thrust_coeff_standing, + wind_speed, thrust_coeff, power); + + const int n_spec_table = wind_speed.size(); + + Gpu::DeviceVector d_wind_speed(wind_speed.size()); + Gpu::DeviceVector d_power(wind_speed.size()); + Gpu::copy(Gpu::hostToDevice, wind_speed.begin(), wind_speed.end(), d_wind_speed.begin()); + Gpu::copy(Gpu::hostToDevice, power.begin(), power.end(), d_power.begin()); + + Gpu::DeviceScalar d_total_power(0.0); + Real* d_total_power_ptr = d_total_power.dataPtr(); + + const Real* d_wind_speed_ptr = d_wind_speed.dataPtr(); + const Real* d_power_ptr = d_power.dataPtr(); + + for ( MFIter mfi(cons_in,TilingIfNotGPU()); mfi.isValid(); ++mfi) { + + auto SMark_array = mf_SMark.array(mfi); + auto Nturb_array = mf_Nturb.array(mfi); + auto u_vel = U_old.array(mfi); + auto v_vel = V_old.array(mfi); + auto w_vel = W_old.array(mfi); + Box tbx = mfi.nodaltilebox(0); + + ParallelFor(tbx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept { + + if(SMark_array(i,j,k,0) == 1.0) { + Real avg_vel = std::pow(u_vel(i,j,k)*u_vel(i,j,k) + + v_vel(i,j,k)*v_vel(i,j,k) + + w_vel(i,j,k)*w_vel(i,j,k),0.5); + Real turb_power = interpolate_1d(d_wind_speed_ptr, d_power_ptr, avg_vel, n_spec_table); + turb_power = turb_power*Nturb_array(i,j,k,0); + Gpu::Atomic::Add(d_total_power_ptr,turb_power); + } + }); + } + + Real h_total_power = 0.0; + Gpu::copy(Gpu::deviceToHost, d_total_power.dataPtr(), d_total_power.dataPtr()+1, &h_total_power); + + amrex::ParallelAllReduce::Sum(&h_total_power, 1, amrex::ParallelContext::CommunicatorAll()); + + if (ParallelDescriptor::IOProcessor()){ + static std::ofstream file("power_output_EWP.txt", std::ios::app); + // Check if the file opened successfully + if (!file.is_open()) { + std::cerr << "Error opening file!" << std::endl; + Abort("Could not open file to write power output in ERF_AdvanceSimpleAD.cpp"); + } + file << time << " " << h_total_power << "\n"; + file.flush(); + } +} + void EWP::update (const Real& dt_advance, MultiFab& cons_in, @@ -121,7 +187,7 @@ EWP::source_terms_cellcentered (const Geometry& geom, Real C_T = interpolate_1d(wind_speed_d, thrust_coeff_d, Vabs, n_spec_table); Real C_TKE = 0.0; - Real K_turb = 1.0; + Real K_turb = 6.0; Real L_wake = std::pow(dx[0]*dx[1],0.5)/2.0; Real sigma_e = Vabs/(3.0*K_turb*L_wake)* diff --git a/Source/WindFarmParametrization/EWP/ERF_EWP.H b/Source/WindFarmParametrization/EWP/ERF_EWP.H index 119590a27..f930704ed 100644 --- a/Source/WindFarmParametrization/EWP/ERF_EWP.H +++ b/Source/WindFarmParametrization/EWP/ERF_EWP.H @@ -35,9 +35,18 @@ public: void update (const amrex::Real& dt_advance, amrex::MultiFab& cons_in, - amrex::MultiFab& U_old, amrex::MultiFab& V_old, + amrex::MultiFab& U_old, + amrex::MultiFab& V_old, const amrex::MultiFab& mf_vars_ewp); + void compute_power_output (const amrex::MultiFab& cons_in, + const amrex::MultiFab& U_old, + const amrex::MultiFab& V_old, + const amrex::MultiFab& W_old, + const amrex::MultiFab& mf_SMark, + const amrex::MultiFab& mf_Nturb, + const amrex::Real& time); + protected: amrex::Vector xloc, yloc; amrex::Real hub_height, rotor_rad, thrust_coeff_standing, nominal_power; diff --git a/Source/WindFarmParametrization/Fitch/ERF_AdvanceFitch.cpp b/Source/WindFarmParametrization/Fitch/ERF_AdvanceFitch.cpp index 6f1036339..d96740fda 100644 --- a/Source/WindFarmParametrization/Fitch/ERF_AdvanceFitch.cpp +++ b/Source/WindFarmParametrization/Fitch/ERF_AdvanceFitch.cpp @@ -61,9 +61,9 @@ Fitch::advance (const Geometry& geom, AMREX_ALWAYS_ASSERT(time > -1.0); source_terms_cellcentered(geom, cons_in, mf_vars_fitch, U_old, V_old, W_old, mf_Nturb); update(dt_advance, cons_in, U_old, V_old, mf_vars_fitch); + compute_power_output(cons_in, U_old, V_old, mf_SMark, mf_Nturb, time); } - void Fitch::update (const Real& dt_advance, MultiFab& cons_in, @@ -98,6 +98,67 @@ Fitch::update (const Real& dt_advance, } } +void +Fitch::compute_power_output (const MultiFab& cons_in, + const MultiFab& U_old, + const MultiFab& V_old, + const MultiFab& mf_SMark, + const MultiFab& mf_Nturb, + const Real& time) +{ + get_turb_loc(xloc, yloc); + get_turb_spec(rotor_rad, hub_height, thrust_coeff_standing, + wind_speed, thrust_coeff, power); + + const int n_spec_table = wind_speed.size(); + + Gpu::DeviceVector d_wind_speed(wind_speed.size()); + Gpu::DeviceVector d_power(wind_speed.size()); + Gpu::copy(Gpu::hostToDevice, wind_speed.begin(), wind_speed.end(), d_wind_speed.begin()); + Gpu::copy(Gpu::hostToDevice, power.begin(), power.end(), d_power.begin()); + + Gpu::DeviceScalar d_total_power(0.0); + Real* d_total_power_ptr = d_total_power.dataPtr(); + + const Real* d_wind_speed_ptr = d_wind_speed.dataPtr(); + const Real* d_power_ptr = d_power.dataPtr(); + + for ( MFIter mfi(cons_in,TilingIfNotGPU()); mfi.isValid(); ++mfi) { + + auto SMark_array = mf_SMark.array(mfi); + auto Nturb_array = mf_Nturb.array(mfi); + auto u_vel = U_old.array(mfi); + auto v_vel = V_old.array(mfi); + Box tbx = mfi.nodaltilebox(0); + + ParallelFor(tbx, [=] AMREX_GPU_DEVICE(int i, int j, int k) noexcept { + + if(SMark_array(i,j,k,0) == 1.0) { + Real avg_vel = std::pow(u_vel(i,j,k)*u_vel(i,j,k) + v_vel(i,j,k)*v_vel(i,j,k),0.5); + Real turb_power = interpolate_1d(d_wind_speed_ptr, d_power_ptr, avg_vel, n_spec_table); + turb_power = turb_power*Nturb_array(i,j,k,0); + Gpu::Atomic::Add(d_total_power_ptr,turb_power); + } + }); + } + + Real h_total_power = 0.0; + Gpu::copy(Gpu::deviceToHost, d_total_power.dataPtr(), d_total_power.dataPtr()+1, &h_total_power); + + amrex::ParallelAllReduce::Sum(&h_total_power, 1, amrex::ParallelContext::CommunicatorAll()); + + if (ParallelDescriptor::IOProcessor()){ + static std::ofstream file("power_output_Fitch.txt", std::ios::app); + // Check if the file opened successfully + if (!file.is_open()) { + std::cerr << "Error opening file!" << std::endl; + Abort("Could not open file to write power output in ERF_AdvanceSimpleAD.cpp"); + } + file << time << " " << h_total_power << "\n"; + file.flush(); + } +} + void Fitch::source_terms_cellcentered (const Geometry& geom, const MultiFab& cons_in, diff --git a/Source/WindFarmParametrization/Fitch/ERF_Fitch.H b/Source/WindFarmParametrization/Fitch/ERF_Fitch.H index baa557e22..3476cfc6b 100644 --- a/Source/WindFarmParametrization/Fitch/ERF_Fitch.H +++ b/Source/WindFarmParametrization/Fitch/ERF_Fitch.H @@ -38,7 +38,15 @@ public: amrex::MultiFab& U_old, amrex::MultiFab& V_old, const amrex::MultiFab& mf_vars_fitch); + void compute_power_output (const amrex::MultiFab& cons_in, + const amrex::MultiFab& U_old, + const amrex::MultiFab& V_old, + const amrex::MultiFab& mf_SMark, + const amrex::MultiFab& mf_Nturb, + const amrex::Real& time); + protected: + amrex::Vector hub_height_velocity; amrex::Vector xloc, yloc; amrex::Real hub_height, rotor_rad, thrust_coeff_standing, nominal_power; amrex::Vector wind_speed, thrust_coeff, power; diff --git a/Source/WindFarmParametrization/GeneralActuatorDisk/ERF_AdvanceGeneralAD.cpp b/Source/WindFarmParametrization/GeneralActuatorDisk/ERF_AdvanceGeneralAD.cpp index 2f5873f63..acbdddfe9 100644 --- a/Source/WindFarmParametrization/GeneralActuatorDisk/ERF_AdvanceGeneralAD.cpp +++ b/Source/WindFarmParametrization/GeneralActuatorDisk/ERF_AdvanceGeneralAD.cpp @@ -24,8 +24,38 @@ GeneralAD::advance (const Geometry& geom, compute_freestream_velocity(cons_in, U_old, V_old, mf_SMark); source_terms_cellcentered(geom, cons_in, mf_SMark, mf_vars_generalAD); update(dt_advance, cons_in, U_old, V_old, W_old, mf_vars_generalAD); + compute_power_output(time); } +void +GeneralAD::compute_power_output (const Real& time) +{ + get_turb_loc(xloc, yloc); + get_turb_spec(rotor_rad, hub_height, thrust_coeff_standing, + wind_speed, thrust_coeff, power); + + const int n_spec_table = wind_speed.size(); + // Compute power based on the look-up table + + if (ParallelDescriptor::IOProcessor()){ + static std::ofstream file("power_output_GeneralAD.txt", std::ios::app); + // Check if the file opened successfully + if (!file.is_open()) { + std::cerr << "Error opening file!" << std::endl; + Abort("Could not open file to write power output in ERF_AdvanceSimpleAD.cpp"); + } + Real total_power = 0.0; + for(int it=0; it xloc, yloc; amrex::Real turb_disk_angle; diff --git a/Source/WindFarmParametrization/SimpleActuatorDisk/ERF_AdvanceSimpleAD.cpp b/Source/WindFarmParametrization/SimpleActuatorDisk/ERF_AdvanceSimpleAD.cpp index 116de0b48..9938cbce7 100644 --- a/Source/WindFarmParametrization/SimpleActuatorDisk/ERF_AdvanceSimpleAD.cpp +++ b/Source/WindFarmParametrization/SimpleActuatorDisk/ERF_AdvanceSimpleAD.cpp @@ -35,7 +35,7 @@ SimpleAD::compute_power_output (const Real& time) // Compute power based on the look-up table if (ParallelDescriptor::IOProcessor()){ - static std::ofstream file("power_output.txt", std::ios::app); + static std::ofstream file("power_output_SimpleAD.txt", std::ios::app); // Check if the file opened successfully if (!file.is_open()) { std::cerr << "Error opening file!" << std::endl; From 64e6ea58faac63539801aeeac616453aba9061b8 Mon Sep 17 00:00:00 2001 From: "Aaron M. Lattanzi" <103702284+AMLattanzi@users.noreply.github.com> Date: Mon, 2 Dec 2024 16:01:37 -0800 Subject: [PATCH 2/5] Change default n substep. (#1992) --- Source/TimeIntegration/ERF_ComputeTimestep.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Source/TimeIntegration/ERF_ComputeTimestep.cpp b/Source/TimeIntegration/ERF_ComputeTimestep.cpp index d09f9b80a..28131b92a 100644 --- a/Source/TimeIntegration/ERF_ComputeTimestep.cpp +++ b/Source/TimeIntegration/ERF_ComputeTimestep.cpp @@ -201,9 +201,7 @@ ERF::estTimeStep (int level, long& dt_fast_ratio) const if (fixed_dt[level] > 0. && fixed_fast_dt[level] > 0.) { dt_fast_ratio = static_cast( fixed_dt[level] / fixed_fast_dt[level] ); } else if (fixed_dt[level] > 0.) { - dt_fast_ratio = static_cast( std::ceil((fixed_dt[level]/estdt_comp)) ); - } else { - dt_fast_ratio = (estdt_lowM_inv > 0.0) ? static_cast( std::ceil((estdt_lowM/estdt_comp)) ) : 1; + dt_fast_ratio = static_cast( 6 ); } // Force time step ratio to be an even value From 34b69bb4920e038a8d24f68ff505c1f754063478 Mon Sep 17 00:00:00 2001 From: Ann Almgren Date: Mon, 2 Dec 2024 16:01:56 -0800 Subject: [PATCH 3/5] fix sign of fluxes for EB solve (#1993) --- Source/LinearSolvers/ERF_PoissonSolve.cpp | 2 ++ Source/LinearSolvers/ERF_solve_with_EB_mlmg.cpp | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Source/LinearSolvers/ERF_PoissonSolve.cpp b/Source/LinearSolvers/ERF_PoissonSolve.cpp index 2218380c4..0a80fe725 100644 --- a/Source/LinearSolvers/ERF_PoissonSolve.cpp +++ b/Source/LinearSolvers/ERF_PoissonSolve.cpp @@ -43,6 +43,7 @@ void ERF::project_velocities (int lev, Real l_dt, Vector& mom_mf, Mult // Now convert the rho0w MultiFab to hold Omega rather than rhow // **************************************************************************** // +#ifndef ERF_USE_EB if (l_use_terrain && !SolverChoice::terrain_is_flat) { for ( MFIter mfi(rhs[0],TilingIfNotGPU()); mfi.isValid(); ++mfi) { @@ -65,6 +66,7 @@ void ERF::project_velocities (int lev, Real l_dt, Vector& mom_mf, Mult }); } // mfi } +#endif // **************************************************************************** // Compute divergence which will form RHS diff --git a/Source/LinearSolvers/ERF_solve_with_EB_mlmg.cpp b/Source/LinearSolvers/ERF_solve_with_EB_mlmg.cpp index 72b465443..87c7e4fc7 100644 --- a/Source/LinearSolvers/ERF_solve_with_EB_mlmg.cpp +++ b/Source/LinearSolvers/ERF_solve_with_EB_mlmg.cpp @@ -66,7 +66,7 @@ void ERF::solve_with_EB_mlmg (int lev, Vector& rhs, Vector& for (int idim = 0; idim < AMREX_SPACEDIM; ++idim) { bcoef[idim].define(convert(ba_tmp[0],IntVect::TheDimensionVector(idim)), dm_tmp[0], 1, 0, MFInfo(), *m_factory[lev]); - bcoef[idim].setVal(1.0); + bcoef[idim].setVal(-1.0); } mleb.setBCoeffs(0, amrex::GetArrOfConstPtrs(bcoef)); @@ -83,6 +83,13 @@ void ERF::solve_with_EB_mlmg (int lev, Vector& rhs, Vector& phi[0].FillBoundary(geom[lev].periodicity()); + // + // This arises because we solve MINUS del dot beta grad phi = div (rho u) + // + fluxes[0][0].mult(-1.); + fluxes[0][1].mult(-1.); + fluxes[0][2].mult(-1.); + // **************************************************************************** // Impose bc's on pprime // **************************************************************************** From 9f33aaf162026c365ecb61019ed2d23668e2fdae Mon Sep 17 00:00:00 2001 From: Mahesh Natarajan Date: Mon, 2 Dec 2024 16:04:15 -0800 Subject: [PATCH 4/5] The inputs for flow over Witch of Agnesi (#1989) Co-authored-by: Mahesh Natarajan --- Exec/DryRegTests/WitchOfAgnesi/input_sounding | 607 +++++++++++++++++- Exec/DryRegTests/WitchOfAgnesi/inputs | 53 +- Exec/DryRegTests/WitchOfAgnesi/sponge_WoA.txt | 601 +++++++++++++++++ 3 files changed, 1224 insertions(+), 37 deletions(-) create mode 100644 Exec/DryRegTests/WitchOfAgnesi/sponge_WoA.txt diff --git a/Exec/DryRegTests/WitchOfAgnesi/input_sounding b/Exec/DryRegTests/WitchOfAgnesi/input_sounding index 90030278e..6c340b1aa 100644 --- a/Exec/DryRegTests/WitchOfAgnesi/input_sounding +++ b/Exec/DryRegTests/WitchOfAgnesi/input_sounding @@ -1,5 +1,602 @@ - 1000.0 300.0 0.0 - 0.0 300.0 0.0 10.0 0.0 -10000.0 330.0 0.0 10.0 0.0 -20000.0 360.0 0.0 10.0 0.0 -30000.0 390.0 0.0 10.0 0.0 +1000 300 0 +0 300 0 10 0 +0.05 300.000152905238 0 10 0 +0.110271312172386 300.000337221328 0 10 0 +0.171446694027358 300.000524302275 0 10 0 +0.233539706610154 300.000714189555 0 10 0 +0.296564114381692 300.000906925268 0 10 0 +0.360533888269804 300.001102552143 0 10 0 +0.425463208766237 300.001301113552 0 10 0 +0.491366469070116 300.001502653516 0 10 0 +0.558258278278554 300.001707216718 0 10 0 +0.626153464625118 300.00191484851 0 10 0 +0.69506707876688 300.002125594927 0 10 0 +0.76501439712077 300.002339502691 0 10 0 +0.836010925249967 300.002556619228 0 10 0 +0.908072401301102 300.002776992673 0 10 0 +0.981214799493005 300.003000671886 0 10 0 +1.05545433365779 300.003227706457 0 10 0 +1.13080746083504 300.003458146723 0 10 0 +1.20729088491995 300.003692043773 0 10 0 +1.28492156036614 300.003929449466 0 10 0 +1.36371669594401 300.004170416436 0 10 0 +1.44369375855556 300.004414998109 0 10 0 +1.52487047710628 300.004663248711 0 10 0 +1.60726484643526 300.004915223282 0 10 0 +1.69089513130417 300.005170977688 0 10 0 +1.77577987044612 300.005430568633 0 10 0 +1.8619378806752 300.005694053672 0 10 0 +1.94938826105771 300.005961491223 0 10 0 +2.03815039714596 300.006232940581 0 10 0 +2.12824396527554 300.00650846193 0 10 0 +2.21968893692706 300.006788116359 0 10 0 +2.31250558315335 300.007071965871 0 10 0 +2.40671447907304 300.007360073399 0 10 0 +2.50233650843152 300.007652502824 0 10 0 +2.59939286823038 300.007949318982 0 10 0 +2.69790507342622 300.008250587682 0 10 0 +2.7978949617 300.008556375722 0 10 0 +2.89938469829788 300.008866750902 0 10 0 +3.00239678094473 300.009181782038 0 10 0 +3.10695404483129 300.009501538979 0 10 0 +3.21307966767615 300.009826092622 0 10 0 +3.32079717486367 300.010155514929 0 10 0 +3.43013044465902 300.010489878941 0 10 0 +3.54110371350129 300.010829258794 0 10 0 +3.65374158137619 300.011173729737 0 10 0 +3.76806901726922 300.011523368149 0 10 0 +3.88411136470064 300.011878251554 0 10 0 +4.00189434734354 300.01223845864 0 10 0 +4.12144407472608 300.012604069273 0 10 0 +4.24278704801935 300.012975164522 0 10 0 +4.36595016591203 300.013351826669 0 10 0 +4.49096073057309 300.013734139232 0 10 0 +4.61784645370408 300.014122186982 0 10 0 +4.74663546268202 300.014516055961 0 10 0 +4.87735630679464 300.014915833503 0 10 0 +5.01003796356894 300.015321608253 0 10 0 +5.14470984519486 300.015733470186 0 10 0 +5.28140180504517 300.016151510626 0 10 0 +5.42014414429324 300.016575822269 0 10 0 +5.56096761863002 300.017006499199 0 10 0 +5.70390344508186 300.017443636916 0 10 0 +5.84898330893047 300.01788733235 0 10 0 +5.99623937073681 300.018337683886 0 10 0 +6.14570427347025 300.018794791387 0 10 0 +6.29741114974469 300.019258756212 0 10 0 +6.45139362916324 300.019729681244 0 10 0 +6.60768584577308 300.020207670907 0 10 0 +6.76632244563206 300.020692831193 0 10 0 +6.92733859448892 300.021185269687 0 10 0 +7.09076998557864 300.021685095584 0 10 0 +7.25665284753471 300.022192419721 0 10 0 +7.42502395242011 300.022707354597 0 10 0 +7.5959206238788 300.023230014401 0 10 0 +7.76938074540937 300.023760515032 0 10 0 +7.94544276876289 300.024298974132 0 10 0 +8.12414572246672 300.024845511107 0 10 0 +8.30552922047611 300.025400247155 0 10 0 +8.48963347095564 300.025963305292 0 10 0 +8.67649928519236 300.026534810382 0 10 0 +8.86616808664263 300.027114889162 0 10 0 +9.05868192011465 300.02770367027 0 10 0 +9.25408346108876 300.028301284276 0 10 0 +9.45241602517747 300.02890786371 0 10 0 +9.65372357772752 300.029523543089 0 10 0 +9.85805074356582 300.030148458951 0 10 0 +10.0654428168917 300.030782749882 0 10 0 +10.2759457713174 300.031426556548 0 10 0 +10.4896062700596 300.032080021727 0 10 0 +10.7064716762829 300.032743290339 0 10 0 +10.9265900635995 300.03341650948 0 10 0 +11.1500102267259 300.034099828452 0 10 0 +11.3767816922992 300.0347933988 0 10 0 +11.606954729856 300.035497374344 0 10 0 +11.8405803629762 300.036211911209 0 10 0 +12.0777103805933 300.036937167868 0 10 0 +12.3183973484746 300.037673305169 0 10 0 +12.5626946208741 300.038420486376 0 10 0 +12.8106563523596 300.039178877205 0 10 0 +13.0623375098173 300.039948645856 0 10 0 +13.317793884637 300.040729963057 0 10 0 +13.5770821050789 300.041523002096 0 10 0 +13.8402596488275 300.042327938864 0 10 0 +14.1073848557323 300.043144951892 0 10 0 +14.3785169407407 300.043974222391 0 10 0 +14.6537160070242 300.044815934291 0 10 0 +14.9330430593019 300.045670274284 0 10 0 +15.2165600173638 300.046537431864 0 10 0 +15.5043297297967 300.047417599371 0 10 0 +15.796415987916 300.048310972031 0 10 0 +16.0928835399071 300.049217748001 0 10 0 +16.3937981051781 300.050138128413 0 10 0 +16.6992263889282 300.051072317418 0 10 0 +17.0092360969345 300.052020522232 0 10 0 +17.3238959505609 300.052982953183 0 10 0 +17.6432757019917 300.053959823755 0 10 0 +17.9674461496939 300.054951350638 0 10 0 +18.2964791541117 300.055957753774 0 10 0 +18.6304476535958 300.05697925641 0 10 0 +18.9694256805721 300.058016085141 0 10 0 +19.3134883779531 300.059068469967 0 10 0 +19.6627120157947 300.06013664434 0 10 0 +20.0171740082041 300.061220845217 0 10 0 +20.3769529304995 300.062321313113 0 10 0 +20.7421285366294 300.063438292155 0 10 0 +21.1127817768512 300.064572030134 0 10 0 +21.4889948156764 300.065722778564 0 10 0 +21.8708510500839 300.066890792733 0 10 0 +22.2584351280075 300.068076331764 0 10 0 +22.6518329671 300.06927965867 0 10 0 +23.0511317737789 300.070501040415 0 10 0 +23.456420062558 300.071740747969 0 10 0 +23.8677876756687 300.072999056375 0 10 0 +24.2853258029761 300.074276244802 0 10 0 +24.7091270021932 300.075572596615 0 10 0 +25.1392852193984 300.076888399432 0 10 0 +25.5758958098618 300.078223945191 0 10 0 +26.0190555591821 300.079579530215 0 10 0 +26.4688627047422 300.080955455277 0 10 0 +26.9254169574857 300.082352025666 0 10 0 +27.3888195240204 300.083769551258 0 10 0 +27.8591731290531 300.085208346581 0 10 0 +28.3365820381613 300.086668730888 0 10 0 +28.8211520809061 300.088151028228 0 10 0 +29.3129906742921 300.089655567515 0 10 0 +29.8122068465788 300.091182682606 0 10 0 +30.3189112614499 300.09273271237 0 10 0 +30.833216242544 300.094306000767 0 10 0 +31.3552357983546 300.095902896925 0 10 0 +31.8850856475023 300.097523755216 0 10 0 +32.4228832443872 300.099168935333 0 10 0 +32.9687478052254 300.100838802375 0 10 0 +33.5228003344761 300.102533726924 0 10 0 +34.0851636516657 300.104254085131 0 10 0 +34.655962418613 300.106000258796 0 10 0 +35.2353231670646 300.107772635456 0 10 0 +35.823374326743 300.10957160847 0 10 0 +36.4202462538165 300.111397577107 0 10 0 +37.0260712597961 300.113250946635 0 10 0 +37.6409836408654 300.11513212841 0 10 0 +38.2651197076508 300.117041539969 0 10 0 +38.898617815438 300.118979605125 0 10 0 +39.5416183948419 300.120946754057 0 10 0 +40.1942639829369 300.122943423408 0 10 0 +40.8566992548534 300.124970056384 0 10 0 +41.5290710558485 300.127027102849 0 10 0 +42.2115284338586 300.129115019428 0 10 0 +42.9042226725389 300.13123426961 0 10 0 +43.6073073247994 300.133385323847 0 10 0 +44.3209382468437 300.135568659663 0 10 0 +45.0452736327188 300.137784761758 0 10 0 +45.7804740493819 300.140034122118 0 10 0 +46.5267024722951 300.142317240122 0 10 0 +47.2841243215519 300.144634622656 0 10 0 +48.0529074985475 300.146986784225 0 10 0 +48.8332224231981 300.149374247067 0 10 0 +49.6252420717185 300.151797541272 0 10 0 +50.4291420149666 300.154257204898 0 10 0 +51.2451004573635 300.15675378409 0 10 0 +52.0732982763963 300.159287833205 0 10 0 +52.9139190627147 300.161859914934 0 10 0 +53.7671491608278 300.164470600428 0 10 0 +54.6331777104126 300.167120469425 0 10 0 +55.5121966882411 300.169810110378 0 10 0 +56.4044009507371 300.172540120591 0 10 0 +57.3099882771706 300.175311106348 0 10 0 +58.2291594135005 300.17812368305 0 10 0 +59.1621181168754 300.180978475351 0 10 0 +60.1090712008009 300.183876117301 0 10 0 +61.0702285809853 300.186817252483 0 10 0 +62.0458033218725 300.189802534161 0 10 0 +63.0360116838729 300.192832625424 0 10 0 +64.0410731713034 300.195908199333 0 10 0 +65.0612105810453 300.199029939073 0 10 0 +66.0966500519334 300.202198538106 0 10 0 +67.1476211148848 300.205414700326 0 10 0 +68.2143567437804 300.208679140213 0 10 0 +69.2970934071095 300.211992583 0 10 0 +70.3960711203885 300.215355764826 0 10 0 +71.5115334993667 300.218769432908 0 10 0 +72.6437278140296 300.222234345705 0 10 0 +73.7929050434125 300.225751273088 0 10 0 +74.959319931236 300.229320996511 0 10 0 +76.1432310423769 300.232944309191 0 10 0 +77.344900820185 300.236622016277 0 10 0 +78.5645956446601 300.240354935039 0 10 0 +79.8025858915024 300.244143895043 0 10 0 +81.0591459920473 300.247989738345 0 10 0 +82.3345544941004 300.251893319672 0 10 0 +83.6290941236843 300.255855506617 0 10 0 +84.9430518477119 300.259877179835 0 10 0 +86.2767189376 300.263959233237 0 10 0 +87.6303910338364 300.268102574189 0 10 0 +89.0043682115163 300.272308123723 0 10 0 +90.3989550468614 300.276576816735 0 10 0 +91.8144606847367 300.280909602198 0 10 0 +93.2511989071801 300.285307443376 0 10 0 +94.7094882029602 300.289771318038 0 10 0 +96.189651838177 300.294302218678 0 10 0 +97.692017927922 300.298901152737 0 10 0 +99.2169195090132 300.303569142832 0 10 0 +100.764694613821 300.30830722698 0 10 0 +102.3356863452 300.313116458837 0 10 0 +103.930242952551 300.317997907929 0 10 0 +105.548717909012 300.322952659898 0 10 0 +107.191469989819 300.32798181674 0 10 0 +108.858863351839 300.333086497057 0 10 0 +110.551267614289 300.338267836305 0 10 0 +112.269057940675 300.34352698705 0 10 0 +114.012615121958 300.348865119232 0 10 0 +115.78232566096 300.354283420418 0 10 0 +117.578581858046 300.359783096079 0 10 0 +119.401781898089 300.365365369854 0 10 0 +121.252329938733 300.37103148383 0 10 0 +123.130636199987 300.376782698819 0 10 0 +125.037117055159 300.382620294641 0 10 0 +126.972195123158 300.388545570415 0 10 0 +128.936299362178 300.39455984485 0 10 0 +130.929865164783 300.400664456539 0 10 0 +132.953334454427 300.406860764267 0 10 0 +135.007155783416 300.413150147311 0 10 0 +137.09178443234 300.419534005755 0 10 0 +139.207682510997 300.426013760801 0 10 0 +141.355319060835 300.432590855095 0 10 0 +143.535170158919 300.439266753049 0 10 0 +145.747719023476 300.446042941171 0 10 0 +147.993456121 300.452920928403 0 10 0 +150.272879274988 300.45990224646 0 10 0 +152.586493776285 300.466988450172 0 10 0 +154.934812495101 300.474181117845 0 10 0 +157.3183559947 300.481481851606 0 10 0 +159.737652646793 300.488892277774 0 10 0 +162.193238748667 300.496414047221 0 10 0 +164.68565864207 300.504048835751 0 10 0 +167.215464833873 300.511798344474 0 10 0 +169.783218118554 300.519664300194 0 10 0 +172.389487702504 300.527648455799 0 10 0 +175.034851330214 300.535752590656 0 10 0 +177.71989541234 300.543978511017 0 10 0 +180.445215155697 300.552328050425 0 10 0 +183.211414695205 300.560803070131 0 10 0 +186.019107227806 300.569405459517 0 10 0 +188.868915148395 300.578137136521 0 10 0 +191.761470187793 300.587000048075 0 10 0 +194.697413552783 300.595996170546 0 10 0 +197.677396068247 300.605127510183 0 10 0 +200.702078321443 300.614396103573 0 10 0 +203.772130808437 300.623804018106 0 10 0 +206.888234082736 300.633353352442 0 10 0 +210.051078906149 300.643046236987 0 10 0 +213.261366401914 300.65288483438 0 10 0 +216.519808210115 300.662871339985 0 10 0 +219.827126645439 300.673007982387 0 10 0 +223.184054857293 300.683297023903 0 10 0 +226.591336992325 300.693740761095 0 10 0 +230.049728359382 300.704341525294 0 10 0 +233.559995596945 300.715101683129 0 10 0 +237.122916843071 300.726023637071 0 10 0 +240.73928190789 300.737109825978 0 10 0 +244.409892448681 300.748362725648 0 10 0 +248.135562147583 300.759784849393 0 10 0 +251.917116891969 300.771378748605 0 10 0 +255.755394957521 300.783147013341 0 10 0 +259.651247194056 300.795092272916 0 10 0 +263.605537214139 300.807217196505 0 10 0 +267.619141584524 300.81952449375 0 10 0 +271.692950020464 300.832016915383 0 10 0 +275.827865582943 300.844697253858 0 10 0 +280.02480487886 300.857568343983 0 10 0 +284.284698264215 300.870633063578 0 10 0 +288.608490050351 300.88389433413 0 10 0 +292.997138713278 300.897355121466 0 10 0 +297.45161710615 300.911018436432 0 10 0 +301.972912674915 300.924887335583 0 10 0 +306.562027677211 300.938964921889 0 10 0 +311.219979404541 300.953254345446 0 10 0 +315.947800407782 300.967758804201 0 10 0 +320.746538726071 300.982481544687 0 10 0 +325.617258119134 300.997425862774 0 10 0 +330.561038303093 301.012595104423 0 10 0 +335.578975189812 301.027992666462 0 10 0 +340.672181129832 301.043621997367 0 10 0 +345.841785158952 301.059486598057 0 10 0 +351.088933248508 301.075590022706 0 10 0 +356.414788559408 301.091935879562 0 10 0 +361.820531699972 301.108527831779 0 10 0 +367.307360987644 301.125369598271 0 10 0 +372.876492714631 301.142464954564 0 10 0 +378.529161417522 301.159817733677 0 10 0 +384.266620150958 301.17743182701 0 10 0 +390.090140765394 301.195311185244 0 10 0 +396.001014189047 301.213459819259 0 10 0 +402.000550714056 301.231881801064 0 10 0 +408.090080286939 301.250581264748 0 10 0 +414.270952803415 301.269562407436 0 10 0 +420.544538407639 301.288829490269 0 10 0 +426.912227795926 301.308386839395 0 10 0 +433.375432525037 301.328238846978 0 10 0 +439.935585325085 301.34838997222 0 10 0 +446.594140417133 301.368844742407 0 10 0 +453.352573835563 301.389607753962 0 10 0 +460.212383755268 301.410683673519 0 10 0 +467.17509082377 301.432077239017 0 10 0 +474.242238498299 301.453793260811 0 10 0 +481.415393387946 301.475836622792 0 10 0 +488.696145600937 301.498212283541 0 10 0 +496.086109097123 301.520925277486 0 10 0 +503.586922045753 301.543980716087 0 10 0 +511.200247188611 301.567383789038 0 10 0 +518.927772208613 301.591139765488 0 10 0 +526.771210103914 301.615253995279 0 10 0 +534.732299567645 301.63973191021 0 10 0 +542.812805373332 301.664579025319 0 10 0 +551.014518766105 301.689800940181 0 10 0 +559.339257859769 301.715403340234 0 10 0 +567.788868039837 301.741391998124 0 10 0 +576.365222372607 301.76777277507 0 10 0 +585.070222020369 301.794551622256 0 10 0 +593.905796662847 301.821734582238 0 10 0 +602.873904924962 301.849327790384 0 10 0 +611.976534811008 301.877337476329 0 10 0 +621.215704145346 301.905769965456 0 10 0 +630.593461019698 301.934631680406 0 10 0 +640.111884247166 301.963929142607 0 10 0 +649.773083823046 301.993668973831 0 10 0 +659.579201392564 302.023857897774 0 10 0 +669.532410725625 302.054502741667 0 10 0 +679.634918198682 302.08561043791 0 10 0 +689.888963283834 302.11718802573 0 10 0 +700.296819045264 302.149242652876 0 10 0 +710.860792643115 302.181781577332 0 10 0 +721.583225844934 302.214812169062 0 10 0 +732.466495544781 302.248341911787 0 10 0 +743.513014290125 302.28237840479 0 10 0 +754.725230816649 302.316929364744 0 10 0 +766.105630591071 302.352002627586 0 10 0 +777.656736362109 302.387606150404 0 10 0 +789.381108719713 302.42374801337 0 10 0 +801.281346662681 302.460436421697 0 10 0 +813.360088174794 302.497679707636 0 10 0 +825.620010809588 302.535486332496 0 10 0 +838.063832283904 302.573864888708 0 10 0 +850.694311080335 302.612824101922 0 10 0 +863.514247058712 302.652372833133 0 10 0 +876.526482076765 302.69252008085 0 10 0 +889.733900620089 302.733274983298 0 10 0 +903.139430441563 302.774646820659 0 10 0 +916.746043210358 302.816645017351 0 10 0 +930.556755170686 302.859279144344 0 10 0 +944.574627810419 302.902558921519 0 10 0 +958.802768539747 302.94649422006 0 10 0 +973.244331380016 302.991095064897 0 10 0 +987.902517662888 303.036371637185 0 10 0 +1002.78057674 303.082334276824 0 10 0 +1017.88180670328 303.128993485023 0 10 0 +1033.209555116 303.176359926917 0 10 0 +1048.76721975491 303.224444434212 0 10 0 +1064.55824936341 303.273258007892 0 10 0 +1080.58614441603 303.322811820965 0 10 0 +1096.85445789444 303.373117221256 0 10 0 +1113.36679607503 303.424185734252 0 10 0 +1130.12681932833 303.476029065994 0 10 0 +1147.13824293043 303.52865910602 0 10 0 +1164.40483788655 303.58208793036 0 10 0 +1181.93043176702 303.636327804583 0 10 0 +1199.7189095557 303.691391186898 0 10 0 +1217.77421451121 303.747290731306 0 10 0 +1236.10034904105 303.804039290813 0 10 0 +1254.70137558884 303.861649920698 0 10 0 +1273.58141753484 303.920135881832 0 10 0 +1292.74466011004 303.979510644068 0 10 0 +1312.19535132386 304.03978788968 0 10 0 +1331.93780290589 304.100981516869 0 10 0 +1351.97639126165 304.163105643331 0 10 0 +1372.31555844275 304.226174609885 0 10 0 +1392.95981313156 304.290202984172 0 10 0 +1413.91373164071 304.355205564412 0 10 0 +1435.18195892749 304.42119738324 0 10 0 +1456.76920962358 304.488193711598 0 10 0 +1478.6802690801 304.556210062705 0 10 0 +1500.91999442848 304.625262196101 0 10 0 +1523.49331565708 304.695366121756 0 10 0 +1546.4052367041 304.766538104261 0 10 0 +1569.66083656684 304.838794667088 0 10 0 +1593.26527042751 304.912152596939 0 10 0 +1617.2237707961 304.986628948161 0 10 0 +1641.54164867021 305.062241047253 0 10 0 +1666.22429471244 305.139006497448 0 10 0 +1691.27718044529 305.216943183384 0 10 0 +1716.70585946415 305.296069275859 0 10 0 +1742.51596866828 305.376403236678 0 10 0 +1768.71322951048 305.45796382358 0 10 0 +1795.30344926531 305.540770095269 0 10 0 +1822.29252231646 305.62484141653 0 10 0 +1849.68643146338 305.710197463444 0 10 0 +1877.4912492475 305.796858228701 0 10 0 +1905.71313929838 305.884844027009 0 10 0 +1934.35835770003 305.974175500612 0 10 0 +1963.43325437771 306.064873624902 0 10 0 +1992.94427450554 306.156959714149 0 10 0 +2022.8979599353 306.250455427326 0 10 0 +2053.3009506465 306.345382774062 0 10 0 +2084.15998621837 306.441764120688 0 10 0 +2115.48190732382 306.539622196418 0 10 0 +2147.27365724585 306.638980099635 0 10 0 +2179.54228341671 306.739861304303 0 10 0 +2212.29493898013 306.842289666504 0 10 0 +2245.538884377 306.946289431099 0 10 0 +2279.28148895483 307.051885238516 0 10 0 +2313.53023260133 307.159102131674 0 10 0 +2348.29270740252 307.267965563042 0 10 0 +2383.57661932573 307.378501401831 0 10 0 +2419.38978992779 307.490735941334 0 10 0 +2455.74015808888 307.6046959064 0 10 0 +2492.63578177238 307.72040846107 0 10 0 +2530.08483981114 307.837901216347 0 10 0 +2568.09563372048 307.957202238136 0 10 0 +2606.67658953846 308.078340055328 0 10 0 +2645.83625969371 308.201343668058 0 10 0 +2685.58332490128 308.326242556114 0 10 0 +2725.92659608697 308.45306668753 0 10 0 +2766.87501634045 308.58184652734 0 10 0 +2808.43766289773 308.71261304651 0 10 0 +2850.62374915337 308.845397731062 0 10 0 +2893.44262670284 308.980232591366 0 10 0 +2936.90378741556 309.117150171636 0 10 0 +2981.01686553896 309.256183559611 0 10 0 +3025.79163983422 309.397366396437 0 10 0 +3071.2380357439 309.540732886756 0 10 0 +3117.36612759223 309.686317808995 0 10 0 +3164.18614081829 309.834156525873 0 10 0 +3211.70845424274 309.98428499513 0 10 0 +3259.94360236855 310.136739780468 0 10 0 +3308.90227771625 310.291558062732 0 10 0 +3358.59533319417 310.448777651317 0 10 0 +3409.03378450425 310.608436995821 0 10 0 +3460.22881258399 310.770575197939 0 10 0 +3512.19176608492 310.935232023609 0 10 0 +3564.93416388836 311.102447915423 0 10 0 +3618.46769765886 311.272264005289 0 10 0 +3672.80423443592 311.444722127377 0 10 0 +3727.95581926463 311.619864831333 0 10 0 +3783.93467786577 311.797735395786 0 10 0 +3840.75321934593 311.978377842135 0 10 0 +3898.42403894829 312.161836948644 0 10 0 +3956.95992084468 312.348158264843 0 10 0 +4016.37384096953 312.537388126237 0 10 0 +4076.67896989624 312.729573669343 0 10 0 +4137.88867575686 312.92476284705 0 10 0 +4200.01652720538 313.123004444328 0 10 0 +4263.07629642564 313.324348094274 0 10 0 +4327.08196218419 313.528844294521 0 10 0 +4392.04771292913 313.736544424007 0 10 0 +4457.98794993524 313.947500760123 0 10 0 +4524.91729049644 314.161766496245 0 10 0 +4592.85057116605 314.379395759658 0 10 0 +4661.80285104572 314.600443629886 0 10 0 +4731.78941512358 314.824966157439 0 10 0 +4802.8257776626 315.053020382985 0 10 0 +4874.92768563971 315.284664356959 0 10 0 +4948.11112223648 315.519957159623 0 10 0 +5022.3923103822 315.758958921587 0 10 0 +5097.7877163501 316.001730844803 0 10 0 +5174.31405340753 316.248335224043 0 10 0 +5251.98828552081 316.498835468884 0 10 0 +5330.8276311158 316.753296126195 0 10 0 +5410.84956689471 317.011782903162 0 10 0 +5492.0718317103 317.274362690845 0 10 0 +5574.51243049812 317.541103588295 0 10 0 +5658.18963826777 317.812074927247 0 10 0 +5743.12200415396 318.087347297388 0 10 0 +5829.32835552844 318.366992572239 0 10 0 +5916.82780217354 318.651083935655 0 10 0 +6005.63974051831 318.939695908953 0 10 0 +6095.78385793826 319.232904378712 0 10 0 +6187.2801371195 319.530786625226 0 10 0 +6280.14886048847 319.83342135167 0 10 0 +6374.41061470796 320.140888713957 0 10 0 +6470.08629524076 320.453270351347 0 10 0 +6567.19711098154 320.77064941779 0 10 0 +6665.76458895843 321.093110614062 0 10 0 +6765.81057910498 321.420740220679 0 10 0 +6867.35725910373 321.753626131645 0 10 0 +6970.42713930246 322.091857889035 0 10 0 +7075.04306770416 322.435526718448 0 10 0 +7181.2282350319 322.784725565353 0 10 0 +7289.00617986955 323.139549132351 0 10 0 +7398.40079387976 323.500093917391 0 10 0 +7509.43632710013 323.866458252943 0 10 0 +7622.13739331881 324.238742346194 0 10 0 +7736.52897553076 324.617048320258 0 10 0 +7852.63643147589 325.001480256461 0 10 0 +7970.4854992602 325.392144237713 0 10 0 +8090.10230306128 325.789148393007 0 10 0 +8211.51335891937 326.192602943089 0 10 0 +8334.74558061533 326.602620247307 0 10 0 +8459.82628563673 327.019314851709 0 10 0 +8586.78320123345 327.442803538402 0 10 0 +8715.64447056413 327.873205376216 0 10 0 +8846.43865893476 328.31064177273 0 10 0 +8979.19476013095 328.755236527674 0 10 0 +9113.94220284509 329.207115887769 0 10 0 +9250.71085719994 329.666408603052 0 10 0 +9389.53104137011 330.133245984707 0 10 0 +9530.43352830283 330.607761964488 0 10 0 +9673.44955253954 331.090093155744 0 10 0 +9818.61081713981 331.580378916127 0 10 0 +9965.94950070908 332.078761412016 0 10 0 +10115.4982645319 332.585385684725 0 10 0 +10267.290259812 333.100399718546 0 10 0 +10421.3591350214 333.623954510681 0 10 0 +10577.7390433589 334.156204143129 0 10 0 +10736.4646503214 334.6973058566 0 10 0 +10897.5711413884 335.247420126497 0 10 0 +11061.0942298214 335.806710741058 0 10 0 +11227.0701645809 336.375344881715 0 10 0 +11395.5357383618 336.953493205747 0 10 0 +11566.5282957494 337.541329931294 0 10 0 +11740.0857414978 338.139032924829 0 10 0 +11916.2465489324 338.746783791146 0 10 0 +12095.0497684786 339.364767965963 0 10 0 +12276.535036318 339.993174811219 0 10 0 +12460.7425831749 340.632197713166 0 10 0 +12647.7132432347 341.282034183334 0 10 0 +12837.4884631954 341.942885962477 0 10 0 +13030.1103114555 342.6149591276 0 10 0 +13225.6214874395 343.298464202169 0 10 0 +13424.0653310633 343.993616269612 0 10 0 +13625.4858323414 344.700635090223 0 10 0 +13829.9276411387 345.419745221593 0 10 0 +14037.4360770679 346.151176142682 0 10 0 +14248.0571395361 346.89516238166 0 10 0 +14461.8375179413 347.651943647647 0 10 0 +14678.8246020226 348.421764966496 0 10 0 +14899.0664923651 349.204876820748 0 10 0 +15122.6120110628 350.001535293918 0 10 0 +15349.5107125409 350.812002219255 0 10 0 +15579.8128945412 351.63654533314 0 10 0 +15813.5696092714 352.47543843329 0 10 0 +16050.8326747227 353.328961541935 0 10 0 +16291.6546861557 354.197401074142 0 10 0 +16536.0890277602 355.081050011487 0 10 0 +16784.1898844888 355.980208081253 0 10 0 +17036.0122540683 356.89518194136 0 10 0 +17291.6119591915 357.826285371244 0 10 0 +17551.0456598915 358.773839468887 0 10 0 +17814.3708661021 359.73817285424 0 10 0 +18081.6459504058 360.719621879266 0 10 0 +18352.930160974 361.718530844854 0 10 0 +18628.2836347008 362.735252224852 0 10 0 +18907.7674105335 363.770146897492 0 10 0 +19191.4434430037 364.823584384491 0 10 0 +19479.3746159609 365.895943098094 0 10 0 +19771.6247565125 366.987610596393 0 10 0 +20068.2586491723 368.098983847205 0 10 0 +20369.3420502221 369.230469500856 0 10 0 +20674.9417022876 370.382484172209 0 10 0 +20985.1253491341 371.555454732284 0 10 0 +21299.9617506833 372.749818609852 0 10 0 +21619.5206982557 373.966024103379 0 10 0 +21943.8730300417 375.204530703739 0 10 0 +22273.0906468045 376.465809428096 0 10 0 +22607.2465278187 377.75034316542 0 10 0 +22946.4147470482 379.058627034078 0 10 0 +23290.6704895661 380.391168751978 0 10 0 +23640.0900682217 381.74848901979 0 10 0 +23994.7509405572 383.131121917736 0 10 0 +24354.7317259777 384.539615316513 0 10 0 +24720.1122231796 385.974531302922 0 10 0 +25090.9734278394 387.436446620784 0 10 0 +25467.3975505692 388.925953127784 0 10 0 +25849.4680351399 390.443658268875 0 10 0 +26237.2695769792 391.990185566949 0 10 0 +26630.888141946 393.566175131451 0 10 0 +27030.4109853874 395.172284185723 0 10 0 +27435.9266714804 396.809187613817 0 10 0 +27847.5250928648 398.477578527623 0 10 0 +28265.2974905699 400.178168855146 0 10 0 +28689.3364742406 401.911689950836 0 10 0 +29119.7360426664 403.678893228898 0 10 0 +29556.5916046186 405.480550820563 0 10 0 +30000 407.317456256358 0 10 0 diff --git a/Exec/DryRegTests/WitchOfAgnesi/inputs b/Exec/DryRegTests/WitchOfAgnesi/inputs index 604c099cb..afa2ef0f8 100644 --- a/Exec/DryRegTests/WitchOfAgnesi/inputs +++ b/Exec/DryRegTests/WitchOfAgnesi/inputs @@ -1,19 +1,21 @@ # ------------------ INPUTS TO MAIN PROGRAM ------------------- -max_step = 5000 +max_step = 3000000 amrex.fpe_trap_invalid = 0 fabarray.mfiter_tile_size = 1024 1024 1024 # PROBLEM SIZE & GEOMETRY -geometry.prob_lo = -30000. 0. 0. -geometry.prob_hi = 30000. 1. 20000. # zhi not used with grid stretching -amr.n_cell = 80 1 64. +geometry.prob_lo = -72000. 0. 0. +geometry.prob_hi = 72000. 1. 30000. # zhi not used with grid stretching +amr.n_cell = 576 1 600 geometry.is_periodic = 0 1 0 -erf.initial_dz = 50 -erf.grid_stretching_ratio = 1.05 +#erf.initial_dz = 10 +#erf.grid_stretching_ratio = 1.03 + +erf.terrain_z_levels = 0.000000 0.050000 0.110271 0.171447 0.233540 0.296564 0.360534 0.425463 0.491366 0.558258 0.626153 0.695067 0.765014 0.836011 0.908072 0.981215 1.055454 1.130807 1.207291 1.284922 1.363717 1.443694 1.524870 1.607265 1.690895 1.775780 1.861938 1.949388 2.038150 2.128244 2.219689 2.312506 2.406714 2.502337 2.599393 2.697905 2.797895 2.899385 3.002397 3.106954 3.213080 3.320797 3.430130 3.541104 3.653742 3.768069 3.884111 4.001894 4.121444 4.242787 4.365950 4.490961 4.617846 4.746635 4.877356 5.010038 5.144710 5.281402 5.420144 5.560968 5.703903 5.848983 5.996239 6.145704 6.297411 6.451394 6.607686 6.766322 6.927339 7.090770 7.256653 7.425024 7.595921 7.769381 7.945443 8.124146 8.305529 8.489633 8.676499 8.866168 9.058682 9.254083 9.452416 9.653724 9.858051 10.065443 10.275946 10.489606 10.706472 10.926590 11.150010 11.376782 11.606955 11.840580 12.077710 12.318397 12.562695 12.810656 13.062338 13.317794 13.577082 13.840260 14.107385 14.378517 14.653716 14.933043 15.216560 15.504330 15.796416 16.092884 16.393798 16.699226 17.009236 17.323896 17.643276 17.967446 18.296479 18.630448 18.969426 19.313488 19.662712 20.017174 20.376953 20.742129 21.112782 21.488995 21.870851 22.258435 22.651833 23.051132 23.456420 23.867788 24.285326 24.709127 25.139285 25.575896 26.019056 26.468863 26.925417 27.388820 27.859173 28.336582 28.821152 29.312991 29.812207 30.318911 30.833216 31.355236 31.885086 32.422883 32.968748 33.522800 34.085164 34.655962 35.235323 35.823374 36.420246 37.026071 37.640984 38.265120 38.898618 39.541618 40.194264 40.856699 41.529071 42.211528 42.904223 43.607307 44.320938 45.045274 45.780474 46.526702 47.284124 48.052907 48.833222 49.625242 50.429142 51.245100 52.073298 52.913919 53.767149 54.633178 55.512197 56.404401 57.309988 58.229159 59.162118 60.109071 61.070229 62.045803 63.036012 64.041073 65.061211 66.096650 67.147621 68.214357 69.297093 70.396071 71.511533 72.643728 73.792905 74.959320 76.143231 77.344901 78.564596 79.802586 81.059146 82.334554 83.629094 84.943052 86.276719 87.630391 89.004368 90.398955 91.814461 93.251199 94.709488 96.189652 97.692018 99.216920 100.764695 102.335686 103.930243 105.548718 107.191470 108.858863 110.551268 112.269058 114.012615 115.782326 117.578582 119.401782 121.252330 123.130636 125.037117 126.972195 128.936299 130.929865 132.953334 135.007156 137.091784 139.207683 141.355319 143.535170 145.747719 147.993456 150.272879 152.586494 154.934812 157.318356 159.737653 162.193239 164.685659 167.215465 169.783218 172.389488 175.034851 177.719895 180.445215 183.211415 186.019107 188.868915 191.761470 194.697414 197.677396 200.702078 203.772131 206.888234 210.051079 213.261366 216.519808 219.827127 223.184055 226.591337 230.049728 233.559996 237.122917 240.739282 244.409892 248.135562 251.917117 255.755395 259.651247 263.605537 267.619142 271.692950 275.827866 280.024805 284.284698 288.608490 292.997139 297.451617 301.972913 306.562028 311.219979 315.947800 320.746539 325.617258 330.561038 335.578975 340.672181 345.841785 351.088933 356.414789 361.820532 367.307361 372.876493 378.529161 384.266620 390.090141 396.001014 402.000551 408.090080 414.270953 420.544538 426.912228 433.375433 439.935585 446.594140 453.352574 460.212384 467.175091 474.242238 481.415393 488.696146 496.086109 503.586922 511.200247 518.927772 526.771210 534.732300 542.812805 551.014519 559.339258 567.788868 576.365222 585.070222 593.905797 602.873905 611.976535 621.215704 630.593461 640.111884 649.773084 659.579201 669.532411 679.634918 689.888963 700.296819 710.860793 721.583226 732.466496 743.513014 754.725231 766.105631 777.656736 789.381109 801.281347 813.360088 825.620011 838.063832 850.694311 863.514247 876.526482 889.733901 903.139430 916.746043 930.556755 944.574628 958.802769 973.244331 987.902518 1002.780577 1017.881807 1033.209555 1048.767220 1064.558249 1080.586144 1096.854458 1113.366796 1130.126819 1147.138243 1164.404838 1181.930432 1199.718910 1217.774215 1236.100349 1254.701376 1273.581418 1292.744660 1312.195351 1331.937803 1351.976391 1372.315558 1392.959813 1413.913732 1435.181959 1456.769210 1478.680269 1500.919994 1523.493316 1546.405237 1569.660837 1593.265270 1617.223771 1641.541649 1666.224295 1691.277180 1716.705859 1742.515969 1768.713230 1795.303449 1822.292522 1849.686431 1877.491249 1905.713139 1934.358358 1963.433254 1992.944275 2022.897960 2053.300951 2084.159986 2115.481907 2147.273657 2179.542283 2212.294939 2245.538884 2279.281489 2313.530233 2348.292707 2383.576619 2419.389790 2455.740158 2492.635782 2530.084840 2568.095634 2606.676590 2645.836260 2685.583325 2725.926596 2766.875016 2808.437663 2850.623749 2893.442627 2936.903787 2981.016866 3025.791640 3071.238036 3117.366128 3164.186141 3211.708454 3259.943602 3308.902278 3358.595333 3409.033785 3460.228813 3512.191766 3564.934164 3618.467698 3672.804234 3727.955819 3783.934678 3840.753219 3898.424039 3956.959921 4016.373841 4076.678970 4137.888676 4200.016527 4263.076296 4327.081962 4392.047713 4457.987950 4524.917290 4592.850571 4661.802851 4731.789415 4802.825778 4874.927686 4948.111122 5022.392310 5097.787716 5174.314053 5251.988286 5330.827631 5410.849567 5492.071832 5574.512430 5658.189638 5743.122004 5829.328356 5916.827802 6005.639741 6095.783858 6187.280137 6280.148860 6374.410615 6470.086295 6567.197111 6665.764589 6765.810579 6867.357259 6970.427139 7075.043068 7181.228235 7289.006180 7398.400794 7509.436327 7622.137393 7736.528976 7852.636431 7970.485499 8090.102303 8211.513359 8334.745581 8459.826286 8586.783201 8715.644471 8846.438659 8979.194760 9113.942203 9250.710857 9389.531041 9530.433528 9673.449553 9818.610817 9965.949501 10115.498265 10267.290260 10421.359135 10577.739043 10736.464650 10897.571141 11061.094230 11227.070165 11395.535738 11566.528296 11740.085741 11916.246549 12095.049768 12276.535036 12460.742583 12647.713243 12837.488463 13030.110311 13225.621487 13424.065331 13625.485832 13829.927641 14037.436077 14248.057140 14461.837518 14678.824602 14899.066492 15122.612011 15349.510713 15579.812895 15813.569609 16050.832675 16291.654686 16536.089028 16784.189884 17036.012254 17291.611959 17551.045660 17814.370866 18081.645950 18352.930161 18628.283635 18907.767411 19191.443443 19479.374616 19771.624757 20068.258649 20369.342050 20674.941702 20985.125349 21299.961751 21619.520698 21943.873030 22273.090647 22607.246528 22946.414747 23290.670490 23640.090068 23994.750941 24354.731726 24720.112223 25090.973428 25467.397551 25849.468035 26237.269577 26630.888142 27030.410985 27435.926671 27847.525093 28265.297491 28689.336474 29119.736043 29556.591605 30000.000000 xlo.type = "Inflow" xhi.type = "Outflow" @@ -23,13 +25,19 @@ xlo.velocity = 10. 0. 0. #xlo.scalar = 0. zlo.type = "SlipWall" -zhi.type = "SlipWall" -zhi.theta_grad = 0.003 +zhi.type = "Outflow" +#zhi.theta_grad = 0.003 + +erf.sponge_type = "input_sponge" +erf.input_sponge_file = "sponge_WoA.txt" +erf.sponge_strength = 1.0 +erf.use_xhi_sponge_damping = true +erf.xhi_sponge_start = 50000.0 # TIME STEP CONTROL #erf.substepping_type = None erf.fixed_mri_dt_ratio = 4 -erf.fixed_dt = 2.0 +erf.fixed_dt = 0.06 # DIAGNOSTICS & VERBOSITY erf.sum_interval = 1 # timesteps between computing mass @@ -41,11 +49,11 @@ amr.max_level = 0 # maximum level number allowed # CHECKPOINT FILES erf.check_file = chk # root name of checkpoint file -erf.check_int = 1000 # number of timesteps between checkpoints +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_int_1 = 5000 # number of timesteps between plotfiles erf.plot_vars_1 = density x_velocity y_velocity z_velocity pressure theta pert_pres pert_dens # SOLVER CHOICE @@ -63,31 +71,12 @@ erf.rayleigh_dampcoef = 0.2 erf.init_type = "input_sounding" erf.init_sounding_ideal = true -# MULTILEVEL -amr.max_level = 3 -amr.ref_ratio_vect = 2 1 1 2 1 1 2 1 1 -erf.refinement_indicators = box1 box2 box3 - -# levels >1 is where the action is; level 0 is to provide numerical dissipation -# at the inlet/outlet -erf.box1.max_level = 1 -erf.box1.in_box_lo = -24750. 0 0 -erf.box1.in_box_hi = 24750. 1 17000 - -erf.box2.max_level = 2 -erf.box2.in_box_lo = -10125. 0 0 -erf.box2.in_box_hi = 10125. 1 2000 - -erf.box3.max_level = 3 -erf.box3.in_box_lo = -5062.5 0 0 -erf.box3.in_box_hi = 5062.5 1 1000 - # TERRRAIN GRID TYPE -erf.terrain_type = Static +erf.use_terrain = 1 #erf.terrain_smoothing = 1 # Smoothed Terrain Following coords (Klemp 2011) #erf.terrain_gamma_m = 0.5 erf.terrain_smoothing = 2 # Sullivan TF # PROBLEM PARAMETERS -prob.hmax = 100.0 # full hill height +prob.hmax = 1.0 # full hill height prob.L = 1000.0 # hill length at half-height diff --git a/Exec/DryRegTests/WitchOfAgnesi/sponge_WoA.txt b/Exec/DryRegTests/WitchOfAgnesi/sponge_WoA.txt new file mode 100644 index 000000000..566120cb9 --- /dev/null +++ b/Exec/DryRegTests/WitchOfAgnesi/sponge_WoA.txt @@ -0,0 +1,601 @@ +0 10 0 +0.05 10 0 +0.110271312172386 10 0 +0.171446694027358 10 0 +0.233539706610154 10 0 +0.296564114381692 10 0 +0.360533888269804 10 0 +0.425463208766237 10 0 +0.491366469070116 10 0 +0.558258278278554 10 0 +0.626153464625118 10 0 +0.69506707876688 10 0 +0.76501439712077 10 0 +0.836010925249967 10 0 +0.908072401301102 10 0 +0.981214799493005 10 0 +1.05545433365779 10 0 +1.13080746083504 10 0 +1.20729088491995 10 0 +1.28492156036614 10 0 +1.36371669594401 10 0 +1.44369375855556 10 0 +1.52487047710628 10 0 +1.60726484643526 10 0 +1.69089513130417 10 0 +1.77577987044612 10 0 +1.8619378806752 10 0 +1.94938826105771 10 0 +2.03815039714596 10 0 +2.12824396527554 10 0 +2.21968893692706 10 0 +2.31250558315335 10 0 +2.40671447907304 10 0 +2.50233650843152 10 0 +2.59939286823038 10 0 +2.69790507342622 10 0 +2.7978949617 10 0 +2.89938469829788 10 0 +3.00239678094473 10 0 +3.10695404483129 10 0 +3.21307966767615 10 0 +3.32079717486367 10 0 +3.43013044465902 10 0 +3.54110371350129 10 0 +3.65374158137619 10 0 +3.76806901726922 10 0 +3.88411136470064 10 0 +4.00189434734354 10 0 +4.12144407472608 10 0 +4.24278704801935 10 0 +4.36595016591203 10 0 +4.49096073057309 10 0 +4.61784645370408 10 0 +4.74663546268202 10 0 +4.87735630679464 10 0 +5.01003796356894 10 0 +5.14470984519486 10 0 +5.28140180504517 10 0 +5.42014414429324 10 0 +5.56096761863002 10 0 +5.70390344508186 10 0 +5.84898330893047 10 0 +5.99623937073681 10 0 +6.14570427347025 10 0 +6.29741114974469 10 0 +6.45139362916324 10 0 +6.60768584577308 10 0 +6.76632244563206 10 0 +6.92733859448892 10 0 +7.09076998557864 10 0 +7.25665284753471 10 0 +7.42502395242011 10 0 +7.5959206238788 10 0 +7.76938074540937 10 0 +7.94544276876289 10 0 +8.12414572246672 10 0 +8.30552922047611 10 0 +8.48963347095564 10 0 +8.67649928519236 10 0 +8.86616808664263 10 0 +9.05868192011465 10 0 +9.25408346108876 10 0 +9.45241602517747 10 0 +9.65372357772752 10 0 +9.85805074356582 10 0 +10.0654428168917 10 0 +10.2759457713174 10 0 +10.4896062700596 10 0 +10.7064716762829 10 0 +10.9265900635995 10 0 +11.1500102267259 10 0 +11.3767816922992 10 0 +11.606954729856 10 0 +11.8405803629762 10 0 +12.0777103805933 10 0 +12.3183973484746 10 0 +12.5626946208741 10 0 +12.8106563523596 10 0 +13.0623375098173 10 0 +13.317793884637 10 0 +13.5770821050789 10 0 +13.8402596488275 10 0 +14.1073848557323 10 0 +14.3785169407407 10 0 +14.6537160070242 10 0 +14.9330430593019 10 0 +15.2165600173638 10 0 +15.5043297297967 10 0 +15.796415987916 10 0 +16.0928835399071 10 0 +16.3937981051781 10 0 +16.6992263889282 10 0 +17.0092360969345 10 0 +17.3238959505609 10 0 +17.6432757019917 10 0 +17.9674461496939 10 0 +18.2964791541117 10 0 +18.6304476535958 10 0 +18.9694256805721 10 0 +19.3134883779531 10 0 +19.6627120157947 10 0 +20.0171740082041 10 0 +20.3769529304995 10 0 +20.7421285366294 10 0 +21.1127817768512 10 0 +21.4889948156764 10 0 +21.8708510500839 10 0 +22.2584351280075 10 0 +22.6518329671 10 0 +23.0511317737789 10 0 +23.456420062558 10 0 +23.8677876756687 10 0 +24.2853258029761 10 0 +24.7091270021932 10 0 +25.1392852193984 10 0 +25.5758958098618 10 0 +26.0190555591821 10 0 +26.4688627047422 10 0 +26.9254169574857 10 0 +27.3888195240204 10 0 +27.8591731290531 10 0 +28.3365820381613 10 0 +28.8211520809061 10 0 +29.3129906742921 10 0 +29.8122068465788 10 0 +30.3189112614499 10 0 +30.833216242544 10 0 +31.3552357983546 10 0 +31.8850856475023 10 0 +32.4228832443872 10 0 +32.9687478052254 10 0 +33.5228003344761 10 0 +34.0851636516657 10 0 +34.655962418613 10 0 +35.2353231670646 10 0 +35.823374326743 10 0 +36.4202462538165 10 0 +37.0260712597961 10 0 +37.6409836408654 10 0 +38.2651197076508 10 0 +38.898617815438 10 0 +39.5416183948419 10 0 +40.1942639829369 10 0 +40.8566992548534 10 0 +41.5290710558485 10 0 +42.2115284338586 10 0 +42.9042226725389 10 0 +43.6073073247994 10 0 +44.3209382468437 10 0 +45.0452736327188 10 0 +45.7804740493819 10 0 +46.5267024722951 10 0 +47.2841243215519 10 0 +48.0529074985475 10 0 +48.8332224231981 10 0 +49.6252420717185 10 0 +50.4291420149666 10 0 +51.2451004573635 10 0 +52.0732982763963 10 0 +52.9139190627147 10 0 +53.7671491608278 10 0 +54.6331777104126 10 0 +55.5121966882411 10 0 +56.4044009507371 10 0 +57.3099882771706 10 0 +58.2291594135005 10 0 +59.1621181168754 10 0 +60.1090712008009 10 0 +61.0702285809853 10 0 +62.0458033218725 10 0 +63.0360116838729 10 0 +64.0410731713034 10 0 +65.0612105810453 10 0 +66.0966500519334 10 0 +67.1476211148848 10 0 +68.2143567437804 10 0 +69.2970934071095 10 0 +70.3960711203885 10 0 +71.5115334993667 10 0 +72.6437278140296 10 0 +73.7929050434125 10 0 +74.959319931236 10 0 +76.1432310423769 10 0 +77.344900820185 10 0 +78.5645956446601 10 0 +79.8025858915024 10 0 +81.0591459920473 10 0 +82.3345544941004 10 0 +83.6290941236843 10 0 +84.9430518477119 10 0 +86.2767189376 10 0 +87.6303910338364 10 0 +89.0043682115163 10 0 +90.3989550468614 10 0 +91.8144606847367 10 0 +93.2511989071801 10 0 +94.7094882029602 10 0 +96.189651838177 10 0 +97.692017927922 10 0 +99.2169195090132 10 0 +100.764694613821 10 0 +102.3356863452 10 0 +103.930242952551 10 0 +105.548717909012 10 0 +107.191469989819 10 0 +108.858863351839 10 0 +110.551267614289 10 0 +112.269057940675 10 0 +114.012615121958 10 0 +115.78232566096 10 0 +117.578581858046 10 0 +119.401781898089 10 0 +121.252329938733 10 0 +123.130636199987 10 0 +125.037117055159 10 0 +126.972195123158 10 0 +128.936299362178 10 0 +130.929865164783 10 0 +132.953334454427 10 0 +135.007155783416 10 0 +137.09178443234 10 0 +139.207682510997 10 0 +141.355319060835 10 0 +143.535170158919 10 0 +145.747719023476 10 0 +147.993456121 10 0 +150.272879274988 10 0 +152.586493776285 10 0 +154.934812495101 10 0 +157.3183559947 10 0 +159.737652646793 10 0 +162.193238748667 10 0 +164.68565864207 10 0 +167.215464833873 10 0 +169.783218118554 10 0 +172.389487702504 10 0 +175.034851330214 10 0 +177.71989541234 10 0 +180.445215155697 10 0 +183.211414695205 10 0 +186.019107227806 10 0 +188.868915148395 10 0 +191.761470187793 10 0 +194.697413552783 10 0 +197.677396068247 10 0 +200.702078321443 10 0 +203.772130808437 10 0 +206.888234082736 10 0 +210.051078906149 10 0 +213.261366401914 10 0 +216.519808210115 10 0 +219.827126645439 10 0 +223.184054857293 10 0 +226.591336992325 10 0 +230.049728359382 10 0 +233.559995596945 10 0 +237.122916843071 10 0 +240.73928190789 10 0 +244.409892448681 10 0 +248.135562147583 10 0 +251.917116891969 10 0 +255.755394957521 10 0 +259.651247194056 10 0 +263.605537214139 10 0 +267.619141584524 10 0 +271.692950020464 10 0 +275.827865582943 10 0 +280.02480487886 10 0 +284.284698264215 10 0 +288.608490050351 10 0 +292.997138713278 10 0 +297.45161710615 10 0 +301.972912674915 10 0 +306.562027677211 10 0 +311.219979404541 10 0 +315.947800407782 10 0 +320.746538726071 10 0 +325.617258119134 10 0 +330.561038303093 10 0 +335.578975189812 10 0 +340.672181129832 10 0 +345.841785158952 10 0 +351.088933248508 10 0 +356.414788559408 10 0 +361.820531699972 10 0 +367.307360987644 10 0 +372.876492714631 10 0 +378.529161417522 10 0 +384.266620150958 10 0 +390.090140765394 10 0 +396.001014189047 10 0 +402.000550714056 10 0 +408.090080286939 10 0 +414.270952803415 10 0 +420.544538407639 10 0 +426.912227795926 10 0 +433.375432525037 10 0 +439.935585325085 10 0 +446.594140417133 10 0 +453.352573835563 10 0 +460.212383755268 10 0 +467.17509082377 10 0 +474.242238498299 10 0 +481.415393387946 10 0 +488.696145600937 10 0 +496.086109097123 10 0 +503.586922045753 10 0 +511.200247188611 10 0 +518.927772208613 10 0 +526.771210103914 10 0 +534.732299567645 10 0 +542.812805373332 10 0 +551.014518766105 10 0 +559.339257859769 10 0 +567.788868039837 10 0 +576.365222372607 10 0 +585.070222020369 10 0 +593.905796662847 10 0 +602.873904924962 10 0 +611.976534811008 10 0 +621.215704145346 10 0 +630.593461019698 10 0 +640.111884247166 10 0 +649.773083823046 10 0 +659.579201392564 10 0 +669.532410725625 10 0 +679.634918198682 10 0 +689.888963283834 10 0 +700.296819045264 10 0 +710.860792643115 10 0 +721.583225844934 10 0 +732.466495544781 10 0 +743.513014290125 10 0 +754.725230816649 10 0 +766.105630591071 10 0 +777.656736362109 10 0 +789.381108719713 10 0 +801.281346662681 10 0 +813.360088174794 10 0 +825.620010809588 10 0 +838.063832283904 10 0 +850.694311080335 10 0 +863.514247058712 10 0 +876.526482076765 10 0 +889.733900620089 10 0 +903.139430441563 10 0 +916.746043210358 10 0 +930.556755170686 10 0 +944.574627810419 10 0 +958.802768539747 10 0 +973.244331380016 10 0 +987.902517662888 10 0 +1002.78057674 10 0 +1017.88180670328 10 0 +1033.209555116 10 0 +1048.76721975491 10 0 +1064.55824936341 10 0 +1080.58614441603 10 0 +1096.85445789444 10 0 +1113.36679607503 10 0 +1130.12681932833 10 0 +1147.13824293043 10 0 +1164.40483788655 10 0 +1181.93043176702 10 0 +1199.7189095557 10 0 +1217.77421451121 10 0 +1236.10034904105 10 0 +1254.70137558884 10 0 +1273.58141753484 10 0 +1292.74466011004 10 0 +1312.19535132386 10 0 +1331.93780290589 10 0 +1351.97639126165 10 0 +1372.31555844275 10 0 +1392.95981313156 10 0 +1413.91373164071 10 0 +1435.18195892749 10 0 +1456.76920962358 10 0 +1478.6802690801 10 0 +1500.91999442848 10 0 +1523.49331565708 10 0 +1546.4052367041 10 0 +1569.66083656684 10 0 +1593.26527042751 10 0 +1617.2237707961 10 0 +1641.54164867021 10 0 +1666.22429471244 10 0 +1691.27718044529 10 0 +1716.70585946415 10 0 +1742.51596866828 10 0 +1768.71322951048 10 0 +1795.30344926531 10 0 +1822.29252231646 10 0 +1849.68643146338 10 0 +1877.4912492475 10 0 +1905.71313929838 10 0 +1934.35835770003 10 0 +1963.43325437771 10 0 +1992.94427450554 10 0 +2022.8979599353 10 0 +2053.3009506465 10 0 +2084.15998621837 10 0 +2115.48190732382 10 0 +2147.27365724585 10 0 +2179.54228341671 10 0 +2212.29493898013 10 0 +2245.538884377 10 0 +2279.28148895483 10 0 +2313.53023260133 10 0 +2348.29270740252 10 0 +2383.57661932573 10 0 +2419.38978992779 10 0 +2455.74015808888 10 0 +2492.63578177238 10 0 +2530.08483981114 10 0 +2568.09563372048 10 0 +2606.67658953846 10 0 +2645.83625969371 10 0 +2685.58332490128 10 0 +2725.92659608697 10 0 +2766.87501634045 10 0 +2808.43766289773 10 0 +2850.62374915337 10 0 +2893.44262670284 10 0 +2936.90378741556 10 0 +2981.01686553896 10 0 +3025.79163983422 10 0 +3071.2380357439 10 0 +3117.36612759223 10 0 +3164.18614081829 10 0 +3211.70845424274 10 0 +3259.94360236855 10 0 +3308.90227771625 10 0 +3358.59533319417 10 0 +3409.03378450425 10 0 +3460.22881258399 10 0 +3512.19176608492 10 0 +3564.93416388836 10 0 +3618.46769765886 10 0 +3672.80423443592 10 0 +3727.95581926463 10 0 +3783.93467786577 10 0 +3840.75321934593 10 0 +3898.42403894829 10 0 +3956.95992084468 10 0 +4016.37384096953 10 0 +4076.67896989624 10 0 +4137.88867575686 10 0 +4200.01652720538 10 0 +4263.07629642564 10 0 +4327.08196218419 10 0 +4392.04771292913 10 0 +4457.98794993524 10 0 +4524.91729049644 10 0 +4592.85057116605 10 0 +4661.80285104572 10 0 +4731.78941512358 10 0 +4802.8257776626 10 0 +4874.92768563971 10 0 +4948.11112223648 10 0 +5022.3923103822 10 0 +5097.7877163501 10 0 +5174.31405340753 10 0 +5251.98828552081 10 0 +5330.8276311158 10 0 +5410.84956689471 10 0 +5492.0718317103 10 0 +5574.51243049812 10 0 +5658.18963826777 10 0 +5743.12200415396 10 0 +5829.32835552844 10 0 +5916.82780217354 10 0 +6005.63974051831 10 0 +6095.78385793826 10 0 +6187.2801371195 10 0 +6280.14886048847 10 0 +6374.41061470796 10 0 +6470.08629524076 10 0 +6567.19711098154 10 0 +6665.76458895843 10 0 +6765.81057910498 10 0 +6867.35725910373 10 0 +6970.42713930246 10 0 +7075.04306770416 10 0 +7181.2282350319 10 0 +7289.00617986955 10 0 +7398.40079387976 10 0 +7509.43632710013 10 0 +7622.13739331881 10 0 +7736.52897553076 10 0 +7852.63643147589 10 0 +7970.4854992602 10 0 +8090.10230306128 10 0 +8211.51335891937 10 0 +8334.74558061533 10 0 +8459.82628563673 10 0 +8586.78320123345 10 0 +8715.64447056413 10 0 +8846.43865893476 10 0 +8979.19476013095 10 0 +9113.94220284509 10 0 +9250.71085719994 10 0 +9389.53104137011 10 0 +9530.43352830283 10 0 +9673.44955253954 10 0 +9818.61081713981 10 0 +9965.94950070908 10 0 +10115.4982645319 10 0 +10267.290259812 10 0 +10421.3591350214 10 0 +10577.7390433589 10 0 +10736.4646503214 10 0 +10897.5711413884 10 0 +11061.0942298214 10 0 +11227.0701645809 10 0 +11395.5357383618 10 0 +11566.5282957494 10 0 +11740.0857414978 10 0 +11916.2465489324 10 0 +12095.0497684786 10 0 +12276.535036318 10 0 +12460.7425831749 10 0 +12647.7132432347 10 0 +12837.4884631954 10 0 +13030.1103114555 10 0 +13225.6214874395 10 0 +13424.0653310633 10 0 +13625.4858323414 10 0 +13829.9276411387 10 0 +14037.4360770679 10 0 +14248.0571395361 10 0 +14461.8375179413 10 0 +14678.8246020226 10 0 +14899.0664923651 10 0 +15122.6120110628 10 0 +15349.5107125409 10 0 +15579.8128945412 10 0 +15813.5696092714 10 0 +16050.8326747227 10 0 +16291.6546861557 10 0 +16536.0890277602 10 0 +16784.1898844888 10 0 +17036.0122540683 10 0 +17291.6119591915 10 0 +17551.0456598915 10 0 +17814.3708661021 10 0 +18081.6459504058 10 0 +18352.930160974 10 0 +18628.2836347008 10 0 +18907.7674105335 10 0 +19191.4434430037 10 0 +19479.3746159609 10 0 +19771.6247565125 10 0 +20068.2586491723 10 0 +20369.3420502221 10 0 +20674.9417022876 10 0 +20985.1253491341 10 0 +21299.9617506833 10 0 +21619.5206982557 10 0 +21943.8730300417 10 0 +22273.0906468045 10 0 +22607.2465278187 10 0 +22946.4147470482 10 0 +23290.6704895661 10 0 +23640.0900682217 10 0 +23994.7509405572 10 0 +24354.7317259777 10 0 +24720.1122231796 10 0 +25090.9734278394 10 0 +25467.3975505692 10 0 +25849.4680351399 10 0 +26237.2695769792 10 0 +26630.888141946 10 0 +27030.4109853874 10 0 +27435.9266714804 10 0 +27847.5250928648 10 0 +28265.2974905699 10 0 +28689.3364742406 10 0 +29119.7360426664 10 0 +29556.5916046186 10 0 +30000 10 0 From a65862f596a0a0a5c491f43fa981a4908efea8e7 Mon Sep 17 00:00:00 2001 From: "Aaron M. Lattanzi" <103702284+AMLattanzi@users.noreply.github.com> Date: Tue, 3 Dec 2024 09:43:38 -0800 Subject: [PATCH 5/5] Force 12 substeps since the default changed. (#1995) --- Exec/DryRegTests/ParticlesOverWoA/inputs | 1 + 1 file changed, 1 insertion(+) diff --git a/Exec/DryRegTests/ParticlesOverWoA/inputs b/Exec/DryRegTests/ParticlesOverWoA/inputs index 6fd14bfd0..e6bca805e 100644 --- a/Exec/DryRegTests/ParticlesOverWoA/inputs +++ b/Exec/DryRegTests/ParticlesOverWoA/inputs @@ -32,6 +32,7 @@ tracer_particles.place_randomly_in_cells = true # TIME STEP CONTROL erf.fixed_dt = 1E-3 +erf.fixed_mri_dt_ratio = 12 # DIAGNOSTICS & VERBOSITY erf.sum_interval = 1 # timesteps between computing mass