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.

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

update CMEPS #2352

Merged
merged 17 commits into from
Jul 26, 2024
Merged

Conversation

DeniseWorthen
Copy link
Collaborator

@DeniseWorthen DeniseWorthen commented Jul 1, 2024

Commit Queue Requirements:

  • Fill out all sections of this template.
  • All sub component pull requests have been reviewed by their code managers.
  • Run the full Intel+GNU RT suite (compared to current baselines) on either Hera/Derecho/Hercules
  • Commit 'test_changes.list' from previous step

Description:

Update CMEPS for recent commits at ESCOMP/main. This adds the capability w/in CMEPS to run the ATM and LND on different grids for CESM. This would require additional development w/in the NoahMP LND component for UFS. Additional changes involve components unused by UFS at this time (rof, runoff and glc, land ice).

Commit Message:

  * CMEPS - Sync CMEPS with ESCOMP/main. 

Priority:

  • Normal

Git Tracking

UFSWM:

Sub component Pull Requests:

UFSWM Blocking Dependencies:

  • None

Changes

Regression Test Changes (Please commit test_changes.list):

  • PR Updates/Changes Baselines.

The mediator history files now contain an additional field (atmFrac_lfrin) which causes any file written by the mediator (restarts and/or history files) to fail comparison. Spot checking the failed files below show they are B4B other than the additional field. The following dropdown lists the only files which fail comparison for the full RT. All are either mediator restarts or mediator history files.

File list
rt_atm_ds2s_docn_pcice_intel.log:61: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_atmwav_control_noaero_p8_intel.log:41: Comparing RESTART/ufs.atmw.cpl.r.2021-03-22-64800.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_2threads_p8_intel.log:52: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_bmark_p8_intel.log:47: Comparing RESTART/ufs.cpld.cpl.r.2013-04-01-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_c192_p8_intel.log:52: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_c48_intel.log:51: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_ciceC_p8_intel.log:64: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_gfsv17_intel.log:63: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_noaero_p8_agrid_intel.log:63: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_noaero_p8_intel.log:63: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_nowave_noaero_p8_gnu.log:63: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_nowave_noaero_p8_intel.log:63: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_p8_faster_intel.log:64: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_p8_intel.log:64: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_p8_mixedmode_intel.log:64: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_p8.v2.sfc_intel.log:64: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_pdlib_p8_gnu.log:63: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_pdlib_p8_intel.log:63: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_control_qr_p8_intel.log:64: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_debug_gfsv17_intel.log:51: Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_debug_noaero_p8_intel.log:51: Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_debug_p8_intel.log:52: Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_debug_pdlib_p8_intel.log:51: Comparing RESTART/ufs.cpld.cpl.r.2021-03-22-32400.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_decomp_p8_intel.log:52: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_mpi_gfsv17_intel.log:63: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_mpi_p8_intel.log:52: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_s2sa_p8_intel.log:52: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_cpld_warmstart_c48_intel.log:51: Comparing RESTART/ufs.cpld.cpl.r.2021-03-23-43200.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_3072x1536_cfsr_intel.log:7: Comparing RESTART/DATM_CFSR3072x1536.cpl.r.2011-10-02-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_bulk_cfsr_intel.log:7: Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_bulk_gefs_intel.log:7: Comparing RESTART/DATM_GEFS_NEW.cpl.r.2011-10-02-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_ciceC_cfsr_intel.log:7: Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_control_cfsr_faster_intel.log:7: Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_control_cfsr_gnu.log:7: Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_control_cfsr_intel.log:7: Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_control_gefs_intel.log:7: Comparing RESTART/DATM_GEFS_NEW.cpl.r.2011-10-02-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_debug_cfsr_intel.log:7: Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_gfs_intel.log:7: Comparing RESTART/DATM_GFS.cpl.r.2021-03-23-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_iau_gefs_intel.log:7: Comparing RESTART/DATM_GEFS_NEW.cpl.r.2011-10-02-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_multiple_files_cfsr_intel.log:5: Comparing RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_mx025_cfsr_intel.log:10: Comparing RESTART/DATM_CFSR.cpl.r.2011-10-01-43200.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_mx025_gefs_intel.log:10: Comparing RESTART/DATM_GEFS_NEW.cpl.r.2011-10-01-43200.nc .....USING NCCMP......NOT IDENTICAL
rt_datm_cdeps_stochy_gefs_intel.log:7: Comparing RESTART/DATM_GEFS_NEW.cpl.r.2011-10-02-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_hafs_regional_atm_ocn_intel.log:9: Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_hafs_regional_atm_ocn_intel.log:10: Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_hafs_regional_atm_ocn_wav_intel.log:12: Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_hafs_regional_atm_wav_intel.log:10: Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_hafs_regional_datm_cdeps_intel.log:5: Comparing ufs.hafs.cpl.hi.2019-08-30-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_hafs_regional_datm_cdeps_intel.log:6: Comparing ufs.hafs.cpl.r.2019-08-30-00000.nc .....USING NCCMP......NOT IDENTICAL
rt_hafs_regional_docn_intel.log:7: Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_hafs_regional_docn_intel.log:8: Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_hafs_regional_docn_oisst_intel.log:7: Comparing ufs.hafs.cpl.hi.2019-08-29-21600.nc .....USING NCCMP......NOT IDENTICAL
rt_hafs_regional_docn_oisst_intel.log:8: Comparing ufs.hafs.cpl.r.2019-08-29-21600.nc .....USING NCCMP......NOT IDENTICAL

