Add two-stream radiation model with simplified surface energy balance (force-restore) - #3950

Merged

asalmgren merged 229 commits into

erf-model:developmentfrom

hgopalan:ERF-Radiation

Sep 14, 2026

Commits on Aug 6, 2026

Implement Phase 1 Two-Stream Radiation Module - Core Infrastructure and Solvers

Copilot
and
hgopalan
authored
ece698b

Commits on Aug 7, 2026

Merge pull request #280 from hgopalan/copilot/copilotphase1-two-stream-radiation
Harish
authored
dcc9173
Phase 1b: Add Radiation diagnostics to build system and wiring

Copilot
and
hgopalan
authored
90cf5d9
Phase 1b: Wire Radiation Module into Build System and SolverChoice

Copilot
and
hgopalan
authored
08443a7
Merge pull request #281 from hgopalan/copilot/copilotphase1b-wire-radiation-module
Harish
authored
7797dd8
Fix Phase 1 sounding file: move case-specific soundings into their own test folders
Harish
committed
73a2143
Fix some files
Harish
committed
e964426
Equation Bug
Harish
committed
a4deff1
Fix bug
Harish
committed
fe50d8d
Fix bug
Harish
committed
1c6cd59
Fix bug
Harish
committed
3c96abe
Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
32230e1
MD files
Harish
committed
68bdffe
MD files
Harish
committed
7b2aba7
Add RAD_DEVELOPMENT.md and RAD_MPI_SKILLS.md documentation

Copilot
and
hgopalan
authored
7a06f85
Implement Phase 2: Real per-column vertical integration with GPU-safe kernel

Copilot
and
hgopalan
authored
4ba9bf8
Update documentation: Mark Phase 2 complete, add Phase 2 lessons to RAD_MPI_SKILLS.md

Copilot
and
hgopalan
authored
aa90b9b
Merge branch 'ERF-Radiation' into copilot/phase2-real-per-column-radiation
Harish
authored
e52d4a4
Merge pull request #282 from hgopalan/copilot/phase2-real-per-column-radiation
Harish
authored
3a516fc
Phase 2b: Wire per-column kernel into diagnostics driver - Initial implementation

Copilot
and
hgopalan
authored
4592cc1
Phase 2b: Fix state access to use vars_old[lev][Vars::cons]

Copilot
and
hgopalan
authored
db4a105
Fix Access Bug
Harish
committed
9600fd7
Merge pull request #283 from hgopalan/copilot/phase2b-wire-real-per-column-kernel
Harish
authored
577343c
Fix
Harish
committed
6743bee
Fix
Harish
committed
f41d400
Phase 2c: Implement GPU-safe ParallelFor, real LW downward sweep, and real dz

Copilot
and
hgopalan
authored
04d4a1f
Phase 2c: Update documentation with Phase 2b, Phase 2c sections and known issues

