Merge pull request #547 from climbfuji/remove_ipd_step3_and_5

NoahMP: add #define CCPP to support removal of IPD
NCAR · Jan 14, 2021 · 143d7f0 · 143d7f0
2 parents e19fe2a + 06c1c1f
commit 143d7f0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git 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)
 

diff --git 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
@@ -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
@@ -1,3 +1,4 @@
+#define CCPP
 !>  \file sfc_noahmp_drv.f
 !!  This file contains the NoahMP land surface scheme driver.