Input data Changes:

  • None.

Library Changes/Upgrades:

  • No Updates

Testing Log:

  • RDHPCS
    • Hera
    • Orion
    • Hercules
    • Jet
    • Gaea
    • Derecho
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
  • opnReqTest (complete task if unnecessary)

@DeniseWorthen DeniseWorthen added the Baseline Updates Current baselines will be updated. label Jul 2, 2024
@FernandoAndrade-NOAA
Copy link
Collaborator

#2354 has been merged, please go ahead and sync with develop so we can begin testing, thank you.

@FernandoAndrade-NOAA FernandoAndrade-NOAA added the Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. label Jul 24, 2024
@FernandoAndrade-NOAA
Copy link
Collaborator

@BrianCurtis-NOAA @zach1221 getting started with testing for this PR.

dpsarmie
dpsarmie previously approved these changes Jul 24, 2024
@zach1221 zach1221 added jenkins-ort run ORT testing and removed jenkins-ort run ORT testing labels Jul 24, 2024
@FernandoAndrade-NOAA
Copy link
Collaborator

Several tests timed out on Hera and Gaea during baseline recreation, rerunning.
Hera

cpld_debug_pdlib_p8_gnu

Gaea

cpld_control_gfsv17 intel
cpld_control_c192_p8 intel
cpld_bmark_p8 intel
hafs_regional_atm_wav intel

@FernandoAndrade-NOAA
Copy link
Collaborator

Hera's regional_atmaq_debug intel timed out, rerunning.

@FernandoAndrade-NOAA
Copy link
Collaborator

FernandoAndrade-NOAA commented Jul 25, 2024

regional_atmaq_debug_intel timed out again on Hera during runtime. Compile seems fine

/scratch1/NCEPDEV/stmp2/Fernando.Andrade-maldonado/FV3_RT/rt_836500/

@DeniseWorthen
Copy link
Collaborator Author

ATMAQ does not use CMEPS, so the time outs are not related to this PR.

@FernandoAndrade-NOAA
Copy link
Collaborator

Another failure after increasing the time limit to 1hr, I will be disabling the test on Hera and creating a git issue.

@FernandoAndrade-NOAA
Copy link
Collaborator

#2377 Issue created.

@zach1221 zach1221 merged commit e6ec3d1 into ufs-community:develop Jul 26, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Baseline Updates Current baselines will be updated. Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Sync CMEPS with ESCOMP repository; add trigrid capability
6 participants