CLM Lake pressure is not density and GFS Diagnostics: weasdi is not snodi + #2047, #2053, and #2056 by SamuelTrahanNOAA · Pull Request #2044 · ufs-community/ufs-weather-model

SamuelTrahanNOAA · 2023-12-15T21:25:38Z

PR Author Checklist:

I have linked PR's from all sub-components involved in section below.
I am confirming reviews are completed in ALL sub-component PR's.
I have run the full RT suite on either Hera/Hercules AND have attached the log to this PR below this line:
- LOG: Hera log is committed to branch.
I have added the list of all failed regression tests to "Anticipated changes" section.
I have filled out all sections of the template.

Description

PRs #2047, #2053, and #2056 are combined into this one.

Fixes two bugs:

CLM Lake was using near-surface pressure in place of near-surface density.
GFS_diagnostics was outputting weasdi (water equivalent snow depth over ice) in place of snodi (snow depth over ice)

Fixes are from @tanyasmirnova

Commit Message

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

- UFS:
    - commit message in PR template (#2053)
    - fix hercules crashes (#2015)
- CMEPS & FV3: Bad data from in CCPP CLM Lake physics scheme caused model crashes
    - Communicate changes to lake ice (Closes #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)

Linked Issues and Pull Requests

Associated UFSWM Issue to close

Due to combining #2056:

fixes crash when running GFS PBL/sfclay and clm lake in RRFS ensemble #2055

Subcomponent Pull Requests

Blocking Dependencies

None

Subcomponents involved:

Anticipated Changes

Input data

No changes are expected to input data.

Regression Tests:

Changes are expected to the following tests:

All tests with "hrrr" or "clm_lake" in their name.

List of tests in rt.conf format

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 |

Libraries

Not Needed

Code Managers Log

This PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR.
Move new/updated input data on RDHPCS Hera and propagate input data changes to all supported systems.
- N/A

Testing Log:

RDHPCS
- Hera
- Orion
- Hercules
- Jet
- Gaea
- Derecho
WCOSS2
- Dogwood/Cactus
- Acorn
CI
- Completed
opnReqTest
- N/A
- Log attached to comment

SamuelTrahanNOAA · 2023-12-18T18:35:06Z

@jkbk2004 @FernandoAndrade-NOAA - I'd like to combine PR #2047 into this one. The RRFS model needs them urgently. They're both small tweaks to RRFS physics code, which change answers for (mostly) RRFS physics variants.

jkbk2004 · 2023-12-18T18:46:09Z

@jkbk2004 @FernandoAndrade-NOAA - I'd like to combine PR #2047 into this one. The RRFS model needs them urgently. They're both small tweaks to RRFS physics code, which change answers for (mostly) RRFS physics variants.

Sure! I updated the queue table to work on this pr after #2041.

SamuelTrahanNOAA · 2023-12-18T19:11:26Z

@jkbk2004 @FernandoAndrade-NOAA - I'd like to combine PR #2047 into this one. The RRFS model needs them urgently. They're both small tweaks to RRFS physics code, which change answers for (mostly) RRFS physics variants.

Sure! I updated the queue table to work on this pr after #2041.

I'll wait until tomorrow to merge #2047 into this PR. That'll give more time for people to look at the PRs independently.

SamuelTrahanNOAA · 2023-12-19T20:58:19Z

I am waiting to hear back from @JiliDong-NOAA about the status of #2056

On a local working copy, I've merged #2047 and #2056 into this PR. Conflicts were easy to resolve. I'd rather not test twice. I'm waiting to hear back from @JiliDong-NOAA that #2056 is ready for final testing.

SamuelTrahanNOAA · 2023-12-19T20:59:16Z

I am waiting to hear back from @JiliDong-NOAA about the status of #2056

On a local working copy, I've merged #2047 and #2056 into this PR. Conflicts were easy to resolve. I'd rather not test twice. I'm waiting to hear back from @JiliDong-NOAA that #2056 is ready for final testing.

Jili says the PR #2056 is ready for testing. I'll begin momentarily.

#2056 (comment)

zach1221 · 2023-12-21T04:49:06Z

Dusan's recommended fix from 2015 added to hercules fv3_slurm file. Tests passed for regional_netcdf_parallel and the two wrtGauss cases, so were re-enabled for hercules.

jkbk2004 · 2023-12-21T13:23:46Z

We can start merging process.

BrianCurtis-NOAA · 2023-12-21T13:37:16Z

@jkbk2004 Are we adding the template? @SamuelTrahanNOAA any changes you'd prefer to make to the commit message?

…-fix

SamuelTrahanNOAA · 2023-12-21T14:27:10Z

@BrianCurtis-NOAA - How is this?

There are so many PRs and issues involved, I had to trim the list down a bit.

FV3 diagnostic fixes and CCPP bug fixes for model crashes

- UFS: commit message in PR template (#2053)
- CMEPS & FV3: Bad data from in CCPP CLM Lake physics scheme caused model crashes
    - Communicate changes to lake ice (Closes #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 snowfall melting and accumulation (NOAA-EMC/fv3atm#739)

SamuelTrahanNOAA · 2023-12-21T14:37:05Z

@BrianCurtis-NOAA - Sorry, I missed a bit

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

- UFS: commit message in PR template (#2053)
- CMEPS & FV3: Bad data from in CCPP CLM Lake physics scheme caused model crashes
    - Communicate changes to lake ice (Closes #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)

BrianCurtis-NOAA · 2023-12-21T14:39:54Z

@BrianCurtis-NOAA - Sorry, I missed a bit

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

- UFS: commit message in PR template (#2053)
- CMEPS & FV3: Bad data from in CCPP CLM Lake physics scheme caused model crashes
    - Communicate changes to lake ice (Closes #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)

Yeah I too was trying to piece together all the changes. This look good. Thanks.

SamuelTrahanNOAA · 2023-12-21T14:50:28Z

Is there an issue I should cite for #2053? Or is it solely a PR?

BrianCurtis-NOAA · 2023-12-21T14:53:43Z

Is there an issue I should cite for #2053? Or is it solely a PR?

Just the PR.

DeniseWorthen · 2023-12-21T15:50:26Z

This PR should also close Issue #2015

SamuelTrahanNOAA · 2023-12-21T15:54:21Z

This PR should also close Issue #2015

@BrianCurtis-NOAA @jkbk2004 - I have updated the commit message to reflect this:

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

- UFS:
    - commit message in PR template (#2053)
    - fix hercules crashes (#2015)
- CMEPS & FV3: Bad data from in CCPP CLM Lake physics scheme caused model crashes
    - Communicate changes to lake ice (Closes #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)

jkbk2004 · 2023-12-21T16:10:18Z

@SamuelTrahanNOAA all sub component PRs were merged.

SamuelTrahanNOAA · 2023-12-21T16:31:05Z

This PR is ready for final review and merge. I've reverted .gitmodules. The FV3 and CMEPS point to their authoritative branches and URLs.

SamuelTrahanNOAA added 8 commits December 15, 2023 16:58

clm lake unit fix & wrong variable sent for snodi

8635abd

point to sam's branch

21ee461

hera tests passed

7d2ce38

revisions to slowfall accumulation from @tanyasmirnova

a1dba0a

hera tests passed

0ec8f84

point to sam's branch

d1ece2c

clm_lake.f90: explain lakedepth corruption safeguards

3747544

ccpp-physics module_sf_ruclsm.f90: explain the snow_mosaic=0 line

ea272d2

point FV3 to personal fork

10f30e0

update FV3

256322f

JiliDong-NOAA and others added 5 commits December 19, 2023 01:20

point CMEPS to personal fork

5173503

Initial Updates to template

315f27d

Fix type for checkboxes and add instructions section to pr template

d2e1e08

Cheyenne->Derecho, update GNU machines in template

243690f

update FV3

29c0fa0

SamuelTrahanNOAA mentioned this pull request Dec 19, 2023

fix crash when using clm lake and GFS PBL/sfclay #2056

Closed

42 tasks

JiliDong-NOAA and others added 8 commits December 19, 2023 15:38

change name of lake_freeze to flag_lakefreeze

8945208

fv3 updated

803e54a

Updates taking into account most suggestions up to this point

0ca12c0

More changes from PR discussion

4779ed4

merge ufs-community#2047

24236dc

merge develop

b1b6484

merge fv3atm#742 into FV3

b0b76e3

merge ufs-community#2056

c330e79

tanyasmirnova approved these changes Dec 19, 2023

View reviewed changes

jkbk2004 and others added 3 commits December 21, 2023 12:49

add jet RT log: passed

5479e0f

Acorn RT Log

d64d98d

add gaea c4 RT log: passed

4391a46

This was referenced Dec 21, 2023

clm lake fix: pressure is not density + #142 and #148 ufs-community/ccpp-physics#139

Merged

add flag to track lake freezing for clm lake NOAA-EMC/CMEPS#105

Merged

Merge remote-tracking branch 'upstream/template_tuneup' into clm-unit…

abf6360

…-fix

SamuelTrahanNOAA changed the title ~~CLM Lake pressure is not density and GFS Diagnostics: weasdi is not snodi + #2047 and #2056~~ CLM Lake pressure is not density and GFS Diagnostics: weasdi is not snodi + #2047, #2053, and #2056 Dec 21, 2023

point FV3 to NOAA-EMC/fv3atm

626dc93

point to NOAA-EMC emc/develop for CMEPS-interface/CMEPS

f91ed44

jkbk2004 requested review from BrianCurtis-NOAA, DeniseWorthen, jkbk2004, sadeghitabas and zach1221 December 21, 2023 16:32

jkbk2004 approved these changes Dec 21, 2023

View reviewed changes

zach1221 approved these changes Dec 21, 2023

View reviewed changes

zach1221 merged commit 991d652 into ufs-community:develop Dec 21, 2023

grantfirl mentioned this pull request Mar 11, 2024

UFS-dev PR#139 NCAR/ufs-weather-model#123

Merged

Conversation

SamuelTrahanNOAA commented Dec 15, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Author Checklist:

Description

Commit Message

Linked Issues and Pull Requests

Associated UFSWM Issue to close

Subcomponent Pull Requests

Blocking Dependencies

Subcomponents involved:

Anticipated Changes

Input data

Regression Tests:

Libraries

Testing Log:

Uh oh!

SamuelTrahanNOAA commented Dec 18, 2023

Uh oh!

jkbk2004 commented Dec 18, 2023

Uh oh!

SamuelTrahanNOAA commented Dec 18, 2023

Uh oh!

SamuelTrahanNOAA commented Dec 19, 2023

Uh oh!

SamuelTrahanNOAA commented Dec 19, 2023

Uh oh!

zach1221 commented Dec 21, 2023

Uh oh!

jkbk2004 commented Dec 21, 2023

Uh oh!

BrianCurtis-NOAA commented Dec 21, 2023

Uh oh!

SamuelTrahanNOAA commented Dec 21, 2023

Uh oh!

SamuelTrahanNOAA commented Dec 21, 2023

Uh oh!

BrianCurtis-NOAA commented Dec 21, 2023

Uh oh!

SamuelTrahanNOAA commented Dec 21, 2023

Uh oh!

BrianCurtis-NOAA commented Dec 21, 2023

Uh oh!

DeniseWorthen commented Dec 21, 2023

Uh oh!

SamuelTrahanNOAA commented Dec 21, 2023

Uh oh!

jkbk2004 commented Dec 21, 2023

Uh oh!

SamuelTrahanNOAA commented Dec 21, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

SamuelTrahanNOAA commented Dec 15, 2023 •

edited

Loading