Skip to content

Commit 0f868c2

Browse files
committed
Merge branch 'staging/dycore-without-physics' into develop (PR #1281)
This merge modifies the Makefile logic in src/core_atmosphere so that PHYSICS is not defined whenever MPAS_CAM_DYCORE is found in CPPFLAGS. This removes the need for any changes to src/core_atmosphere/Makefile when building MPAS-A as a dycore in CAM-SIMA. As before, it is still possible to manually un-define PHYSICS for stand-alone MPAS-A by commenting-out or removing the definition of PHYSICS. * staging/dycore-without-physics: Disable physics for MPAS dycore-only build
2 parents 4d7cc96 + f359771 commit 0f868c2

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/core_atmosphere/Makefile

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@
44
# To build a dycore-only MPAS-Atmosphere model, comment-out or delete
55
# the definition of PHYSICS, below
66
#
7-
PHYSICS=-DDO_PHYSICS
8-
7+
# If MPAS_CAM_DYCORE is found in CPPFLAGS, PHYSICS will become undefined automatically
8+
#
9+
ifeq ($(findstring MPAS_CAM_DYCORE,$(CPPFLAGS)),)
10+
PHYSICS = -DDO_PHYSICS
11+
endif
912

1013
ifdef PHYSICS
1114
PHYSCORE = physcore

0 commit comments

Comments
 (0)