From 6adf45c6f64a9dd17e37107c64145144fb924154 Mon Sep 17 00:00:00 2001
From: Matt Williamson <87771120+mattw-nws@users.noreply.github.com>
Date: Thu, 6 Jul 2023 20:25:24 +0000
Subject: [PATCH] Required fixes for serial build

---
 include/core/HY_Features.hpp | 9 +++++++++
 src/NGen.cpp                 | 5 +++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/include/core/HY_Features.hpp b/include/core/HY_Features.hpp
index f779dc5f4c..19961f4712 100644
--- a/include/core/HY_Features.hpp
+++ b/include/core/HY_Features.hpp
@@ -106,6 +106,15 @@ namespace hy_features {
          */
         inline auto catchments(){return network.filter("cat");}
 
+        /**
+         * @brief An iterator of only the catchment feature ids from only the specified layer
+         * 
+         * @return auto 
+         */
+        inline auto catchments(long lv) {
+            return network.filter("cat",lv);
+        }
+
         /**
          * @brief Return a set of levels that contain a catchment
          */
diff --git a/src/NGen.cpp b/src/NGen.cpp
index f7f12c57a5..816cc440eb 100644
--- a/src/NGen.cpp
+++ b/src/NGen.cpp
@@ -46,14 +46,15 @@ bool is_subdivided_hydrofabric_wanted = false;
 #include "parallel_utils.h"
 #include "core/Partition_Parser.hpp"
 #include <HY_Features_MPI.hpp>
-#include <Layer.hpp>
-#include <SurfaceLayer.hpp>
 
 std::string PARTITION_PATH = "";
 int mpi_rank;
 int mpi_num_procs;
 #endif
 
+#include <Layer.hpp>
+#include <SurfaceLayer.hpp>
+
 std::unordered_map<std::string, std::ofstream> nexus_outfiles;
 
 int main(int argc, char *argv[]) {