Copilot
and
hgopalan
authored
5e83943
Merge pull request #284 from hgopalan/copilot/phase2c-gpu-fix-and-lw-completion
Harish
authored
dcb2691
Fix gating
Harish
committed
f9e38d1
Phase 3: Add cloud optical properties (variable tau profile + cloud fraction masking)
Harish
committed
ab99f75
Phase 3: Add SW_Cloud_Layer RegTest inputs and sounding file
Harish
committed
552c1d1
Complete Phase 3: Implement Cloud Optical Properties
Harish
authored
5d020ad
Update RAD_MPI_SKILLS with new Phase 3 lessons
Harish
authored
bcecd3c
Merge pull request #286 from hgopalan/copilot/phase3-cloud-optical-properties-manual
Harish
authored
8358239
Fix D.7 section split caused by misplaced D.8/D.9 insertion
Harish
committed
92baf5c
Phase 4: Add scattering parameters to RadChoice (single_scattering_albedo, asymmetry_factor, cloud variants)
Harish
committed
d9ca3d8
Phase 4: Add compute_sw_diffuse_flux() Meador-Weaver two-stream scattering helper
Harish
committed
a68a938
Phase 4: Wire compute_sw_diffuse_flux() into vertical_two_stream_sweep()
Harish
committed
df30c2d
Phase 4: Add SW_Scattering_Cloud RegTest
Harish
committed
3d99f07
Merge pull request #287 from hgopalan/copilot/phase4-scattering-effects-manual
Harish
authored
4dd51ee
Fix stale [Phase1] hardcoded debug tag in RadiationDiagnostics::append
Harish
committed
3fcba5c
Revise radiation development status and documentation
Harish
authored
a88b522
Revise RAD_MPI_SKILLS.md for clarity and updates
Harish
authored
541e5b0
Phase 5 Step 1/6: Add per-level (SW,LW) heating rate output to vertical_two_stream_sweep()
Harish
committed
54de2b2
Modify radiation heating allocation conditions
Harish
authored
288566b
Wire TwoStream radiation diagnostics into time loop
Harish
authored
819fc3e
Enable radiation source terms with TwoStream checks
Harish
authored
d8f18e0
Update assertion method for lw_enabled check
Harish
authored
880bbe9
Phase 5 Step 6a: Add sounding file for RhoTheta coupling RegTest
Harish
committed
5ffc918
Merge pull request #288 from hgopalan/copilot/phase5-rhotheta-coupling
Harish
authored
bf357dc
Phase 5 Step 6a: Add RhoTheta coupling smoke-test RegTest (inputs)
Harish
committed
eb701d2
Phase 5 Step 6b: Add check script for RhoTheta coupling RegTest
Harish
committed
a8565de
Update RAD_DEVELOPMENT.md
Harish
authored
7c02310
Document Phase 5 validation and RegTest results
Harish
authored
385f19e
Document Phase 5 lesson on code correctness and wiring
Harish
authored
dae79e0
Enhance roadmap with ease and regression test columns
Harish
authored
38ae4dc
Update RAD_DEVELOPMENT.md
Harish
authored
07e2fc0
Phase 6: Time-Stepping Integration - Documentation and RegTest

Copilot
and
hgopalan
authored
1b86314
Merge pull request #289 from hgopalan/copilot/phase-6-radiation-integration
Harish
authored
4d2279e
Fixed some minor issues
Harish
committed
d341482
Update RAD_DEVELOPMENT.md
Harish
authored
5368751
Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
ea1d86f
Enhance Phase 6 diagnostics handling and rules
Harish
authored
2eea47d
Revise Phase 6 diagnostics identity and prevention rules
Harish
authored
80c1701
Phase 7: TwoStream Runtime Diagnostics Controls - Core Implementation

Copilot
and
hgopalan
authored
f13a7cd
Apply remaining changes

Copilot
and
hgopalan
authored
41caf39
Delete Exec/CanonicalTests/Radiation/Phase6_TimeIntegration/__pycache__/check_timing_consistency.cpython-312.pyc
Harish
authored
aebaab3
Merge pull request #290 from hgopalan/copilot/erf-radiation
Harish
authored
493fc8e
Add file change
Harish
committed
a70e7eb
Phase 8: Complete benchmark suite implementation with metrics validation

Copilot
and
hgopalan
authored
ca07802
Phase 8: Complete benchmark suite with full testing and validation

Copilot
and
hgopalan
authored
bcb7caa
Apply remaining changes

Copilot
and
hgopalan
authored
07821fe
Merge pull request #291 from hgopalan/copilot/erf-radiation
Harish
authored
036110b

Commits on Aug 8, 2026

Phase 9: Add diagnostics dedup hardening and nonuniform dz support

Copilot
and
hgopalan
authored
e5f7781
Phase 9: Update documentation with Phase 9 scope and lessons learned

