Skip to content
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

Jump to bottom

UFS-dev PR#139 #123

Merged
merged 12 commits into from
Mar 12, 2024
Merged

UFS-dev PR#139 #123

merged 12 commits into from
Mar 12, 2024

Conversation

grantfirl
Copy link
Collaborator

@grantfirl grantfirl commented Feb 6, 2024 •
edited
Loading

Identical to ufs-community#2044 (BL change expected -- see below for which tests change)

Also contains:
ufs-community#1784 (no BL change)
ufs-community#2021 (no BL change)
ufs-community#1979 (BL change and new input) - cpld_control_c48_intel
ufs-community#2010 (BL change -- see below)
ufs-community#2009 (BL change) - cpld_s2sa_p8
ufs-community#1836 (no BL change)
ufs-community#2041 (no BL change)

ulmononian and others added 11 commits December 4, 2023 13:32
@ulmononian
Add support for Gaea C5 (includes PR ufs-community#1977: new ccpp SDF…
f42e347 
…s added to support RRFS multiphysics ensemble and add tob in ocean output)(Includes PR ufs-community#1997) (ufs-community#1784)

* Reinstate all the c5 changes that I botched with my git ignorance.

* Update ufs_common. Upate c5 modulefile.

* TPN adjustments for C5 regional_atmaq tests.

* Remove set -eu from module-setup.sh

* Update rt.sh adding new DISKNM for Gaea_C5

* updates for gaea-c5 modulefiles, scripts

* Update rt.conf fix gaea machine name
@DusanJovic-NOAA
Create 'coupler.res' log file in write grid comp. Explicitly specify …
1f7dd77 
…chunk sizes in restart files (ufs-community#2021)

* Acorn RT Log, failure due to Acorn queue limits, not system or code issue

* revert change in cpld_debug_p8 and increase wlclk for cpld_debug_pdlib_p8/jet
@JessicaMeixner-NOAA
Update MOM6 templates for coordination with global-workflow updates (u…
5be4f33 
…fs-community#1979)

* Update MOM templates to be in sync with recent additions to g-w
and update 5 deg template to be in line with g-w and OM4 settings

* Revert manual copying of file now that new file is in input directory
@DeniseWorthen
add component defaults, rename templates to .in, rename ufs.configure…
fb8792b 
… for application, cleanup tests (ufs-community#2010)

* additional template variables for CICE namelist

* rename templates, add component level defaults

* clean up unnecessary quotes in tests

* add cmeps restart directory variable

* add MOM6 variables to some standalone tests

* add missing mom6 variables for two restart tests
@NickSzapiro-NOAA
Add atm+ocean+ice+aerosols S2SA regression test (cpld_s2sa_p8) (ufs-c…
766ae99 
…ommunity#2009)

* Add cpld_s2sa_p8 regression test

* Reduce output in cpld_s2sa_p8
@mark-a-potts
Add Derecho to supported platforms (ufs-community#1836)
10635ef 
UFS:
- Remove Cheyenne (retiring UCAR HPC) support.
- Add UCAR's new Derecho HPC system to supported Tier 1 Platforms.
@SamuelTrahanNOAA
bug fix: disable concurrency in GFS_phys_time_vary_init NetCDF calls…
1d90c04 
… AND ufs-community#2040 and ufs-community#2043 (ufs-community#2041)

General clean-up, and CCPP concurrency bug fixes

1. Remove nfhout, nfhmax_hf, nfhout_hf and nsout from fv3atm and the regression tests. ( Remove nfhout, nfhmax_hf,  nfhout_hf etc configuration parameters NOAA-EMC/fv3atm#731 )
2. Add comments to smc pert and fix bug in stc pert ( Fix bugs in soil temperature perturbation ufs-community#2042 )
3. Disable concurrency in NetCDF calls within CCPP GFS_phys_time_vary_init subroutine to avoid crashes
@SamuelTrahanNOAA
CLM Lake pressure is not density and GFS Diagnostics: weasdi is not s…
991d652 
…nodi + ufs-community#2047, ufs-community#2053, and ufs-community#2056 (ufs-community#2044)

FV3 diagnostic fixes, CCPP fixes for model crashes, new PR template

- UFS:
    - commit message in PR template (ufs-community#2053)
    - fix hercules crashes (ufs-community#2015)
- CMEPS & FV3: Bad data from in CCPP CLM Lake physics scheme caused model crashes
    - Communicate changes to lake ice (Closes ufs-community#2055, NOAA-EMC/CMEPS#105, NOAA-EMC/fv3atm#741) 
    - unit mismatch (NOAA-EMC/fv3atm#736)
- FV3: correct errors in diagnostic calculations
    - snodi had weasdi data in it (NOAA-EMC/fv3atm#736)
    - revisions to RUC LSM snowfall melting and accumulation (NOAA-EMC/fv3atm#739)
@grantfirl
Merge commit '991d6527da22d11016df035998ec1352d0449875' into ufs-dev-…
be4b4df 
…PR139
@grantfirl
Merge branch 'main' into ufs-dev-PR139
db440d4
@grantfirl
use NCAR-main versions of auto RT scripts
0ff59c6
@grantfirl
Copy link
Collaborator Author

Tests expected to change for 2044:

COMPILE | rrfs | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta,FV3_RRFS_v1nssl -D32BIT=ON | | fv3 |
RUN | hrrr_control | - noaacloud | baseline |
RUN | hrrr_control_decomp | - noaacloud | |
RUN | hrrr_control_2threads | - noaacloud | |
RUN | hrrr_control_restart | - noaacloud | | hrrr_control
COMPILE | atm_debug_dyn32 | intel | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta,FV3_HRRR_c3,FV3_HRRR_gf,FV3_global_nest_v1 | - noaacloud | fv3 |
RUN | hrrr_control_debug | - noaacloud | baseline |
RUN | hrrr_gf_debug | - noaacloud | baseline |
RUN | hrrr_c3_debug | - noaacloud | baseline |
RUN | rap_clm_lake_debug | - noaacloud | baseline |
COMPILE | rrfs_dyn32_phy32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | - noaacloud | fv3 |
RUN | hrrr_control_dyn32_phy32 | - noaacloud | baseline |
RUN | hrrr_control_2threads_dyn32_phy32 | - derecho noaacloud | |
RUN | hrrr_control_decomp_dyn32_phy32 | - noaacloud | |
RUN | hrrr_control_restart_dyn32_phy32 | - noaacloud | | hrrr_control_dyn32_phy32
COMPILE | rrfs_dyn32_phy32_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR,FV3_HRRR_gf -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | - noaacloud | fv3 |
RUN | hrrr_control_debug_dyn32_phy32 | - noaacloud | baseline |
COMPILE | rrfs | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_RAP_sfcdiff,FV3_HRRR,FV3_RRFS_v1beta -D32BIT=ON | + hera hercules | fv3 |
RUN | hrrr_control | + hera hercules | baseline |
RUN | hrrr_control_noqr | + hera hercules | |
RUN | hrrr_control_2threads | + hera hercules | |
RUN | hrrr_control_decomp | + hera hercules | |
RUN | hrrr_control_restart | + hera hercules | | hrrr_control
RUN | hrrr_control_restart_noqr | + hera hercules | | hrrr_control_noqr
COMPILE | atm_dyn32_debug | gnu | -DAPP=ATM -D32BIT=ON -DDEBUG=ON | + hera hercules | fv3 |
RUN | hrrr_control_debug | + hera hercules | baseline |
RUN | hrrr_gf_debug | + hera hercules | baseline |
RUN | hrrr_c3_debug | + hera hercules | baseline |
RUN | rap_clm_lake_debug | + hera hercules | baseline |
COMPILE | rrfs_dyn32_phy32 | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_RAP,FV3_HRRR -D32BIT=ON -DCCPP_32BIT=ON | + hera hercules | fv3 |
RUN | hrrr_control_dyn32_phy32 | + hera hercules | baseline |
RUN | hrrr_control_2threads_dyn32_phy32 | + hera hercules | |
RUN | hrrr_control_decomp_dyn32_phy32 | + hera hercules | |
RUN | hrrr_control_restart_dyn32_phy32 | + hera hercules | | hrrr_control_dyn32_phy32
COMPILE | atm_dyn32_phy32_debug | gnu | -DAPP=ATM -D32BIT=ON -DCCPP_32BIT=ON -DDEBUG=ON | + hera hercules | fv3 |
RUN | hrrr_control_debug_dyn32_phy32 | + hera hercules | baseline |

@grantfirl
Copy link
Collaborator Author

RT failures expected for 2010:

7831:FAILED TESTS:
7832:147 hafs_regional_docn_intel failed in check_result
7833:hafs_regional_docn_intel 147 failed in run_test
7834:148 hafs_regional_docn_oisst_intel failed in check_result
7835:hafs_regional_docn_oisst_intel 148 failed in run_test
7836:149 hafs_regional_datm_cdeps_intel failed in check_result
7837:hafs_regional_datm_cdeps_intel 149 failed in run_test

@grantfirl grantfirl marked this pull request as ready for review March 11, 2024 17:56
mkavulich
mkavulich approved these changes Mar 11, 2024
View reviewed changes
Copy link
Collaborator

@mkavulich mkavulich left a comment

Choose a reason for hiding this comment

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

That's a long list of files changed! I gave it a quick glance and nothing seemed awry, but I did not scrutinize every test file change.

@grantfirl
Copy link
Collaborator Author

Yes, it's a surprising number of file changes. Several of the preceding PRs (non-CCPP ones) changed 50+ files each. Some of it is related to machine support changes and there was one that "cleaned up" the test files, of which there are on the order of ~100.

@grantfirl grantfirl merged commit 75c1d26 into NCAR:main Mar 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mkavulich mkavulich mkavulich approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@grantfirl @mkavulich @ulmononian @DusanJovic-NOAA @JessicaMeixner-NOAA @DeniseWorthen @NickSzapiro-NOAA @mark-a-potts @SamuelTrahanNOAA