From 27b6aa12188fa3326014148b1915b60564162fea Mon Sep 17 00:00:00 2001
From: Akash Dhruv <akashdhruv@gwmail.gwu.edu>
Date: Wed, 23 Oct 2024 17:50:06 -0500
Subject: [PATCH] Update Noah-MP submodules to resolve cmake errors

---
 CMake/BuildERFExe.cmake                                 | 4 ++--
 Source/LandSurfaceModel/ERF_LandSurface.H               | 2 +-
 Source/LandSurfaceModel/NOAH/{NOAH.H => ERF_NOAH.H}     | 0
 Source/LandSurfaceModel/NOAH/{NOAH.cpp => ERF_NOAH.cpp} | 4 +---
 Source/LandSurfaceModel/NOAH/Make.package               | 4 ++--
 Submodules/NOAH-MP                                      | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)
 rename Source/LandSurfaceModel/NOAH/{NOAH.H => ERF_NOAH.H} (100%)
 rename Source/LandSurfaceModel/NOAH/{NOAH.cpp => ERF_NOAH.cpp} (93%)

diff --git a/CMake/BuildERFExe.cmake b/CMake/BuildERFExe.cmake
index 47451d4cb..ea3c16f7a 100644
--- a/CMake/BuildERFExe.cmake
+++ b/CMake/BuildERFExe.cmake
@@ -72,9 +72,9 @@ function(build_erf_lib erf_lib_name)
                                $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Source/LandSurfaceModel/NOAH>
                                $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Submodules/NOAH-MP/drivers/hrldas>)
     target_sources(${erf_lib_name} PRIVATE
-                   ${SRC_DIR}/LandSurfaceModel/NOAH/NOAH.cpp)
+                   ${SRC_DIR}/LandSurfaceModel/NOAH/ERF_NOAH.cpp)
     target_compile_definitions(${erf_lib_name} PUBLIC ERF_USE_NOAH)
-    target_link_libraries(${erf_lib_name} PUBLIC NoahMP)
+    target_link_libraries_system(${erf_lib_name} PUBLIC NoahMP::noahmp)
   endif()
 
   if(ERF_ENABLE_RRTMGP)
diff --git a/Source/LandSurfaceModel/ERF_LandSurface.H b/Source/LandSurfaceModel/ERF_LandSurface.H
index fac3d0484..56ad3b2ea 100644
--- a/Source/LandSurfaceModel/ERF_LandSurface.H
+++ b/Source/LandSurfaceModel/ERF_LandSurface.H
@@ -8,7 +8,7 @@
 #include <ERF_MM5.H>
 
 #if ERF_USE_NOAH
-#include <NOAH.H>
+#include <ERF_NOAH.H>
 #endif
 
 class LandSurface {
diff --git a/Source/LandSurfaceModel/NOAH/NOAH.H b/Source/LandSurfaceModel/NOAH/ERF_NOAH.H
similarity index 100%
rename from Source/LandSurfaceModel/NOAH/NOAH.H
rename to Source/LandSurfaceModel/NOAH/ERF_NOAH.H
diff --git a/Source/LandSurfaceModel/NOAH/NOAH.cpp b/Source/LandSurfaceModel/NOAH/ERF_NOAH.cpp
similarity index 93%
rename from Source/LandSurfaceModel/NOAH/NOAH.cpp
rename to Source/LandSurfaceModel/NOAH/ERF_NOAH.cpp
index 25bc5bcdd..77d0a1aeb 100644
--- a/Source/LandSurfaceModel/NOAH/NOAH.cpp
+++ b/Source/LandSurfaceModel/NOAH/ERF_NOAH.cpp
@@ -2,9 +2,7 @@
 #include<iostream>
 
 #include <AMReX_Print.H>
-#include <NoahmpIO.H>
-
-#include <NOAH.H>
+#include <ERF_NOAH.H>
 
 using namespace amrex;
 
diff --git a/Source/LandSurfaceModel/NOAH/Make.package b/Source/LandSurfaceModel/NOAH/Make.package
index 83a420afa..4f1e6f483 100644
--- a/Source/LandSurfaceModel/NOAH/Make.package
+++ b/Source/LandSurfaceModel/NOAH/Make.package
@@ -1,2 +1,2 @@
-CEXE_sources += NOAH.cpp
-CEXE_headers += NOAH.H
+CEXE_sources += ERF_NOAH.cpp
+CEXE_headers += ERF_NOAH.H
diff --git a/Submodules/NOAH-MP b/Submodules/NOAH-MP
index 7ddec5dca..482646ac5 160000
--- a/Submodules/NOAH-MP
+++ b/Submodules/NOAH-MP
@@ -1 +1 @@
-Subproject commit 7ddec5dca05a403a902e3ec11003ce6e09c048ca
+Subproject commit 482646ac5641492048973f7706db57145a3db11a