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

creating a branch for PR #183

Merged
merged 9 commits into from
Aug 14, 2020

Conversation

SMoorthi-emc
Copy link
Contributor

Description

(Instructions: this, and all subsequent sections of text should be removed and filled in as appropriate.)
Provide a detailed description of what this PR does.
This PR updates fv3atm and ccpp-physics (see PRs Sm jul302020 #155 and Sm jul302020 #486)
What bug does it fix, or what feature does it add?
This PR fixes several bugs and adds update for the atmosphere/ww3 two way coupling.
It adds new variables for z0 over land, ice and water which makes the coupled model with fractional grid to reproduce with respect to restart and continuous runs, with both the NEMS mediator and CMEPS.
Is a change of answers expected from this PR?
Yes

Issue(s) addressed

Link the issues to be closed with this PR, whether in this repository, or in another repository.
(Remember, issues should always be created before starting work on a PR branch!)

  • fixes #<issue_number>
  • fixes noaa-emc/fv3atm/issues/<issue_number>

Testing

How were these changes tested?
What compilers / HPCs was it tested with?
Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
Yes

Dependencies

If testing this branch requires non-default branches in other repositories, list them.
Those branches should have matching names (ideally)

Do PRs in upstream repositories need to be merged first?
If so add the "waiting for other repos" label and list the upstream PRs

  • waiting on noaa-emc/nems/pull/<pr_number>
  • waiting on noaa-emc/fv3atm/pull/<pr_number>

.gitmodules Outdated
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
branch = develop
[submodule "FMS"]
path = FMS
url = https://github.com/NOAA-GFDL/FMS
branch = master
branch = 2019.01.03-release-in-progress
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is the name of the FMS branch changed?

@SMoorthi-emc
Copy link
Contributor Author

As I understand that is the version that works for both ufs-s2s-model and ufs-weather-model.
I don't know if master has been changed to that version - if master can run with s2s, then it can be changed, but I am not aware of it.

@DusanJovic-NOAA
Copy link
Collaborator

As I understand that is the version that works for both ufs-s2s-model and ufs-weather-model.
I don't know if master has been changed to that version - if master can run with s2s, then it can be changed, but I am not aware of it.

Your branch is using this FMS commit:

$ git submodule status .
 f61416fef691d9ba39a40df1ce72aa574f54c390 FMS (2019.01.03)

which is tag 2019.01.03, and it's exact commit used by ufs-s2s-model. The branch you are referring to in .gitmodules (2019.01.03-release-in-progress) has already been merged to master. Please change this back to master.

@SMoorthi-emc
Copy link
Contributor Author

SMoorthi-emc commented Aug 10, 2020 via email

@climbfuji
Copy link
Collaborator

when I changed back to master I get "f7f1c1c73c1f478a53e84caee6aff2fa840ad086 FMS (2020.03-beta1)" Is this correct? Thanks Moorthi

Can you go to directory FMS and run git checkout f61416fef691d9ba39a40df1ce72aa574f54c390?

This should give you git log:

commit f61416fef691d9ba39a40df1ce72aa574f54c390 (HEAD, tag: 2019.01.03)
Merge: 83a8dcb 4eab9e6
Author: colingladueNOAA <60889854+colingladueNOAA@users.noreply.github.com>
Date:   Fri Jul 17 16:37:38 2020 -0400

    Merge pull request #529 from NOAA-GFDL/2019.01.03-release-in-progress

    Update version numbers for 2019.01.03 release

Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me. We can merge ccpp-physics, but I would like to hear from Arun and Bao about the fv3atm PR before we merge that one.

@climbfuji
Copy link
Collaborator

@DusanJovic-NOAA @SMoorthi-emc Is it possible to pull in this tiny PR that changes only rt_cheyenne.conf and does not require running any tests again?

#185

This would be the instructions:

# in ufs-weather-model
git remote add dom https://github.com/climbfuji/ufs-weather-model
git remote update
git cherry-pick 52d86f28802878cb54613e313fea1d0ef78133d9
# then push to your fork to update the PR

No problem if not, we can make it part of the next PR, too.

Thanks,

Dom

@SMoorthi-emc
Copy link
Contributor Author

SMoorthi-emc commented Aug 13, 2020 via email

@DusanJovic-NOAA
Copy link
Collaborator

Dom, I have no problem doing this if Dusan agrees. Moorthi

On Thu, Aug 13, 2020 at 12:15 PM Dom Heinzeller @.***> wrote: @DusanJovic-NOAA https://github.com/DusanJovic-NOAA @SMoorthi-emc https://github.com/SMoorthi-emc Is it possible to pull in this tiny PR that changes only rt_cheyenne.conf and does not require running any tests again? #185 <#185> This would be the instructions: # in ufs-weather-model git remote add dom https://github.com/climbfuji/ufs-weather-model git remote update git cherry-pick 52d86f2 # then push to your fork to update the PR No problem if not, we can make it part of the next PR, too. Thanks, Dom — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#183 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/ALLVRYWJAG3Y6D4HCBQOXPDSAQGRVANCNFSM4PZOE2AQ .
-- Dr. Shrinivas Moorthi Research Meteorologist Modeling and Data Assimilation Branch Environmental Modeling Center / National Centers for Environmental Prediction 5830 University Research Court - (W/NP23), College Park MD 20740 USA Tel: (301)683-3718 e-mail: Shrinivas.Moorthi@noaa.gov Phone: (301) 683-3718 Fax: (301) 683-3718

Sure. Go ahead, pull #185.

@SMoorthi-emc
Copy link
Contributor Author

SMoorthi-emc commented Aug 13, 2020 via email

@climbfuji
Copy link
Collaborator

OK, it is done. Hopefully, it is correct. Moorthi On Thu, Aug 13, 2020 at 1:05 PM Dusan Jovic notifications@github.com wrote:

Thanks, perfect!

@DusanJovic-NOAA DusanJovic-NOAA merged commit e96bc9c into ufs-community:develop Aug 14, 2020
pjpegion pushed a commit to NOAA-PSL/ufs-weather-model.p7b that referenced this pull request Jul 20, 2021
* replace #ifdef OPENMP with #ifdef _OPENMP
* OpenMP link libraries
* fix typos and missing stuff
* clean up compile defs
* move CCPP code generator call to FV3, where it belongs
* install targets are updated
* minor cleanups
epic-cicd-jenkins pushed a commit that referenced this pull request Apr 17, 2023
Adding a Jinja Templating tool for Rocoto.
epic-cicd-jenkins pushed a commit that referenced this pull request Apr 17, 2023
* Modify workflow environment for orion

* update build env for orion

* Update env scripts

* Update hash of regional workflow

Co-authored-by: Chan-Hoo Jeon <chjeon@Orion-login-1.HPC.MsState.Edu>
Co-authored-by: Chan-Hoo Jeon <chjeon@Orion-login-2.HPC.MsState.Edu>
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