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

RRFS updates #938

Merged
merged 5 commits into from
Apr 29, 2024
Merged

Conversation

EricJames-NOAA
Copy link
Contributor

This PR provides some updates for RRFS, including:

(1) Rename RRFS UPP control files as requested by Benjamin Blake (EMC) to get rid of "fv3lam" reference.
(2) Correct the reading of smoke emissions (EBB) to read the correct 3-D variable ebu_smoke.
(3) Enable output of 2-D smoke emissions computed as the vertically integrated smoke emissions.
(4) Update HWP to be a 1-h average (hwp_ave in netCDF files).
(5) Get rid of vertically integrated hydrometeor output which doesn't include subgrid components.

The code was tested for RRFS_NA_3km system on Jet.

@WenMeng-NOAA
Copy link
Collaborator

@EricJames-NOAA Can you sync your branch with the latest UPP develop and provide me sample model files for testing?

@WenMeng-NOAA
Copy link
Collaborator

@EricJames-NOAA Can you open a new issue for your proposed changes 2) to 5)?

@EricJames-NOAA
Copy link
Contributor Author

@WenMeng-NOAA I have some test files for you here on Hera:

/scratch1/BMC/wrfruc/ejames/wen_ebb_hwp/

@WenMeng-NOAA
Copy link
Collaborator

@EricJames-NOAA My test indicates regenerating the RRFS flat control file 'postxconfig-NT-rrfs.txt' is needed. Please validate my test results at /home/Wen.Meng/stmp2/rrfs_2024032812 on Hera.

Copy link
Collaborator

@BenjaminBlake-NOAA BenjaminBlake-NOAA left a comment

Choose a reason for hiding this comment

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

@EricJames-NOAA Thanks for including the RRFS file renaming changes, those look good to me.

@EricJames-NOAA
Copy link
Contributor Author

/scratch1/BMC/wrfruc/ejames/wen_ebb_hwp/

@WenMeng-NOAA thanks for catching that, I have regenerated the postxconfig-NT-rrfs.txt file.

I accidentally copied over the wrong netCDF files. Could you please run a test using these new ones:

/scratch1/BMC/wrfruc/ejames/wen_ebb_hwp/

I'm very sorry for my mistake.

@WenMeng-NOAA
Copy link
Collaborator

@EricJames-NOAA Please see my new run at /home/Wen.Meng/stmp2/rrfs_2024042315.

@EricJames-NOAA
Copy link
Contributor Author

@EricJames-NOAA Please see my new run at /home/Wen.Meng/stmp2/rrfs_2024042315.

@WenMeng-NOAA your results are consistent with mine...I see the updated fields. Thanks!

@WenMeng-NOAA
Copy link
Collaborator

@EricJames-NOAA Thanks for verifying. We will wrap this PR for the final testing.

@WenMeng-NOAA
Copy link
Collaborator

@FernandoAndrade-NOAA You may start the UPP RTs on Hera and Orion. For your reference, my tests on Hera are at /home/Wen.Meng/stmp2:

Wen.Meng@hfe02 stmp2$ ls -ltr */*diff
-rw-r--r-- 1 Wen.Meng stmp    75 Apr 25 17:35 rap_2020072316_pe_test/WRFPRS.GrbF16.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800_pe_test/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400_pe_test/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800_pe_test/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400_pe_test/PRSLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400/PRSLEV00.tm00.diff

You should change the control file 'postxconfig-NT-fv3rlam_rrfs.txt' into 'postxconfig-NT-rrfs.txt' in job cards runfv3r and run3drtma.

@WenMeng-NOAA WenMeng-NOAA added Ready for Review This PR is ready for code review. Baseline Change The baselines of the UPP regression tests are changed. labels Apr 25, 2024
@FernandoAndrade-NOAA
Copy link
Collaborator

@FernandoAndrade-NOAA You may start the UPP RTs on Hera and Orion. For your reference, my tests on Hera are at /home/Wen.Meng/stmp2:

Wen.Meng@hfe02 stmp2$ ls -ltr */*diff
-rw-r--r-- 1 Wen.Meng stmp    75 Apr 25 17:35 rap_2020072316_pe_test/WRFPRS.GrbF16.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800_pe_test/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400_pe_test/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800_pe_test/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400_pe_test/PRSLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400/PRSLEV00.tm00.diff

