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

small cloud tuning from Greg Thompson #1410

Merged
merged 19 commits into from
Oct 19, 2022

Conversation

grantfirl
Copy link
Collaborator

@grantfirl grantfirl commented Sep 9, 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.

  • 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

This PR only updates the FV3 and ccpp/physics submodule pointer to include new cloud tuning for ice clouds aloft by Greg Thompson.

Issue(s) addressed

NCAR/ccpp-physics#966

Testing

The changes were tested using rt.conf on Hera/Intel. All tests pass except for those using the Thompson MP scheme, which fail in run_result as expected due to the new tuning.

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

Dependencies

ufs-community/ccpp-physics#1
NOAA-EMC/fv3atm#580

@jkbk2004
Copy link
Collaborator

@grantfirl we are trying to see if we can add in fms upgrade (g2tmpl and crtm as well). One or two days delay is possible for this pr. Also, Dustin's #1394 is on hold. But we are giving a priority for emc ccpp fork branch switch after #1394. So schedules for ccpp prs a bit tangled. If progress can be made on #1394, commit schedule issue can be resolved very nicely. But I will check with emc code managers.

@BrianCurtis-NOAA
Copy link
Collaborator

@grantfirl Is this ready to get tested today?

@grantfirl
Copy link
Collaborator Author

@BrianCurtis-NOAA @ChunxiZhang-NOAA The underlying physics code changes are certainly ready to test, although it looks like there will be an issue testing this because the ccpp-physics PR is into the ufs/dev branch right now, and the ufs/dev branch is behind NCAR/main. I think that the PRs that were merged into NCAR/main since ufs/dev was forked off have changed some baselines, so the UFS RTs will basically be testing old code against newer baselines, which, I'm guessing, is no good. @ChunxiZhang-NOAA We could change the target of the ccpp-physics PR back into NCAR/main if @BrianCurtis-NOAA would like to work on this today. I know that you wanted to merge Dustin's "accumulated cleanup" PR into NCAR/main before syncing, but I'm not sure that it is ready yet, so perhaps we should just change the target of the Thompson tuning PR to avoid delaying EMC code managers?

@grantfirl
Copy link
Collaborator Author

@BrianCurtis-NOAA FYI, I have a doctor's appointment for the next hour or so, but will be back to help after 11 ET.

@BrianCurtis-NOAA
Copy link
Collaborator

@grantfirl It sounds like getting UFS using ufs-community/ccpp-physics should be a higher priority? @ChunxiZhang-NOAA Is this something you could get done by tomorrow?

@ChunxiZhang-NOAA
Copy link
Contributor

ChunxiZhang-NOAA commented Sep 21, 2022

@grantfirl @BrianCurtis-NOAA I thought this PR would be merged AFTER the fv3atm pointed to ufs-community/ccpp-physics ufs/dev branch. Currently, I am still waiting for Dustin's PR#956. If this PR is not ready by the end of day today, I will just go ahead and sync the ufs/dev branch with NCAR/main, then create a PR to make fv3atm point to ufs/dev.

@dustinswales
Copy link
Collaborator

@ChunxiZhang-NOAA @jkbk2004 @grantfirl I suggest to proceed without#956.
It's not a critical PR, just cleanup, and I'm still having some issues with two RTs that aren't matching the baselines.

@ChunxiZhang-NOAA
Copy link
Contributor

@dustinswales @jkbk2004 @grantfirl Ok, I will start the transition process without #956.

@BrianCurtis-NOAA
Copy link
Collaborator

BrianCurtis-NOAA commented Sep 21, 2022

@dustinswales

I suggest to proceed without#956. It's not a critical PR, just cleanup, and I'm still having some issues with two RTs that aren't matching the baselines.

You may want to compare the outputs manually. It may lead you into finding if its a code issue or if new baselines need to be generated because of your changes.

@grantfirl
Copy link
Collaborator Author

@BrianCurtis-NOAA All of the submodules have been updated after Chunxi made the switch to use the ufs-community/ufs/dev branch of ccpp-physics. This should be ready to test now if you'd like to return to it.

Grant Firl and others added 3 commits October 6, 2022 14:23
This change properly parallelizes the ORT workflow using the Jenkins
matrix and agent directives, which eliminates the need for the
ufs-weather-model/ort-docker-pipeline job and change request handling.
@jkbk2004
Copy link
Collaborator

@grantfirl There is still time. But we are considering to merge in #1453 to this PR. Its just one file change on jenkinsfile that has no impact to other tests.

@grantfirl
Copy link
Collaborator Author

@grantfirl There is still time. But we are considering to merge in #1453 to this PR. Its just one file change on jenkinsfile that has no impact to other tests.

@jkbk2004 OK, that is fine with me. I'm waiting to update the PR branches associated with this one until #1437 is merged. If you would like me to update beforehand, just let me know.

