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.

Sign up for GitHub

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

Jump to bottom

Move Noah MP init to CCPP and update Noah MP regression tests, ice flux init bug fix in CCPP #425

Merged
merged 25 commits into from
Mar 3, 2021
Merged

Move Noah MP init to CCPP and update Noah MP regression tests, ice flux init bug fix in CCPP #425

merged 25 commits into from
Mar 3, 2021

Conversation

climbfuji
Copy link
Collaborator

@climbfuji climbfuji commented Feb 21, 2021 •
edited
Loading

Description

This PR does several things:

  1. Update the submodule pointer for fv3atm (Move the Noah MP initialization of surface fields from fv3atm to CCPP) from @climbfuji.
  2. Updates to Noah MP regression tests from @HelinWei-NOAA.
  3. Apply a bugfix to the recently added RRTMGP threading tests and enable the test on wcoss_cray (from @DusanJovic-NOAA)
  4. Initialize ice flux in CMEPSA bug fix in ccpp-physics from @shansun6

Issue(s) addressed

This finally completes step 2 of NOAA-EMC/fv3atm#214.

Fixes #437.

Testing

Regression tests will be run on all tier-1 platforms. Results change for regression tests using Noah MP, all others remain the same. This has been verified at the time when these PRs were created using both Intel and GNU on Hera.

New baselines created and used for verification on (logs updated in PR) on all tier-1 platforms:

  • cheyenne.gnu
  • cheyenne.intel
  • gaea.intel
  • hera.gnu
  • hera.intel
  • jet.intel
  • orion.intel (auto-rt)
  • wcoss_cray
  • wcoss_dell_p3

Dependencies

NCAR/ccpp-physics#575
NOAA-EMC/fv3atm#249
#425

@climbfuji climbfuji mentioned this pull request Feb 22, 2021
Merged
@climbfuji climbfuji mentioned this pull request Feb 22, 2021
Merged
@climbfuji climbfuji changed the title Move Noah MP init to CCPP and add/update Noah MP regression tests Move Noah MP init to CCPP and update Noah MP regression tests Feb 23, 2021
@climbfuji climbfuji marked this pull request as ready for review February 23, 2021 03:27
@climbfuji climbfuji added the Baseline Updates Current baselines will be updated. label Feb 26, 2021
@climbfuji climbfuji mentioned this pull request Feb 26, 2021
Closed
@climbfuji
Copy link
Collaborator Author

Everyone, I ran rt.sh on hera with Intel and GNU now that the Noah MP changes themselves are complete (hash 8650416 for ufs-weather-model in this branch and submodule hashes referred to). All tests pass against the existing baseline except those using Noah MP, as expected. The tests that do not match the existing baseline all run to completion, i.e. they are ok.

Intel

fv3_ccpp_gfdlmprad_noahmp
fv3_ccpp_rrfs_v1beta
fv3_ccpp_rrfs_v1beta_debug

rt_hera_intel_against_existing.log
rt_hera_intel_against_existing_fail_test.log

GNU

fv3_ccpp_rrfs_v1beta_debug
fv3_ccpp_rrfs_v1beta

rt_hera_gnu_against_existing.log
rt_hera_gnu_against_existing_fail_test.log

I am going to pull in ccpp-physics PR NCAR/ccpp-physics#563 (Initialize ice flux in CMEPSA bug fix), which I anticipate may change some of the coupled regression test results. I am also going to pull in a auto-rt PR (work in progress) that enables auto-rt on cheyenne and potentially includes a few bug fixes for that system, too.

@climbfuji
Copy link
Collaborator Author

Log Name:rt_auto_cheyenne.gnu_20210226141306.log
Log Location:/glade/work/heinzell/fv3/ufs-weather-model/auto-rt/control-20210226/tests/auto
Logs are kept for one month

@climbfuji climbfuji changed the title Move Noah MP init to CCPP and update Noah MP regression tests Move Noah MP init to CCPP and update Noah MP regression tests, auto-rt updates, ice flux init bug fix in CCPP Feb 26, 2021
@BrianCurtis-NOAA
Copy link
Collaborator

Log Name:rt_auto_20210302000010.log
Log Location:/mnt/lfs4/HFIP/h-nems/Brian.Curtis/git/ufs-community/ufs-weather-model/tests/auto
Logs are kept for one month

@climbfuji
Copy link
Collaborator Author

Log Name:rt_auto_20210302000010.log
Log Location:/mnt/lfs4/HFIP/h-nems/Brian.Curtis/git/ufs-community/ufs-weather-model/tests/auto
Logs are kept for one month

