Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate Parameter Parsing: moved configuration of EnzoInitiailCloud into constructor #379

Merged
merged 3 commits into from
May 14, 2024
Merged

Migrate Parameter Parsing: moved configuration of EnzoInitiailCloud into constructor #379

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
47440f5
moved parameter parsing for EnzoInitialCloud from EnzoConfig to const…
mabruzzo Mar 23, 2024
b8ce6ca
Merge branch 'main' into param-prototype-initialcloud
jwise77 May 13, 2024
adcfa9c
removed redundant assignment of initialize_uniform_bfield_
mabruzzo May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
106 changes: 0 additions & 106 deletions src/Enzo/enzo-core/EnzoConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,24 +52,6 @@ EnzoConfig::EnzoConfig() throw ()
initial_burkertbodenheimer_densityprofile(1),
initial_burkertbodenheimer_rotating(true),
initial_burkertbodenheimer_outer_velocity(-1),
// EnzoInitialCloud
initial_cloud_center_x(0.0),
initial_cloud_center_y(0.0),
initial_cloud_center_z(0.0),
initial_cloud_density_cloud(0.0),
initial_cloud_density_wind(0.0),
initial_cloud_eint_wind(0.0),
initial_cloud_etot_wind(0.0),
initial_cloud_initialize_uniform_bfield(false),
initial_cloud_metal_mass_frac(0.0),
initial_cloud_perturb_Nwaves(0),
initial_cloud_perturb_amplitude(0.),
initial_cloud_perturb_min_wavelength(std::numeric_limits<double>::min()),
initial_cloud_perturb_max_wavelength(std::numeric_limits<double>::min()),
initial_cloud_perturb_seed(0),
initial_cloud_radius(0.),
initial_cloud_subsample_n(0),
initial_cloud_velocity_wind(0.0),
// EnzoInitialCosmology
initial_cosmology_temperature(0.0),
// EnzoInitialCollapse
Expand Down Expand Up @@ -327,7 +309,6 @@ EnzoConfig::EnzoConfig() throw ()

