Skip to content

Commit 93e2ac5

Browse files
committed
Merge branch 'stg/fix-dycore-only-build' into hotfix-v8.2.1 (PR #1221)
This merge fixes dycore-only (i.e., no-physics) builds for both stand-alone applications and when MPAS-A is used as a dycore in CAM/CAM-SIMA. Prior to this merge there were two issues in the atmosphere core's Registry.xml file that caused dynamics-only builds to fail: * With the MPAS v8.2.0 release, the MPAS-A registry file introduced a new stream, da_state, which unconditionally included variables that exist only when physics are enabled. * Also beginning with the MPAS v8.2.0 release, the Registry.xml file unconditionally included a new registry file from Noah-MP, which is applicable only when physics are enabled. This merge fixes MPAS-A dycore-only builds by guarding the above regions in the Registry.xml file with the DO_PHYSICS macro. * stg/fix-dycore-only-build: Fix MPAS-A dycore-only build
2 parents 0a8dd86 + 520d165 commit 93e2ac5

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/core_atmosphere/Registry.xml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,10 +1155,6 @@
11551155
<var_array name="scalars"/>
11561156
<var name="initial_time"/>
11571157
<var name="xtime"/>
1158-
<var name="cldfrac"/>
1159-
<var name="re_cloud" packages="mp_thompson_in;mp_wsm6_in"/>
1160-
<var name="re_ice" packages="mp_thompson_in;mp_wsm6_in"/>
1161-
<var name="re_snow" packages="mp_thompson_in;mp_wsm6_in"/>
11621158
<var name="u"/>
11631159
<var name="w"/>
11641160
<var name="rho"/>
@@ -1171,6 +1167,11 @@
11711167
<var name="uReconstructZonal"/>
11721168
<var name="uReconstructMeridional"/>
11731169
<var name="surface_pressure"/>
1170+
#ifdef DO_PHYSICS
1171+
<var name="cldfrac"/>
1172+
<var name="re_cloud" packages="mp_thompson_in;mp_wsm6_in"/>
1173+
<var name="re_ice" packages="mp_thompson_in;mp_wsm6_in"/>
1174+
<var name="re_snow" packages="mp_thompson_in;mp_wsm6_in"/>
11741175
<var name="refl10cm_max"/>
11751176
<var name="rainc"/>
11761177
<var name="rainnc"/>
@@ -1209,6 +1210,7 @@
12091210
<var name="smois"/>
12101211
<var name="tslb"/>
12111212
<var name="h_oml_initial"/>
1213+
#endif
12121214
</stream>
12131215
</streams>
12141216

@@ -3588,6 +3590,8 @@
35883590
<!-- **************************************************************************************** -->
35893591

35903592
#include "diagnostics/Registry_diagnostics.xml"
3591-
#include "physics/Registry_noahmp.xml"
35923593

3594+
#ifdef DO_PHYSICS
3595+
#include "physics/Registry_noahmp.xml"
3596+
#endif
35933597
</registry>

0 commit comments

Comments
 (0)