Commit 0302289c authored by Chichi Lalescu's avatar Chichi Lalescu
Browse files

rename parameter

parent 99e1c858
Pipeline #37005 failed with stage
in 16 minutes and 39 seconds
......@@ -120,7 +120,7 @@ class DNS(_code):
return None
def generate_default_parameters(self):
# these parameters are relevant for all DNS classes
self.parameters['fftw_planner_type'] = 'FFTW_ESTIMATE'
self.parameters['fftw_plan_rigor'] = 'FFTW_ESTIMATE'
self.parameters['dealias_type'] = int(1)
self.parameters['dkx'] = float(1.0)
self.parameters['dky'] = float(1.0)
......
......@@ -118,7 +118,7 @@ class PP(_code):
return None
def generate_default_parameters(self):
# these parameters are relevant for all PP classes
self.parameters['fftw_planner_type'] = 'FFTW_ESTIMATE'
self.parameters['fftw_plan_rigor'] = 'FFTW_ESTIMATE'
self.parameters['dealias_type'] = int(1)
self.parameters['dkx'] = float(1.0)
self.parameters['dky'] = float(1.0)
......
......@@ -119,7 +119,7 @@ class TEST(_code):
return None
def generate_default_parameters(self):
# these parameters are relevant for all TEST classes
self.parameters['fftw_planner_type'] = 'FFTW_ESTIMATE'
self.parameters['fftw_plan_rigor'] = 'FFTW_ESTIMATE'
self.parameters['dealias_type'] = int(1)
self.parameters['dkx'] = float(1.0)
self.parameters['dky'] = float(1.0)
......
......@@ -38,11 +38,11 @@ int NSVE<rnumber>::initialize(void)
simname.c_str(),
nx, ny, nz,
dkx, dky, dkz,
fftw_planner_string_to_flag[this->fftw_plan_type]);
fftw_planner_string_to_flag[this->fftw_plan_rigor]);
this->tmp_vec_field = new field<rnumber, FFTW, THREE>(
nx, ny, nz,
this->comm,
fftw_planner_string_to_flag[this->fftw_plan_type]);
fftw_planner_string_to_flag[this->fftw_plan_rigor]);
this->fs->checkpoints_per_file = checkpoints_per_file;
......@@ -162,7 +162,7 @@ int NSVE<rnumber>::read_parameters(void)
this->max_vorticity_estimate = hdf5_tools::read_value<double>(parameter_file, "parameters/max_vorticity_estimate");
std::string tmp = hdf5_tools::read_string(parameter_file, "parameters/forcing_type");
snprintf(this->forcing_type, 511, "%s", tmp.c_str());
this->fftw_plan_type = hdf5_tools::read_string(parameter_file, "parameters/fftw_plan_type");
this->fftw_plan_rigor = hdf5_tools::read_string(parameter_file, "parameters/fftw_plan_rigor");
H5Fclose(parameter_file);
return EXIT_SUCCESS;
}
......
......@@ -53,7 +53,7 @@ class NSVE: public direct_numerical_simulation
double max_velocity_estimate;
double max_vorticity_estimate;
double nu;
std::string fftw_plan_type;
std::string fftw_plan_rigor;
/* other stuff */
vorticity_equation<rnumber, FFTW> *fs;
......
......@@ -13,7 +13,7 @@ int NSVE_field_stats<rnumber>::initialize(void)
this->vorticity = new field<rnumber, FFTW, THREE>(
nx, ny, nz,
this->comm,
fftw_planner_string_to_flag[this->fftw_plan_type]);
fftw_planner_string_to_flag[this->fftw_plan_rigor]);
this->vorticity->real_space_representation = false;
hid_t parameter_file = H5Fopen(
(this->simname + std::string(".h5")).c_str(),
......@@ -44,7 +44,7 @@ int NSVE_field_stats<rnumber>::initialize(void)
this->vorticity->clayout->starts,
this->vorticity->clayout->comm);
}
this->fftw_plan_type = hdf5_tools::read_string(parameter_file, "parameters/fftw_plan_type");
this->fftw_plan_rigor = hdf5_tools::read_string(parameter_file, "parameters/fftw_plan_rigor");
H5Fclose(parameter_file);
return EXIT_SUCCESS;
}
......
......@@ -42,7 +42,7 @@ class NSVE_field_stats: public postprocess
private:
field_binary_IO<rnumber, COMPLEX, THREE> *bin_IO;
public:
std::string fftw_plan_type;
std::string fftw_plan_rigor;
field<rnumber, FFTW, THREE> *vorticity;
......
......@@ -32,7 +32,7 @@ int symmetrize_test<rnumber>::read_parameters()
H5P_DEFAULT);
this->random_seed = hdf5_tools::read_value<int>(
parameter_file, "/parameters/random_seed");
this->fftw_plan_type = hdf5_tools::read_string(parameter_file, "parameters/fftw_plan_type");
this->fftw_plan_rigor = hdf5_tools::read_string(parameter_file, "parameters/fftw_plan_rigor");
H5Fclose(parameter_file);
return EXIT_SUCCESS;
}
......@@ -46,13 +46,13 @@ int symmetrize_test<rnumber>::do_work(void)
field<rnumber, FFTW, THREE> *test_field0 = new field<rnumber, FFTW, THREE>(
this->nx, this->ny, this->nz,
this->comm,
fftw_planner_string_to_flag[this->fftw_plan_type]);
fftw_planner_string_to_flag[this->fftw_plan_rigor]);
DEBUG_MSG("finished allocating field0\n");
DEBUG_MSG("about to allocate field1\n");
field<rnumber, FFTW, THREE> *test_field1 = new field<rnumber, FFTW, THREE>(
this->nx, this->ny, this->nz,
this->comm,
fftw_planner_string_to_flag[this->fftw_plan_type]);
fftw_planner_string_to_flag[this->fftw_plan_rigor]);
DEBUG_MSG("finished allocating field1\n");
std::default_random_engine rgen;
std::normal_distribution<rnumber> rdist;
......
......@@ -42,7 +42,7 @@ template <typename rnumber>
class symmetrize_test: public test
{
public:
std::string fftw_plan_type;
std::string fftw_plan_rigor;
int random_seed;
symmetrize_test(
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment