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

2D advection of cellular automata (Combined PR# 1804) #1870

Merged
merged 24 commits into from
Sep 5, 2023

Conversation

lisa-bengtsson
Copy link
Contributor

@lisa-bengtsson lisa-bengtsson commented Aug 16, 2023

PR Author Checklist:

  • I have linked PR's from all sub-components involved in section below.
  • I am confirming reviews are completed in ALL sub-component PR's.
  • I have run the full RT suite on either Hera/Cheyenne AND have attached the log to this PR below this line:
    • LOG: /scratch2/BMC/gsienkf/Lisa.Bengtsson/ufs-weather-model-CAadvection2/tests/logs/RegressionTests_hera.log
  • I have added the list of all failed regression tests to "Anticipated changes" section.
  • I have filled out all sections of the template.

Description

This development adds a capability to advect CA cells (or - in the future - 2D cloud objects) with a mean level wind. The updated CA/cloud state is then used to inform on convective initiation in saSAS (and -in the future - the C3 convection scheme)

*Add namelist ca_advect as control switch.
*Ensure the same definition for halo sizes are used in the domain construction, as when allocating data to be used in the atmospehre_scalar_field_halo routines.
*Update halo size from 1 to 3.
*Bring in U,V and control flags from FV3 to CA driver routines - compute mean level wind
*2D advection of CA cells

Linked Issues and Pull Requests

Associated UFSWM Issue to close

Closes: #1869

Subcomponent Pull Requests

Blocking Dependencies

None

Subcomponents involved:

  • AQM
  • CDEPS
  • CICE
  • CMEPS
  • CMakeModules
  • FV3
  • GOCART
  • HYCOM
  • MOM6
  • NOAHMP
  • WW3
  • stochastic_physics
  • none

Anticipated Changes

Input data

  • No changes are expected to input data.
  • Changes are expected to input data:
    • New input data.
    • Updated input data.

Regression Tests:

  • No changes are expected to any regression test.
  • Changes are expected to the following tests:
Tests effected by changes in this PR:

Libraries

  • Not Needed
  • Needed
    • Create separate issue in JCSDA/spack-stack asking for update to library. Include library name, library version.
    • Add issue link from JCSDA/spack-stack following this item
Code Managers Log
  • 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.
  • Move new/updated input data on RDHPCS Hera and propagate input data changes to all supported systems.
    • N/A

Testing Log:

  • RDHPCS
    • Hera
    • Orion
    • Jet
    • Gaea
    • Cheyenne
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
    • Completed
  • opnReqTest
    • N/A
    • Log attached to comment

@lisa-bengtsson
Copy link
Contributor Author

Log to RT test intel on Hera:
/scratch2/BMC/gsienkf/Lisa.Bengtsson/ufs-weather-model-CAadvection2/tests/logs/RegressionTests_hera.log

All jobs pass. No anticipated baseline changes.

@zach1221
Copy link
Collaborator

zach1221 commented Sep 1, 2023

@lisa-bengtsson would you be open to combining UFS-WM PR# 1804 into this one? It's just documentation changes.

@lisa-bengtsson
Copy link
Contributor Author

@lisa-bengtsson would you be open to combining UFS-WM PR# 1804 into this one? It's just documentation changes.

Yes no problem.

@FernandoAndrade-NOAA
Copy link
Collaborator

@BrianCurtis-NOAA, FYI following fv3 sub pr approval and sync, this pr looks good for testing after we advance through the current queue.

@zach1221
Copy link
Collaborator

zach1221 commented Sep 1, 2023

@lisa-bengtsson Ok, I think we're ready to begin testing against this PR. If you can combine the changes from 1804 in this one and sync up your branch/resolve conflicts, then we should be good to go.

@lisa-bengtsson
Copy link
Contributor Author

@zach1221 I have synced up the branch. I wonder how I can easiest combine the changes from 1804 with this PR? A merge?

@zach1221
Copy link
Collaborator

zach1221 commented Sep 1, 2023

@zach1221 I have synced up the branch. I wonder how I can easiest combine the changes from 1804 with this PR? A merge?

I usually just clone the PRs, make the updates, then push back to the branch. There's probably an easier way but that's my method. I'm happy to do it, if that's ok?

@lisa-bengtsson
Copy link
Contributor Author

@zach1221 I have synced up the branch. I wonder how I can easiest combine the changes from 1804 with this PR? A merge?

I usually just clone the PRs, make the updates, then push back to the branch. There's probably an easier way but that's my method. I'm happy to do it, if that's ok?

That would be great if you could do it, thank you!

@zach1221 zach1221 added No Baseline Change No Baseline Change Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked. jenkins-ci Jenkins CI: ORT build/test on docker container labels Sep 1, 2023
@zach1221 zach1221 changed the title 2D advection of cellular automata 2D advection of cellular automata (Combined PR# 1804) Sep 1, 2023
@zach1221
Copy link
Collaborator

zach1221 commented Sep 4, 2023

ORTs passed. Jenkins-ci log attached.

Jenkins-ci 1870 ORTs.pdf

@BrianCurtis-NOAA
Copy link
Collaborator

ORTs passed. Jenkins-ci log attached. Uploading Jenkins-ci 1870 ORTs.pdf…

This link is broken.

@zach1221
Copy link
Collaborator

zach1221 commented Sep 5, 2023

ORTs passed. Jenkins-ci log attached. Uploading Jenkins-ci 1870 ORTs.pdf…

This link is broken.

should be fixed.

@zach1221
Copy link
Collaborator

zach1221 commented Sep 5, 2023

Testing is complete. I will follow up on the stochastic physics sub-pr to begin the merging process.

@zach1221
Copy link
Collaborator

zach1221 commented Sep 5, 2023

@lisa-bengtsson Stochastic physics PR #62 has been merged. Please update the submodule pointer and revert the change in .gitmodule url.
hash: fed14957ba8fa9789b86c2df413b76a9eef633ae

@BrianCurtis-NOAA
Copy link
Collaborator

fv3 merged: NOAA-EMC/fv3atm@379ef21

@zach1221 zach1221 merged commit d3daaf1 into ufs-community:develop Sep 5, 2023
@lisa-bengtsson
Copy link
Contributor Author

Thank you!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
jenkins-ci Jenkins CI: ORT build/test on docker container No Baseline Change No Baseline Change Ready for Commit Queue The PR is ready for the Commit Queue. All checkboxes in PR template have been checked.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add capability to advect CA cells/cloud objects with the wind on the cellular automata grid
5 participants