diff --git a/include/openmc/mgxs_interface.h b/include/openmc/mgxs_interface.h index 0c1091c4b..16d30606e 100644 --- a/include/openmc/mgxs_interface.h +++ b/include/openmc/mgxs_interface.h @@ -45,8 +45,8 @@ struct MgxsInterface MgxsInterface(const std::string& path_cross_sections, const std::vector xs_to_read, const std::vector> xs_temps); - void setNuclidesToRead(std::vector arg_xs_to_read); - void setNuclideTemperaturesToRead(std::vector> xs_temps); + void set_nuclides_to_read(std::vector arg_xs_to_read); + void set_nuclide_temperatures_to_read(std::vector> xs_temps); void init(); @@ -59,7 +59,7 @@ struct MgxsInterface // Reads just the header of the cross sections file, to find // min & max energies as well as the available XS - void readHeader(const std::string& path_cross_sections); + void read_header(const std::string& path_cross_sections); }; namespace data { @@ -69,14 +69,14 @@ namespace data { // Puts available XS in MGXS file to globals so that when // materials are read, the MGXS specified in a material can // be ensured to be present in the available data. -void putMgxsHeaderDataToGlobals(); +void put_mgxs_header_data_to_globals(); // Set which nuclides and temperatures are to be read on // mgInterface through global data -void setMgInterfaceNuclidesAndTemps(); +void set_mg_interface_nuclides_and_temps(); // After macro XS have been read, materials can be marked as fissionable -void markFissionableMgxsMaterials(); +void mark_fissionable_mgxs_materials(); //============================================================================== // Mgxs tracking/transport/tallying interface methods diff --git a/src/cross_sections.cpp b/src/cross_sections.cpp index 84596f615..0949a9890 100644 --- a/src/cross_sections.cpp +++ b/src/cross_sections.cpp @@ -155,8 +155,8 @@ void read_cross_sections_xml() if (settings::run_CE) { read_ce_cross_sections_xml(); } else { - data::mgInterface.readHeader(settings::path_cross_sections); - putMgxsHeaderDataToGlobals(); + data::mgInterface.read_header(settings::path_cross_sections); + put_mgxs_header_data_to_globals(); } // Establish mapping between (type, material) and index in libraries diff --git a/src/initialize.cpp b/src/initialize.cpp index 2d40a4392..513ee62f5 100644 --- a/src/initialize.cpp +++ b/src/initialize.cpp @@ -260,9 +260,9 @@ void read_input_xml() read_ce_cross_sections(nuc_temps, thermal_temps); } else { // Create material macroscopic data for MGXS - setMgInterfaceNuclidesAndTemps(); + set_mg_interface_nuclides_and_temps(); data::mgInterface.init(); - markFissionableMgxsMaterials(); + mark_fissionable_mgxs_materials(); } simulation::time_read_xs.stop(); } diff --git a/src/mgxs_interface.cpp b/src/mgxs_interface.cpp index 59670cb34..41c6519db 100644 --- a/src/mgxs_interface.cpp +++ b/src/mgxs_interface.cpp @@ -30,19 +30,19 @@ MgxsInterface::MgxsInterface(const std::string& path_cross_sections, const std::vector xs_to_read, const std::vector> xs_temps) { - readHeader(path_cross_sections); - setNuclidesToRead(xs_to_read); - setNuclideTemperaturesToRead(xs_temps); + read_header(path_cross_sections); + set_nuclides_to_read(xs_to_read); + set_nuclide_temperatures_to_read(xs_temps); init(); } // Should these perhaps unnecessary setters be lumped into one? -void MgxsInterface::setNuclidesToRead(std::vector arg_xs_to_read) +void MgxsInterface::set_nuclides_to_read(std::vector arg_xs_to_read) { // Check to remove all duplicates xs_to_read = arg_xs_to_read; } -void MgxsInterface::setNuclideTemperaturesToRead(std::vector> xs_temps) +void MgxsInterface::set_nuclide_temperatures_to_read(std::vector> xs_temps) { xs_temps_to_read = xs_temps; if (xs_to_read.size() != xs_temps.size()) @@ -182,7 +182,7 @@ std::vector> MgxsInterface::get_mat_kTs() //============================================================================== -void MgxsInterface::readHeader(const std::string& path_cross_sections) +void MgxsInterface::read_header(const std::string& path_cross_sections) { // Save name of HDF5 file to be read to struct data cross_sections_path = path_cross_sections; @@ -231,7 +231,7 @@ void MgxsInterface::readHeader(const std::string& path_cross_sections) file_close(file_id); } -void putMgxsHeaderDataToGlobals() +void put_mgxs_header_data_to_globals() { // Get the minimum and maximum energies int neutron = static_cast(Particle::Type::neutron); @@ -249,7 +249,7 @@ void putMgxsHeaderDataToGlobals() } } -void setMgInterfaceNuclidesAndTemps() +void set_mg_interface_nuclides_and_temps() { // Get temperatures from global data std::vector> these_nuc_temps(data::nuclide_map.size()); @@ -280,7 +280,7 @@ void setMgInterfaceNuclidesAndTemps() } } -void markFissionableMgxsMaterials() +void mark_fissionable_mgxs_materials() { // Loop over all files for (const auto& mat : model::materials) {