Skip to content

Commit

Permalink
Add anonymous namespace back to parameters in AMReX_Amr.cpp (#1529)
Browse files Browse the repository at this point in the history
  • Loading branch information
WeiqunZhang authored Nov 9, 2020
1 parent eb29a4f commit ad7c4ea
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
3 changes: 3 additions & 0 deletions Src/Amr/AMReX_Amr.H
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,8 @@ public:
static void fillDerivePlotVarList ();
static void fillDeriveSmallPlotVarList ();

static void setComputeNewDtOnRegrid (int flag) { compute_new_dt_on_regrid = flag; }

static void Initialize ();
static void Finalize ();
//! AmrLevel lev.
Expand Down Expand Up @@ -464,6 +466,7 @@ protected:
static Vector<BoxArray> initial_ba;
//! Array of BoxArrays read in to externally define grid hierarchy at each regrid
static Vector<BoxArray> regrid_ba;
static int compute_new_dt_on_regrid;

#if defined(BL_USE_SENSEI_INSITU)
static AmrInSituBridge *insitu_bridge;
Expand Down
8 changes: 2 additions & 6 deletions Src/Amr/AMReX_Amr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ bool Amr::first_plotfile;
bool Amr::first_smallplotfile;
Vector<BoxArray> Amr::initial_ba;
Vector<BoxArray> Amr::regrid_ba;
int Amr::compute_new_dt_on_regrid;
#ifdef BL_USE_SENSEI_INSITU
AmrInSituBridge* Amr::insitu_bridge;
#endif
Expand All @@ -70,11 +71,7 @@ namespace
const std::string CheckPointVersion("CheckPointVersion_1.0");

bool initialized = false;
}

//Tan Nov 24, 2017 : I removed this anonymous namespace so I could access the inner variables from other source files
//namespace
//{
//
// These are all ParmParse'd in. Set defaults in Initialize()!!!
//
Expand All @@ -89,12 +86,11 @@ namespace
int insitu_on_restart;
int checkpoint_on_restart;
bool checkpoint_files_output;
int compute_new_dt_on_regrid;
bool precreateDirectories;
bool prereadFAHeaders;
VisMF::Header::Version plot_headerversion(VisMF::Header::Version_v1);
VisMF::Header::Version checkpoint_headerversion(VisMF::Header::Version_v1);
//}
}



Expand Down

0 comments on commit ad7c4ea

Please sign in to comment.