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

Update to cellular automaton stochastic convective organization scheme #589

Merged

Conversation

lisa-bengtsson
Copy link
Contributor

@lisa-bengtsson lisa-bengtsson commented May 20, 2021

PR Checklist

  • Ths 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.

  • If new or updated input data is required by this PR, it is clearly stated in the text of the PR.

Instructions: All subsequent sections of text should be filled in as appropriate.

The information provided below allows the code managers to understand the changes relevant to this PR, whether those changes are in the ufs-weather-model repository or in a subcomponent repository. Ufs-weather-model code managers will use the information provided to add any applicable labels, assign reviewers and place it in the Commit Queue. Once the PR is in the Commit Queue, it is the PR owner's responsiblity to keep the PR up-to-date with the develop branch of ufs-weather-model.

Description

Updates include:

  1. Introduction of CA domain definition.
  2. Read/Write and restart capability of CA
  3. Change namelist control parameter so that CA time and space scales are adjusted for various resolutions given the same CA namelist input.
  4. Significant cleaning of old ideas.
  5. Improved coupling to cumulus convection to be committed in coordination with this issue: Physics update in cumulus convection, PBL & surface layer for UFS_P7 NCAR/ccpp-physics#657

Test results with GFSv16 as a baseline (atmosphere only) can be found here for winter and summer: https://www.emc.ncep.noaa.gov/gmb/jhan/vsdbw/v16upcas2/ and https://www.emc.ncep.noaa.gov/gmb/jhan/vsdbw/v16upcaw2

New baselines are needed for the fv3_ca regression tests.

Issue(s) addressed

Link the issues to be closed with this PR, whether in this repository, or in another repository.
(Remember, issues must always be created before starting work on a PR branch!)

  • fixes #<issue_number>
  • fixes noaa-emc/fv3atm/issues/<issue_number>

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)

  • hera.intel
  • hera.gnu
  • orion.intel
  • cheyenne.intel
  • cheyenne.gnu
  • gaea.intel
  • jet.intel
  • wcoss_cray
  • wcoss_dell_p3
  • CI

Dependencies

If testing this branch requires non-default branches in other repositories, list them. Those branches should have matching names (ideally).

Do PRs in upstream repositories need to be merged first?
If so add the "waiting for other repos" label and list the upstream PRs

NOAA-PSL/stochastic_physics#41
NOAA-EMC/fv3atm#305

@MinsukJi-NOAA MinsukJi-NOAA added the Baseline Updates Current baselines will be updated. label Jun 10, 2021
Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

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

Please add links/references to the associated PRs in the PR description. Thanks!

tests/rt.sh Outdated
@@ -240,12 +240,13 @@ elif [[ $MACHINE_ID = hera.* ]]; then
QUEUE=debug
COMPILE_QUEUE=batch

#ACCNR=fv3-cpu
ACCNR=ome
Copy link
Collaborator

Choose a reason for hiding this comment

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

The changes to rt.sh will need to be reverted.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I will create new baselines, update rt.sh with a new date and revert these updates.

@BrianCurtis-NOAA
Copy link
Collaborator

Machine: gaea
Compiler: intel
Job: RT
Repo location: /lustre/f2/pdata/ncep/emc.nemspara/autort/pr/649388260/20210612114511/ufs-weather-model
Please manually delete: /lustre/f2/scratch/emc.nemspara/FV3_RT/rt_26174
Test control_ca 024 failed in check_result failed
Test control_ca 024 failed in run_test failed
Test cpld_ca 004 failed in check_result failed
Test cpld_ca 004 failed in run_test failed
Please make changes and add the following label back:
gaea-intel-RT

@ufs-community ufs-community deleted a comment from lisa-bengtsson Jun 12, 2021
@MinsukJi-NOAA
Copy link
Contributor

@lisa-bengtsson I deleted your comment by mistake. Reproduced below with a response.

Hm... not sure what do make of this? What would be different on gaea? Is it possible to remake the baselines and run the regression test again?

