Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NoahMP: add #define CCPP to support removal of IPD #547

Merged
merged 5 commits into from
Jan 14, 2021
Merged

NoahMP: add #define CCPP to support removal of IPD #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d8c061
Update CMakeLists.txt to look for the cmake include snippets in the r…
climbfuji Jan 6, 2021
ca1afdb
Add #ifdef CCPP to three NoahMP routines
climbfuji Jan 6, 2021
904eca2
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into re…
climbfuji Jan 7, 2021
3c98411
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into re…
climbfuji Jan 8, 2021
06c1c1f
Merge branch 'master' of https://github.com/NCAR/ccpp-physics into re…
climbfuji Jan 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)

Expand All @@ -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)

Expand Down
1 change: 1 addition & 0 deletions physics/module_sf_noahmp_glacier.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#define CCPP
!> \file module_sf_noahmp_glacier.f90
!! This file contains the NoahMP Glacier scheme.

Expand Down
3 changes: 2 additions & 1 deletion physics/module_sf_noahmplsm.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions physics/sfc_noahmp_drv.f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#define CCPP
!> \file sfc_noahmp_drv.f
!! This file contains the NoahMP land surface scheme driver.

Expand Down