You should change the control file 'postxconfig-NT-fv3rlam_rrfs.txt' into 'postxconfig-NT-rrfs.txt' in job cards run_fv3r_ and run_3drtma_.

Orion and Hercules are still running likely due to the ongoing maintenance. On Hera, I'm seeing NATLEV matching while PRSLEV are differing a bit from your results in both fv3r and 3drtma, if you could verify comparison at /scratch2/NAGAPE/epic/Fernando.Andrade-maldonado/regression-tests/upp/938/UPP/ci/rundir/upp-HERA

@WenMeng-NOAA
Copy link
Collaborator

@FernandoAndrade-NOAA You may start the UPP RTs on Hera and Orion. For your reference, my tests on Hera are at /home/Wen.Meng/stmp2:

Wen.Meng@hfe02 stmp2$ ls -ltr */*diff
-rw-r--r-- 1 Wen.Meng stmp    75 Apr 25 17:35 rap_2020072316_pe_test/WRFPRS.GrbF16.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800_pe_test/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400_pe_test/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800_pe_test/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400_pe_test/PRSLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400/PRSLEV00.tm00.diff

You should change the control file 'postxconfig-NT-fv3rlam_rrfs.txt' into 'postxconfig-NT-rrfs.txt' in job cards run_fv3r_ and run_3drtma_.

Orion and Hercules are still running likely due to the ongoing maintenance. On Hera, I'm seeing NATLEV matching while PRSLEV are differing a bit from your results in both fv3r and 3drtma, if you could verify comparison at /scratch2/NAGAPE/epic/Fernando.Andrade-maldonado/regression-tests/upp/938/UPP/ci/rundir/upp-HERA

@FernandoAndrade-NOAA I have examined the results in both your run directories and mine, and they are consistent. I forgot to recreate the baselines from last PR in my RTs, which seems to be the root cause. Your RTs on Hera are good to me.

@FernandoAndrade-NOAA
Copy link
Collaborator

@FernandoAndrade-NOAA You may start the UPP RTs on Hera and Orion. For your reference, my tests on Hera are at /home/Wen.Meng/stmp2:

Wen.Meng@hfe02 stmp2$ ls -ltr */*diff
-rw-r--r-- 1 Wen.Meng stmp    75 Apr 25 17:35 rap_2020072316_pe_test/WRFPRS.GrbF16.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 13064 Apr 25 17:37 fv3r_2023062800_pe_test/PRSLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400_pe_test/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25456 Apr 25 17:37 rtma_2023040400/NATLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 25172 Apr 25 17:39 fv3r_2023062800_pe_test/NATLEV10.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400_pe_test/PRSLEV00.tm00.diff
-rw-r--r-- 1 Wen.Meng stmp 14470 Apr 25 17:39 rtma_2023040400/PRSLEV00.tm00.diff

You should change the control file 'postxconfig-NT-fv3rlam_rrfs.txt' into 'postxconfig-NT-rrfs.txt' in job cards run_fv3r_ and run_3drtma_.

Orion and Hercules are still running likely due to the ongoing maintenance. On Hera, I'm seeing NATLEV matching while PRSLEV are differing a bit from your results in both fv3r and 3drtma, if you could verify comparison at /scratch2/NAGAPE/epic/Fernando.Andrade-maldonado/regression-tests/upp/938/UPP/ci/rundir/upp-HERA

@FernandoAndrade-NOAA I have examined the results in both your run directories and mine, and they are consistent. I forgot to recreate the baselines from last PR in my RTs, which seems to be the root cause. Your RTs on Hera are good to me.

