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

Fixed the warm bias in stratosphere from MERRA2 coupled microphysics (branch Maie) #1815

Merged
merged 22 commits into from
Jul 24, 2023

Conversation

AnningCheng-NOAA
Copy link
Contributor

@AnningCheng-NOAA AnningCheng-NOAA commented Jun 30, 2023

Description

Fixed the warm bias in stratosphere from MERRA2 coupled microphysics replacing PR 1788 closed accidently and addressing Isue 1786. It will modified the results from merra2_thompson and atmaero_control_p8_rad_micro whenever mraerosol=.true. No library updates.

Includes entire PR #1838 (changes one line from compile.sh), and code change from PR #1794 (one line from detect_machine.sh).

Input data additions/changes

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

Anticipated changes to regression tests:

  • No changes are expected to any regression test.
  • Changes are expected to the following tests: merra2_thompson and atmaero_control_p8_rad_micro

RegressionTests_hera.log

Subcomponents involved:

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

Library Updates/Changes

  • Not 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

Combined with PR's (If Applicable):

Commit Queue Checklist:

  • Link PR's from all sub-components involved in section below
  • Confirm reviews completed in ALL sub-component PR's
  • Add all appropriate labels to this PR.
  • Run full RT suite on either Hera/Cheyenne AND attach log to a PR comment.
  • Add list of any failed regression tests to "Anticipated changes to regression tests" section.

Linked PR's and Issues:

Testing Day Checklist:

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

