Repository navigation
Merge develop into release/MAPL-v3 - #1536
Merged
Merged
Conversation
…alling routine, Zero-Diff for stock config
…ons outside of MoistGC
…ute_gnu_intel Bugfix: stabilize GEOSldas offline route restart comparisons
…feature/sdrabenh/Dev_v11p
…feature/sdrabenh/Dev_v11p
Updates for v12 configuration
…ctivity-datm bugfix: Skip a connection in GCM when DataAtmosphere is running
… reduce supercooled QL over ice/snow surfaces
V12 tuning and GWD updates
…-divisions Guard zero divisions in gravity wave fixers and Obukhov length
Hand-merge GEOS-CAM_v12 into feature/sdrabenh/v11.11.0-rc5
Updates for new GCM v11.11.0 Release
…srcterm Make direct ESMF regridding deterministic
Fixes for Datmodyn
Resolve 176 conflicts, keeping the MAPL3 ports on our side and hand-applying develop's science deltas on top. GEOSgwd_GridComp: - Port develop's GWD updates onto the MAPL3 rewrite: frontal/katabatic background forcing (NCAR_ET_FAC_DTDTM, NCAR_ET_FAC_WS300, NCAR_BKG_TAU), sigma-scaled NCAR_HR_CF and NCAR_QBO_HDEPTH_SCALING, directional momentum and energy flux diagnostics, and the HT_mi/HT_dc/CNV_FRC/WSPD_STABLE300M import set replacing DQLDT/DQIDT/DQCDT_LS/DTDT_DC. - Fix uninitialized use_threads in SetServices. - Correct develop's gw_intr_ncar argument order at positions 51-56; develop passes the taugw/fegw/fepgw east-west pairs grouped by direction, which mis-binds six of the eight intent(out) diagnostics. - Keep the gw_convect.F90 allocate workaround from 440aa6a. GEOS_SuperdynGridComp: port c1edf91 and 1740620 (WSPD_STABLE300M export). Larger trees that have not been ported to MAPL3 (pyMoist, GEOSroute, moist, makebcs) take develop wholesale; Process_Library.F90 and GEOS_TurbulenceGridComp.F90 keep their ESMF_Attribute to ESMF_Info conversions.
Pad the NAME column in the IMPORT and EXPORT tables so the pipe separators line up now that WSPD_STABLE300M and the *_EXP aliases have widened the longest entries. Whitespace only; no spec changes.
The NCAR GWD science update renamed import DTDT_DC to HT_dc, added HT_mi and WSPD_STABLE300M, and dropped DQLDT/DQIDT, while the S3 regression data still predates it. Rework the case so it runs and compares against the existing baselines: - Connect DataGwdImports DTDT_DC to GWD HT_dc, and synthesize HT_mi and WSPD_STABLE300M as zero-filled exports since the restart has no such fields. Drop the now-unused DQLDT/DQIDT internals. - Rename HT_dc back to DTDT_DC in the generated import checkpoint before comparing, so the field is checked value-for-value instead of excluded. The read-only baseline is left untouched. - Stage a symlink-only baseline directory to keep GWD_export.nc out of compare_results()' glob; its new diagnostics and shifted values cannot match until the baselines are regenerated. GWD_import.nc and GWD_internal.nc now compare clean.
pchakraborty
added
0 diff
mathomp4
approved these changes
Oct 5, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📝 Merge
develop→release/MAPL-v3Description
Brings
origin/developinto the MAPL-v3 line and fixes up the GWD regressiontest for the science changes that came with it.
Merge
origin/develop(through Fixes for Datmodyn #1534, "Fixes for Datmodyn") intorelease/MAPL-v3.GWD regression (
gwd-ncar-sa)The NCAR GWD update renamed import
DTDT_DCtoHT_dc, addedHT_miandWSPD_STABLE300M, and droppedDQLDT/DQIDT, while the S3 regression datastill predates it. The case was reworked so it runs and compares against the
existing baselines:
DataGwdImportsDTDT_DCto GWDHT_dc, and synthesizeHT_miand
WSPD_STABLE300Mas zero-filled exports since the restart has no suchfields. Drop the now-unused
DQLDT/DQIDTinternals.HT_dcback toDTDT_DCin the generated import checkpoint beforecomparing, so the field is checked value-for-value instead of excluded. The
read-only baseline is left untouched.
GWD_export.ncout ofcompare_results()' glob; its new diagnostics and shifted values cannotmatch until the baselines are regenerated.
GWD_StateSpecs.rcIMPORT/EXPORT table columns (whitespaceonly).
GWD_import.ncandGWD_internal.nccompare clean;gwd-ncar-sapasses.Follow-ups
access), then drop the
GWD_export.ncexclusion and thencrenameshim.