fixed restart non-reproducing issue 2588 when using MERRA2 climatology + Add output of ocean scalar variables for quick diagnostics #2632 + Fix CICD Jenkinsfile change default RT suite to full #2628

[AnningCheng-NOAA]

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:

Commit Message:

* UFSWM - Add output of diagnostic ocean scalar variables: diag_table_cpld_sfs.IN
* UFSWM - Jenkinsfile update
  * FV3 - 
    * ccpp-physics -  a few of lines of code modified in aerinterp.F90

Priority:

• Critical Bugfix: fixes failure to restart-reproduce if using a restart from 15th of month #2588

Git Tracking

UFSWM:

• Fixes failure to restart-reproduce if using a restart from 15th of month #2588

Sub component Pull Requests:

• FV3: Fix restart-reproduce if using a restart from 15th of month using MERRA2 climatology NOAA-EMC/fv3atm#933
  • CCPP: fixed restart not producing issue 2588 using MERRA2 climatology ccpp-physics#256

UFSWM Blocking Dependencies:

• None

---

Changes

Regression Test Changes (Please commit test_changes.list):

• No Baseline Changes.

Input data Changes:

• None.

Library Changes/Upgrades:

• No Updates

---

Testing Log:

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

[DeniseWorthen]

@AnningCheng-NOAA Thanks for the fix! I've confirmed also that your fix passes the restart tests at day 15, hour 00 in my reproducer branch.

[DeniseWorthen]

@jkbk2004 This is a critical bug fix.

[jkbk2004]

@jkbk2004 This is a critical bug fix.

Sure! If possible, I like to schedule today with some other no baseline change PRs.

[jkbk2004]

@AnningCheng-NOAA can you sync up branches?

[AnningCheng-NOAA]

@jong Kim - NOAA Affiliate ***@***.***> done.

…

On Tue, Mar 4, 2025 at 4:32 PM JONG KIM ***@***.***> wrote: @AnningCheng-NOAA <https://github.com/AnningCheng-NOAA> can you sync up branches? — Reply to this email directly, view it on GitHub <#2625 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ALQPMIMJU7WKTURIFC2HMV32SYLXLAVCNFSM6AAAAABX775SQGVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDMOJYHE4DAMZTGI> . You are receiving this because you were mentioned.Message ID: ***@***.***> [image: jkbk2004]*jkbk2004* left a comment (ufs-community/ufs-weather-model#2625) <#2625 (comment)> @AnningCheng-NOAA <https://github.com/AnningCheng-NOAA> can you sync up branches? — Reply to this email directly, view it on GitHub <#2625 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/ALQPMIMJU7WKTURIFC2HMV32SYLXLAVCNFSM6AAAAABX775SQGVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDMOJYHE4DAMZTGI> . You are receiving this because you were mentioned.Message ID: ***@***.***>

[jkbk2004]

@sanAkel I combined #2632 to this pr.

[sanAkel]

@sanAkel I combined #2632 to this pr.

Thanks @jkbk2004

[jkbk2004]

@AnningCheng-NOAA can you sync up branches one more time? We can start working on this pr.

[DeniseWorthen]

@jkbk2004 Please be sure to commit a clean test change list for this PR. I see you posted the log, but Anning's branch still shows the previous list I believe.

[jkbk2004]

@BrianCurtis-NOAA skip acorn for this pr?

[BrianCurtis-NOAA]

@BrianCurtis-NOAA skip acorn for this pr?

Nope, Acorn almost finished.

[jkbk2004]

OK! we can start merging.