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

Add prognostic cumulus closure description in saSAS #523

Merged
merged 40 commits into from
Jun 3, 2022

Conversation

lisa-bengtsson
Copy link
Contributor

@lisa-bengtsson lisa-bengtsson commented Apr 20, 2022

Description

This PR introduces an optional closure assumption to the Arakawa-Schubert cloud work function in saSAS cumulus convection, as well as the GFS shallow convection scheme, in where the mass-flux at cloud base is described as the product between updraft area fraction and updraft velocity. The updraft area fraction is given by a prognostic moisture budget equation.

The update is not aimed for UFS coupled prototype 8, but is an option to be explored beyond P8.

In addition to updates in the ccpp/physics submodule, new field_table, and namelist parameters are added in ufs-weather-model.

The PR is also making a small change in the stochastic_physics_driver.F90 to allow the cellular automata to work on non-uniform blocksizes. Previously the code aborted if not all blocks in the domain had the same size, however, the code works the way it's been formulated, so I simply removed the call to mpp_error in case on non-uniform blocksizes.

Issue(s) addressed

Issue: NCAR/ccpp-physics#890
ufs-community/ufs-weather-model#1193

Testing

This PR does not change the answers in the control, but a new test has been added where the scheme is activated using progsigma = True.

The regression tests have been tested on Hera.

Dependencies

Dependency:
NCAR/ccpp-physics#903
ufs-community/ufs-weather-model#1187

.gitmodules Outdated Show resolved Hide resolved
.gitmodules Outdated Show resolved Hide resolved
@grantfirl
Copy link
Collaborator

@lisa-bengtsson NCAR/ccpp-physics#903 has been merged. Please pull down the latest ccpp-physics main branch, git add that latest branch, and revert your changes to .gitmodules in preparation for merging this PR.

@lisa-bengtsson
Copy link
Contributor Author

I have added the NCAR/ccpp-physics#903 and reverted .gitmodules, I still see the changes in ccpp/physics here (in fv3atm), how can I see that it is pointing to the correct ccpp/physics?

@grantfirl
Copy link
Collaborator

grantfirl commented Jun 3, 2022

I have added the NCAR/ccpp-physics#903 and reverted .gitmodules, I still see the changes in ccpp/physics here (in fv3atm), how can I see that it is pointing to the correct ccpp/physics?

@lisa-bengtsson You should see that there are changes in ccpp/physics because you've updated the ccpp-physics submodule. The latest ccpp-physics commit hash is NCAR/ccpp-physics@77bcfb1 and it looks like your branch is correctly pointing to it, so we're all good.

You can check this on GitHub by looking at the 'files changed' in the PR, clicking on the ccpp/physics and then the number of changed files (19 files). It'll show which commit has fv3atm is pointing to. You can also use git in the command line to do this. Assuming that your latest fv3atm branch is checked out, if you do a git submodule update --init --recursive when in the FV3 directory, it will checkout the commits that your fv3atm branch is pointing to. Then, cd into ccpp/physics and run git log to see the commits.

I'm sure that there are other ways as well.

Edit: I just googled, and you can do git submodule status in your fv3atm branch to see which commits of the submodules that you're pointing to.

@lisa-bengtsson
Copy link
Contributor Author

I have added the NCAR/ccpp-physics#903 and reverted .gitmodules, I still see the changes in ccpp/physics here (in fv3atm), how can I see that it is pointing to the correct ccpp/physics?

@lisa-bengtsson You should see that there are changes in ccpp/physics because you've updated the ccpp-physics submodule. The latest ccpp-physics commit hash is NCAR/ccpp-physics@77bcfb1 and it looks like your branch is correctly pointing to it, so we're all good.

You can check this on GitHub by looking at the 'files changed' in the PR, clicking on the ccpp/physics and then the number of changed files (19 files). It'll show which commit has fv3atm is pointing to. You can also use git in the command line to do this. Assuming that your latest fv3atm branch is checked out, if you do a git submodule update --init --recursive when in the FV3 directory, it will checkout the commits that your fv3atm branch is pointing to. Then, cd into ccpp/physics and run git log to see the commits.

I'm sure that there are other ways as well.

Edit: I just googled, and you can do git submodule status in your fv3atm branch to see which commits of the submodules that you're pointing to.

Great, thank you Grant. Then I think we are good to go with this branch.

@jkbk2004 jkbk2004 merged commit 61f060f into NOAA-EMC:develop Jun 3, 2022
bluefinweiwei added a commit to bluefinweiwei/fv3atm that referenced this pull request Oct 12, 2022
…OAA-EMC#523"

https://github.com/NOAA-EMC/fv3atm/pull/523/files
	modified:   ../ccpp/data/CCPP_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.meta
	modified:   ../ccpp/driver/GFS_restart.F90
	modified:   ../ccpp/physics (new commits, untracked content)
bluefinweiwei added a commit to bluefinweiwei/fv3atm that referenced this pull request Oct 12, 2022
…OAA-EMC#523"

https://github.com/NOAA-EMC/fv3atm/pull/523/files
	modified:   ../ccpp/data/CCPP_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.meta
	modified:   ../ccpp/driver/GFS_restart.F90
	modified:   ../ccpp/physics (new commits, untracked content)

	modified:   ../ccpp/data/CCPP_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.meta
	modified:   ../ccpp/driver/GFS_restart.F90
	modified:   ../ccpp/physics (new commits, untracked content)
bluefinweiwei added a commit to bluefinweiwei/fv3atm that referenced this pull request Oct 12, 2022
…OAA-EMC#523"

https://github.com/NOAA-EMC/fv3atm/pull/523/files

	modified:   ../ccpp/data/CCPP_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.meta
	modified:   ../ccpp/driver/GFS_restart.F90
	modified:   stochastic_physics_wrapper.F90
bluefinweiwei added a commit to DTC-phytne/fv3atm that referenced this pull request Oct 13, 2022
…OAA-EMC#523" (#1)

https://github.com/NOAA-EMC/fv3atm/pull/523/files

	modified:   ../ccpp/data/CCPP_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.meta
	modified:   ../ccpp/driver/GFS_restart.F90
	modified:   stochastic_physics_wrapper.F90
bluefinweiwei added a commit to DTC-phytne/fv3atm that referenced this pull request Oct 13, 2022
* Adopt progsigma "Add prognostic cumulus closure description in saSAS NOAA-EMC#523"
https://github.com/NOAA-EMC/fv3atm/pull/523/files

	modified:   ../ccpp/data/CCPP_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.meta
	modified:   ../ccpp/driver/GFS_restart.F90
	modified:   stochastic_physics_wrapper.F90

* modified:   .gitmodules
bluefinweiwei added a commit to DTC-phytne/fv3atm that referenced this pull request Oct 13, 2022
* Adopt progsigma "Add prognostic cumulus closure description in saSAS NOAA-EMC#523"
https://github.com/NOAA-EMC/fv3atm/pull/523/files

	modified:   ../ccpp/data/CCPP_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.F90
	modified:   ../ccpp/data/GFS_typedefs.meta
	modified:   ../ccpp/driver/GFS_restart.F90
	modified:   stochastic_physics_wrapper.F90

* modified:   .gitmodules

* modified:   ccpp/physics
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.

7 participants