Update Noah-MP submodules to resolve cmake errors

erf-model · Oct 23, 2024 · 27b6aa1 · 27b6aa1
1 parent 49cc9bf
commit 27b6aa1
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 9 deletions.
diff --git 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
@@ -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 → Source/LandSurfaceModel/NOAH/ERF_NOAH.H b/Source/LandSurfaceModel/NOAH/NOAH.H → Source/LandSurfaceModel/NOAH/ERF_NOAH.H
diff --git a/Source/LandSurfaceModel/NOAH/NOAH.cpp → Source/LandSurfaceModel/NOAH/ERF_NOAH.cpp b/Source/LandSurfaceModel/NOAH/NOAH.cpp → 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
@@ -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