Header file order and iosfwd (AMReX-Codes#1883)

Include amrex headers before standard C++ headers. Use iosfwd instead of iostream if we can.
mohuangrui · Mar 21, 2021 · ef0eb9f · ef0eb9f
1 parent c984473
commit ef0eb9f
Show file tree

Hide file tree

Showing 117 changed files with 444 additions and 431 deletions.
diff --git a/Src/Amr/AMReX_Amr.H b/Src/Amr/AMReX_Amr.H
@@ -3,19 +3,18 @@
 #define AMREX_Amr_H_
 #include <AMReX_Config.H>
 
-#include <fstream>
-#include <memory>
-#include <list>
-
 #include <AMReX_Box.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_Array.H>
 #include <AMReX_Vector.H>
 #include <AMReX_BCRec.H>
-
 #include <AMReX_AmrCore.H>
 
+#include <iosfwd>
+#include <list>
+#include <memory>
+
 namespace amrex {
 
 class AmrLevel;

diff --git a/Src/Amr/AMReX_Amr.cpp b/Src/Amr/AMReX_Amr.cpp
@@ -1,17 +1,3 @@
-#include <algorithm>
-#include <cstdio>
-#include <list>
-#include <iostream>
-#include <iomanip>
-#include <sstream>
-#include <iomanip>
-#include <limits>
-#include <cmath>
-
-#ifdef AMREX_USE_OMP
-#include <omp.h>
-#endif
-
 #include <AMReX_Geometry.H>
 #include <AMReX_TagBox.H>
 #include <AMReX_Array.H>
@@ -48,6 +34,19 @@
 #include <AMReX_AmrInSituBridge.H>
 #endif
 
+#ifdef AMREX_USE_OMP
+#include <omp.h>
+#endif
+
+#include <algorithm>
+#include <cmath>
+#include <cstdio>
+#include <iostream>
+#include <iomanip>
+#include <limits>
+#include <list>
+#include <sstream>
+
 namespace amrex {
 
 //

diff --git a/Src/Amr/AMReX_AmrLevel.cpp b/Src/Amr/AMReX_AmrLevel.cpp
@@ -1,9 +1,4 @@
 
-#include <sstream>
-
-#include <memory>
-#include <limits>
-
 #include <AMReX_AmrLevel.H>
 #include <AMReX_Derive.H>
 #include <AMReX_ParallelDescriptor.H>
@@ -20,6 +15,10 @@
 #include <AMReX_EB2.H>
 #endif
 
+#include <sstream>
+#include <memory>
+#include <limits>
+
 namespace amrex {
 
 #ifdef AMREX_USE_EB

diff --git a/Src/Amr/AMReX_Derive.H b/Src/Amr/AMReX_Derive.H
@@ -2,14 +2,14 @@
 #define AMREX_Derive_H_
 #include <AMReX_Config.H>
 
-#include <list>
-#include <string>
-
 #include <AMReX_ArrayLim.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Box.H>
 #include <AMReX_Interpolater.H>
 
+#include <list>
+#include <string>
+
 namespace amrex {
 
 extern "C"

diff --git a/Src/Amr/AMReX_Derive.cpp b/Src/Amr/AMReX_Derive.cpp
@@ -1,9 +1,9 @@
 
-#include <cstring>
-
 #include <AMReX_Derive.H>
 #include <AMReX_StateDescriptor.H>
 
+#include <cstring>
+
 namespace amrex {
 
 Box

diff --git a/Src/Amr/AMReX_StateData.H b/Src/Amr/AMReX_StateData.H
@@ -3,8 +3,6 @@
 #define AMREX_StateData_H_
 #include <AMReX_Config.H>
 
-#include <memory>
-
 #include <AMReX_Box.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_MultiFab.H>
@@ -19,6 +17,8 @@
 #include <AMReX_RealBox.H>
 #include <AMReX_StateDescriptor.H>
 
+#include <memory>
+
 namespace amrex {
 
 class StateDataPhysBCFunct;

diff --git a/Src/Amr/AMReX_StateData.cpp b/Src/Amr/AMReX_StateData.cpp
@@ -1,8 +1,4 @@
 
-#include <iostream>
-#include <limits>
-#include <algorithm>
-
 #include <AMReX_RealBox.H>
 #include <AMReX_StateData.H>
 #include <AMReX_StateDescriptor.H>
@@ -13,6 +9,10 @@
 #include <omp.h>
 #endif
 
+#include <iostream>
+#include <limits>
+#include <algorithm>
+
 namespace amrex {
 
 #ifdef AMREX_USE_FLOAT

diff --git a/Src/Amr/AMReX_StateDescriptor.H b/Src/Amr/AMReX_StateDescriptor.H
@@ -3,15 +3,15 @@
 #define AMREX_StateDescriptor_H_
 #include <AMReX_Config.H>
 
-#include <utility>
-#include <memory>
-
 #include <AMReX_Array.H>
 #include <AMReX_Vector.H>
 #include <AMReX_REAL.H>
 #include <AMReX_Box.H>
 #include <AMReX_PhysBCFunct.H>
 
+#include <utility>
+#include <memory>
+
 namespace amrex {
 
 typedef void (*BndryFuncFabDefault) (Box const& bx, FArrayBox& data,

diff --git a/Src/Amr/AMReX_StateDescriptor.cpp b/Src/Amr/AMReX_StateDescriptor.cpp
@@ -1,12 +1,12 @@
 
-#include <algorithm>
-#include <string>
-#include <iostream>
-
 #include <AMReX_StateDescriptor.H>
 #include <AMReX_Interpolater.H>
 #include <AMReX_BCRec.H>
 
+#include <algorithm>
+#include <string>
+#include <iostream>
+
 namespace amrex {
 
 int StateDescriptor::bf_ext_dir_threadsafe = 0;

diff --git a/Src/AmrCore/AMReX_AmrCore.H b/Src/AmrCore/AMReX_AmrCore.H
@@ -2,11 +2,11 @@
 #define BL_AMRCORE_H_
 #include <AMReX_Config.H>
 
-#include <ostream>
-#include <memory>
-
 #include <AMReX_AmrMesh.H>
 
+#include <iosfwd>
+#include <memory>
+
 namespace amrex {
 
 #ifdef AMREX_PARTICLES

diff --git a/Src/AmrCore/AMReX_AmrCore.cpp b/Src/AmrCore/AMReX_AmrCore.cpp
@@ -1,6 +1,4 @@
 
-#include <algorithm>
-
 #include <AMReX_AmrCore.H>
 #include <AMReX_Print.H>
 
@@ -12,6 +10,9 @@
 #include <omp.h>
 #endif
 
+#include <algorithm>
+#include <ostream>
+
 namespace amrex {
 
 AmrCore::AmrCore ()

diff --git a/Src/AmrCore/AMReX_Cluster.H b/Src/AmrCore/AMReX_Cluster.H
@@ -3,14 +3,15 @@
 #define AMREX_Cluster_H_
 #include <AMReX_Config.H>
 
-#include <list>
 #include <AMReX_IntVect.H>
 #include <AMReX_Box.H>
 #include <AMReX_Array.H>
 #include <AMReX_Vector.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_REAL.H>
 
+#include <list>
+
 namespace amrex {
 
 class BoxDomain;

diff --git a/Src/AmrCore/AMReX_Cluster.cpp b/Src/AmrCore/AMReX_Cluster.cpp
@@ -1,12 +1,13 @@
 
-#include <algorithm>
-#include <cmath>
 #include <AMReX_Cluster.H>
 #include <AMReX_BoxDomain.H>
 #include <AMReX_Vector.H>
 #include <AMReX_Array.H>
 #include <AMReX_BLProfiler.H>
 
+#include <algorithm>
+#include <cmath>
+
 namespace amrex {
 
 namespace {

diff --git a/Src/AmrCore/AMReX_ErrorList.H b/Src/AmrCore/AMReX_ErrorList.H
@@ -2,9 +2,6 @@
 #define AMREX_ErrorList_H_
 #include <AMReX_Config.H>
 
-#include <string>
-#include <memory>
-
 #include <AMReX_Array.H>
 #include <AMReX_Vector.H>
 #include <AMReX_REAL.H>
@@ -13,6 +10,9 @@
 #include <AMReX_TagBox.H>
 #include <AMReX_Geometry.H>
 
+#include <string>
+#include <memory>
+
 namespace amrex {
 
 

diff --git a/Src/AmrCore/AMReX_ErrorList.cpp b/Src/AmrCore/AMReX_ErrorList.cpp
@@ -1,9 +1,10 @@
 
-#include <iostream>
 #include <AMReX_BLassert.H>
 #include <AMReX_ErrorList.H>
 #include <AMReX_SPACE.H>
 
+#include <iostream>
+
 namespace amrex {
 
 ErrorRec::ErrorFunc::ErrorFunc ()

diff --git a/Src/AmrCore/AMReX_FillPatchUtil.H b/Src/AmrCore/AMReX_FillPatchUtil.H
@@ -14,13 +14,13 @@
 #include <AMReX_EBFabFactory.H>
 #endif
 
-#include <cmath>
-#include <limits>
-
 #ifdef AMREX_USE_OMP
 #include <omp.h>
 #endif
 
+#include <cmath>
+#include <limits>
+
 namespace amrex
 {
 

diff --git a/Src/AmrCore/AMReX_Interpolater.cpp b/Src/AmrCore/AMReX_Interpolater.cpp
@@ -1,6 +1,4 @@
 
-#include <climits>
-
 #include <AMReX_FArrayBox.H>
 #include <AMReX_IArrayBox.H>
 #include <AMReX_Geometry.H>
@@ -11,6 +9,8 @@
 #include <AMReX_INTERP_F.H>
 #endif
 
+#include <climits>
+
 namespace amrex {
 
 //

diff --git a/Src/AmrCore/AMReX_TagBox.cpp b/Src/AmrCore/AMReX_TagBox.cpp
@@ -1,8 +1,3 @@
-#include <algorithm>
-#include <cstdlib>
-#include <cmath>
-#include <climits>
-
 #include <AMReX_TagBox.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_ParallelDescriptor.H>
@@ -11,6 +6,11 @@
 #include <AMReX_iMultiFab.H>
 #include <AMReX_MultiFabUtil.H>
 
+#include <algorithm>
+#include <cstdlib>
+#include <cmath>
+#include <climits>
+
 namespace amrex {
 
 TagBox::TagBox () noexcept {}

diff --git a/Src/Base/AMReX.H b/Src/Base/AMReX.H
@@ -13,12 +13,12 @@
 #include <AMReX_REAL.H>
 #include <AMReX_Math.H>
 
-#include <iostream>
+#include <cstdio>
 #include <functional>
+#include <iostream>
+#include <memory>
 #include <string>
-#include <cstdio>
 #include <vector>
-#include <memory>
 
 //
 // Initialize, Finalize, Error Reporting, and Version String Functions

diff --git a/Src/Base/AMReX_Array.H b/Src/Base/AMReX_Array.H
@@ -2,14 +2,6 @@
 #define AMREX_ARRAY_H_
 #include <AMReX_Config.H>
 
-#include <array>
-#include <memory>
-#include <utility>
-#include <string>
-#include <iostream>
-#include <sstream>
-#include <cstdio>
-#include <type_traits>
 #include <AMReX.H>
 #include <AMReX_GpuQualifiers.H>
 #include <AMReX_GpuControl.H>
@@ -19,6 +11,12 @@
 #include <AMReX_Algorithm.H>
 #include <AMReX_Dim3.H>
 
+#include <array>
+#include <memory>
+#include <utility>
+#include <string>
+#include <type_traits>
+
 namespace amrex {
 
     template <class T, std::size_t N>

diff --git a/Src/Base/AMReX_Array4.H b/Src/Base/AMReX_Array4.H
@@ -6,6 +6,9 @@
 #include <AMReX_IntVect.H>
 #include <AMReX_GpuPrint.H>
 
+#include <iostream>
+#include <sstream>
+
 namespace amrex {
 
     template <typename T>