From 81858c119c8b6d3b6a77205369cea5cb9157c6bd Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Wed, 17 Oct 2018 13:48:30 -0500
Subject: [PATCH] Revert include ordering in state_point.cpp. Add comment about
 adaptor_type

---
 include/openmc/tallies/tally.h |  2 ++
 src/state_point.cpp            | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/include/openmc/tallies/tally.h b/include/openmc/tallies/tally.h
index 96b081615d..c323d3bace 100644
--- a/include/openmc/tallies/tally.h
+++ b/include/openmc/tallies/tally.h
@@ -22,6 +22,8 @@ extern "C" double global_tally_absorption;
 // Non-member functions
 //==============================================================================
 
+// Alias for the type returned by xt::adapt(...). N is the dimension of the
+// multidimensional array
 template <std::size_t N>
 using adaptor_type = xt::xtensor_adaptor<xt::xbuffer_adaptor<double*&, xt::no_ownership>, N>;
 
diff --git a/src/state_point.cpp b/src/state_point.cpp
index 2383a5ed1a..63c8264a36 100644
--- a/src/state_point.cpp
+++ b/src/state_point.cpp
@@ -1,5 +1,12 @@
 #include "openmc/state_point.h"
 
+#include <algorithm>
+#include <string>
+#include <vector>
+
+#include "xtensor/xbuilder.hpp" // for empty_like
+#include "xtensor/xview.hpp"
+
 #include "openmc/capi.h"
 #include "openmc/constants.h"
 #include "openmc/error.h"
@@ -9,13 +16,6 @@
 #include "openmc/simulation.h"
 #include "openmc/tallies/tally.h"
 
-#include "xtensor/xbuilder.hpp" // for empty_like
-#include "xtensor/xview.hpp"
-
-#include <algorithm>
-#include <string>
-#include <vector>
-
 namespace openmc {