Testing Log (for CM's):

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

@AnningCheng-NOAA
Copy link
Contributor Author

All RTs completed successfully as expected at /scratch1/NCEPDEV/global/Anning.Cheng/tmp1/ufs-weather-model/tests. log files for the two tests needing new baselines attached.
run_176_atmaero_control_p8_rad_micro_intel.log
run_051_merra2_thompson_intel.log

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

@AnningCheng-NOAA Can you add/link dependency PR and Issues in the PR description? Complete PR description is always helpful.

@AnningCheng-NOAA
Copy link
Contributor Author

AnningCheng-NOAA commented Jun 30, 2023 via email

@jkbk2004
Copy link
Collaborator

Denise: I think it is suggested by Jong to point CMEPS to @.*** <NOAA-EMC/CMEPS@cec8db8>

On Fri, Jun 30, 2023 at 8:55 AM Denise Worthen @.> wrote: @.* commented on this pull request. ------------------------------ In .gitmodules <#1815 (comment)> : > @@ -16,8 +16,8 @@ branch = develop [submodule "CMEPS"] path = CMEPS-interface/CMEPS - url = https://github.com/NOAA-EMC/CMEPS - branch = emc/develop + url = https://github.com/AnningCheng-NOAA/CMEPS Why are you pointing to a branch of CMEPS? — Reply to this email directly, view it on GitHub <#1815 (review)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/ALQPMINUGKLRHYXZS5MU3WTXN3EDPANCNFSM6AAAAAAZZIRM4E . You are receiving this because you authored the thread.Message ID: @.***>

CMEPS hash is correct in your fork branch. So, you don't any change for cmeps in gitmodules and only need fv3 changes. You can revert lines changed for CMEPS in gitmodules.

@AnningCheng-NOAA
Copy link
Contributor Author

@jkbk2004 done

@DeniseWorthen
Copy link
Collaborator

DeniseWorthen commented Jun 30, 2023

@AnningCheng-NOAA The RT test log you posted attached to the PR request shows many, many failed tests. If you have a RT test log that shows only two failed cases, you need to provide it.

@grantfirl
Copy link
Collaborator

@DeniseWorthen @jkbk2004 @AnningCheng-NOAA I recreated PRs for fv3atm (NOAA-EMC/fv3atm#674) and ccpp-physics (ufs-community/ccpp-physics#88) that were accidentally closed. Should I recreate this one too, or should we ask @AnningCheng-NOAA just to point to NOAA-EMC/fv3atm#674?

@grantfirl
Copy link
Collaborator

@AnningCheng-NOAA The RT test log you posted shows many, many failed tests.

Agreed. The hera/intel RT log file is not consistent with the claim of changing the baselines for just those 2 tests. I can re-run them using my branches that I created for the re-opened PRs if you'd like.

@DeniseWorthen
Copy link
Collaborator

@grantfirl I've updated the linked the updated PRs in the PR information, thanks. I think this PR is already the new, replacement PR for #1788

@AnningCheng-NOAA
Copy link
Contributor Author

AnningCheng-NOAA commented Jun 30, 2023 via email

@grantfirl
Copy link
Collaborator

Here is the log from Anning's testing that was added to the repo instead of attached in the comments. It is showing the two failed tests are the expected ones (only).

RegressionTests_hera.log

@AnningCheng-NOAA Please delete the link to the log in this PR description, since that seems to be in error. I'm going to re-run the RTs to double-check as soon as I'm able (I'm currently running RTs on Hera for a different PR).

@grantfirl
Copy link
Collaborator

grantfirl commented Jun 30, 2023

Also, @AnningCheng-NOAA we need to point your ufs-weather-model PR branch to the PR branch that I opened for fv3atm. Here is how I would do this:

  • On your machine where you have your code, cd into the top level ufs-weather-model directory and double-check that you're on your maie branch: git branch.

  • cd FV3

  • We need to add my fork as a new remote for you to checkout my PR branch: git remote add grant-fork https://github.com/grantfirl/fv3atm

  • git fetch grant-fork

  • git checkout strat_warm_bias_fix_cheng

  • If this was all successful, cd back up to the ufs-weather-model directory

  • git add FV3

  • edit .gitmodules so that
    [submodule "FV3"]
    path = FV3
    url = https://github.com/AnningCheng-NOAA/fv3atm
    branch = maie
    is replaced with
    [submodule "FV3"]
    path = FV3
    url = https://github.com/grantfirl/fv3atm
    branch = strat_warm_bias_fix_cheng

  • git add .gitmodules

  • git commit -m "update FV3 submodule pointer and .gitmodules for testing"

  • git push

@AnningCheng-NOAA
Copy link
Contributor Author

Grant:

I received the following error:

/scratch1/NCEPDEV/global/Anning.Cheng/tmp1/ufs-weather-model/FV3% git add remote grant-fork https://github.com/grantfirl/fv3atm
fatal: pathspec 'remote' did not match any files

@grantfirl
Copy link
Collaborator

Grant:

I received the following error:

/scratch1/NCEPDEV/global/Anning.Cheng/tmp1/ufs-weather-model/FV3% git add remote grant-fork https://github.com/grantfirl/fv3atm fatal: pathspec 'remote' did not match any files

Sorry, the command should have been:
git remote add grant-fork https://github.com/grantfirl/fv3atm

@AnningCheng-NOAA
Copy link
Contributor Author

Grant, I encounter an error in last step. Please advise.
git_Push1

@grantfirl
Copy link
Collaborator

Grant, I encounter an error in last step. Please advise. git_Push1

You'll get this error if your local branch is behind what is on GitHub. When I accidentally commit something locally to a branch that is missing commits from a remote, I typically revert the last local commit git reset HEAD~1, pull in the commits from GitHub that are missing git pull, then redo the new commit and try to push.

It looks like you were able to finish the instructions, though, because commit 79ca754 shows up here and it looks like .gitmodules is pointing to the right place and the submodule pointer for fv3atm is correct. I think we're good to go now.

@AnningCheng-NOAA
Copy link
Contributor Author

AnningCheng-NOAA commented Jun 30, 2023 via email

@AnningCheng-NOAA
Copy link
Contributor Author

Grant, done

@grantfirl
Copy link
Collaborator

@AnningCheng-NOAA Looks good. @jkbk2004 I think that we're in good shape to add this to the commit queue after #1775, #1777, and #1797. I'm sure that we'll need to merge in the top of the develop as things get merged, but it's in good shape right now.

I'm running one last "pre-test" RT set on Hera right now to verify @AnningCheng-NOAA 's tests.

@zach1221 zach1221 added the Baseline Updates Current baselines will be updated. label Jul 17, 2023
@jkbk2004 jkbk2004 mentioned this pull request Jul 19, 2023
39 tasks
@zach1221 zach1221 added the jet-RT Run AutoRT Jet regression testing label Jul 21, 2023
@epic-cicd-jenkins epic-cicd-jenkins removed the jet-RT Run AutoRT Jet regression testing label Jul 21, 2023
@zach1221
Copy link
Collaborator

zach1221 commented Jul 21, 2023

Ok, testing is now complete. I'll follow up on the ufs-community/ccpp-physics/pull/88 so we can begin the merging process.

@BrianCurtis-NOAA
Copy link
Collaborator

fv3 hash: NOAA-EMC/fv3atm@b32981f

@grantfirl
Copy link
Collaborator

grantfirl commented Jul 24, 2023

@zach1221 @jkbk2004 @BrianCurtis-NOAA OK, ready for review/merge.

@zach1221
Copy link
Collaborator

Thanks @grantfirl ! Sending out final reviews.

@zach1221
Copy link
Collaborator

Disregard the assignments I sent out, that was a mistake.

@zach1221 zach1221 merged commit 4d05445 into ufs-community:develop Jul 24, 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.

None yet

8 participants