Sort some includes

r-barnes · Oct 18, 2020 · 603cd9d · 603cd9d
1 parent 00d2927
commit 603cd9d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/programs/parallel_d8_accum/main.cpp b/programs/parallel_d8_accum/main.cpp
@@ -4,13 +4,13 @@
 //    Modelling & Software 92, 202–212. doi:10.1016/j.envsoft.2017.02.022
 #include "perimeters.hpp"
 
-#include <richdem/common/version.hpp>
-#include <richdem/common/Layoutfile.hpp>
+#include <richdem/common/Array2D.hpp>
 #include <richdem/common/communication.hpp>
+#include <richdem/common/grid_cell.hpp>
+#include <richdem/common/Layoutfile.hpp>
 #include <richdem/common/memory.hpp>
 #include <richdem/common/timer.hpp>
-#include <richdem/common/Array2D.hpp>
-#include <richdem/common/grid_cell.hpp>
+#include <richdem/common/version.hpp>
 
 #include <gdal_priv.h>
 

diff --git a/programs/parallel_d8_accum/makefile b/programs/parallel_d8_accum/makefile
@@ -1,3 +1,4 @@
+#Note: This makefile is deprecated, please use cmake if possible
 export CXX=g++
 export MPICXX=mpic++
 export GDAL_LIBS=`gdal-config --libs`

diff --git a/programs/parallel_priority_flood/main.cpp b/programs/parallel_priority_flood/main.cpp
@@ -6,13 +6,13 @@
 #include "Zhou2016pf.hpp"
 //#include "Barnes2014pf.hpp" //NOTE: Used only for timing tests
 
-#include <richdem/common/version.hpp>
-#include <richdem/common/Layoutfile.hpp>
+#include <richdem/common/Array2D.hpp>
 #include <richdem/common/communication.hpp>
+#include <richdem/common/grid_cell.hpp>
+#include <richdem/common/Layoutfile.hpp>
 #include <richdem/common/memory.hpp>
 #include <richdem/common/timer.hpp>
-#include <richdem/common/Array2D.hpp>
-#include <richdem/common/grid_cell.hpp>
+#include <richdem/common/version.hpp>
 
 #include <gdal_priv.h>
 

diff --git a/programs/parallel_priority_flood/makefile b/programs/parallel_priority_flood/makefile
@@ -1,3 +1,4 @@
+#Note: This makefile is deprecated, please use cmake if possible
 export OMPI_CXX=g++
 export CXX=g++
 export MPICXX=mpic++