From 2d8c061a3f6aead4e8e8184095fad5a049009429 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Wed, 6 Jan 2021 09:40:36 -0700
Subject: [PATCH 1/2] Update CMakeLists.txt to look for the cmake include
 snippets in the right place

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f8b7e9d6..88d6240f0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ set(TYPEDEFS $ENV{CCPP_TYPEDEFS})
 if(TYPEDEFS)
   message(STATUS "Got CCPP TYPEDEFS from environment variable: ${TYPEDEFS}")
 else(TYPEDEFS)
-  include(./CCPP_TYPEDEFS.cmake)
+  include(${CMAKE_CURRENT_BINARY_DIR}/CCPP_TYPEDEFS.cmake)
   message(STATUS "Got CCPP TYPEDEFS from cmakefile include file: ${TYPEDEFS}")
 endif(TYPEDEFS)
 
@@ -88,7 +88,7 @@ set(SCHEMES $ENV{CCPP_SCHEMES})
 if(SCHEMES)
   message(STATUS "Got CCPP SCHEMES from environment variable: ${SCHEMES}")
 else(SCHEMES)
-  include(./CCPP_SCHEMES.cmake)
+  include(${CMAKE_CURRENT_BINARY_DIR}/CCPP_SCHEMES.cmake)
   message(STATUS "Got CCPP SCHEMES from cmakefile include file: ${SCHEMES}")
 endif(SCHEMES)
 
@@ -97,7 +97,7 @@ set(CAPS $ENV{CCPP_CAPS})
 if(CAPS)
   message(STATUS "Got CCPP CAPS from environment variable: ${CAPS}")
 else(CAPS)
-  include(./CCPP_CAPS.cmake)
+  include(${CMAKE_CURRENT_BINARY_DIR}/CCPP_CAPS.cmake)
   message(STATUS "Got CCPP CAPS from cmakefile include file: ${CAPS}")
 endif(CAPS)
 

From ca1afdb3ecebea579cfe13848130756ef6b39411 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Wed, 6 Jan 2021 09:40:54 -0700
Subject: [PATCH 2/2] Add #ifdef CCPP to three NoahMP routines

---
 physics/module_sf_noahmp_glacier.f90 | 1 +
 physics/module_sf_noahmplsm.f90      | 3 ++-
 physics/sfc_noahmp_drv.f             | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/physics/module_sf_noahmp_glacier.f90 b/physics/module_sf_noahmp_glacier.f90
index f3e0531f5..0b3749b5a 100644
--- a/physics/module_sf_noahmp_glacier.f90
+++ b/physics/module_sf_noahmp_glacier.f90
@@ -1,3 +1,4 @@
+#define CCPP
 !>  \file module_sf_noahmp_glacier.f90
 !!  This file contains the NoahMP Glacier scheme.
 
diff --git a/physics/module_sf_noahmplsm.f90 b/physics/module_sf_noahmplsm.f90
index 02ea70a6e..567f4a0cf 100644
--- a/physics/module_sf_noahmplsm.f90
+++ b/physics/module_sf_noahmplsm.f90
@@ -1,9 +1,10 @@
+#define CCPP
 !>  \file module_sf_noahmplsm.f90
 !!  This file contains the NoahMP land surface model.
 
 !>\ingroup NoahMP_LSM
 module module_sf_noahmplsm
-#ifndef CCPP  
+#ifndef CCPP
   use  module_wrf_utl
 #endif
 
diff --git a/physics/sfc_noahmp_drv.f b/physics/sfc_noahmp_drv.f
index 963810734..f60a4233f 100644
--- a/physics/sfc_noahmp_drv.f
+++ b/physics/sfc_noahmp_drv.f
@@ -1,3 +1,4 @@
+#define CCPP
 !>  \file sfc_noahmp_drv.f
 !!  This file contains the NoahMP land surface scheme driver.