@DusanJovic-NOAA looks like the auto-rt tests failed on jet, run manually?

@BrianCurtis-NOAA
Copy link
Collaborator

Log Name:rt_auto_20210301183005.log
Log Location:/work/noaa/nems/bcurtis/git/ufs-community/ufs-weather-model/tests/auto
Logs are kept for one month

@DusanJovic-NOAA
Copy link
Collaborator

jet.intel log file is here:
/lfs4/HFIP/hfv3gfs/Dusan.Jovic/ufs/pr425/ufs-weather-model/tests/RegressionTests_jet.intel.log

@climbfuji
Copy link
Collaborator Author

jet.intel log file is here:
/lfs4/HFIP/hfv3gfs/Dusan.Jovic/ufs/pr425/ufs-weather-model/tests/RegressionTests_jet.intel.log

Thanks, Dusan!

@climbfuji climbfuji added the Waiting for Reviews The PR is waiting for reviews from associated component PR's. label Mar 2, 2021
junwang-noaa
junwang-noaa approved these changes Mar 3, 2021
View reviewed changes
Copy link
Collaborator

@junwang-noaa junwang-noaa left a comment

Choose a reason for hiding this comment

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

Need to point fv3 back to emc develop branch.

@climbfuji climbfuji changed the title Move Noah MP init to CCPP and update Noah MP regression tests, auto-rt updates, ice flux init bug fix in CCPP Move Noah MP init to CCPP and update Noah MP regression tests, ice flux init bug fix in CCPP Mar 3, 2021
@climbfuji
Copy link
Collaborator Author

@junwang-noaa @DusanJovic-NOAA ci tests passed, please merge. Thanks!