@jkbk2004
Copy link
Collaborator

@grantfirl thanks so much! please, go ahead to combine in the change in @jessemcfarland #1453. I think it makes a sense to prepare since today is Friday. #1437 is a bit heavy pr.

@grantfirl
Copy link
Collaborator Author

@jkbk2004 This PR and its submodule PRs have been updated to the latest development code, so it should be ready to test.

@jkbk2004
Copy link
Collaborator

@grantfirl @BrianCurtis-NOAA I will be away from desk next a few hours. Can you add new BL_DATE=20221017?

@BrianCurtis-NOAA
Copy link
Collaborator

@grantfirl Your on the top of the commit queue. Please update to the latest develop in UFSWM and change the BL_DATE in rt.sh to 20221017.

@BrianCurtis-NOAA BrianCurtis-NOAA added the Baseline Updates Current baselines will be updated. label Oct 17, 2022
@grantfirl
Copy link
Collaborator Author

OK, @BrianCurtis-NOAA I'll do this now.

@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: orion
Compiler: intel
Job: BL
[BL] Repo location: /work/noaa/nems/emc.nemspara/autort/pr/1051599583/20221017150025/ufs-weather-model
[BL] Error: Test compile_001 failed in run_compile failed
[BL] Error: Test compile_002 failed in run_compile failed
[BL] Error: Test compile_003 failed in run_compile failed
[BL] Error: Test compile_004 failed in run_compile failed
[BL] Error: Test compile_005 failed in run_compile failed
[BL] Error: Test compile_006 failed in run_compile failed
[BL] Error: Test compile_007 failed in run_compile failed
[BL] Error: Test compile_008 failed in run_compile failed
[BL] Error: Test compile_009 failed in run_compile failed
[BL] Error: Test compile_010 failed in run_compile failed
[BL] Error: Test compile_011 failed in run_compile failed
[BL] Error: Test compile_012 failed in run_compile failed
[BL] Error: Test compile_013 failed in run_compile failed
[BL] Error: Test compile_014 failed in run_compile failed
[BL] Error: Test compile_015 failed in run_compile failed
[BL] Error: Test compile_016 failed in run_compile failed
[BL] Error: Test compile_017 failed in run_compile failed
[BL] Error: Test compile_018 failed in run_compile failed
[BL] Error: Test compile_021 failed in run_compile failed
[BL] Error: Test compile_022 failed in run_compile failed
[BL] Error: Test compile_023 failed in run_compile failed
Please make changes and add the following label back: orion-intel-BL

on-behalf-of @ufs-community <brian.curtis@noaa.gov>
on-behalf-of @ufs-community <brian.curtis@noaa.gov>
@zach1221 zach1221 added the jenkins-ci Jenkins CI: ORT build/test on docker container label Oct 17, 2022
@BrianCurtis-NOAA
Copy link
Collaborator

Automated RT Failure Notification
Machine: gaea
Compiler: intel
Job: BL
[BL] Repo location: /lustre/f2/pdata/ncep/emc.nemspara/autort/pr/1051599583/20221017200008/ufs-weather-model
[BL] Baseline creation and move successful
[RT] Repo location: /lustre/f2/pdata/ncep/emc.nemspara/autort/pr/1051599583/20221017220129/ufs-weather-model
[RT] Error: Test cpld_restart_bmark_p8 011 failed in run_test failed
Please make changes and add the following label back: gaea-intel-BL

@jkbk2004
Copy link
Collaborator

We will skip the test on Cheyenne. It will be down until Oct. 20. @grantfirl we can start merging process.

@grantfirl
Copy link
Collaborator Author

We will skip the test on Cheyenne. It will be down until Oct. 20. @grantfirl we can start merging process.

OK, will do.

@grantfirl
Copy link
Collaborator Author

NOAA-EMC/fv3atm#580 is ready for review/merge.

@jkbk2004 jkbk2004 mentioned this pull request Oct 18, 2022
16 tasks
Copy link
Contributor

@ChunxiZhang-NOAA ChunxiZhang-NOAA left a comment

Choose a reason for hiding this comment

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

Looks good.

@zach1221
Copy link
Collaborator

@jkbk2004
Copy link
Collaborator

@grantfirl we can merge in here with fv3atm hash update and reverting branch in gitmodules.

@jkbk2004
Copy link
Collaborator

@ChunxiZhang-NOAA @DusanJovic-NOAA We will skip cheyenne for this pr. Can you go ahead to approve?

@jkbk2004 jkbk2004 merged commit 6b73f5d into ufs-community:develop Oct 19, 2022
@jkbk2004 jkbk2004 mentioned this pull request Oct 19, 2022
16 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Baseline Updates Current baselines will be updated. jenkins-ci Jenkins CI: ORT build/test on docker container
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants