From 603cd9d16164393e49ba8e37322fe82653ed5046 Mon Sep 17 00:00:00 2001 From: Richard Barnes Date: Sun, 18 Oct 2020 09:52:11 -0600 Subject: [PATCH] Sort some includes --- programs/parallel_d8_accum/main.cpp | 8 ++++---- programs/parallel_d8_accum/makefile | 1 + programs/parallel_priority_flood/main.cpp | 8 ++++---- programs/parallel_priority_flood/makefile | 1 + 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/programs/parallel_d8_accum/main.cpp b/programs/parallel_d8_accum/main.cpp index 8ae6ae8d..c35c91bb 100644 --- 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 -#include +#include #include +#include +#include #include #include -#include -#include +#include #include diff --git a/programs/parallel_d8_accum/makefile b/programs/parallel_d8_accum/makefile index f48c0005..62b18e9a 100644 --- 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 index 5d15d7f1..fe73795e 100644 --- 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 -#include +#include #include +#include +#include #include #include -#include -#include +#include #include diff --git a/programs/parallel_priority_flood/makefile b/programs/parallel_priority_flood/makefile index e31bbc0e..5ba751b5 100644 --- 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++