@junwang-noaa junwang-noaa merged commit 4fbebd7 into ufs-community:develop Mar 3, 2021
AnningCheng-NOAA added a commit to AnningCheng-NOAA/ufs-weather-model that referenced this pull request Mar 8, 2021
@AnningCheng-NOAA
Merge remote-tracking branch 'upstream/develop' into merra2
e6bc1e4 
* upstream/develop:
  update MOM6 to GFDL 20210224 main branch commit (ufs-community#439)
  Add GNU and Cheyenne Support to Automated RT (ufs-community#444)
  Move Noah MP init to CCPP and update Noah MP regression tests, ice flux init bug fix in CCPP (ufs-community#425)
  Feature/rt automation (ufs-community#403)
  Update ccpp-physics. Make RRTMGP thread safe (ufs-community#418)
  Update regression tests from GFSv15+Thompson to GFSv16+Thompson, include "Add one regional regression test in DEBUG mode. (ufs-community#419)" (ufs-community#421)
  UGWP v0 v1 combined (ufs-community#396)
  add optional mesh in MOM6; add dz_min and min_seaice as configurable variables for coupled model (ufs-community#399)
  updates FMS to 2020.04.01 (ufs-community#392)
  Move LSM vegetation lookup tables into CCPP, clean up RUC snow cover on ice initialization (remove IPD step 2)  (ufs-community#407)
  Update CMEPS for HAFS integration; add datm and coupled-model tests on Gaea (ufs-community#401)
  Remove legacy gnumake build from fv3atm and NEMS, remove legacy Python 2.7 support, rename v16beta to v16 and RT updates (ufs-community#384)
  MOM6 bugfixes, GFDL update, update CDMBGWD settings; fix for restart reproducibility (without waves) when USE_LA_LI2016=True, sign error on fprec passed to ocean, GFDL update, resolution dependent cdmbgwd settings (ufs-community#379)
  dycore options to add zero-gradient BC to reconstruct interface u/v and change dz_min as input (ufs-community#369)
  Update develop from NOAA-GSL: RUC ice, MYNN sfclay, stochastic land perturbations (ufs-community#386)
  update cpl gfsv16 tests, rrtmgp fix and bug fixes in cmeps (ufs-community#378)
  point fv3 to EMC develop branch (ufs-community#377)
  Remove IPD steps 3 and 5 (ufs-community#357)
  Update CMEPS  (ufs-community#345)
  Implementation of CCPP timestep_init and timestep_final phases (ufs-community#337)
  Remove unnecessary SIMD instruction sets for Jet, first round of cleanup in rt.conf, initialize cld_amt to zero for regional runs (dycore) (ufs-community#353)
  add frac grid input, update and add additional cpld tests (ufs-community#354)
  Add checkpoint restarts for ufs-cpld (ufs-community#342)
  Update the format of rt.conf (ufs-community#349)
  Remove IPD (step 1) (ufs-community#331)
  Feature/ww3update (ufs-community#334)
  Replace old regional SDF with FV3_GFS_v15_thompson_mynn (ufs-community#333)
  Update modules with hpc-stack v1.1.0 (ufs-community#319)
  Regression test log for PR ufs-community#323 for jet.intel (ufs-community#336)
  RRTMGP and Thompson MP coupling (ufs-community#323)
  Add 2 new tests for DATM-MOM6-CICE6 application (ufs-community#332)
  Add optional bulk flux calculation in ufs-datm (ufs-community#266)
  Final-final GFS v16 updates / restart reproducibility bugfixes (ufs-community#325)
  Updates to build for JEDI linking/control, add wcoss2 (ufs-community#295)
  Update CICE, Move regression test input outside baseline directory (ufs-community#270)
  Feature/update mom6 and retain b4b results for 025x025 resolution (ufs-community#290)
  Update for Jet, bug fixes in running with frac_grid=T and GFDL MP, and in restarting with frac_grid=T  (ufs-community#304)
  Updates to stochastic_physics_wrapper (ufs-community#280)
  Update develop from gsd/develop 2020/11/20: Unified gravity wave drag, updates to other GSL physics (ufs-community#297)
  Fix to allow quilting with non-factors for layout (ufs-community#250)
  rt update (ufs-community#261)
@junwang-noaa junwang-noaa mentioned this pull request Mar 13, 2021
Closed
epic-cicd-jenkins pushed a commit that referenced this pull request Apr 17, 2023
@gspetro-NOAA @gspetro
[develop] Update Build/Run and ConfigWorkflow Chapters (#425)
0e11b9d 
* update stochastic physics link

* add HPC-Stack Intersphinx links

* remove hpc-stack submodule in favor of intersphinx links

* move tables to 'tables' directory

* remove duplicate Glossary terms; update links

* update Quickstart

* add M. Leukin to mgmt team list; change expt gen command

* fix typo

* fix typo

* add stochastic physics link & troubleshooting tips

* separate Build & Run chapters; update crosslinks

* minor fix

* update file exts in Config Params chapter

* update user/platform sections of Config Params Chapter

* update file name params

* grid_gen, verbose, compiler, etc. params

* ConfigWorkflow 1st draft revision

* add met docs to intersphinx

* fix minor errors

* updated table 4.1

* add default values to ConfigWorkflow, other minor fixes

* add RRFS and GSI to Glossary

* update tables & file exts

* add L1 data locations

* address comments in ConfigWorkflow

* fix table

* minor fixes

* minor updates

* rm reg_wflow references, update tables, minor updates

* switch order of steps so python env is loaded first

* edit and rearrange pyenv and config BR sections

* edit mac/linux/VX config sections

* 1st draft of RunSRW

* add parameter definitions that were accidentally deleted in .sh --> .yaml switch

* remove comments

* fix typo

* fix link

* add info from Mike L.

* update build & workflow images

* update workflow generation image

* update image

* update image

* fix reviewer comments

* update expt gen image

* rm reg_wflow refs, switch config.sh to .yaml, update directory structure in intro

* rm reg_wflow refs, switch config.sh to .yaml

* change templates dir to parm

* update GSI glossary entry

* fixes based on PR review

* remove fixed file mapping params

* remove SFC_CLIMO_FIELDS from config_defaults.yaml/ConfigWorkflow.rst

* update info on data: section of machine file

* minor wording fix

* minor wording fix

* add note about converting ols .sh file to .yaml

* update intro forum link, minor wording/details

* update pngs, RRFS note, minor intro fixes

* update wflow gen img

Co-authored-by: gspetro <gillian.s.petro@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@barlage barlage barlage approved these changes

@junwang-noaa junwang-noaa junwang-noaa approved these changes

@DusanJovic-NOAA DusanJovic-NOAA DusanJovic-NOAA approved these changes

Assignees
No one assigned
Labels
Baseline Updates Current baselines will be updated. Waiting for Reviews The PR is waiting for reviews from associated component PR's.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Enable test fv3_ccpp_gfs_v16_RRTMGP_2thrd on wcoss_cray
6 participants
@climbfuji @BrianCurtis-NOAA @DusanJovic-NOAA @barlage @junwang-noaa @HelinWei-NOAA