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

Merge gsl/develop to RRFS_dev #142

Merged

Conversation

SamuelTrahanNOAA
Copy link
Collaborator

@SamuelTrahanNOAA SamuelTrahanNOAA commented Jun 15, 2022

PR Checklist

  • 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. Please consult the ufs-weather-model wiki if you are unsure how to do this.

  • This PR has been tested using a branch which is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR

  • An Issue describing the work contained in this PR has been created either in the subcomponent(s) or in the ufs-weather-model. The Issue should be created in the repository that is most relevant to the changes in contained in the PR. The Issue and the dependent sub-component PR
    are specified below.

  • Results for one or more of the regression tests change and the reasons for the changes are understood and explained below. Changes to code from many people past many moons.

  • New or updated input data is required by this PR. If checked, please work with the code managers to update input data sets on all platforms.

Description

Merge gsl/develop to RRFS_dev

Issue(s) addressed

Merge gsl/develop to RRFS_dev

Testing

How were these changes tested? What compilers / HPCs was it tested with? Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) Have regression tests and unit tests (utests) been run? On which platforms and with which compilers? (Note that unit tests can only be run on tier-1 platforms)

Testing is incomplete

  • hera.intel
  • hera.gnu
  • orion.intel
  • cheyenne.intel
  • cheyenne.gnu
  • gaea.intel
  • jet.intel
  • wcoss_cray
  • wcoss_dell_p3
  • opnReqTest for newly added/changed feature
  • CI

Dependencies

NOAA-GSL/fv3atm#149
NOAA-GSL/ccpp-physics#157

DusanJovic-NOAA and others added 30 commits December 16, 2021 10:10
…ature/ort addition. (ufs-community#931)

* Add UFS driver, a copy of two fortran files from the NEMS repository. Remove NEMS submodule.

* Update CMEPS for current escomp/master. Implement the ability to write mediator history files for ATM on tiles rather than mesh

* Update CDEPS component. The updated CDEPS includes code updates for GFS v16 data mode.

* Operation requirement test (ORT) for:
  - cpld_control_p7 thread and decomposition tests
  - cpld_bmark_p7 thread and decomposition tests
  - Due to the wave component in these tests, restart and debug do not work

Co-authored-by: Minsuk Ji <[email protected]>
Co-authored-by: Denise Worthen <[email protected]>
Co-authored-by: BinLi-NOAA <[email protected]>
FV3 nuopc cap code cleanup. Remove used code/variables. Fix minor inconsistencies.
…everal bug fixes for regression testing scripts (ufs-community#962)

This PR contains code changes 1) to remove old comments in GFS_typedefs.F90, increase cloud cover for Thompson MP by passing convective cloud water mixing ratio to progcld6. 2) Updates for auto fixes

