Make initial iterations compatible with boundary planes (Exawind#1651)

* enable initial iterations to be compatible with boundary planes

* set up reg test for this capability

* formatting

Author: mbkuhn

amr-wind/equation_systems/PDE.H

@@ -137,7 +137,9 @@ public:
     {
         BL_PROFILE(
             "amr-wind::" + this->identifier() + "::pre_advection_actions");
-        m_adv_op->preadvect(fstate, m_time.delta_t(), m_time.current_time());
+        m_adv_op->preadvect(
+            fstate, m_time.delta_t(),
+            0.5 * (m_time.current_time() + m_time.new_time()));
     }
 
     void compute_predictor_rhs(const DiffusionType difftype) override

amr-wind/equation_systems/PDEBase.cpp

@@ -94,7 +94,7 @@ void PDEMgr::prepare_boundaries()
 {
     // If state variables exist at NPH, fill their boundary cells
     const auto nph_time =
-        m_sim.time().current_time() + 0.5 * m_sim.time().delta_t();
+        0.5 * (m_sim.time().current_time() + m_sim.time().new_time());
     if (m_constant_density &&
         m_sim.repo().field_exists("density", FieldState::NPH)) {
         auto& nph_field =

amr-wind/equation_systems/icns/icns_advection.H

@@ -208,7 +208,7 @@ struct AdvectionOp<ICNS, fvm::Godunov>
         }
 
         // Populate boundaries (valid cells) using velocity BCs
-        m_macproj_op.set_inflow_velocity(time + 0.5 * dt);
+        m_macproj_op.set_inflow_velocity(time);
 
         // MAC projection
         m_macproj_op(fstate, dt);
@@ -217,8 +217,7 @@ struct AdvectionOp<ICNS, fvm::Godunov>
         if (fvm::Godunov::nghost_state > 0) {
             amrex::Array<Field*, AMREX_SPACEDIM> mac_vel = {
                 AMREX_D_DECL(&u_mac, &v_mac, &w_mac)};
-            dof_field.fillpatch_sibling_fields(
-                time + 0.5 * dt, u_mac.num_grow(), mac_vel);
+            dof_field.fillpatch_sibling_fields(time, u_mac.num_grow(), mac_vel);
         }
 
         for (int lev = 0; lev < repo.num_active_levels(); ++lev) {

test/CMakeLists.txt

@@ -403,6 +403,7 @@ endif()
 
 if(AMR_WIND_ENABLE_NETCDF)
   add_test_red(abl_bndry_input abl_bndry_output)
+  add_test_red(abl_bndry_input_init abl_bndry_output)
   add_test_red(abl_bndry_input_amr abl_bndry_output)
   add_test_red(abl_bndry_input_amr_inflow abl_bndry_output_amr_inflow)
   add_test_red(abl_bndry_input_amr_upper abl_bndry_output_amr_upper)

test/test_files/abl_bndry_input_init/abl_bndry_input_init.inp

@@ -0,0 +1,80 @@
+#¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
+#            SIMULATION STOP            #
+#.......................................#
+time.stop_time               =   22000.0     # Max (simulated) time to evolve
+time.max_step                =   10          # Max number of time steps
+#¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
+#         TIME STEP COMPUTATION         #
+#.......................................#
+time.fixed_dt         =   0.4        # Use this constant dt if > 0
+time.cfl              =   0.95         # CFL factor
+#¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
+#            INPUT AND OUTPUT           #
+#.......................................#
+time.plot_interval            =  10       # Steps between plot files
+time.checkpoint_interval      =  -1       # Steps between checkpoint files
+#¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
+#               PHYSICS                 #
+#.......................................#
+incflo.gravity          =   0.  0. -9.81  # Gravitational force (3D)
+incflo.density          = 1.0          # Reference density
+incflo.use_godunov = 1
+incflo.diffusion_type = 2
+transport.viscosity = 1.0e-5
+transport.laminar_prandtl = 0.7
+transport.turbulent_prandtl = 0.3333
+transport.reference_temperature = 290.0
+turbulence.model = Smagorinsky
+Smagorinsky_coeffs.Cs = 0.135
+incflo.physics = ABL
+ICNS.source_terms = CoriolisForcing GeostrophicForcing
+CoriolisForcing.east_vector = 1.0 0.0 0.0
+CoriolisForcing.north_vector = 0.0 1.0 0.0
+CoriolisForcing.latitude = 90.0
+CoriolisForcing.rotational_time_period = 125663.706143592
+GeostrophicForcing.geostrophic_wind = 10.0 0.0 0.0
+incflo.velocity = 10.0 0.0 0.0
+ABL.temperature_heights = 0.0 2000.0
+ABL.temperature_values = 290.0 290.0
+ABL.perturb_temperature = false
+ABL.cutoff_height = 50.0
+ABL.perturb_velocity = true
+ABL.perturb_ref_height = 50.0
+ABL.Uperiods = 4.0
+ABL.Vperiods = 4.0
+ABL.deltaU = 1.0
+ABL.deltaV = 1.0
+ABL.kappa = .41
+ABL.surface_roughness_z0 = 0.01
+ABL.bndry_file = "../abl_bndry_output/bndry_file.nc"
+ABL.bndry_io_mode = 1
+ABL.bndry_var_names = velocity temperature
+ABL.bndry_output_format = netcdf
+#¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
+#        ADAPTIVE MESH REFINEMENT       #
+#.......................................#
+amr.n_cell              = 48 48 48    # Grid cells at coarsest AMRlevel
+amr.max_level           = 0           # Max AMR level in hierarchy 
+#¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
+#              GEOMETRY                 #
+#.......................................#
+geometry.prob_lo        =   0.       0.     0.  # Lo corner coordinates
+geometry.prob_hi        =   1000.  1000.  1000.  # Hi corner coordinates
+geometry.is_periodic    =   0   0   0   # Periodicity x y z (0/1)
+# Boundary conditions
+xlo.type = "mass_inflow"
+xlo.density = 1.0
+xlo.temperature = 0.0
+xhi.type = "pressure_outflow"
+ylo.type = "mass_inflow"
+ylo.density = 1.0
+ylo.temperature = 0.0
+yhi.type = "pressure_outflow"
+zlo.type =   "wall_model"
+zhi.type =   "slip_wall"
+zhi.temperature_type = "fixed_gradient"
+zhi.temperature = 0.0
+#¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#
+#              VERBOSITY                #
+#.......................................#
+incflo.verbose          =   0          # incflo_level

test/test_files/abl_bndry_output/abl_bndry_output.inp

@@ -49,7 +49,7 @@ ABL.surface_roughness_z0 = 0.01
 ABL.bndry_file = "bndry_file.nc"
 ABL.bndry_io_mode = 0
 ABL.bndry_planes = ylo xlo
-ABL.bndry_output_start_time = 2.0
+ABL.bndry_output_start_time = 0.0
 ABL.bndry_var_names = velocity temperature
 ABL.bndry_output_format = netcdf
 #¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨¨#