Skip to content

Commit

Permalink
Merge branch 'development' into massive_star_new_updates
Browse files Browse the repository at this point in the history
  • Loading branch information
zingale authored Dec 21, 2023
2 parents de72a2a + fe78cf0 commit 2c386bd
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 14 deletions.
5 changes: 0 additions & 5 deletions Source/driver/Castro.H
Original file line number Diff line number Diff line change
Expand Up @@ -1455,11 +1455,6 @@ protected:
static amrex::AmrTracerParticleContainer* TracerPC;
#endif

///
/// Name of the probin file and its length.
///
static std::string probin_file;

static amrex::IntVect hydro_tile_size;
static amrex::IntVect no_tile_size;

Expand Down
8 changes: 1 addition & 7 deletions Source/driver/Castro.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,6 @@ Radiation* Castro::radiation = nullptr;
#endif


std::string Castro::probin_file = "probin";


#if AMREX_SPACEDIM == 1
#ifndef AMREX_USE_GPU
IntVect Castro::hydro_tile_size(1024);
Expand Down Expand Up @@ -553,8 +550,6 @@ Castro::read_params ()

}

ppa.query("probin_file",probin_file);

Vector<int> tilesize(AMREX_SPACEDIM);
if (pp.queryarr("hydro_tile_size", tilesize, 0, AMREX_SPACEDIM))
{
Expand Down Expand Up @@ -3656,8 +3651,7 @@ Castro::derive (const std::string& name,
void
Castro::extern_init ()
{
// initialize the external runtime parameters -- these will
// live in the probin
// initialize the external runtime parameters

if (ParallelDescriptor::IOProcessor()) {
std::cout << "reading extern runtime parameters ..." << std::endl;
Expand Down
3 changes: 1 addition & 2 deletions Source/driver/Castro_setup.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,7 @@ Castro::variableSetUp ()
init_prob_parameters();

// Initialize the runtime parameters for any of the external
// microphysics (these are the parameters that are in the &extern
// block of the probin file)
// microphysics
extern_init();

// set small positive values of the "small" quantities if they are
Expand Down

0 comments on commit 2c386bd

Please sign in to comment.