Use fmt/core.h header to reduce compile time

src/cell.cpp

@@ -9,9 +9,8 @@
 #include <set>
 #include <string>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <gsl/gsl>
-#include <fmt/format.h>
 
 #include "openmc/capi.h"
 #include "openmc/constants.h"

src/dagmc.cpp

@@ -15,7 +15,7 @@
 #include "uwuw.hpp"
 #include "dagmcmetadata.hpp"
 #endif
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include <string>
 #include <sstream>

src/geometry.cpp

@@ -2,7 +2,7 @@
 
 #include <array>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <fmt/ostream.h>
 
 #include "openmc/cell.h"

src/geometry_aux.cpp

@@ -4,7 +4,7 @@
 #include <sstream>
 #include <unordered_set>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <pugixml.hpp>
 
 #include "openmc/cell.h"

src/hdf5_interface.cpp

@@ -7,7 +7,7 @@
 
 #include "xtensor/xtensor.hpp"
 #include "xtensor/xarray.hpp"
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "hdf5.h"
 #include "hdf5_hl.h"

src/initialize.cpp

@@ -9,7 +9,7 @@
 #ifdef _OPENMP
 #include <omp.h>
 #endif
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/capi.h"
 #include "openmc/constants.h"
@@ -134,7 +134,7 @@ parse_command_line(int argc, char* argv[])
       } else if (arg == "-n" || arg == "--particles") {
         i += 1;
         settings::n_particles = std::stoll(argv[i]);
-      
+
       } else if (arg == "-e" || arg == "--event") {
         settings::event_based = true;
 

src/lattice.cpp

@@ -4,7 +4,7 @@
 #include <string>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/cell.h"
 #include "openmc/error.h"

src/mgxs.cpp

@@ -9,7 +9,7 @@
 #include <omp.h>
 #endif
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "xtensor/xmath.hpp"
 #include "xtensor/xsort.hpp"
 #include "xtensor/xadapt.hpp"

src/output.cpp

@@ -11,7 +11,7 @@
 #include <unordered_map>
 #include <utility> // for pair
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <fmt/ostream.h>
 #ifdef _OPENMP
 #include <omp.h>

src/particle.cpp

@@ -3,7 +3,7 @@
 #include <algorithm> // copy, min
 #include <cmath>     // log, abs, copysign
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/bank.h"
 #include "openmc/capi.h"
@@ -236,7 +236,7 @@ Particle::event_advance()
     score_track_derivative(this, distance);
   }
 }