Co-authored-by: Dusan Jovic <[email protected]>
…fications (ufs-community#970)

- CCPP Physics changes: see Wrapper for ccpp-physics ufs-community#806, #807, ufs-community#813, NOAA-EMC/fv3atm#447.
- UFS weather model changes for ORT updates following changes in Fix Auto-RT on Gaea, Jet and Orion ufs-community#965
…over ice and NoahMP tsurf bugfix) (ufs-community#971)

* update submodule pointer for regression testing for ccpp-physics ufs-community#808,816: roughness length over ice and NoahMP tsurf bugfix
* Reduce time step from 600s to 450s for tests control_csawmg and control_csawmg_debug

Co-authored-by: Dom Heinzeller <[email protected]>
Co-authored-by: climbfuji <[email protected]>
* Update FV3 cap by adding 'model set run clock' specialization routine. Because FV3 cap does not modify 'Earth clock' anymore in case of a restarted run, that adjustment is now done in the UFS driver.
* Fix model_configure file for two tests to define `fhrot` parameter.
…ity#963)

Revert/cleanup iovr=4 in RRTMG per developer's request. The current exponential cloud overlapping method used in RRTMG represents the method used in the pre-2018 operational HWRF model.
* Fhzero ORT applies to the two tests `control` and `control_p7`
* Test can be run by invoking, for example, `./opnReqTest -n control -c fhz`
…ly.conf and update MOM6 to main branch (20211220) (ufs-community#976)

* add a new cdeps test using GFS data mode
* update rt_weekly.conf to include cpld_bmark_p7_35d tests
* update MOM6

Co-authored-by: jiandewang <[email protected]>
…les from ccpp-physics CMakeLists.txt (ufs-community#947)

*adds a new regression test control_wam_debug and fixes problems with the existing control_wam test (e.g. IAER was not set as intended).
…community#968)

Update upp submodule in fv3atm with latest UPP version for outputting foundation temperature and fixing land-sea mask issue in global inline post.
…unity#981)

* Bug fixes for running on jet or with rocoto
1. Correctly detect Jet when deciding build job runtimes
2. Do not delete out and err files in compile & test jobs
3. Correct dependencies for WW3 in Rocoto
4. Do not hard-code ACCNR to h-nems
This PR also contains fv3/ccpp physics (CCPP PR#812) updates that implements a vertically-integrated formula to properly compute tracer column mass and ensure mass conservation for all tracers except TKE. See issue NCAR/ccpp-physics#811 for details
*This PR turns on the rap_restart tests. Bit-for-bit reproducibility is achieved with the bug fixes for MYNN sfclay in the associated fv3atm and ccpp-physics PRs.
…nal HRRR (ufs-community#986)

This PR implements a feature of the operational HRRR, radar-derived microphysics temperature tendencies applied in the first N minutes of the forecast to improve clouds in the first few hours. Two regression tests are added.
…st suite to initial P8 configuration; (ufs-community#944)

* add updates for suites, tests for initial P8 configuration
* add IOPT_SFC=3 as default; set IOPT_SFC=1 in p7 tests
* change min_seaice to 1e-6; set to 1e-11 in p7 tests
* set dddmp=0.1 in both P7 and P8. This matches the final
P7 configuration. It will change P7 baselines.
* set cdmbwd in both P7 and P8 to the final P7 configuration.
(1.0,2.2,1.0,1.0) for all resolutions. It will change P7 baselines.
* add dusan's ecflow fix for wcoss2
* update FV3 with Moorthis' snod fix
* update rt_weekly to use p8 tests
* change integration length to 5 days
* improves cloud fraction when using Thompson MP. See NCAR/ccpp-physics#809 for more details.
…r schemes and Corrected S4 template regression testing job card (ufs-community#995)

* Added a new regression test for HAFS. 
* Fixed the S4 RT template job card.

Co-authored-by: David Huber <[email protected]>
Co-authored-by: Bin Liu <[email protected]>
…hompson MP (ufs-community#1000)

This PR contains changes in ccpp-physics (Update consistency checks and effective radii calculation for Thompson MP) and adds two new regression tests for both Intel and GNU that use the new prognostic cloud scheme progcld_thompson with GFS v16 and with RAP. The new cloud scheme is activated by setting icloud == 3 in input.nml.
* Add fhz ort to cpld tests
* Set ACCNR in rt.sh, not detect_machine.sh. Add some comments explaining where the variable should not be set or used.

Co-authored-by: Samuel Trahan <[email protected]>
…-community#1011)

* Unify write_netcdf and write_netcdf_parallel modules.
* Add support for writing 'cubed_sphere_grid' history files in a single netcdf file.
…mework and physics (ufs-community#1013)

* updates the submodule pointers for fv3atm, ccpp-framework and ccpp-physics for:  Change standard name and unit of CCPP error flag variable in CCPP framework and physics.
Add code updates to enable the ESMF managed threading in UFS.


Co-authored-by: Gerhard Theurich <[email protected] >
* sync with ww3 develop branch
* This PR addresses part 2 of issue ufs-community#748 to activate the exponential-random cloud overlap method (iovr=5) in RRTMG. RT tests were added for  iovr=4 and iovr=5 options
* change iovr to use the environment variable in control.nml.IN; modify all tests that use control.nml.IN to set env. var. iovr=3 (except for new tests); remove restart files from new tests
…ecision in stochastic physics (ufs-community#1028)

- The 2D decomposition is enabled on write grid component.
- FV3atm PR NOAA-EMC/fv3atm#468 from @MicroTed 
- stochastic physics PR NOAA-PSL/stochastic_physics#53 from Dom.

Co-authored-by: Ted Mansell <[email protected]>
Co-authored-by: Dom Heinzeller <[email protected]>
* add run phases to allow waves to run in the slow loop
* re-order hafs wave test
* update aliases in fd_nems.yaml
* update CMEPS to prevent advertise conflicts when s2sw is
still using connectors
* add correct masking variables to hafs nems.configure files
@hu5970
Copy link

hu5970 commented Jun 16, 2022

@tanyasmirnova @mdtoyNOAA @joeolson42 Do those surface wind differences make sense after so many changes from MYNN? Thanks.
Right now, we just need to make sure the new code does not produce clear wrong results. We will do full retro soon to check those new code.

@tanyasmirnova
Copy link
Collaborator

@joeolson42 @mdtoyNOAA @hu5970 @SamuelTrahanNOAA Ming, the new code might increase positive wind bias at the low levels.
Ming, also, I gave Sam the updates to the diag_table_hrrr, diag_table_hrrr_stoch and diag_table_rap. When he merges my changes, these tables should be updated in the workflow.
For now you can copy my /mnt/lfs4/BMC/wrfruc/smirnova/RRFS_retro/gsl-srweather-app/regional_workflow/ush/templates//diag_table.FV3_HRRR to your workflow.

@SamuelTrahanNOAA
Copy link
Collaborator Author

SamuelTrahanNOAA commented Jun 16, 2022

There's a new thompson microphysics feature I had to disable to prevent a crash:

EDIT: That is disabled by default in the code. It was the scripts that enabled it.

@hu5970
Copy link

hu5970 commented Jun 17, 2022

@tanyasmirnova I will update "regional_workflow/ush/templates//diag_table.FV3_HRRR" to make sure the right diag_table is used in RRFS.

@hu5970
Copy link

hu5970 commented Jun 17, 2022

Hi All, Should we try to find a time for a short tag-up to decide how to move forward of this PR before ned of today (early release)?

@SamuelTrahanNOAA
Copy link
Collaborator Author

The netcdf I/O still isn't working, but I'm getting close to fixing it.

@SamuelTrahanNOAA
Copy link
Collaborator Author

The FV3GFS NetCDF I/O works again.

@@ -192,7 +192,6 @@
"gfs_sfc", "stype", "sotyp", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "slmsksfc", "land", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "vfracsfc", "veg", "fv3_history2d", "all", .false., "none", 2
"gfs_sfc", "wetness", "wetness", "fv3_history2d", "all", .false., "none", 2
Copy link
Collaborator

Choose a reason for hiding this comment

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

@SamuelTrahanNOAA Sam, we need this variable in the output to compute fire potential index. Could we revert this change or there is a serious problem with having it in diag_table_hrrr?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Also, I made a PR to your repository with changes to diag_table_hrrr, daig_table_hrrr_stoch and diag_table_rap

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It was inconsistent. I've added it to both hrrr diag tables now.

@SamuelTrahanNOAA SamuelTrahanNOAA marked this pull request as ready for review June 22, 2022 12:01
Copy link
Collaborator

@tanyasmirnova tanyasmirnova left a comment

Choose a reason for hiding this comment

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

@SamuelTrahanNOAA diag_flux should be defaul false value for tests using sfcdiff.

tests/tests/rap_noah_sfcdiff_unified_ugwp Outdated Show resolved Hide resolved
tests/tests/rap_noah_sfcdiff_unified_ugwp_2threads Outdated Show resolved Hide resolved
tests/tests/rap_noah_sfcdiff_unified_ugwp_debug Outdated Show resolved Hide resolved
tests/tests/rap_noah_sfcdiff_unified_ugwp_decomp Outdated Show resolved Hide resolved
tests/tests/rap_noah_sfcdiff_unified_ugwp_restart Outdated Show resolved Hide resolved
@SamuelTrahanNOAA SamuelTrahanNOAA merged commit 05e9b1b into NOAA-GSL:RRFS_dev Jun 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.