Skip to content

Commit

Permalink
Merge pull request #85 from seahorce-scidac/cleanup_io
Browse files Browse the repository at this point in the history
remove FillBoundary calls from Checkpoint and Plotfile
  • Loading branch information
asalmgren authored Dec 14, 2023
2 parents 0de4e2e + 3885d64 commit cd023ac
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 23 deletions.
21 changes: 0 additions & 21 deletions Source/IO/Checkpoint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -314,10 +314,6 @@ ROMSX::ReadCheckpointFile ()
VisMF::Read(mf_rv, amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "YRHS"));
MultiFab::Copy(*(vec_rv[lev]),mf_rv,0,0,2,(vec_rv[lev])->nGrowVect());

//Do not update with FillBoundary since k=-1 contains boundary information
// vec_ru[lev]->FillBoundary(geom[lev].periodicity());
// vec_rv[lev]->FillBoundary(geom[lev].periodicity());

MultiFab mf_ubar(ba2d,dmap[lev],3,NGROW);
VisMF::Read(mf_ubar, amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "XBar"));
MultiFab::Copy(*(vec_ubar[lev]),mf_ubar,0,0,3,(vec_ubar[lev])->nGrowVect());
Expand All @@ -326,41 +322,24 @@ ROMSX::ReadCheckpointFile ()
VisMF::Read(mf_vbar, amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "YBar"));
MultiFab::Copy(*(vec_vbar[lev]),mf_vbar,0,0,3,(vec_vbar[lev])->nGrowVect());

//Do not update with FillBoundary since k=-1 contains boundary information
// vec_ubar[lev]->FillBoundary(geom[lev].periodicity());
// vec_vbar[lev]->FillBoundary(geom[lev].periodicity());

VisMF::Read(*(vec_rufrc[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "rufrc"));
VisMF::Read(*(vec_rvfrc[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "rvfrc"));
vec_rufrc[lev]->FillBoundary(geom[lev].periodicity());
vec_rvfrc[lev]->FillBoundary(geom[lev].periodicity());

VisMF::Read(*(vec_sustr[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "sustr"));
VisMF::Read(*(vec_svstr[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "svstr"));
vec_sustr[lev]->FillBoundary(geom[lev].periodicity());
vec_svstr[lev]->FillBoundary(geom[lev].periodicity());

VisMF::Read(*(vec_rdrag[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "rdrag"));
vec_rdrag[lev]->FillBoundary(geom[lev].periodicity());

VisMF::Read(*(vec_bustr[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "bustr"));
VisMF::Read(*(vec_bvstr[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "bvstr"));
vec_bustr[lev]->FillBoundary(geom[lev].periodicity());
vec_bvstr[lev]->FillBoundary(geom[lev].periodicity());

VisMF::Read(*(vec_DU_avg1[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "DU_avg1"));
VisMF::Read(*(vec_DU_avg2[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "DU_avg2"));
VisMF::Read(*(vec_DV_avg1[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "DV_avg1"));
VisMF::Read(*(vec_DV_avg2[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "DV_avg2"));
vec_DU_avg1[lev]->FillBoundary(geom[lev].periodicity());
vec_DU_avg2[lev]->FillBoundary(geom[lev].periodicity());
vec_DV_avg1[lev]->FillBoundary(geom[lev].periodicity());
vec_DV_avg2[lev]->FillBoundary(geom[lev].periodicity());

VisMF::Read(*(vec_zeta[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "zeta"));
VisMF::Read(*(vec_Zt_avg1[lev]), amrex::MultiFabFileFullPrefix(lev, restart_chkfile, "Level_", "Zt_avg1"));
vec_zeta[lev]->FillBoundary(geom[lev].periodicity());
vec_Zt_avg1[lev]->FillBoundary(geom[lev].periodicity());
}

#ifdef ROMSX_USE_PARTICLES
Expand Down
2 changes: 0 additions & 2 deletions Source/IO/Plotfile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,6 @@ ROMSX::WritePlotFile (int which, Vector<std::string> plot_var_names)
else if (which == 2)
plotfilename = Concatenate(plot_file_2, istep[0], 5);

mf[0].FillBoundary(geom[0].periodicity());

if (finest_level == 0)
{
if (plotfile_type == "amrex") {
Expand Down

0 comments on commit cd023ac

Please sign in to comment.