This should be taken care of once the new baselines for *_ca are moved to the right place.

@lisa-bengtsson
Copy link
Contributor Author

@lisa-bengtsson I deleted your comment by mistake. Reproduced below with a response.

Hm... not sure what do make of this? What would be different on gaea? Is it possible to remake the baselines and run the regression test again?

This should be taken care of once the new baselines for *_ca are moved to the right place.

Ok, thanks for clarifying!

@MinsukJi-NOAA MinsukJi-NOAA added the Waiting for Reviews The PR is waiting for reviews from associated component PR's. label Jun 13, 2021
@MinsukJi-NOAA
Copy link
Contributor

This PR is ready for merge once the FV3 and stochastic_physics are merged in their repositories, and then the .gitmodules pointers are updated.

@lisa-bengtsson
Copy link
Contributor Author

@junwang-noaa @MinsukJi-NOAA .gitmodules has been reverted.

@MinsukJi-NOAA
Copy link
Contributor

@junwang-noaa @MinsukJi-NOAA .gitmodules has been reverted.

@lisa-bengtsson, your FV3 hash should be 0a47bd1, not 453f38e. Also, stochastic_physics should be c142e67, not 2ba2421

@lisa-bengtsson
Copy link
Contributor Author

@junwang-noaa @MinsukJi-NOAA .gitmodules has been reverted.

@lisa-bengtsson, your FV3 hash should be 0a47bd1, not 453f38e. Also, stochastic_physics should be c142e67, not 2ba2421

@MinsukJi-NOAA Ok, I thought I only needed to update .gitmodules, should I fetch upstream to the merged FV3 and stochastic_physics directories?

@MinsukJi-NOAA
Copy link
Contributor

@MinsukJi-NOAA Ok, I thought I only needed to update .gitmodules, should I fetch upstream to the merged FV3 and stochastic_physics directories?

Yes

@lisa-bengtsson
Copy link
Contributor Author

@MinsukJi-NOAA Ok, I thought I only needed to update .gitmodules, should I fetch upstream to the merged FV3 and stochastic_physics directories?

Yes

Apologies that I don't get how this work. I tried to do "git fetch upstream", then:
[Lisa.Bengtsson@hfe03 ufs-weather-model]$ git pull upstream develop
From https://github.com/ufs-community/ufs-weather-model

  • branch develop -> FETCH_HEAD
    Already up to date.
    [Lisa.Bengtsson@hfe03 ufs-weather-model]$ git status
    On branch feature/CA_develop2
    Your branch is up to date with 'origin/feature/CA_develop2'.

nothing to commit, working tree clean

Do I have to specify a number explicitly? If you could provide me the commands to point to these merged repositories I would greatly appreciate it.

@lisa-bengtsson
Copy link
Contributor Author

@MinsukJi-NOAA @junwang-noaa am I pointing to the right place now?

@MinsukJi-NOAA
Copy link
Contributor

@MinsukJi-NOAA @junwang-noaa am I pointing to the right place now?

@lisa-bengtsson , FV3 is still pointing to a different hash. Try this:

$ cd FV3
$ git checkout develop
$ cd ..
$ git diff FV3
-Subproject commit 7a57a2bc70cf6777a4eedb415d91e0bd347cc55f
+Subproject commit 0a47bd13ab49a785e9731eb8d59a46b429f26720

git add, commit then push

@MinsukJi-NOAA
Copy link
Contributor

FV3 is now correctly pointing to 0a47bd1.

@lisa-bengtsson
Copy link
Contributor Author

lisa-bengtsson commented Jun 14, 2021 via email

@MinsukJi-NOAA MinsukJi-NOAA merged commit 14c69ba into ufs-community:develop Jun 14, 2021
pjpegion pushed a commit to NOAA-PSL/ufs-weather-model that referenced this pull request Apr 4, 2023
* Add convective cloud to radiation, Thompson MP only.
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. Waiting for Reviews The PR is waiting for reviews from associated component PR's.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants