Merge branch 'pvcode-cvode-improvements' of https://github.com/boutproject/BOUT-dev into pvcode-cvode-improvements

Author: dschwoerer

src/solver/impls/pvode/pvode.cxx

@@ -35,8 +35,8 @@
 #include <bout/field3d.hxx>
 #include <bout/mesh.hxx>
 #include <bout/msg_stack.hxx>
-#include <bout/output.hxx>
 #include <bout/options.hxx>
+#include <bout/output.hxx>
 #include <bout/sys/timer.hxx>
 #include <bout/unused.hxx>
 #include <bout/version.hxx>