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 3-moment option for NSSL cloud microphysics #1924

Merged
merged 26 commits into from
Nov 6, 2023

Conversation

MicroTed
Copy link
Contributor

@MicroTed MicroTed commented Sep 26, 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:
  • I have added the list of all failed regression tests to "Anticipated changes" section.
  • I have filled out all sections of the template.

Description

Adds support for NSSL microphysics option of 3-moment rain, graupel, and hail (or just rain and graupel if the hail species is deactivated). This predicts the reflectivity moment (6th moment in diameter), which in turn predicts the shape parameter of the gamma function particle size distribution.

Linked Issues and Pull Requests

Associated UFSWM Issue to close

N/A

Subcomponent Pull Requests

PR for CCPP: ufs-community/ccpp-physics#110
PR for FV3 with added variables needed by CCPP: NOAA-EMC/fv3atm#702

Blocking Dependencies

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 affected by changes in this PR: Yes, it will change regional_wofs, rrfs_v1nssl, and rrfs_v1nssl_nohailnoccn because of some changes to the NSSL microphysics scheme that is used with the tests. Failed tests (comparisons): regional_wofs, rrfs_v1nssl, rrfs_v1nssl_nohailnoccn

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
    • Hercules
    • Jet
    • Gaea
    • Cheyenne
  • WCOSS2
    • Dogwood/Cactus
    • Acorn
  • CI
    • Completed
  • opnReqTest
    • N/A
    • Log attached to comment

@MicroTed
Copy link
Contributor Author

MicroTed commented Oct 1, 2023

The addition of -mcmodel=medium to Intel.cmake was needed on jet to avoid a link error. I think this is because jet compiles for multiple targets, which increases the code size enough to not fit in the 'small' mcmodel. (No problem on hera)

@grantfirl
Copy link
Collaborator

@MicroTed Is this ready to be out of draft?

@MicroTed
Copy link
Contributor Author

MicroTed commented Oct 6, 2023

@grantfirl I suppose so, and the FV3 one, too.

@MicroTed MicroTed marked this pull request as ready for review October 6, 2023 04:30
@FernandoAndrade-NOAA FernandoAndrade-NOAA added the Baseline Updates Current baselines will be updated. label Nov 1, 2023
@zach1221
Copy link
Collaborator

zach1221 commented Nov 2, 2023

Hi, @MicroTed . I think we're ready to begin testing of this PR next. Can you please sync up your branch to resolve conflicts?

@jkbk2004
Copy link
Collaborator

jkbk2004 commented Nov 2, 2023

@MicroTed can you sync up at the fv3atm level? Ihttps://github.com/NOAA-EMC/fv3atm/pull/702

@MicroTed
Copy link
Contributor Author

MicroTed commented Nov 2, 2023

@jkbk2004 I think everything should be up to date now.

@zach1221 zach1221 added 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 Nov 2, 2023
@zach1221
Copy link
Collaborator

zach1221 commented Nov 2, 2023

@jkbk2004 @BrianCurtis-NOAA beginning testing of this PR.

@FernandoAndrade-NOAA
Copy link
Collaborator

@BrianCurtis-NOAA FYI, the cpld_bmark_p8_intel BL creation needed an increase in time limit for Gaea within default_vars.sh. A standalone test creation run for that case showed in the timestamp that it took around 36-37 minutes, a bit over the default of 30 I believe.

@DeniseWorthen
Copy link
Collaborator

The last commit for the cpld_bmark_p8 test on gaea showed

   0: The total amount of wall time                        = 606.710669

@FernandoAndrade-NOAA
Copy link
Collaborator

Just to be clear, this timeout was during the BL creation run for rt.sh. After the time limit increase, there was no issue and the current successful Gaea log for this PR shows around the same runtime at 604.509965.
The previously failed run on Gaea is available at
/lustre/f2/scratch/Fernando.Andrade-maldonado/FV3_RT/rt_21322/cpld_bmark_p8_intel/

@BrianCurtis-NOAA
Copy link
Collaborator

I don't understand. Were all baselines generated on RDHPCS or just the new ones listed in this PR ?

@jkbk2004
Copy link
Collaborator

jkbk2004 commented Nov 3, 2023

On hera, I confirm that only nssl and wof cases change results.

@zach1221
Copy link
Collaborator

zach1221 commented Nov 3, 2023

Right, just regional_wofs, rrfs_v1nssl, and rrfs_v1nssl_nohailnoccn baselines changed.

@BrianCurtis-NOAA
Copy link
Collaborator

BrianCurtis-NOAA commented Nov 3, 2023

On hera, I confirm that only nssl and wof cases change results.

I copied over the 20231024 baselines to 20231102 and did baselines for the nssl/wofs tests and a large percentage of my tests failed in comparison.

I wanted to confirm in the process of creating baselines, that you copied over the old baselines to the new baselines and added the changed baselines.

@BrianCurtis-NOAA
Copy link
Collaborator

I will re-do my git clone and try once more.

@zach1221
Copy link
Collaborator

zach1221 commented Nov 3, 2023

@BrianCurtis-NOAA yes, I copied existing from 20231024 over to 20231102, then created new ones for those three cases mentioned previously, added them to 20231102. Then finally ran the matching against 20231102.

@BrianCurtis-NOAA
Copy link
Collaborator

@BrianCurtis-NOAA yes, I copied existing from 20231024 over to 20231102, then created new ones for those three cases mentioned previously, added them to 20231102. Then finally ran the matching against 20231102.

Thanks Zach, then it was probably me. Apologies for the delay.

@jkbk2004
Copy link
Collaborator

jkbk2004 commented Nov 4, 2023

@BrianCurtis-NOAA acorn test underway?

@zach1221
Copy link
Collaborator

zach1221 commented Nov 6, 2023

Regression testing is complete. I'll follow up on the ccpp-physics PR to begin the merging process.

@zach1221
Copy link
Collaborator

zach1221 commented Nov 6, 2023

@MicroTed please revert .gitmodule url changes and update the submodule hash for fv3atm.
hash:0dbc9ed837c3b179f545696ef93ac950e1f816ea

@MicroTed
Copy link
Contributor Author

MicroTed commented Nov 6, 2023

@zach1221 Thanks! They should be updated now

@zach1221 zach1221 merged commit 4513c26 into ufs-community:develop Nov 6, 2023
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 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.

9 participants