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 for AM5: turns off saturation adjustment in 2dz filter #300

Merged
merged 1 commit into from
Oct 20, 2023

Conversation

laurenchilutti
Copy link
Contributor

Description

Brings update from internal development branch to GitHub main branch (to bring to dev/gfdl_am5).
Turns off saturation adjustment in the 2dz filter for non-SHiELD configuration.
This will change answers for runs using fv_sg_adj > 0 in AM5.

Fixes # (issue)

How Has This Been Tested?

Tested by CI and by Linjiong.

Checklist:

Please check all whether they apply or not

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

Turn off saturation adjustment in the 2dz filter for non-SHiELD configuration.

See merge request fv3team/atmos_cubed_sphere!136
@laurenchilutti laurenchilutti changed the title Merge branch 'user/lnz/shield2023' into 'main' Update for AM5: turns off saturation adjustment in 2dz filter Oct 20, 2023
@laurenchilutti
Copy link
Contributor Author

@bensonr I am bringing this into the main branch via a PR so that CI can run on the commit before merging. This will then be cherry-picked to dev/gfdl_am5.

@bensonr
Copy link
Contributor

bensonr commented Oct 20, 2023

@laurenchilutti - do you need to cherry pick or can you simply merge Main into dev/gfdl_am5?

@laurenchilutti
Copy link
Contributor Author

I can compare what will happen with a merge of main to dev/gfdl_am5 versus the cherry-pick approach that I had been planning. A merge would be much simpler.

@laurenchilutti
Copy link
Contributor Author

Just tested and I will be able to just merge main to dev/gfdl_am5. Would you rather I do this vi a PR or would a manual merge be appropriate?

@laurenchilutti laurenchilutti merged commit e94dc4b into NOAA-GFDL:main Oct 20, 2023
74 checks passed
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.

3 participants