Move read_materials_xml and read_plots_xml to C++

This commit is contained in:
Paul Romano 2019-02-20 15:45:30 -06:00
parent 3eea8311d3
commit 627ee79f0c
11 changed files with 80 additions and 148 deletions

View file

@ -15,19 +15,17 @@ extern "C" const bool dagmc_enabled;
namespace openmc {
namespace model {
extern moab::DagMC* DAG;
} // namespace model
extern moab::DagMC* DAG;
}
//==============================================================================
// Non-member functions
//==============================================================================
extern "C" void load_dagmc_geometry();
void load_dagmc_geometry();
extern "C" void free_memory_dagmc();
void read_geometry_dagmc();
extern "C" pugi::xml_document* read_uwuw_materials();
bool read_uwuw_materials(pugi::xml_document& doc);
bool get_uwuw_materials_xml(std::string& s);
} // namespace openmc

View file

@ -109,6 +109,13 @@ private:
// Fortran compatibility
//==============================================================================
//! Read material data from materials.xml
void read_materials_xml();
//==============================================================================
// Fortran compatibility
//==============================================================================
extern "C" int* material_element(int i_material);
extern "C" bool material_isotropic(int i_material, int i_nuc_mat);

View file

@ -4,6 +4,7 @@
#include <unordered_map>
#include <sstream>
#include "pugixml.hpp"
#include "xtensor/xarray.hpp"
#include "hdf5.h"
@ -160,9 +161,8 @@ void voxel_finalize(hid_t dspace, hid_t dset, hid_t memspace);
// External functions
//===============================================================================
//! Read plots from plots.xml node
//! \param[in] plot node of plots.xml
extern "C" void read_plots(pugi::xml_node* plot_node);
//! Read plot specifications from a plots.xml file
void read_plots_xml();
//! Create a ppm image for a plot object
//! \param[in] plot object