Skip to content

Commit 1dff92c

Browse files
authored
Merge branch 'singhbalwinder/joverfelt/eamxx/fix-mam4xx-microphysics-NBFB-bug' (PR #6942)
The MAM4xx microphysics standalone test shows NBFB behavior for two consecutive runs on GPUs. This PR fixes that, and all the fixes are in the MAM4xx submodule. This PR also fixes an issue related to the LINOZ file read in the microphysics interface. The time dimension in the LINOZ file is not unlimited. Adding a function call to pretend_dim_is_unlimited fixes this issue. [non-BFB] only for EAMxx
2 parents eb0b976 + 3b22fd4 commit 1dff92c

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

components/eamxx/src/physics/mam/readfiles/tracer_reader_utils.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,7 @@ inline void setup_tracer_data(TracerData &tracer_data, // out
295295
const int cyclical_ymd) // in
296296
{
297297
scorpio::register_file(trace_data_file, scorpio::Read);
298+
scorpio::pretend_dim_is_unlimited(trace_data_file,"time");
298299
// by default, I am assuming a zonal file.
299300
TracerFileType tracer_file_type = ZONAL;
300301

components/eamxx/tests/single-process/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,13 @@ else()
1616
message(STATUS "RRTMGP and COSP only supported for double precision builds; skipping")
1717
endif()
1818
if (SCREAM_ENABLE_MAM)
19-
# Once the mam4xx aerosol microphysics AtmosphereProcess is running, the
20-
# corresponding test here needs to be reworked with valid aerosol
21-
# initial conditions.
2219
add_subdirectory(mam/optics)
2320
add_subdirectory(mam/aci)
2421
add_subdirectory(mam/drydep)
2522
add_subdirectory(mam/emissions)
2623
add_subdirectory(mam/constituent_fluxes)
2724
add_subdirectory(mam/wet_scav)
28-
29-
# Currently this test produces non-deterministic output.
30-
# Commenting it so the other PRs can test normally
31-
# add_subdirectory(mam/aero_microphys)
25+
add_subdirectory(mam/aero_microphys)
3226
endif()
3327
if (SCREAM_TEST_LEVEL GREATER_EQUAL SCREAM_TEST_LEVEL_EXPERIMENTAL)
3428
add_subdirectory(zm)

0 commit comments

Comments
 (0)