@@ -335,7 +335,6 @@ add_library(libopenmc SHARED
   src/random_lcg.F90
   src/reaction_header.F90
   src/relaxng
-  src/sab_header.F90
   src/set_header.F90
   src/settings.F90
   src/simulation_header.F90
 
@@ -57,7 +57,7 @@ extern std::map<LibraryKey, std::size_t> library_map;
 
 //! Read cross sections file (either XML or multigroup H5) and populate data
 //! libraries
-extern "C" void read_cross_sections_xml();
+void read_cross_sections_xml();
 
 //! Read cross_sections.xml and populate data libraries
 void read_ce_cross_sections_xml();
 
@@ -6,21 +6,46 @@
 
 #include <cstdint>
 #include <string>
-
+#include <vector>
 
 namespace openmc {
 
 //==============================================================================
 //! Replace Universe, Lattice, and Material IDs with indices.
 //==============================================================================
 
-extern "C" void adjust_indices();
+void adjust_indices();
 
 //==============================================================================
 //! Assign defaults to cells with undefined temperatures.
 //==============================================================================
 
-extern "C" void assign_temperatures();
+void assign_temperatures();
+
+//==============================================================================
+//! \brief Obtain a list of temperatures that each nuclide/thermal scattering
+//! table appears at in the model. Later, this list is used to determine the
+//! actual temperatures to read (which may be different if interpolation is
+//! used)
+//!
+//! \param[out] nuc_temps  Vector of temperatures for each nuclide
+//! \param[out] thermal_temps Vector of tempratures for each thermal scattering
+//!   table
+//==============================================================================
+
+void get_temperatures(std::vector<std::vector<double>>& nuc_temps,
+  std::vector<std::vector<double>>& thermal_temps);
+
+//==============================================================================
+//! \brief Perform final setup for geometry
+//!
+//! \param[out] nuc_temps  Vector of temperatures for each nuclide
+//! \param[out] thermal_temps Vector of tempratures for each thermal scattering
+//!   table
+//==============================================================================
+
+void finalize_geometry(std::vector<std::vector<double>>& nuc_temps,
+  std::vector<std::vector<double>>& thermal_temps);
 
 //==============================================================================
 //! Figure out which Universe is the root universe.
@@ -36,7 +61,7 @@ extern "C" int32_t find_root_universe();
 //! Populate all data structures needed for distribcells.
 //==============================================================================
 
-extern "C" void prepare_distribcell();
+void prepare_distribcell();
 
 //==============================================================================
 //! Recursively search through the geometry and count cell instances.
 
@@ -11,6 +11,7 @@ int parse_command_line(int argc, char* argv[]);
 #ifdef OPENMC_MPI
 void initialize_mpi(MPI_Comm intracomm);
 #endif
+void read_input_xml();
 
 }
 
 
@@ -93,6 +93,9 @@ class Material
   void calculate_photon_xs(const Particle& p) const;
 };
 
+void read_ce_cross_sections(const std::vector<std::vector<double>>& nuc_temps,
+  const std::vector<std::vector<double>>& thermal_temps);
+
 //==============================================================================
 // Fortran compatibility
 //==============================================================================
 
@@ -169,6 +169,12 @@ class Nuclide {
   static int XS_PHOTON_PROD;
 };
 
+//==============================================================================
+// Non-member functions
+//==============================================================================
+
+void check_data_version(hid_t file_id);
+
 //==============================================================================
 // Global variables
 //==============================================================================
 
@@ -37,7 +37,7 @@ extern "C" void print_particle(Particle* p);
 //! Display plot information.
 //==============================================================================
 
-extern "C" void print_plot();
+void print_plot();
 
 //==============================================================================
 //! Display information regarding cell overlap checking.
 
@@ -97,7 +97,7 @@ extern double weight_survive;        //!< Survival weight after Russian roulette
 
 //! Read settings from XML file
 //! \param[in] root XML node for <settings>
-extern "C" void read_settings_xml();
+void read_settings_xml();
 
 extern "C" void read_settings_xml_f(pugi::xml_node_struct* root_ptr);
 
 
@@ -20,6 +20,7 @@ extern Timer time_bank_sendrecv;
 extern Timer time_finalize;
 extern Timer time_inactive;
 extern Timer time_initialize;
+extern Timer time_read_xs;
 extern Timer time_tallies;
 extern Timer time_total;
 extern Timer time_transport;
 
@@ -87,6 +87,9 @@ end subroutine free_memory_bank
 
       subroutine free_memory_cmfd() bind(C)
       end subroutine free_memory_cmfd
+
+      subroutine sab_clear() bind(C)
+      end subroutine
     end interface
 
     call free_memory_geometry()
@@ -97,7 +100,7 @@ end subroutine free_memory_cmfd
     call free_memory_nuclide()
     call free_memory_photon()
     call free_memory_settings()
-    call free_memory_sab()
+    call sab_clear()
     call free_memory_source()
     call free_memory_mesh()
     call free_memory_tally()
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ int parse_command_line(int argc, char* argv[]);`
`11`	`11`	`#ifdef OPENMC_MPI`
`12`	`12`	`void initialize_mpi(MPI_Comm intracomm);`
`13`	`13`	`#endif`
	`14`	`+void read_input_xml();`
`14`	`15`
`15`	`16`	`}`
`16`	`17`