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

Fast-forward MAM4xx submodule to Add Fixes for Test Failures #6867

Merged
merged 2 commits into from
Jan 9, 2025
Merged

Fast-forward MAM4xx submodule to Add Fixes for Test Failures #6867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5e6e27
fast-forward mam4xx submodule to fix non-determinism in amicphys test
mjschmidt271 Dec 17, 2024
67f5740
ff mam4xx to agree with interface
mjschmidt271 Dec 19, 2024
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
5 changes: 5 additions & 0 deletions components/eamxx/src/physics/mam/eamxx_mam_aci_functions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,6 +406,10 @@ void call_function_dropmixnuc(
}
});
team.team_barrier();
// HACK: dropmixnuc() requires the parameter enable_aero_vertical_mix,
// so we define it here until we have a better idea of where it
// might come from
const bool enable_aero_vertical_mix = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this ALWAYS going to be true? The fact that dropmixnuc has it as an input arg makes me wonder if there are cases we foresee needing this to be false? If it's ALWAYS going to be true, this is fine. If we foresee it being false sometimes, then you could maybe add it as an input to call_function_dropmixnuc, and have the process interface read it from input file (defaulting to true if not found).

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Short answer: for the purposes of EAMxx/E3SM, yes it will always be true.

If I'm paraphrasing correctly (@singhbalwinder), this is a temporary switch to resolve some differences in the mam4xx functionality between what is in e3sm and the parallel development in our forked repo that is meant to simplify and speedup the process of development and review on our side.

mam4::ndrop::dropmixnuc(
team, dt, ekat::subview(T_mid, icol), ekat::subview(p_mid, icol),
ekat::subview(p_int, icol), ekat::subview(pdel, icol),
Expand All @@ -417,6 +421,7 @@ void call_function_dropmixnuc(
spechygro, lmassptr_amode, num2vol_ratio_min_nmodes,
num2vol_ratio_max_nmodes, numptr_amode, nspec_amode, exp45logsig,
alogsig, aten, mam_idx, mam_cnst_idx,
enable_aero_vertical_mix,
ekat::subview(qcld, icol), // out
ekat::subview(wsub, icol), // in
ekat::subview(cloud_frac_prev, icol), // in
Expand Down
Loading
Loading