Orion will be unavailable for testing at the moment as they prepare for a shutdown for maintenance. Hercules showed similar results to Hera RTs with differences due to the inability to update baselines in the previous PR caused by instability. Only the expected test cases are showing differences this run so Hercules should be good to go. I'll keep an eye out for when Orion is available again to proceed with the merge process.

@WenMeng-NOAA
Copy link
Collaborator

@EricJames-NOAA Can you sync your branch one more time?

@FernandoAndrade-NOAA
Copy link
Collaborator

Orion RTs match with the Hera run, this PR should be ready to go following a final re-sync.

@WenMeng-NOAA
Copy link
Collaborator

This PR is ready for merging.

@WenMeng-NOAA WenMeng-NOAA merged commit 13d5b6d into NOAA-EMC:develop Apr 29, 2024
5 checks passed
zhanglikate added a commit to zhanglikate/UPP that referenced this pull request Apr 30, 2024
commit 13d5b6d
Author: EricJames-NOAA <[email protected]>
Date:   Mon Apr 29 15:28:47 2024 -0600

    RRFS updates (NOAA-EMC#938)

    * Initial commit to rename RRFS fix files, update EBB to be vertically integrated from 3D ebu_smoke, and switch to use 1-h average HWP.

    * Getting rid of vertically integrated hydrometeor fields.

    * Updating postxconfig-NT-rrfs.txt

commit 88493f3
Author: Wei Huang <[email protected]>
Date:   Fri Apr 26 21:29:51 2024 -0600

    add module for AWS (NOAA-EMC#934)

    * add module for AWS

    * comment that this is for NOAA Cloud

commit be0410e
Author: hsinmulin-NOAA <[email protected]>
Date:   Tue Apr 23 15:46:47 2024 -0400

    Add files via upload (NOAA-EMC#937)

    add
    1. 80 m for SPFH_ON_SPEC_HGT_LVL_ABOVE_GRND_FDHGT
    2. 80 m for PRES_ON_SPEC_HGT_LVL_ABOVE_GRND_FDHGT

commit 79d74d9
Author: Edward Hartnett <[email protected]>
Date:   Mon Apr 22 13:34:39 2024 -0600

    turn on doxygen build in CI (NOAA-EMC#932)

    * turn on doxygen build in CI

    * turn on doxygen build in CI

    * turn on doxygen build in CI

    * turn on doxygen build in CI

    * fixed cmake file

    * fixed doc directory

commit 5d6d179
Author: Dusan Jovic <[email protected]>
Date:   Fri Apr 19 14:17:10 2024 -0400

    Remove dependency on sfcio and use sigio only when nemsio is enabled (NOAA-EMC#930)

    * Remove sfcio and use sigio only when numsio is enabled

    * Remove sfcio from modulefiles/wcoss2.lua

    * Compile GFSPOSTSIG.F only if nemsio is enabled

commit 91921f4
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Apr 15 21:04:39 2024 -0400

    Bump idna from 3.6 to 3.7 in /doc/UserGuide (NOAA-EMC#928)

    Bumps [idna](https://github.com/kjd/idna) from 3.6 to 3.7.
    - [Release notes](https://github.com/kjd/idna/releases)
    - [Changelog](https://github.com/kjd/idna/blob/master/HISTORY.rst)
    - [Commits](kjd/idna@v3.6...v3.7)

    ---
    updated-dependencies:
    - dependency-name: idna
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <[email protected]>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Wen Meng <[email protected]>

commit 8bc3fc9
Author: EricJames-NOAA <[email protected]>
Date:   Fri Apr 12 16:06:36 2024 -0600

    Bug fix for blowing snow effect on visibility (NOAA-EMC#915)

    * Correcting bug in CALVIS_GSD.f

    * Introducing roughness length impact on BLSN (no BLSN effect at z0>0.7).

    * Removing some gridpoint print statements for testing.

    * Checking change to compile_upp.sh

    * Reverting change.

commit fd93933
Author: YaliMao-NOAA <[email protected]>
Date:   Thu Apr 11 17:14:24 2024 +0000

    For RRFS, change the mnemonics of column max of EDPARM from EDPARM on 0m level to MXEDPRM of the entire atmosphere. (NOAA-EMC#926)

    For this purpose, MXEDPRM is added to both post_avblflds.xml and control file fv3lam_rrfs.xml

commit 5faac75
Author: WenMeng-NOAA <[email protected]>
Date:   Tue Apr 9 18:25:18 2024 -0400

    Correct total soil moisture from SOIMOI to CISOIM (NOAA-EMC#922)

    * Correct total soil moisture from SOIMOI to CISOIM

    * Update shortname of UPP ID 36

    * update CMake debug mode

commit 83e83a9
Author: Innocent Souopgui <[email protected]>
Date:   Fri Apr 5 15:10:14 2024 -0500

    Remove the detection of Jet/Centos7 nodes (NOAA-EMC#920)

    * Remove the detection of Jet/Centos7 nodes and removes the associated module file jet_c.lua

    * Update detect_machine.sh remove hera 12

    ---------

    Co-authored-by: Fernando Andrade - NOAA <[email protected]>

commit 1d1e58a
Author: Dusan Jovic <[email protected]>
Date:   Fri Apr 5 13:10:20 2024 -0400

    Add BUILD_WITH_NEMSIO build option to allow building UPP without nemsio (NOAA-EMC#911)

    * Add BUILD_WITH_NEMSIO build option to allow building UPP without nemsio

    * Specify w3emc and bacio as dependencies of nemsio library

    * Add compile_upp.sh option to build without nemsio (-n)

commit 7d39b5c
Author: WenMeng-NOAA <[email protected]>
Date:   Thu Apr 4 17:07:14 2024 -0400

    Add LTNG in PRSLEV dataset of RRFS (NOAA-EMC#918)

commit 62ecf8a
Author: AndrewBenjamin-NOAA <[email protected]>
Date:   Thu Apr 4 14:50:08 2024 -0400

    RRFSv1.0 Product cleanup: removal of retired products from fv3lam_rrfs.xml (NOAA-EMC#909)

    * removed  <table_info>NCEP</table_info> for ULWRF to use the official WMO ID rather than the dupilcate NCEP local use ID

    * removed <table_info>NCEP</table_info> from REFZR, REFZI, BMIXL, and CNWAT to use WMO grib2 ids

    * removed <table_info>NCEP</table_info> from SNOWC, SFEXC, SSRUN, BGRUN, FRICV, CD, SNOHF, PEVAP, TCOLI in order to use WMO id over NCEP local use ID.

    * removed <table_info>NCEP<table_info> from SNFALB, CDLYR, USWRF, DSWRF, DLWRF, VWSH, TCOLR, TCOLS, UPHL

    * removed <table_info>NCEP<table_info> from MSTAV in post_avblflds.xml to use WMO grib2 id for RRFS

    * removed duplicate CNWAT NATLEV entry in fv3lam_rrfs.xml.

    * updated fv3lam_rrfs.xml and parm/postxconfig-NT-fv3lam_rrfs.txt to remove products no longer needed in the RRFS.

    * changed precision in SSRUN

    * fixed SSRUN precision in flat file

    * removed LSPA and SNOWC from NATLEV

commit df9b16b
Author: EricJames-NOAA <[email protected]>
Date:   Mon Apr 1 15:51:56 2024 -0600

    Add surface albedo, accumulated snow melt, and total soil moisture output in RRFS (NOAA-EMC#908)

    * Updating CLDRAD and INITPOST_NETCDF

    * Reverting change in CLDRAD.f

    * Changes to output CISOILM and SNOM.

    * Cleaning up syntax.

    * Adding change logs.

    * Small updates.

    * Removing extcof55 from visibility calculation (it's all zeroes).

    * Reverting change in INITPOST_NETCDF.f setting smstot to spval

    * Using a single level "0 m underground" for CISOILM

commit 92b080d
Author: KarinaAsmar-NOAA <[email protected]>
Date:   Sat Mar 30 20:03:49 2024 -0400

    Add additional SFS variables and isobaric levels (NOAA-EMC#903)

    * added additional isobaric levels

    * adding HLCY, SSRUN, VBDSF

    * added HLCY, SSRUN, VBDSF

    * replacing id 772 with 401 and 403 (vbdsf and nbdsf)

    * vbdsf and nbdsf with info from avblflds

    * removed id 772 and added 401 and 403 (vbdsf and nbdsf)

    * vbdsf and nbdsf copied from gfs flux

    * vbdsf and nbdsf copied from gfs flux
DavidHuber-NOAA added a commit to DavidHuber-NOAA/UPP that referenced this pull request Sep 9, 2024
* origin/develop:
  Updates to support MPAS applications (RRFS and HFIP) (NOAA-EMC#1029)
  Add 6-hrly max winds at 10m to SFS (NOAA-EMC#1019)
  Update jet.lua (NOAA-EMC#1027)
  Updates to support UPP use with MPAS (NOAA-EMC#1018)
  [develop]: Turn on WARN_AS_ERROR for Doxygen Documentation Builds (NOAA-EMC#1023)
  Sample PR for testing (NOAA-EMC#1007)
  Enable template 4-49 to obtain aerosol ensemble information (NOAA-EMC#1011)
  Relocate gfs/gefs/sfs control files (NOAA-EMC#990)
  update g2tmp on aws to 1.12.0 (NOAA-EMC#996)
  [develop]: Update requirements files (NOAA-EMC#994)
  Bump zipp from 3.17.0 to 3.19.1 in /doc/UserGuide (NOAA-EMC#991)
  remove stack-python load for Gaea build (NOAA-EMC#993)
  Bump certifi from 2024.2.2 to 2024.7.4 in /doc/UserGuide (NOAA-EMC#988)
  [develop]: Add Doxygen variable definitions to modules (NOAA-EMC#965)
  Read bucket either as an integer or float (NOAA-EMC#984)
  Update Orion module file for Rocky 9 upgrade (NOAA-EMC#987)
  UPP bugfixes for inline post and g2tmpl 1.12.0 compatibility (and number concentration updates) (NOAA-EMC#974)
  Sync the RRFS hotfix NOAA-EMC#967 and NOAA-EMC#968. (NOAA-EMC#979)
  Bump urllib3 from 2.2.1 to 2.2.2 in /doc/UserGuide (NOAA-EMC#981)
  Fix for hydrostatic runs - write out Omega and HGT from model output (NOAA-EMC#959)
  Bump requests from 2.31.0 to 2.32.0 in /doc/UserGuide (NOAA-EMC#963)
  Correct rt.sh paths (NOAA-EMC#957)
  Updates to use GRIB2 template 4.9 for QPFFFG and QPFARI variables in RRFS (NOAA-EMC#929)
  Add hourly averaged smoke PM2.5 and dust PM10 (NOAA-EMC#917)
  Update Namelist documentation for all namelist options (NOAA-EMC#940)
  update gtg code revision to v.4.16.3 (NOAA-EMC#954)
  Bump jinja2 from 3.1.3 to 3.1.4 in /doc/UserGuide (NOAA-EMC#953)
  Clean up labeling for 15-min accumulated fields (NOAA-EMC#948)
  Updates to the GSL exp1 ceiling diagnostic (NOAA-EMC#947)
  Additional RT log information (NOAA-EMC#941)
  add cmake load to modulefile/gaea.lua (NOAA-EMC#945)
  RRFS updates (NOAA-EMC#938)
  add module for AWS (NOAA-EMC#934)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Baseline Change The baselines of the UPP regression tests are changed. Ready for Review This PR is ready for code review. RRFS
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Miscellaneous RRFS updates Rename RRFS UPP control files
5 participants