Remove cells array on Fortran side

This commit is contained in:
Paul Romano 2019-02-15 06:35:59 -06:00
parent 47c19353e4
commit 964fdfde30
20 changed files with 162 additions and 588 deletions

View file

@ -199,6 +199,8 @@ public:
// Non-member functions
//==============================================================================
void read_cells(pugi::xml_node node);
#ifdef DAGMC
int32_t next_cell(DAGCell* cur_cell, DAGSurface* surf_xed);
#endif

View file

@ -26,6 +26,7 @@ extern moab::DagMC* DAG;
extern "C" void load_dagmc_geometry();
extern "C" void free_memory_dagmc();
void read_geometry_dagmc();
extern "C" pugi::xml_document* read_uwuw_materials();
bool get_uwuw_materials_xml(std::string& s);

View file

@ -10,6 +10,8 @@
namespace openmc {
void read_geometry_xml();
//==============================================================================
//! Replace Universe, Lattice, and Material IDs with indices.
//==============================================================================
@ -111,7 +113,7 @@ extern "C" int maximum_levels(int32_t univ);
//! Deallocates global vectors and maps for cells, universes, and lattices.
//==============================================================================
extern "C" void free_memory_geometry_c();
extern "C" void free_memory_geometry();
} // namespace openmc
#endif // OPENMC_GEOMETRY_AUX_H

View file

@ -273,5 +273,11 @@ private:
std::array<double, 2> pitch_; //!< Lattice tile width and height
};
//==============================================================================
// Non-member functions
//==============================================================================
void read_lattices(pugi::xml_node node);
} // namespace openmc
#endif // OPENMC_LATTICE_H

View file

@ -395,6 +395,12 @@ public:
void to_hdf5_inner(hid_t group_id) const;
};
//==============================================================================
// Non-member functions
//==============================================================================
void read_surfaces(pugi::xml_node node);
//==============================================================================
// Fortran compatibility functions
//==============================================================================