Skip to content

[Fix]: Separation of conditionals for selecting radiation in Physics call #98

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

Merged
oelbert merged 3 commits into from
May 12, 2026
Merged

[Fix]: Separation of conditionals for selecting radiation in Physics call #98

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa3aa27
Breaking apart dynamics and static conditionals in physics call to di…
fmalatino May 4, 2026
75635bc
Reversing order of conditionals for Physics call
fmalatino May 5, 2026
8e51426
Moving _interpolate_radiation outside of do_radiation
fmalatino May 12, 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
98 changes: 48 additions & 50 deletions pyshield/stencils/physics.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1627,57 +1627,55 @@ def __call__(
)

# Call radiation if timestep is right
if do_radiation and self._rterrtmgp:
if not surface_state:
raise ValueError("You must pass a surface state to run radiation")
if not radiation_state:
raise ValueError("You must pass a radiation state to run radiation")
if not date:
raise ValueError("You must pass a date to run radiation")
self._copy_to_radiation(
self._prsi1,
self._prsl1,
self._t1,
physics_state.tsfc,
self._qvapor1,
self._qliquid1,
self._qice1,
self._qo3mr1,
self._qcld1,
radiation_state.prsi,
radiation_state.prsl,
radiation_state.tlyr,
radiation_state.tsfc,
radiation_state.qvapor,
radiation_state.qliquid,
radiation_state.qice,
radiation_state.qo3mr,
radiation_state.qcld,
)
ndsl_log.info("Entering radiation")
self._radiation.step_radiation(radiation_state, surface_state, date)
self._copy_from_radiation(
radiation_state.hrtsw,
radiation_state.hrtlw,
radiation_state.fswu,
radiation_state.fswd,
radiation_state.flwu,
radiation_state.flwd,
physics_state.hrtsw,
physics_state.hrtlw,
self._hrtsw1,
self._hrtlw1,
physics_state.fswu,
physics_state.fswd,
physics_state.flwu,
physics_state.flwd,
self._layer_flip,
self._level_flip,
)

if self._rterrtmgp:
if not radiation_state:
raise ValueError("You must pass a radiation state to run radiation")
if do_radiation:
if not surface_state:
raise ValueError("You must pass a surface state to run radiation")
if not radiation_state:
raise ValueError("You must pass a radiation state to run radiation")
if not date:
raise ValueError("You must pass a date to run radiation")
self._copy_to_radiation(
self._prsi1,
self._prsl1,
self._t1,
physics_state.tsfc,
self._qvapor1,
self._qliquid1,
self._qice1,
self._qo3mr1,
self._qcld1,
radiation_state.prsi,
radiation_state.prsl,
radiation_state.tlyr,
radiation_state.tsfc,
radiation_state.qvapor,
radiation_state.qliquid,
radiation_state.qice,
radiation_state.qo3mr,
radiation_state.qcld,
)
ndsl_log.info("Entering radiation")
self._radiation.step_radiation(radiation_state, surface_state, date)
self._copy_from_radiation(
radiation_state.hrtsw,
radiation_state.hrtlw,
radiation_state.fswu,
radiation_state.fswd,
radiation_state.flwu,
radiation_state.flwd,
physics_state.hrtsw,
physics_state.hrtlw,
self._hrtsw1,
self._hrtlw1,
physics_state.fswu,
physics_state.fswd,
physics_state.flwu,
physics_state.flwd,
self._layer_flip,
self._level_flip,
)

self._interpolate_radiation(
self._gridlat,
self._gridlon,
Expand Down