From cc919d25c5954e2e977099c30a8ac9cbc270db5c Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 7 Feb 2020 14:55:11 -0600 Subject: [PATCH] Use fmt/core.h header to reduce compile time --- src/cell.cpp | 3 +-- src/dagmc.cpp | 2 +- src/geometry.cpp | 2 +- src/geometry_aux.cpp | 2 +- src/hdf5_interface.cpp | 2 +- src/initialize.cpp | 4 ++-- src/lattice.cpp | 2 +- src/mgxs.cpp | 2 +- src/output.cpp | 2 +- src/particle.cpp | 4 ++-- src/physics.cpp | 2 +- src/physics_mg.cpp | 4 ++-- src/plot.cpp | 2 +- src/reaction.cpp | 2 +- src/secondary_uncorrelated.cpp | 2 +- src/settings.cpp | 2 +- src/source.cpp | 2 +- src/state_point.cpp | 2 +- src/surface.cpp | 2 +- src/tallies/derivative.cpp | 2 +- src/tallies/filter_azimuthal.cpp | 2 +- src/tallies/filter_cell.cpp | 2 +- src/tallies/filter_cell_instance.cpp | 2 +- src/tallies/filter_distribcell.cpp | 2 +- src/tallies/filter_energy.cpp | 2 +- src/tallies/filter_energyfunc.cpp | 2 +- src/tallies/filter_material.cpp | 2 +- src/tallies/filter_mesh.cpp | 2 +- src/tallies/filter_mu.cpp | 2 +- src/tallies/filter_polar.cpp | 2 +- src/tallies/filter_sph_harm.cpp | 2 +- src/tallies/filter_sptl_legendre.cpp | 2 +- src/tallies/filter_surface.cpp | 2 +- src/tallies/filter_universe.cpp | 2 +- src/tallies/filter_zernike.cpp | 2 +- src/tallies/tally.cpp | 2 +- src/tallies/trigger.cpp | 2 +- src/thermal.cpp | 2 +- src/track_output.cpp | 2 +- src/volume_calc.cpp | 2 +- src/wmp.cpp | 2 +- src/xml_interface.cpp | 2 +- 42 files changed, 45 insertions(+), 46 deletions(-) diff --git a/src/cell.cpp b/src/cell.cpp index d09cde948..cd6199b75 100644 --- a/src/cell.cpp +++ b/src/cell.cpp @@ -9,9 +9,8 @@ #include #include -#include +#include #include -#include #include "openmc/capi.h" #include "openmc/constants.h" diff --git a/src/dagmc.cpp b/src/dagmc.cpp index 3f16799a5..59435f245 100644 --- a/src/dagmc.cpp +++ b/src/dagmc.cpp @@ -15,7 +15,7 @@ #include "uwuw.hpp" #include "dagmcmetadata.hpp" #endif -#include +#include #include #include diff --git a/src/geometry.cpp b/src/geometry.cpp index d2012d901..055f0ec7f 100644 --- a/src/geometry.cpp +++ b/src/geometry.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include #include "openmc/cell.h" diff --git a/src/geometry_aux.cpp b/src/geometry_aux.cpp index 0df1198b1..ae6d894aa 100644 --- a/src/geometry_aux.cpp +++ b/src/geometry_aux.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include "openmc/cell.h" diff --git a/src/hdf5_interface.cpp b/src/hdf5_interface.cpp index f207f53b7..1fcc97f3c 100644 --- a/src/hdf5_interface.cpp +++ b/src/hdf5_interface.cpp @@ -7,7 +7,7 @@ #include "xtensor/xtensor.hpp" #include "xtensor/xarray.hpp" -#include +#include #include "hdf5.h" #include "hdf5_hl.h" diff --git a/src/initialize.cpp b/src/initialize.cpp index a5b516f68..10d86ee80 100644 --- a/src/initialize.cpp +++ b/src/initialize.cpp @@ -9,7 +9,7 @@ #ifdef _OPENMP #include #endif -#include +#include #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; diff --git a/src/lattice.cpp b/src/lattice.cpp index a8dd23aa8..8f88d8c59 100644 --- a/src/lattice.cpp +++ b/src/lattice.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "openmc/cell.h" #include "openmc/error.h" diff --git a/src/mgxs.cpp b/src/mgxs.cpp index 094361dcb..163954caa 100644 --- a/src/mgxs.cpp +++ b/src/mgxs.cpp @@ -9,7 +9,7 @@ #include #endif -#include +#include #include "xtensor/xmath.hpp" #include "xtensor/xsort.hpp" #include "xtensor/xadapt.hpp" diff --git a/src/output.cpp b/src/output.cpp index ecfdb8a95..d98cfd4a1 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -11,7 +11,7 @@ #include #include // for pair -#include +#include #include #ifdef _OPENMP #include diff --git a/src/particle.cpp b/src/particle.cpp index 276fc197d..24bec111c 100644 --- a/src/particle.cpp +++ b/src/particle.cpp @@ -3,7 +3,7 @@ #include // copy, min #include // log, abs, copysign -#include +#include #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() { diff --git a/src/physics.cpp b/src/physics.cpp index a0f929125..1065c200b 100644 --- a/src/physics.cpp +++ b/src/physics.cpp @@ -21,7 +21,7 @@ #include "openmc/thermal.h" #include "openmc/tallies/tally.h" -#include +#include #include // for max, min, max_element #include // for sqrt, exp, log, abs, copysign diff --git a/src/physics_mg.cpp b/src/physics_mg.cpp index 526a21439..f63a48d2a 100644 --- a/src/physics_mg.cpp +++ b/src/physics_mg.cpp @@ -2,7 +2,7 @@ #include -#include +#include #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); diff --git a/src/plot.cpp b/src/plot.cpp index 0ff785712..bc94b3ad6 100644 --- a/src/plot.cpp +++ b/src/plot.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include "xtensor/xview.hpp" diff --git a/src/reaction.cpp b/src/reaction.cpp index ff22540e1..ce0090752 100644 --- a/src/reaction.cpp +++ b/src/reaction.cpp @@ -3,7 +3,7 @@ #include #include // for move -#include +#include #include "openmc/constants.h" #include "openmc/hdf5_interface.h" diff --git a/src/secondary_uncorrelated.cpp b/src/secondary_uncorrelated.cpp index 320761916..a1aa8ca0b 100644 --- a/src/secondary_uncorrelated.cpp +++ b/src/secondary_uncorrelated.cpp @@ -2,7 +2,7 @@ #include // for string -#include +#include #include "openmc/error.h" #include "openmc/hdf5_interface.h" diff --git a/src/settings.cpp b/src/settings.cpp index 9bdfd7756..5bd53de25 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -4,7 +4,7 @@ #include // for numeric_limits #include -#include +#include #ifdef _OPENMP #include #endif diff --git a/src/source.cpp b/src/source.cpp index 631520854..b15a15d23 100644 --- a/src/source.cpp +++ b/src/source.cpp @@ -2,7 +2,7 @@ #include // for move -#include +#include #include "xtensor/xadapt.hpp" #include "openmc/bank.h" diff --git a/src/state_point.cpp b/src/state_point.cpp index 706eb17ef..503b1354e 100644 --- a/src/state_point.cpp +++ b/src/state_point.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include "xtensor/xbuilder.hpp" // for empty_like #include "xtensor/xview.hpp" diff --git a/src/surface.cpp b/src/surface.cpp index b1ba2eb05..a2c54260a 100644 --- a/src/surface.cpp +++ b/src/surface.cpp @@ -4,7 +4,7 @@ #include #include -#include +#include #include "openmc/error.h" #include "openmc/dagmc.h" diff --git a/src/tallies/derivative.cpp b/src/tallies/derivative.cpp index 483008340..b749d6906 100644 --- a/src/tallies/derivative.cpp +++ b/src/tallies/derivative.cpp @@ -7,7 +7,7 @@ #include "openmc/tallies/tally.h" #include "openmc/xml_interface.h" -#include +#include template class std::vector; diff --git a/src/tallies/filter_azimuthal.cpp b/src/tallies/filter_azimuthal.cpp index 4d18e5974..a7c29b2db 100644 --- a/src/tallies/filter_azimuthal.cpp +++ b/src/tallies/filter_azimuthal.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include "openmc/constants.h" #include "openmc/error.h" diff --git a/src/tallies/filter_cell.cpp b/src/tallies/filter_cell.cpp index 86e78df91..76a80f0d5 100644 --- a/src/tallies/filter_cell.cpp +++ b/src/tallies/filter_cell.cpp @@ -1,6 +1,6 @@ #include "openmc/tallies/filter_cell.h" -#include +#include #include "openmc/capi.h" #include "openmc/cell.h" diff --git a/src/tallies/filter_cell_instance.cpp b/src/tallies/filter_cell_instance.cpp index cb6381410..e3d7e02b2 100644 --- a/src/tallies/filter_cell_instance.cpp +++ b/src/tallies/filter_cell_instance.cpp @@ -2,7 +2,7 @@ #include -#include +#include #include "openmc/capi.h" #include "openmc/cell.h" diff --git a/src/tallies/filter_distribcell.cpp b/src/tallies/filter_distribcell.cpp index 7ea9b9b04..43e68a8f9 100644 --- a/src/tallies/filter_distribcell.cpp +++ b/src/tallies/filter_distribcell.cpp @@ -1,6 +1,6 @@ #include "openmc/tallies/filter_distribcell.h" -#include +#include #include "openmc/cell.h" #include "openmc/error.h" diff --git a/src/tallies/filter_energy.cpp b/src/tallies/filter_energy.cpp index 1ffea1402..1138dabe2 100644 --- a/src/tallies/filter_energy.cpp +++ b/src/tallies/filter_energy.cpp @@ -1,6 +1,6 @@ #include "openmc/tallies/filter_energy.h" -#include +#include #include "openmc/capi.h" #include "openmc/constants.h" // For F90_NONE diff --git a/src/tallies/filter_energyfunc.cpp b/src/tallies/filter_energyfunc.cpp index cecd8306b..8c4e5609d 100644 --- a/src/tallies/filter_energyfunc.cpp +++ b/src/tallies/filter_energyfunc.cpp @@ -1,6 +1,6 @@ #include "openmc/tallies/filter_energyfunc.h" -#include +#include #include "openmc/error.h" #include "openmc/search.h" diff --git a/src/tallies/filter_material.cpp b/src/tallies/filter_material.cpp index 2760b028d..8311fc73b 100644 --- a/src/tallies/filter_material.cpp +++ b/src/tallies/filter_material.cpp @@ -1,6 +1,6 @@ #include "openmc/tallies/filter_material.h" -#include +#include #include "openmc/capi.h" #include "openmc/material.h" diff --git a/src/tallies/filter_mesh.cpp b/src/tallies/filter_mesh.cpp index 609c3662b..6c2cc8bd1 100644 --- a/src/tallies/filter_mesh.cpp +++ b/src/tallies/filter_mesh.cpp @@ -1,6 +1,6 @@ #include "openmc/tallies/filter_mesh.h" -#include +#include #include "openmc/capi.h" #include "openmc/constants.h" diff --git a/src/tallies/filter_mu.cpp b/src/tallies/filter_mu.cpp index 2a75089d5..f874488b1 100644 --- a/src/tallies/filter_mu.cpp +++ b/src/tallies/filter_mu.cpp @@ -1,6 +1,6 @@ #include "openmc/tallies/filter_mu.h" -#include +#include #include "openmc/error.h" #include "openmc/search.h" diff --git a/src/tallies/filter_polar.cpp b/src/tallies/filter_polar.cpp index 367ca738a..c81410750 100644 --- a/src/tallies/filter_polar.cpp +++ b/src/tallies/filter_polar.cpp @@ -1,6 +1,6 @@ #include "openmc/tallies/filter_polar.h" -#include +#include #include "openmc/constants.h" #include "openmc/error.h" diff --git a/src/tallies/filter_sph_harm.cpp b/src/tallies/filter_sph_harm.cpp index b9852aafd..fe014d0f4 100644 --- a/src/tallies/filter_sph_harm.cpp +++ b/src/tallies/filter_sph_harm.cpp @@ -2,7 +2,7 @@ #include // For pair -#include +#include #include #include "openmc/capi.h" diff --git a/src/tallies/filter_sptl_legendre.cpp b/src/tallies/filter_sptl_legendre.cpp index 1b38ec154..6f060ed44 100644 --- a/src/tallies/filter_sptl_legendre.cpp +++ b/src/tallies/filter_sptl_legendre.cpp @@ -2,7 +2,7 @@ #include // For pair -#include +#include #include "openmc/capi.h" #include "openmc/error.h" diff --git a/src/tallies/filter_surface.cpp b/src/tallies/filter_surface.cpp index 203a6a094..72061becb 100644 --- a/src/tallies/filter_surface.cpp +++ b/src/tallies/filter_surface.cpp @@ -1,6 +1,6 @@ #include "openmc/tallies/filter_surface.h" -#include +#include #include "openmc/error.h" #include "openmc/surface.h" diff --git a/src/tallies/filter_universe.cpp b/src/tallies/filter_universe.cpp index 75c5ebe59..ac3903041 100644 --- a/src/tallies/filter_universe.cpp +++ b/src/tallies/filter_universe.cpp @@ -1,6 +1,6 @@ #include "openmc/tallies/filter_universe.h" -#include +#include #include "openmc/cell.h" #include "openmc/error.h" diff --git a/src/tallies/filter_zernike.cpp b/src/tallies/filter_zernike.cpp index badd85103..eab76cbc8 100644 --- a/src/tallies/filter_zernike.cpp +++ b/src/tallies/filter_zernike.cpp @@ -4,7 +4,7 @@ #include #include // For pair -#include +#include #include #include "openmc/capi.h" diff --git a/src/tallies/tally.cpp b/src/tallies/tally.cpp index b52c09ee3..b63128dc0 100644 --- a/src/tallies/tally.cpp +++ b/src/tallies/tally.cpp @@ -28,7 +28,7 @@ #include "openmc/tallies/filter_surface.h" #include "openmc/xml_interface.h" -#include +#include #include "xtensor/xadapt.hpp" #include "xtensor/xbuilder.hpp" // for empty_like #include "xtensor/xview.hpp" diff --git a/src/tallies/trigger.cpp b/src/tallies/trigger.cpp index 405650b2b..0665828fd 100644 --- a/src/tallies/trigger.cpp +++ b/src/tallies/trigger.cpp @@ -3,7 +3,7 @@ #include #include // for std::pair -#include +#include #include "openmc/capi.h" #include "openmc/constants.h" diff --git a/src/thermal.cpp b/src/thermal.cpp index d7bdb150c..67ca8905f 100644 --- a/src/thermal.cpp +++ b/src/thermal.cpp @@ -3,7 +3,7 @@ #include // for sort, move, min, max, find #include // for round, sqrt, abs -#include +#include #include "xtensor/xarray.hpp" #include "xtensor/xbuilder.hpp" #include "xtensor/xmath.hpp" diff --git a/src/track_output.cpp b/src/track_output.cpp index 3b358621b..314e43351 100644 --- a/src/track_output.cpp +++ b/src/track_output.cpp @@ -6,7 +6,7 @@ #include "openmc/settings.h" #include "openmc/simulation.h" -#include +#include #include "xtensor/xtensor.hpp" #include // for size_t diff --git a/src/volume_calc.cpp b/src/volume_calc.cpp index f2f934833..8cae7743d 100644 --- a/src/volume_calc.cpp +++ b/src/volume_calc.cpp @@ -15,7 +15,7 @@ #include "openmc/timer.h" #include "openmc/xml_interface.h" -#include +#include #ifdef _OPENMP #include #endif diff --git a/src/wmp.cpp b/src/wmp.cpp index d441de7db..96e1d5641 100644 --- a/src/wmp.cpp +++ b/src/wmp.cpp @@ -6,7 +6,7 @@ #include "openmc/math_functions.h" #include "openmc/nuclide.h" -#include +#include #include diff --git a/src/xml_interface.cpp b/src/xml_interface.cpp index cab7fd2df..a715dfae2 100644 --- a/src/xml_interface.cpp +++ b/src/xml_interface.cpp @@ -1,6 +1,6 @@ #include "openmc/xml_interface.h" -#include +#include #include "openmc/error.h" #include "openmc/string_utils.h"