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.

Sign up for GitHub

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

Jump to bottom

UPP refactor phase 2 from Bo Cui #233

Merged
merged 4 commits into from
Dec 15, 2020
Merged

UPP refactor phase 2 from Bo Cui #233

merged 4 commits into from
Dec 15, 2020

Conversation

BoCui-NOAA
Copy link
Contributor

UPP Refactor phase 2 merge:

  1. add "implicit none" statements

  2. Modernize inequality statements, change the relational operators from Fortran 77 to 90.

@BoCui-NOAA BoCui-NOAA mentioned this pull request Nov 30, 2020
Closed
@WenMeng-NOAA WenMeng-NOAA changed the title 20201123 BoCui:Add "implicit none"/Modernize inequality statements UPP refactor phase 2 from Bo Cui Nov 30, 2020
mkavulich
mkavulich approved these changes Dec 1, 2020
View reviewed changes
Copy link
Contributor

@mkavulich mkavulich left a comment

Choose a reason for hiding this comment

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

Looks straightforward to me 👍

I was originally going to suggest skipping the changes in the already-commented lines but I think it's better to do a future commit removing unnecessarily commented code blocks.

@BoCui-NOAA
Copy link
Contributor Author

@WenMeng-NOAA Wen, should I resolve the conflicts in file sorc/ncep_post.fd/CALRAD_WCLOUD_newcrtm.f on Github directly? or I made modifications on local machine and then commit it?

Bo

@WenMeng-NOAA
Copy link
Collaborator

@BoCui-NOAA Did you sync your branch with the latest changes from upstream/develop?

@BoCui-NOAA
Copy link
Contributor Author

@WenMeng-NOAA Wen, I already sync my branch from upstream/develop, new changes for file CALRAD_WCLOUD_newcrtm.f was committed.

Bo

@WenMeng-NOAA
Copy link
Collaborator

@BoCui-NOAA The conflicting is still here. It looks to me you add the last upstream/develop changes as your development.

@WenMeng-NOAA
Copy link
Collaborator

@BoCui-NOAA I don't see the PR #230 in the commit log of your feature branch.

@WenMeng-NOAA
Copy link
Collaborator

@BoCui-NOAA Now your branch looks good to me.

@BoCui-NOAA
Merge pull request #2 from BoCui-NOAA/develop
b27510f 
Update FV3-LAM flat files and ncep_post executable names (NOAA-EMC#237)
@WenMeng-NOAA
Copy link
Collaborator

The regression tests were conducted on WCOSS Dell, Cray and NOAA R&D machine Hera. No changed results were found. This PR is ready for merging.

@WenMeng-NOAA WenMeng-NOAA merged commit 2c43340 into NOAA-EMC:develop Dec 15, 2020
@WenMeng-NOAA WenMeng-NOAA mentioned this pull request Dec 15, 2020
Closed
@WenMeng-NOAA WenMeng-NOAA linked an issue Dec 15, 2020 that may be closed by this pull request
Updates with the UPP refactor phase 2 merge from Bo Cui #235
Closed
@HelinWei-NOAA HelinWei-NOAA mentioned this pull request Sep 20, 2021
Closed
@BoCui-NOAA BoCui-NOAA deleted the upp_refactor_p2_bc branch April 5, 2022 00:19
EricJames-NOAA pushed a commit to EricJames-NOAA/UPP that referenced this pull request Dec 14, 2022
@mkavulich
Update the update_fork.pl script for the new develop branch (NOAA-EMC…
d051d0c 
…#233)

## DESCRIPTION OF CHANGES: 
Updating the update_fork.pl script for user forks to update the develop branch (which is now the default) rather than community_develop

## TESTS CONDUCTED: 
Updated my own fork using the new version of this script
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JesseMeng-NOAA JesseMeng-NOAA JesseMeng-NOAA approved these changes

@WenMeng-NOAA WenMeng-NOAA WenMeng-NOAA approved these changes

@mkavulich mkavulich mkavulich approved these changes

@hu5970 hu5970 Awaiting requested review from hu5970

@HuiyaChuang-NOAA HuiyaChuang-NOAA Awaiting requested review from HuiyaChuang-NOAA

@kayeekayee kayeekayee Awaiting requested review from kayeekayee

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Updates with the UPP refactor phase 2 merge from Bo Cui
4 participants
@BoCui-NOAA @WenMeng-NOAA @mkavulich @JesseMeng-NOAA