diff --git a/bfps/DNS.py b/bfps/DNS.py
index 487583950b69e40cc32a0d800efefd41ee39a2fe..eb51862e414437b50151df870c739ebdcf23dae0 100644
--- a/bfps/DNS.py
+++ b/bfps/DNS.py
@@ -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)
diff --git a/bfps/PP.py b/bfps/PP.py
index 867864e0b46b1b2356c8e6dc133ad4d17f88efee..5716a7fe793c71413b823e4aad10dc6886294ef4 100644
--- a/bfps/PP.py
+++ b/bfps/PP.py
@@ -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)
diff --git a/bfps/TEST.py b/bfps/TEST.py
index 2a8b37ba81d7ea267d4590fe13c3ed5cf0a72616..66b2b4aad6b308c78735005f55765bfa3d3eb98c 100644
--- a/bfps/TEST.py
+++ b/bfps/TEST.py
@@ -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)
diff --git a/bfps/cpp/full_code/NSVE.cpp b/bfps/cpp/full_code/NSVE.cpp
index 74593b3768a787a5dc2bc54001d12a826d3a54e9..770ee120d40256b36192819ba31cc981245f5f57 100644
--- a/bfps/cpp/full_code/NSVE.cpp
+++ b/bfps/cpp/full_code/NSVE.cpp
@@ -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;
}
diff --git a/bfps/cpp/full_code/NSVE.hpp b/bfps/cpp/full_code/NSVE.hpp
index c3ad7a0a8b9c75990712dfb0198a4824295285b2..83c63d35790d3616cf143da1ac43bec133e91675 100644
--- a/bfps/cpp/full_code/NSVE.hpp
+++ b/bfps/cpp/full_code/NSVE.hpp
@@ -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;
diff --git a/bfps/cpp/full_code/NSVE_field_stats.cpp b/bfps/cpp/full_code/NSVE_field_stats.cpp
index 142c51e7718f5a97170958a127e353a5d213e6e4..b1c8d567592712f5d9feadd2caac73ca279238dd 100644
--- a/bfps/cpp/full_code/NSVE_field_stats.cpp
+++ b/bfps/cpp/full_code/NSVE_field_stats.cpp
@@ -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;
}
diff --git a/bfps/cpp/full_code/NSVE_field_stats.hpp b/bfps/cpp/full_code/NSVE_field_stats.hpp
index ae519fc79bb839ddbda0bc3aa3a787ba3547c84d..28a2376f17ac2ac837cbacac828cd91572bb3a17 100644
--- a/bfps/cpp/full_code/NSVE_field_stats.hpp
+++ b/bfps/cpp/full_code/NSVE_field_stats.hpp
@@ -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;
diff --git a/bfps/cpp/full_code/symmetrize_test.cpp b/bfps/cpp/full_code/symmetrize_test.cpp
index 45225fcb8d70324f4c5a68054ba62cb5d0123217..7cf96a71efe881876de1bcef2ab4d9f0482aaddf 100644
--- a/bfps/cpp/full_code/symmetrize_test.cpp
+++ b/bfps/cpp/full_code/symmetrize_test.cpp
@@ -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;
diff --git a/bfps/cpp/full_code/symmetrize_test.hpp b/bfps/cpp/full_code/symmetrize_test.hpp
index f674d3650666c7021259491c7635ecaed60d4e3c..628aee6f5ba3fac23cfbe551418a6ff1213d7d5c 100644
--- a/bfps/cpp/full_code/symmetrize_test.hpp
+++ b/bfps/cpp/full_code/symmetrize_test.hpp
@@ -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(