Copilot
and
hgopalan
authored
74264ae
Merge pull request #292 from hgopalan/copilot/phase-9-twostream-integration-polish
Harish
authored
ff53c42
Push some
Harish
committed
b19a55f
Fix
Harish
committed
c5f5709
docs(radiation): update roadmap with Phase 9 complete and SEB phases 17-20
Harish
committed
c0a981a
Phase 10 Step 1-4: Wire per-level dz(k) into vertical_two_stream_sweep function

Copilot
and
hgopalan
authored
e69093d
Phase 10 Step 6: Update documentation with implementation details

Copilot
and
hgopalan
authored
df5350b
Phase 10: Add TwoStream_NonuniformDZ test for nonuniform vertical spacing validation

Copilot
and
hgopalan
authored
d720f42
Register TwoStream_NonuniformDZ test in CTestList

Copilot
and
hgopalan
authored
d047ce4
Merge pull request #293 from hgopalan/copilot/phase-10-implementation
Harish
authored
a4243b9
Fix
Harish
committed
d8de167
Phase 11 Implementation: Surface Heterogeneity + Fallback for TwoStream Radiation

Copilot
and
hgopalan
authored
83103ef
Phase 11 Final: Complete surface heterogeneity implementation with comprehensive test infrastructure

Copilot
and
hgopalan
authored
473ca01
Phase 11 COMPLETE: All deliverables finalized

Copilot
and
hgopalan
authored
89e8d3b
Phase 11 FINAL COMMIT: Complete implementation with full documentation and verification guide

Copilot
and
hgopalan
authored
74cd57d
Merge pull request #294 from hgopalan/copilot/phase-11-homogeneous-surface-properties
Harish
authored
0ffe8c7
Fix
Harish
committed
09bf96d
Fix
Harish
committed
982fa6e
Fix
Harish
committed
c28a86f
Fix
Harish
committed
5f850e4
Phase 12: Add dynamic tau diagnosis functions and parameters

Copilot
and
hgopalan
authored
5fc8569
Phase 12: Complete implementation with test case and documentation

Copilot
and
hgopalan
authored
caddaad
Phase 12: Final documentation and deliverables summary

Copilot
and
hgopalan
authored
1cb8e98
Merge pull request #295 from hgopalan/copilot/phase-12-moisture-cloud-aware-tau
Harish
authored
1017cb3
Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
9308740
Fix the phase12 case
Harish
committed
a00a9af
Phase 13: Implement YSUNew radiative tendency limiter/smoothing with diagnostics

Copilot
and
hgopalan
authored
4d90d25
Phase 13: Complete YSUNew radiative tendency limiter implementation with regtest and documentation

Copilot
and
hgopalan
authored
b5e4e20
Merge pull request #296 from hgopalan/copilot/implement-ysunew-only-coupling
Harish
authored
8637e54
Fix the python script
Harish
committed
50e9f22
Phase 14: Add prognostic cloud fraction parameters and core diagnosis logic

Copilot
and
hgopalan
authored
868cc54
Phase 14: Add comprehensive documentation to RAD_DEVELOPMENT.md and RAD_MPI_SKILLS.md

Copilot
and
hgopalan
authored
fd30b42
Phase 14: Create regression test case and checker

Copilot
and
hgopalan
authored
5520522
Phase 14: Final summary document and completion checkpoint

Copilot
and
hgopalan
authored
a8967e2
Merge pull request #297 from hgopalan/copilot/implement-prognostic-cloud-fraction
Harish
authored
4afc7b9
Fix
Harish
committed
fa09460
Fix
Harish
committed
8c85442
Fix
Harish
committed
a5421b4
Phase 14A: Add member variables and allocate fallback MultiFabs, wire LSM field retrieval

Copilot
and
hgopalan
authored
499d0dc
Phase 14A: Add comprehensive documentation to RAD_DEVELOPMENT.md

Copilot
and
hgopalan
authored
d65de28
Phase 14A: Refactor LSM wiring code, remove unnecessary inline comments

