Merge branch 'development' into LSM

erf-model · Jan 19, 2024 · 11029a4 · 11029a4
2 parents 9ffc6d7 + 4852011
commit 11029a4
Show file tree

Hide file tree

Showing 4 changed files with 323 additions and 316 deletions.
diff --git a/Source/Initialization/ERF_init_from_metgrid.cpp b/Source/Initialization/ERF_init_from_metgrid.cpp
@@ -360,6 +360,11 @@ ERF::init_from_metgrid (int lev)
  }
  }
 
+ // NOTE: We must guarantee one halo cell in the bdy file.
+ // Otherwise, we make the total width match the set width.
+ if (metgrid_bdy_width-1 <= metgrid_bdy_set_width) metgrid_bdy_width = metgrid_bdy_set_width;
+ amrex::Print() << "Running with specification width: " << metgrid_bdy_set_width
+ << " and relaxation width: " << metgrid_bdy_width - metgrid_bdy_set_width << std::endl;
 
  // Set up boxes for lateral boundary arrays.
  bdy_data_xlo.resize(ntimes);

diff --git a/Source/TimeIntegration/TI_slow_rhs_fun.H b/Source/TimeIntegration/TI_slow_rhs_fun.H
@@ -208,10 +208,9 @@
  } else if (init_type == "metgrid") {
  width = metgrid_bdy_width;
  set_width = metgrid_bdy_set_width;
- if (width == set_width) width += 1;
  }
  wrfbdy_compute_interior_ghost_rhs(init_type, bdy_time_interval, start_bdy_time, new_stage_time, slow_dt,
- width-1, set_width, fine_geom,
+ width, set_width, fine_geom,
  S_rhs, S_data, bdy_data_xlo, bdy_data_xhi,
  bdy_data_ylo, bdy_data_yhi);
  }