Skip to content
Closed

Xtensor #3793

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion include/openmc/bremsstrahlung.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "openmc/particle.h"

#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

namespace openmc {

Expand Down
2 changes: 1 addition & 1 deletion include/openmc/distribution_energy.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define OPENMC_DISTRIBUTION_ENERGY_H

#include "hdf5.h"
#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

#include "openmc/constants.h"
#include "openmc/endf.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/eigenvalue.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <cstdint> // for int64_t

#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"
#include <hdf5.h>

#include "openmc/array.h"
Expand Down
4 changes: 2 additions & 2 deletions include/openmc/hdf5_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

#include "hdf5.h"
#include "hdf5_hl.h"
#include "xtensor/xadapt.hpp"
#include "xtensor/xarray.hpp"
#include "xtensor/containers/xadapt.hpp"
#include "xtensor/containers/xarray.hpp"

#include "openmc/array.h"
#include "openmc/error.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/material.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "openmc/span.h"
#include "pugixml.hpp"
#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"
#include <hdf5.h>

#include "openmc/bremsstrahlung.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/mesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

#include "hdf5.h"
#include "pugixml.hpp"
#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

#include "openmc/bounding_box.h"
#include "openmc/error.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/mgxs.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include <string>

#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

#include "openmc/constants.h"
#include "openmc/hdf5_interface.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/photon.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "openmc/particle.h"
#include "openmc/vector.h"

#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"
#include <hdf5.h>

#include <string>
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/plot.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include <unordered_set>

#include "pugixml.hpp"
#include "xtensor/xarray.hpp"
#include "xtensor/containers/xarray.hpp"

#include "hdf5.h"
#include "openmc/cell.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/scattdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef OPENMC_SCATTDATA_H
#define OPENMC_SCATTDATA_H

#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

#include "openmc/constants.h"
#include "openmc/vector.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/secondary_correlated.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define OPENMC_SECONDARY_CORRELATED_H

#include "hdf5.h"
#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

#include "openmc/angle_energy.h"
#include "openmc/distribution.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/secondary_kalbach.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#define OPENMC_SECONDARY_KALBACH_H

#include "hdf5.h"
#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

#include "openmc/angle_energy.h"
#include "openmc/constants.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/secondary_thermal.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "openmc/secondary_correlated.h"
#include "openmc/vector.h"

#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"
#include <hdf5.h>

namespace openmc {
Expand Down
4 changes: 2 additions & 2 deletions include/openmc/tallies/tally.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#include "openmc/vector.h"

#include "pugixml.hpp"
#include "xtensor/xfixed.hpp"
#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xfixed.hpp"
#include "xtensor/containers/xtensor.hpp"

#include <string>
#include <unordered_map>
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/thermal.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <string>
#include <unordered_map>

#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

#include "openmc/angle_energy.h"
#include "openmc/endf.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/urr.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#ifndef OPENMC_URR_H
#define OPENMC_URR_H

#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

#include "openmc/constants.h"
#include "openmc/hdf5_interface.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/volume_calc.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include "openmc/vector.h"

#include "pugixml.hpp"
#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"
#ifdef _OPENMP
#include <omp.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/wmp.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define OPENMC_WMP_H

#include "hdf5.h"
#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

#include <complex>
#include <string>
Expand Down
4 changes: 2 additions & 2 deletions include/openmc/xml_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <string>

#include "pugixml.hpp"
#include "xtensor/xadapt.hpp"
#include "xtensor/xarray.hpp"
#include "xtensor/containers/xadapt.hpp"
#include "xtensor/containers/xarray.hpp"

#include "openmc/position.h"
#include "openmc/vector.h"
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/xsdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#ifndef OPENMC_XSDATA_H
#define OPENMC_XSDATA_H

#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

#include "openmc/hdf5_interface.h"
#include "openmc/memory.h"
Expand Down
2 changes: 1 addition & 1 deletion src/bremsstrahlung.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "openmc/search.h"
#include "openmc/settings.h"

#include "xtensor/xmath.hpp"
#include "xtensor/core/xmath.hpp"

namespace openmc {

Expand Down
2 changes: 1 addition & 1 deletion src/cmfd_solver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#ifdef _OPENMP
#include <omp.h>
#endif
#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xtensor.hpp"

#include "openmc/bank.h"
#include "openmc/capi.h"
Expand Down
4 changes: 2 additions & 2 deletions src/distribution_angle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

#include <cmath> // for abs, copysign

#include "xtensor/xarray.hpp"
#include "xtensor/xview.hpp"
#include "xtensor/containers/xarray.hpp"
#include "xtensor/views/xview.hpp"

#include "openmc/endf.h"
#include "openmc/hdf5_interface.h"
Expand Down
2 changes: 1 addition & 1 deletion src/distribution_energy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <cstddef> // for size_t
#include <iterator> // for back_inserter

#include "xtensor/xview.hpp"
#include "xtensor/views/xview.hpp"

#include "openmc/endf.h"
#include "openmc/hdf5_interface.h"
Expand Down
8 changes: 4 additions & 4 deletions src/eigenvalue.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "openmc/eigenvalue.h"

#include "xtensor/xbuilder.hpp"
#include "xtensor/xmath.hpp"
#include "xtensor/xtensor.hpp"
#include "xtensor/xview.hpp"
#include "xtensor/generators/xbuilder.hpp"
#include "xtensor/core/xmath.hpp"
#include "xtensor/containers/xtensor.hpp"
#include "xtensor/views/xview.hpp"

#include "openmc/array.h"
#include "openmc/bank.h"
Expand Down
4 changes: 2 additions & 2 deletions src/endf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
#include <iterator> // for back_inserter
#include <stdexcept> // for runtime_error

#include "xtensor/xarray.hpp"
#include "xtensor/xview.hpp"
#include "xtensor/containers/xarray.hpp"
#include "xtensor/views/xview.hpp"

#include "openmc/array.h"
#include "openmc/constants.h"
Expand Down
2 changes: 1 addition & 1 deletion src/finalize.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "openmc/volume_calc.h"
#include "openmc/weight_windows.h"

#include "xtensor/xview.hpp"
#include "xtensor/views/xview.hpp"

namespace openmc {

Expand Down
4 changes: 2 additions & 2 deletions src/hdf5_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <stdexcept>
#include <string>

#include "xtensor/xarray.hpp"
#include "xtensor/xtensor.hpp"
#include "xtensor/containers/xarray.hpp"
#include "xtensor/containers/xtensor.hpp"
#include <fmt/core.h>

#include "hdf5.h"
Expand Down
6 changes: 3 additions & 3 deletions src/material.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#include "openmc/material.h"

#include <algorithm> // for min, max, sort, fill
Expand All @@ -8,9 +8,9 @@
#include <string>
#include <unordered_set>

#include "xtensor/xbuilder.hpp"
#include "xtensor/xoperation.hpp"
#include "xtensor/xview.hpp"
#include "xtensor/generators/xbuilder.hpp"
#include "xtensor/core/xoperation.hpp"
#include "xtensor/views/xview.hpp"

#include "openmc/capi.h"
#include "openmc/container_util.h"
Expand Down
14 changes: 7 additions & 7 deletions src/mesh.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#include "openmc/mesh.h"
#include <algorithm> // for copy, equal, min, min_element
#include <cassert>
Expand All @@ -16,13 +16,13 @@
#include "mpi.h"
#endif

#include "xtensor/xadapt.hpp"
#include "xtensor/xbuilder.hpp"
#include "xtensor/xeval.hpp"
#include "xtensor/xmath.hpp"
#include "xtensor/xsort.hpp"
#include "xtensor/xtensor.hpp"
#include "xtensor/xview.hpp"
#include "xtensor/containers/xadapt.hpp"
#include "xtensor/generators/xbuilder.hpp"
#include "xtensor/core/xeval.hpp"
#include "xtensor/core/xmath.hpp"
#include "xtensor/misc/xsort.hpp"
#include "xtensor/containers/xtensor.hpp"
#include "xtensor/views/xview.hpp"
#include <fmt/core.h> // for fmt

#include "openmc/capi.h"
Expand Down
8 changes: 4 additions & 4 deletions src/mgxs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
#include <cstdlib>
#include <sstream>

#include "xtensor/xadapt.hpp"
#include "xtensor/xmath.hpp"
#include "xtensor/xsort.hpp"
#include "xtensor/xview.hpp"
#include "xtensor/containers/xadapt.hpp"
#include "xtensor/core/xmath.hpp"
#include "xtensor/misc/xsort.hpp"
#include "xtensor/views/xview.hpp"
#include <fmt/core.h>

#include "openmc/error.h"
Expand Down
4 changes: 2 additions & 2 deletions src/nuclide.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include <fmt/core.h>

#include "xtensor/xbuilder.hpp"
#include "xtensor/xview.hpp"
#include "xtensor/generators/xbuilder.hpp"
#include "xtensor/views/xview.hpp"

#include <algorithm> // for sort, min_element
#include <cassert>
Expand Down
2 changes: 1 addition & 1 deletion src/output.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifdef _OPENMP
#include <omp.h>
#endif
#include "xtensor/xview.hpp"
#include "xtensor/views/xview.hpp"

#include "openmc/capi.h"
#include "openmc/cell.h"
Expand Down
10 changes: 5 additions & 5 deletions src/photon.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#include "openmc/photon.h"

#include "openmc/array.h"
Expand All @@ -13,11 +13,11 @@
#include "openmc/search.h"
#include "openmc/settings.h"

#include "xtensor/xbuilder.hpp"
#include "xtensor/xmath.hpp"
#include "xtensor/xoperation.hpp"
#include "xtensor/xslice.hpp"
#include "xtensor/xview.hpp"
#include "xtensor/generators/xbuilder.hpp"
#include "xtensor/core/xmath.hpp"
#include "xtensor/core/xoperation.hpp"
#include "xtensor/views/xslice.hpp"
#include "xtensor/views/xview.hpp"

#include <cmath>
#include <fmt/core.h>
Expand Down
2 changes: 1 addition & 1 deletion src/physics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include <algorithm> // for max, min, max_element
#include <cmath> // for sqrt, exp, log, abs, copysign
#include <xtensor/xview.hpp>
#include <xtensor/views/xview.hpp>

namespace openmc {

Expand Down
2 changes: 1 addition & 1 deletion src/physics_mg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <stdexcept>

#include "xtensor/xarray.hpp"
#include "xtensor/containers/xarray.hpp"
#include <fmt/core.h>

#include "openmc/bank.h"
Expand Down
4 changes: 2 additions & 2 deletions src/plot.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include <fstream>
#include <sstream>

#include "xtensor/xmanipulation.hpp"
#include "xtensor/xview.hpp"
#include "xtensor/misc/xmanipulation.hpp"
#include "xtensor/views/xview.hpp"
#include <fmt/core.h>
#include <fmt/ostream.h>
#ifdef USE_LIBPNG
Expand Down
4 changes: 2 additions & 2 deletions src/scattdata.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
#include <cmath>
#include <numeric>

#include "xtensor/xbuilder.hpp"
#include "xtensor/xview.hpp"
#include "xtensor/generators/xbuilder.hpp"
#include "xtensor/views/xview.hpp"

#include "openmc/constants.h"
#include "openmc/error.h"
Expand Down
Loading
Loading