Copilot
and
hgopalan
authored
85fbae4
Merge pull request #298 from hgopalan/copilot/phase-14a-wire-lsm-properties
Harish
authored
9291120
Critical fix: Add .resize(nlevs_max) for TwoStream MultiFab vectors in ERF_Constructors.cpp

Copilot
and
hgopalan
authored
e3b209f
Add TwoStream_ProgCloudFraction test configuration and CTestList entry

Copilot
and
hgopalan
authored
552e1a6
Update RAD_DEVELOPMENT.md and RAD_MPI_SKILLS.md with Phase 14B documentation

Copilot
and
hgopalan
authored
c9b3d96
Merge pull request #299 from hgopalan/copilot/fix-unresized-twostream-vectors
Harish
authored
60e7dcf

Commits on Aug 9, 2026

Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
e91c06d
Fix wrong file
Harish
committed
3fb91f6
Phase 15: Implement bulk aerosol/turbidity optical depth option

Copilot
and
hgopalan
authored
3798642
Add Phase 15 headers to Make.package

Copilot
and
hgopalan
authored
865b3cc
Merge pull request #300 from hgopalan/copilot/phase-15-bulk-aerosol-turbidity-option
Harish
authored
3bb650c
Height
Harish
committed
9afaa68
Fix Aerosol
Harish
committed
ff67264
Fix Aerosol
Harish
committed
5a47555
Fix Aerosol
Harish
committed
524a330

Commits on Aug 10, 2026

Phase 16: Add solar geometry module and integrate into radiation code

Copilot
and
hgopalan
authored
deabd68
Update roadmap: revise Phase 17-20 scope for SEB (MultiFab infra, diagnostic, prognostic, coupling safeguards); benchmark deferred
Harish
committed
56feb39
Phase 16: Add documentation and test infrastructure

Copilot
and
hgopalan
authored
15c6c6e
Phase 16: Add solar geometry header to Make.package build system

Copilot
and
hgopalan
authored
5ab564d
Merge branch 'ERF-Radiation' into copilot/phase16-time-varying-solar-geometry
Harish
authored
0de0c52
Merge pull request #301 from hgopalan/copilot/phase16-time-varying-solar-geometry
Harish
authored
586deef
Fix Solar Geometry and case setup
Harish
committed
40a326d
Phase 17: SEB MultiFab Infrastructure + Noah-MP Passthrough (Phase 16 cleanup included)

Copilot
and
hgopalan
authored
0d832c4
Merge pull request #302 from hgopalan/copilot/phase-16-cleanup
Harish
authored
d858628
Fix
Harish
committed
2751a1b
Phase 18: Simplified SEB Diagnostic Mode - complete implementation

Copilot
and
hgopalan
authored
4b02828
Merge pull request #303 from hgopalan/copilot/fix-input-sounding-bug
Harish
authored
d4b6c8b
Fix
Harish
committed
f519bb6
Fix
Harish
committed
f246670
Fix
Harish
committed
2ea9053
Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
cb2a72a
Phase 19a: Standardize SEB MultiFab ghost cells to 1 ghost cell in x/y

Copilot
and
hgopalan
authored
98f5aab
Merge pull request #304 from hgopalan/copilot/phase19a-standardize-seb-multifab-ghost-cells
Harish
authored
455083e
Part 1: Add prognostic SEB helper functions

Copilot
and
hgopalan
authored
b191ecb
Part 2: Add Phase 19b parameters to RadChoice

Copilot
and
hgopalan
authored
d44c083
Part 3: Integration of prognostic SEB update in radiation driver

Copilot
and
hgopalan
authored
4c35121
Part 5: Create Phase 19b RegTest directory with inputs and validation script

Copilot
and
hgopalan
authored
c685e0a
Add Phase 19b documentation to RAD_DEVELOPMENT.md and update roadmap

Copilot
and
hgopalan
authored
d695912
Merge pull request #305 from hgopalan/copilot/phase-19b-integrate-seb-residual
Harish
authored
3ba632b
Fix
Harish
committed
f567353
Fix
Harish
committed
498f50d
Fix
Harish
committed
369d881