-  
+
 void
 Particle::event_cross_surface()
 {

src/physics.cpp

@@ -21,7 +21,7 @@
 #include "openmc/thermal.h"
 #include "openmc/tallies/tally.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include <algorithm> // for max, min, max_element
 #include <cmath> // for sqrt, exp, log, abs, copysign

src/physics_mg.cpp

@@ -2,7 +2,7 @@
 
 #include <stdexcept>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "xtensor/xarray.hpp"
 
 #include "openmc/bank.h"
@@ -153,7 +153,7 @@ create_fission_sites(Particle* p)
     // We add 1 to the delayed_group bc in MG, -1 is prompt, but in the rest
     // of the code, 0 is prompt.
     site.delayed_group = dg + 1;
-    
+
     // Store fission site in bank
     if (use_fission_bank) {
       int64_t idx = simulation::fission_bank.thread_safe_append(site);

src/plot.cpp

@@ -4,7 +4,7 @@
 #include <fstream>
 #include <sstream>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <fmt/ostream.h>
 #include "xtensor/xview.hpp"
 

src/reaction.cpp

@@ -3,7 +3,7 @@
 #include <string>
 #include <utility> // for move
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/constants.h"
 #include "openmc/hdf5_interface.h"

src/secondary_uncorrelated.cpp

@@ -2,7 +2,7 @@
 
 #include <string>  // for string
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/error.h"
 #include "openmc/hdf5_interface.h"

src/settings.cpp

@@ -4,7 +4,7 @@
 #include <limits> // for numeric_limits
 #include <string>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #ifdef _OPENMP
 #include <omp.h>
 #endif

src/source.cpp

@@ -2,7 +2,7 @@
 
 #include <algorithm> // for move
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "xtensor/xadapt.hpp"
 
 #include "openmc/bank.h"

src/state_point.cpp

@@ -5,7 +5,7 @@
 #include <string>
 #include <vector>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "xtensor/xbuilder.hpp" // for empty_like
 #include "xtensor/xview.hpp"
 

src/surface.cpp

@@ -4,7 +4,7 @@
 #include <cmath>
 #include <utility>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/error.h"
 #include "openmc/dagmc.h"

src/tallies/derivative.cpp

@@ -7,7 +7,7 @@
 #include "openmc/tallies/tally.h"
 #include "openmc/xml_interface.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 template class std::vector<openmc::TallyDerivative>;
 

src/tallies/filter_azimuthal.cpp

@@ -2,7 +2,7 @@
 
 #include <cmath>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/constants.h"
 #include "openmc/error.h"

src/tallies/filter_cell.cpp

@@ -1,6 +1,6 @@
 #include "openmc/tallies/filter_cell.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/capi.h"
 #include "openmc/cell.h"

src/tallies/filter_cell_instance.cpp

@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/capi.h"
 #include "openmc/cell.h"

src/tallies/filter_distribcell.cpp

@@ -1,6 +1,6 @@
 #include "openmc/tallies/filter_distribcell.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/cell.h"
 #include "openmc/error.h"

src/tallies/filter_energy.cpp

@@ -1,6 +1,6 @@
 #include "openmc/tallies/filter_energy.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/capi.h"
 #include "openmc/constants.h"  // For F90_NONE

src/tallies/filter_energyfunc.cpp

@@ -1,6 +1,6 @@
 #include "openmc/tallies/filter_energyfunc.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/error.h"
 #include "openmc/search.h"

src/tallies/filter_material.cpp

@@ -1,6 +1,6 @@
 #include "openmc/tallies/filter_material.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/capi.h"
 #include "openmc/material.h"

src/tallies/filter_mesh.cpp

@@ -1,6 +1,6 @@
 #include "openmc/tallies/filter_mesh.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/capi.h"
 #include "openmc/constants.h"

src/tallies/filter_mu.cpp

@@ -1,6 +1,6 @@
 #include "openmc/tallies/filter_mu.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/error.h"
 #include "openmc/search.h"

src/tallies/filter_polar.cpp

@@ -1,6 +1,6 @@
 #include "openmc/tallies/filter_polar.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/constants.h"
 #include "openmc/error.h"

src/tallies/filter_sph_harm.cpp

@@ -2,7 +2,7 @@
 
 #include <utility>  // For pair
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <gsl/gsl>
 
 #include "openmc/capi.h"

src/tallies/filter_sptl_legendre.cpp

@@ -2,7 +2,7 @@
 
 #include <utility>  // For pair
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/capi.h"
 #include "openmc/error.h"

src/tallies/filter_surface.cpp

@@ -1,6 +1,6 @@
 #include "openmc/tallies/filter_surface.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/error.h"
 #include "openmc/surface.h"

src/tallies/filter_universe.cpp

@@ -1,6 +1,6 @@
 #include "openmc/tallies/filter_universe.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/cell.h"
 #include "openmc/error.h"

src/tallies/filter_zernike.cpp

@@ -4,7 +4,7 @@
 #include <sstream>
 #include <utility>  // For pair
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include <gsl/gsl>
 
 #include "openmc/capi.h"

src/tallies/tally.cpp

@@ -28,7 +28,7 @@
 #include "openmc/tallies/filter_surface.h"
 #include "openmc/xml_interface.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "xtensor/xadapt.hpp"
 #include "xtensor/xbuilder.hpp" // for empty_like
 #include "xtensor/xview.hpp"

src/tallies/trigger.cpp

@@ -3,7 +3,7 @@
 #include <cmath>
 #include <utility> // for std::pair
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/capi.h"
 #include "openmc/constants.h"

src/thermal.cpp

@@ -3,7 +3,7 @@
 #include <algorithm> // for sort, move, min, max, find
 #include <cmath>     // for round, sqrt, abs
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "xtensor/xarray.hpp"
 #include "xtensor/xbuilder.hpp"
 #include "xtensor/xmath.hpp"

src/track_output.cpp

@@ -6,7 +6,7 @@
 #include "openmc/settings.h"
 #include "openmc/simulation.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #include "xtensor/xtensor.hpp"
 
 #include <cstddef> // for size_t

src/volume_calc.cpp

@@ -15,7 +15,7 @@
 #include "openmc/timer.h"
 #include "openmc/xml_interface.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 #ifdef _OPENMP
 #include <omp.h>
 #endif

src/wmp.cpp

@@ -6,7 +6,7 @@
 #include "openmc/math_functions.h"
 #include "openmc/nuclide.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include <cmath>
 

src/xml_interface.cpp

@@ -1,6 +1,6 @@
 #include "openmc/xml_interface.h"
 
-#include <fmt/format.h>
+#include <fmt/core.h>
 
 #include "openmc/error.h"
 #include "openmc/string_utils.h"