{
for (int i=0; i<3; i++) {
initial_cloud_uniform_bfield[i] = 0;
initial_sedov_array[i] = 0;
initial_soup_array[i] = 0;
initial_soup_d_pos[i] = 0.0;
Expand Down Expand Up @@ -390,25 +371,6 @@ void EnzoConfig::pup (PUP::er &p)

p | initial_bcenter_update_etot;

p | initial_cloud_subsample_n;
p | initial_cloud_radius;
p | initial_cloud_center_x;
p | initial_cloud_center_y;
p | initial_cloud_center_z;
p | initial_cloud_density_cloud;
p | initial_cloud_density_wind;
p | initial_cloud_velocity_wind;
p | initial_cloud_etot_wind;
p | initial_cloud_eint_wind;
p | initial_cloud_metal_mass_frac;
p | initial_cloud_initialize_uniform_bfield;
PUParray(p,initial_cloud_uniform_bfield,3);
p | initial_cloud_perturb_Nwaves;
p | initial_cloud_perturb_amplitude;
p | initial_cloud_perturb_min_wavelength;
p | initial_cloud_perturb_max_wavelength;
p | initial_cloud_perturb_seed;

p | initial_cosmology_temperature;

p | initial_collapse_rank;
Expand Down Expand Up @@ -723,7 +685,6 @@ void EnzoConfig::read(Parameters * p) throw()
read_initial_bb_test_(p);
read_initial_bcenter_(p);
read_initial_burkertbodenheimer_(p);
read_initial_cloud_(p);
read_initial_collapse_(p);
read_initial_cosmology_(p);
read_initial_feedback_test_(p);
Expand Down Expand Up @@ -1053,73 +1014,6 @@ void EnzoConfig::read_initial_bcenter_(Parameters * p)

//----------------------------------------------------------------------

void EnzoConfig::read_initial_cloud_(Parameters * p)
{
// Cloud Crush Initialization
initial_cloud_subsample_n = p->value_integer
("Initial:cloud:subsample_n",0);
initial_cloud_radius = p->value_float
("Initial:cloud:cloud_radius",0.0);
initial_cloud_center_x = p->value_float
("Initial:cloud:cloud_center_x",0.0);
initial_cloud_center_y = p->value_float
("Initial:cloud:cloud_center_y",0.0);
initial_cloud_center_z = p->value_float
("Initial:cloud:cloud_center_z",0.0);
initial_cloud_density_cloud = p->value_float
("Initial:cloud:cloud_density",0.0);
initial_cloud_density_wind = p->value_float
("Initial:cloud:wind_density",0.0);
initial_cloud_velocity_wind = p->value_float
("Initial:cloud:wind_velocity",0.0);
initial_cloud_etot_wind = p->value_float
("Initial:cloud:wind_total_energy",0.0);
initial_cloud_eint_wind = p->value_float
("Initial:cloud:wind_internal_energy",0.0);
initial_cloud_metal_mass_frac = p->value_float
("Initial:cloud:metal_mass_fraction",0.0);
initial_cloud_perturb_Nwaves = p->value_integer
("Initial:cloud:perturb_Nwaves", 0);
initial_cloud_perturb_amplitude = p->value_float
("Initial:cloud:perturb_amplitude", 0.);
initial_cloud_perturb_min_wavelength = p->value_float
("Initial:cloud:perturb_min_lambda", std::numeric_limits<double>::min());
initial_cloud_perturb_max_wavelength = p->value_float
("Initial:cloud:perturb_max_lambda", std::numeric_limits<double>::min());
if (initial_cloud_perturb_Nwaves > 0){
if (initial_cloud_perturb_max_wavelength
== std::numeric_limits<double>::min() ){
initial_cloud_perturb_max_wavelength = initial_cloud_radius;
}
}


int init_cloud_perturb_seed_ = p->value_integer
("Initial:cloud:perturb_seed",0);
ASSERT("EnzoConfig::read()",
"Initial:cloud:perturb_seed must be a 32-bit unsigned integer",
(init_cloud_perturb_seed_ >= 0) &&
(init_cloud_perturb_seed_ <= 4294967295L));
initial_cloud_perturb_seed = (unsigned int) init_cloud_perturb_seed_;

int initial_cloud_uniform_bfield_length = p->list_length
("Initial:cloud:uniform_bfield");
if (initial_cloud_uniform_bfield_length == 0){
initial_cloud_initialize_uniform_bfield = false;
} else if (initial_cloud_uniform_bfield_length == 3){
initial_cloud_initialize_uniform_bfield = true;
for (int i = 0; i <3; i++){
initial_cloud_uniform_bfield[i] = p->list_value_float
(i,"Initial:cloud:uniform_bfield");
}
} else {
ERROR("EnzoConfig::read",
"Initial:cloud:uniform_bfield must contain 0 or 3 entries.");
}
}

//----------------------------------------------------------------------

void EnzoConfig::read_initial_soup_(Parameters * p)
{
// InitialSoup initialization
Expand Down
40 changes: 0 additions & 40 deletions src/Enzo/enzo-core/EnzoConfig.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,24 +94,6 @@ class EnzoConfig : public Config {
initial_burkertbodenheimer_rank(0),
initial_burkertbodenheimer_rotating(true),
initial_burkertbodenheimer_temperature(0.0),
// EnzoInitialCloud
initial_cloud_center_x(0.0),
initial_cloud_center_y(0.0),
initial_cloud_center_z(0.0),
initial_cloud_density_cloud(0.0),
initial_cloud_density_wind(0.0),
initial_cloud_eint_wind(0.0),
initial_cloud_etot_wind(0.0),
initial_cloud_initialize_uniform_bfield(false),
initial_cloud_metal_mass_frac(0.0),
initial_cloud_perturb_Nwaves(0),
initial_cloud_perturb_amplitude(0.0),
initial_cloud_perturb_min_wavelength(std::numeric_limits<double>::min()),
initial_cloud_perturb_max_wavelength(std::numeric_limits<double>::min()),
initial_cloud_perturb_seed(0),
initial_cloud_radius(0.),
initial_cloud_subsample_n(0),
initial_cloud_velocity_wind(0.0),
// EnzoInitialCollapse
initial_collapse_mass(0.0),
initial_collapse_particle_ratio(0.0),
Expand Down Expand Up @@ -367,7 +349,6 @@ class EnzoConfig : public Config {

{
for (int axis=0; axis<3; axis++) {
initial_cloud_uniform_bfield[axis] = 0;
initial_sedov_array[axis] = 0;
initial_sedov_random_array[axis] = 0;
initial_soup_array[axis] = 0;
Expand Down Expand Up @@ -405,7 +386,6 @@ class EnzoConfig : public Config {
void read_initial_bb_test_(Parameters *);
void read_initial_bcenter_(Parameters *);
void read_initial_burkertbodenheimer_(Parameters *);
void read_initial_cloud_(Parameters *);
void read_initial_collapse_(Parameters *);
void read_initial_cosmology_(Parameters *);
void read_initial_feedback_test_(Parameters *);
Expand Down Expand Up @@ -501,26 +481,6 @@ class EnzoConfig : public Config {
bool initial_burkertbodenheimer_rotating;
double initial_burkertbodenheimer_outer_velocity;

/// EnzoInitialCloud;
double initial_cloud_center_x;
double initial_cloud_center_y;
double initial_cloud_center_z;
double initial_cloud_density_cloud;
double initial_cloud_density_wind;
double initial_cloud_eint_wind;
double initial_cloud_etot_wind;
bool initial_cloud_initialize_uniform_bfield;
double initial_cloud_uniform_bfield[3];
double initial_cloud_metal_mass_frac;
int initial_cloud_perturb_Nwaves;
double initial_cloud_perturb_amplitude;
double initial_cloud_perturb_min_wavelength;
double initial_cloud_perturb_max_wavelength;
unsigned int initial_cloud_perturb_seed;
double initial_cloud_radius;
int initial_cloud_subsample_n;
double initial_cloud_velocity_wind;

/// EnzoInitialCosmology;
double initial_cosmology_temperature;

Expand Down
21 changes: 1 addition & 20 deletions src/Enzo/enzo-core/EnzoProblem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,26 +171,7 @@ Initial * EnzoProblem::create_initial_
initial = new EnzoInitialBCenter(parameters, cycle, time,
enzo_config->initial_bcenter_update_etot);
} else if (type == "cloud") {
initial = new EnzoInitialCloud
(cycle,time,
enzo_config->initial_cloud_subsample_n,
enzo_config->initial_cloud_radius,
enzo_config->initial_cloud_center_x,
enzo_config->initial_cloud_center_y,
enzo_config->initial_cloud_center_z,
enzo_config->initial_cloud_density_cloud,
enzo_config->initial_cloud_density_wind,
enzo_config->initial_cloud_etot_wind,
enzo_config->initial_cloud_eint_wind,
enzo_config->initial_cloud_velocity_wind,
enzo_config->initial_cloud_metal_mass_frac,
enzo_config->initial_cloud_initialize_uniform_bfield,
enzo_config->initial_cloud_uniform_bfield,
enzo_config->initial_cloud_perturb_Nwaves,
enzo_config->initial_cloud_perturb_amplitude,
enzo_config->initial_cloud_perturb_min_wavelength,
enzo_config->initial_cloud_perturb_max_wavelength,
enzo_config->initial_cloud_perturb_seed);
initial = new EnzoInitialCloud(cycle,time, p_group);
} else if (type == "collapse") {
initial = new EnzoInitialCollapse
(cycle,time,
Expand Down
88 changes: 52 additions & 36 deletions src/Enzo/initial/EnzoInitialCloud.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,64 +23,80 @@ class EnzoInitialCloud : public Initial {
public: // interface

/// Constructor
EnzoInitialCloud(int cycle, double time, int subsample_n,
double cloud_radius, double cloud_center_x,
double cloud_center_y, double cloud_center_z,
double density_cloud, double density_wind,
double etot_wind, double eint_wind,
double velocity_wind, double metal_mass_frac,
bool initialize_uniform_bfield,
const double uniform_bfield[3],
int perturb_Nwaves, double perturb_amplitude,
double perturb_min_wavelength,
double perturb_max_wavelength, unsigned int perturb_seed)
EnzoInitialCloud(int cycle, double time, ParameterGroup p) noexcept
: Initial(cycle,time),
subsample_n_(subsample_n),
cloud_radius_(cloud_radius),
cloud_center_x_(cloud_center_x),
cloud_center_y_(cloud_center_y),
cloud_center_z_(cloud_center_z),
density_cloud_(density_cloud),
density_wind_(density_wind),
etot_wind_(etot_wind),
eint_wind_(eint_wind),
velocity_wind_(velocity_wind),
metal_mass_frac_(metal_mass_frac),
initialize_uniform_bfield_(initialize_uniform_bfield),
perturb_Nwaves_(perturb_Nwaves),
perturb_amplitude_(perturb_amplitude),
perturb_min_wavelength_(perturb_min_wavelength),
perturb_max_wavelength_(perturb_max_wavelength),
perturb_seed_(perturb_seed)
subsample_n_(p.value_integer("subsample_n",0)),
cloud_radius_(p.value_float("cloud_radius",0.0)),
cloud_center_x_(p.value_float("cloud_center_x",0.0)),
cloud_center_y_(p.value_float("cloud_center_y",0.0)),
cloud_center_z_(p.value_float("cloud_center_z",0.0)),
density_cloud_(p.value_float("cloud_density",0.0)),
density_wind_(p.value_float("wind_density",0.0)),
etot_wind_(p.value_float("wind_total_energy",0.0)),
eint_wind_(p.value_float("wind_internal_energy",0.0)),
velocity_wind_(p.value_float("wind_velocity",0.0)),
metal_mass_frac_(p.value_float("metal_mass_fraction",0.0)),
initialize_uniform_bfield_(false),
mabruzzo marked this conversation as resolved.
Show resolved Hide resolved
perturb_Nwaves_(p.value_integer("perturb_Nwaves", 0)),
perturb_amplitude_(p.value_float("perturb_amplitude", 0.)),
perturb_min_wavelength_(p.value_float
("perturb_min_lambda",
std::numeric_limits<double>::min())),
perturb_max_wavelength_(p.value_float
("perturb_max_lambda",
std::numeric_limits<double>::min())),
perturb_seed_(0)
{
for (int i = 0; i < 3; i++){ uniform_bfield_[i] = uniform_bfield[i]; }
if ( (perturb_Nwaves_ > 0) &&
(perturb_max_wavelength_ == std::numeric_limits<double>::min()) ){
perturb_max_wavelength_ = cloud_radius_;
}

int perturb_seed_tmp = p.value_integer("perturb_seed",0);
ASSERT("EnzoInitialCloud",
"Initial:cloud:perturb_seed must be a 32-bit unsigned integer",
(perturb_seed_tmp >= 0) && (perturb_seed_tmp <= 4294967295L));
perturb_seed_ = (unsigned int) perturb_seed_tmp;

int uniform_bfield_length = p.list_length("uniform_bfield");
if (uniform_bfield_length == 0) {
initialize_uniform_bfield_ = false;
} else if (uniform_bfield_length == 3) {
initialize_uniform_bfield_ = true;
for (int i = 0; i <3; i++) {
uniform_bfield_[i] = p.list_value_float(i,"uniform_bfield");
}
} else {
ERROR("EnzoInitialCloud",
"Initial:cloud:uniform_bfield must contain 0 or 3 entries.");
}

ASSERT("EnzoInitialCloud", "subsample_n must be >=0", subsample_n>=0);
ASSERT("EnzoInitialCloud", "subsample_n must be >=0", subsample_n_>=0);
ASSERT("EnzoInitialCloud", "cloud_radius must be positive",
cloud_radius>0);
cloud_radius_>0);
ASSERT("EnzoInitialCloud", "density_wind must be positive",
density_wind_>0);
ASSERT("EnzoInitialCloud", "density_cloud must be positive",
density_cloud_>0);
double ke_w = 0.5*velocity_wind_*velocity_wind_;
ASSERT("EnzoInitialCloud", "etot_wind must exceed wind kinetic energy",
etot_wind>ke_w);
etot_wind_>ke_w);
if (initialize_uniform_bfield_) {
double me_w = 0.5*(uniform_bfield_[0]*uniform_bfield_[0]+
uniform_bfield_[1]*uniform_bfield_[1]+
uniform_bfield_[2]*uniform_bfield_[2])/density_wind_;
ASSERT("EnzoInitialCloud",
"etot_wind must exceed wind specific kinetic and magnetic energy",
etot_wind>(ke_w+me_w));
etot_wind_>(ke_w+me_w));
}
ASSERT("EnzoInitialCloud", "eint_wind must be zero or positive.",
eint_wind>=0.);
eint_wind_>=0.);
ASSERT("EnzoInitialCloud", "metal_mass_frac must be in [0,1]",
metal_mass_frac >=0 && metal_mass_frac <=1);
metal_mass_frac_ >=0 && metal_mass_frac_ <=1);
if (perturb_Nwaves_ > 0){
ASSERT("EnzoInitialCloud",
"perturb_amplitude_ must be positive if perturb_Nwaves_>0",
perturb_amplitude > 0);
perturb_amplitude_ > 0);
ASSERT("EnzoInitialCloud",
"perturb_min_wavelength_ must be positive if perturb_Nwaves_>0",
perturb_min_wavelength_ > 0);
Expand Down