Commits on Aug 11, 2026

Phase 20 implementation: SEB coupling safeguards and confirmed bugfixes

Copilot
and
hgopalan
authored
10ccf19
Merge pull request #306 from hgopalan/copilot/phase-20-seb-coupling-safeguards
Harish
authored
69d6671
Fix
Harish
committed
f7fc103
Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
16cae91

Commits on Aug 18, 2026

Plotfile
Harish
committed
45a63aa
Merge remote-tracking branch 'origin/development' into ERF-Radiation
Harish
committed
cb45999
Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
273ff85

Commits on Aug 20, 2026

Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
ae07497

Commits on Aug 22, 2026

Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
672e898

Commits on Aug 27, 2026

Merge remote-tracking branch 'origin/development' into ERF-Radiation
Harish
committed
164a090

Commits on Aug 28, 2026

Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
815655f

Commits on Sep 1, 2026

Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
637d7be
Clean up Phase N references from Radiation source code comments

Copilot
and
hgopalan
authored
114d3b3
Merge pull request #307 from hgopalan/copilot/erf-radiation
Harish
authored
f5e284e
Add master reference inputs file for two-stream radiation ParmParse parameters
Harish
committed
e99fa57
Fix ERF_TwoStreamSW.H: use gamma4 explicitly in diffuse SW source term to match documented Meador-Weaver formula (was previously computed but unused, with code silently relying on gamma3+gamma4=1 i…
Harish
committed
42d75d3
Fix
Harish
committed
dfe94a1
Add two-stream radiation documentation to Sphinx docs

Copilot
and
hgopalan
authored
df99d8a
Merge pull request #308 from hgopalan/copilot/erf-radiation-update-docs
Harish
authored
af17993
Final cleaup
Harish
committed
296f8f9
Delete unrequired
Harish
committed
04f9b83
Refactor radiation documentation index and references

Copilot
and
hgopalan
authored
7440b96
Add README files to test directories lacking documentation

Copilot
and
hgopalan
authored
96919ed
Fix remaining Phase6_TimeIntegration reference in PHASE_12_MANUAL_VERIFICATION.md

Copilot
and
hgopalan
authored
05e6e19
Merge remote-tracking branch 'origin/ERF-Radiation' into copilot/clean-up-canonical-tests

Copilot
and
hgopalan
authored
aed3fd8
Merge pull request #309 from hgopalan/copilot/clean-up-canonical-tests
Harish
authored
7db936f

Commits on Sep 3, 2026

Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
8ce980e
Fix two-stream radiation orientation, Exner temperature, plotfile output, and canonical cases

Harish
and
claude
committed
24513ba
Merge pull request #325 from hgopalan/fix/twostream-orientation-exner
Harish
authored
e2e35f7
Wire two-stream radiation into unit and regression tests; re-apply reflected LW surface term

Harish
and
claude
committed
694a7f8
Merge pull request #327 from hgopalan/twostream-tests
Harish
authored
a2273f8
Clean up the two-stream radiation driver

Harish
and
claude
committed
c8395ac
Merge pull request #329 from hgopalan/twostream-cleanup
Harish
authored
fe85438
Two-stream SW adding method with surface albedo; honest diagnostics columns

Harish
and
claude
committed
71c9e0a
Merge pull request #332 from hgopalan/twostream-sw-adding
Harish
authored
3051867
Two-stream: store theta tendencies (Exner) and use a device-safe parameter struct

Harish
and
claude
committed
0b548bf
Merge pull request #333 from hgopalan/twostream-exner-gpu
Harish
authored
1bc02e6
Two-stream: mass-based gray LW, diffuse albedo, Earth-Sun distance; retire isothermal_test

Harish
and
claude
committed
05a5c49
Merge pull request #335 from hgopalan/twostream-lw-mass
Harish
authored
bb5f54f
Two-stream: mass-based optical depth model (tau_model = mass), backward compatible

Harish
and
claude
committed
b1444b3
Merge pull request #336 from hgopalan/twostream-tau-mass
Harish
authored
b24cbed

Commits on Sep 4, 2026

Merge branch 'development' into ERF-Radiation
AMLattanzi
authored
ec86a18

Commits on Sep 5, 2026

Merge branch 'erf-model:development' into ERF-Radiation
Harish
authored
3b912ea
Two-stream radiation: fix portability build breaks and the column sweep's box handling

Harish
and
claude
committed
22befba

Commits on Sep 9, 2026

Two-stream radiation: professional comments, and reject silently-ignored inputs

Harish
and
claude
committed
43c9406
Two-stream radiation: keep the input validation inside the two-stream config

Harish
and
claude
committed
45dd0e1
Merge branch 'development' into ERF-Radiation
Harish
authored
7efd6fc
Two-stream radiation: report bad input instead of aborting on it

Harish
and
claude
committed
5185636
Add a two-stream / RRTMGP cost comparison case, and profile both solvers

Harish
and
claude
committed
3f164ec

Commits on Sep 10, 2026

Fix the CUDA build of the two-stream sweep, and clear the build warnings

Harish
and
claude
committed
6b6f8e0
Run both halves of the SEB diagnostic A/B pair for the same duration

Harish
and
claude
committed
b940fb4

Commits on Sep 11, 2026

Merge branch 'development' into ERF-Radiation
asalmgren
authored
2242830
Merge branch 'development' into ERF-Radiation
asalmgren
authored
c357c66
Restore the HOL_abs declaration the development merge dropped from MRF

Harish
and
claude
committed
af9f0ff
Two-stream SEB: step by dt, sweep once per step, checkpoint the surface state

Harish
and
claude
committed
0d46a03
Two-stream radiation: close the remaining audit items

Harish
and
claude
committed
5da37e8

Commits on Sep 12, 2026

Merge branch 'development' into ERF-Radiation
asalmgren
authored
a6dbe9a

Commits on Sep 13, 2026

Merge remote-tracking branch 'upstream/development' into ERF-Radiation
Harish
committed
d7ffbf5
Two-stream radiation: post-merge fixes, notes out of the tree, phase wording

Harish
and
claude
committed
01fddb6
TerrainFineColumns gtest: keep the CUDA build from odr-using a namespace constexpr

Harish
and
claude
committed
be37033
Two-stream radiation: move the model into a TwoStreamRadiation class

Harish
and
claude
committed
35d70e6
Radiation cases: untrack the remaining run outputs, ignore the data logs

Harish
and
claude
committed
ea92580
SEB case READMEs: drop the implementation summaries

Harish
and
claude
committed
549adbd
Two-stream radiation: address the review of 13 September

Harish
and
claude
committed
5efc5eb
Two-stream radiation: refuse a non-positive state, not only a non-finite one

Harish
and
claude
committed
936cad1
Merge branch 'development' into ERF-Radiation
asalmgren
authored
ba36b3a
Two-stream radiation: select it with erf.radiation_model, drop erf.radiation_type

Harish
and
claude
committed
3eb26c6
Merge remote-tracking branch 'origin/ERF-Radiation' into ERF-Radiation
Harish
committed
e2a67ad

Commits on Sep 14, 2026

Docs: state that the two-stream model runs every slow step by design

Harish
and
claude
committed
c1b921c
Two-stream radiation: review follow-ups on inputs, diagnostics and tree hygiene

asalmgren
and
claude
committed
0dedea7
Merge branch 'development' into ERF-Radiation

asalmgren
and
claude
committed
9b0e797
Merge remote-tracking branch 'prfork/ERF-Radiation' into pr3950
asalmgren
committed
7ff1672
Theory page: the diagnostics Limitations bullet follows the new default

asalmgren
and
claude
committed
bee7f94