Skip to content

Atmosphere/package eval order #1473

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

Draft
mgduda wants to merge 3 commits into
base: develop
Choose a base branch
from
+8 −6
Draft

Atmosphere/package eval order #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
15bb9ab
In atmosphere package setup, setup registry-defined packages after al…
mgduda Jun 15, 2026
5825930
Simplify logic for the atmosphere core's 'sfclayer' registry-defined …
mgduda Jun 15, 2026
fe73db6
Only define the atmosphere core's 'sfclayer' package if DO_PHYSICS is…
mgduda Jun 15, 2026
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
4 changes: 3 additions & 1 deletion src/core_atmosphere/Registry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,9 +485,11 @@
<package name="les"
description="Variables and options associated with LES models"
active_when="trim(config_les_model) /= 'none'"/>
#ifdef DO_PHYSICS
<package name="sfclayer"
description="Variables and options associated with surface layer physics"
active_when="(trim(config_physics_suite) /= 'none' .and. trim(config_sfclayer_scheme) == 'suite') .or. any(trim(config_sfclayer_scheme) == [ character(len=StrKind) :: 'sf_monin_obukhov', 'sf_monin_obukhov_rev', 'sf_mynn' ])"/>
active_when="trim(config_sfclayer_scheme) /= 'off'"/>
#endif
</packages>


Expand Down
10 changes: 5 additions & 5 deletions src/core_atmosphere/mpas_atm_core_interface.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,6 @@ function atm_setup_packages(configs, streamInfo, packages, iocontext) result(ier
integer :: local_ierr


ierr = atm_setup_packages_when(configs, packages)
if (ierr /= 0) then
return
end if

!
! Incremental analysis update
!
Expand Down Expand Up @@ -259,6 +254,11 @@ function atm_setup_packages(configs, streamInfo, packages, iocontext) result(ier

#endif

ierr = atm_setup_packages_when(configs, packages)

@abishekg7 abishekg7 Jun 16, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Not sure if users/community are expected to add new logic in this function, but adding a brief comment about this call needing to follow any new logic might be useful.

if (ierr /= 0) then
return
end if

end function atm_setup_packages


Expand Down