Skip to content

NCAR/main sync#328

Merged
rhaesung merged 66 commits intoufs-community:ufs/devfrom
grantfirl:NCAR_sync_20251112
Dec 22, 2025
Merged

NCAR/main sync#328
rhaesung merged 66 commits intoufs-community:ufs/devfrom
grantfirl:NCAR_sync_20251112

Conversation

@grantfirl
Copy link
Collaborator

@grantfirl grantfirl commented Nov 12, 2025

Description of Changes:

This PR updates ufs/dev from the NCAR/main branch. Major changes are as follows:

  • Updates/simplifies logic from changes in Replace icplocn2atm (integer) with use_oceanuv (logical) #307 in satmedmfvdifq, sfc_diag, sfc_diff, sfc_nst, sfc_ocean (reviewer request upon inclusion into NCAR/main)
  • Updates GFS_phys_time_vary.scm.F90 to match FV3 version changes (accumulated changes from several PRs were brought in)
  • Updates CMakeLists.txt to delineate between RRTMGPRTE source files and OPENMP source files to enable (potentially) different compilation flags for each set (see Hotfix: Fix CMakeLists.txt for RRTMGP NCAR/ccpp-physics#1172)
  • Updates changes from Cloud cover parameter changes for GFSv17 #325 to make the parameter changes configurable via namelist (see Combined UFS-dev PR325 and UFS-dev PR326 NCAR/ccpp-physics#1171). This was requested during inclusion into NCAR/main. This adds xr_con and xr_exp as tunable parameters for Xu-Randall-based cloud fraction algorithms. Logic was added to GFS_typedefs to set these appropriately (as done in radiation_clouds.F). No baseline changes are expected from this change.
  • Minor changes from NRL (see Minor cleanup from NRL NCAR/ccpp-physics#1160) - these changes results in a UFS RT baseline change in the hafs_regional_atm_thompson_gfdlsf_intel test
  • Additional changes from NRL:
    -- removed some openmp commands from radiation_aerosols.F to fix a reproducibility issue when changing number of threads in NEPTUNE (this leads to MANY UFS RT baseline changes; see Combination of #1175 and #1176 NCAR/ccpp-physics#1178 for details; failing tests can be made to pass by only turning back on the openmp changes in radiation_aerosols.f)
    -- added number_of_diagnostic_buckets as an additional array dimension for 2 diagnostic variables to allow for more than one bucket-emptying period

Tests Conducted:

UFS RTs

Dependencies:

None

Documentation:

None

Contributors (optional):

@matusmartini @climbfuji

matusmartini and others added 30 commits September 11, 2025 17:57
because the use of type(MPI_COMM) is not protected by #ifdef MPI.
…e-change

Updating template for ufsatm name change
Co-authored-by: Dom Heinzeller <dom.heinzeller@icloud.com>
Co-authored-by: Dom Heinzeller <dom.heinzeller@icloud.com>
Copy link
Collaborator

@XuLi-NOAA XuLi-NOAA left a comment

Choose a reason for hiding this comment

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

It is fine to me.

@gspetro-NOAA
Copy link

Testing concluded successfully on WM parent PR 2998; this PR can be merged.

@rhaesung rhaesung merged commit ac63f31 into ufs-community:ufs/dev Dec 22, 2025
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.