Skip to content

Fixed location of authoritative repositories#93

Merged
junwang-noaa merged 8 commits into
ufs-community:release/public-v1from
ligiabernardet:doc_updates
Apr 1, 2020
Merged

Fixed location of authoritative repositories#93
junwang-noaa merged 8 commits into
ufs-community:release/public-v1from
ligiabernardet:doc_updates

Conversation

@ligiabernardet
Copy link
Copy Markdown
Collaborator

Fixed location of authoritative repositories. Thank you @junwang-noaa for bringing this up.

@ligiabernardet ligiabernardet added the documentation Improvements or additions to documentation label Mar 30, 2020
@climbfuji
Copy link
Copy Markdown
Collaborator

@ligiabernardet since you are already creating the PR for ufs-weather-model, you might as well do the one for fv3atm with the updated submodule pointers for ccpp-physics and ccpp-framework, and do the same for the updated submodule pointer for fv3atm here.

@ligiabernardet
Copy link
Copy Markdown
Collaborator Author

ligiabernardet commented Mar 30, 2020 via email

@climbfuji
Copy link
Copy Markdown
Collaborator

I can help a bit.

You can start from your existing PR for the ufs-weather-model and check out the branches that correspond to the PRs for ccpp-framework and ccpp-physics inside fv3atm. A git status will then show you that something has changed in fv3atm. Edit .gitmodules, commend out the existing url= and branch= entries for ccpp-physics and ccpp-framework, add the temporary urls and branches instead. Then commit the change to .gitmodules and the updated submodule pointers for ccpp-framework and ccpp-physics with a commit message saying sth like "Update .gitmodules and submodule pointers for ccpp-framework and ccpp-physics for code review and testing", create a local branch, push it to GitHub and create the fv3atm PR. Then do the same for fv3atm in ufs-weather-model in your existing PR.

@ligiabernardet
Copy link
Copy Markdown
Collaborator Author

I updated the submodules. Please see if this worked as it should. Tks.
Associated PRs
NOAA-EMC/ufsatm#90
NCAR/ccpp-physics#420
NCAR/ccpp-framework#274

Comment thread doc/UsersGuide/source/CodeOverview.rst Outdated
├── FV3 https://github.com/NCAR/fv3atm
│ ├── atmos_cubed_sphere https://github.com/NCAR/GFDL_atmos_cubed_sphere
├── FV3 https://github.com/NOAA-EMC/fv3atm
│ ├── atmos_cubed_sphere https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

GFDL_atmos_cubed_shere in public release is pointing to NOAA-GFDL repo.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Tks This has been addressed.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I see line 36 is changed, but line 49 is still listing NOAA-EMC, not NOAA-GFDL.

@climbfuji
Copy link
Copy Markdown
Collaborator

climbfuji commented Mar 31, 2020

Thanks, Jun. I am going to approve and merge the ccpp-framework and ccpp-physics PRs, then I will ask Ligia to update the submodule pointers in the fv3atm and revert the .gitmodules change.

Oh, after running the tests of course.

Update regression test logs for PR 93
@climbfuji
Copy link
Copy Markdown
Collaborator

Regression tests passed on hera.intel, cheyenne.intel, cheyenne.gnu. Will start merging the CCPP PRs.

@climbfuji
Copy link
Copy Markdown
Collaborator

@ligiabernardet The CCPP PRs have been merged. Now you need to use your local working directory from which you created the PRs.

cd FV3/ccpp/framework
git remote update
# assuming that the remote 'origin' points to the NCAR repository
git checkout origin/release/public-v4
cd ../physics
git remote update
# assuming that the remote 'origin' points to the NCAR repository
git checkout origin/release/public-v4
cd ../..
# now you are in directory FV3 and a 'git status' should show you that there are new commits for ccpp/framework and ccpp/physics

Then edit .gitmodules in FV3 and revert the change you made earlier. Then:

git add .gitmodules ccpp/framework ccpp/physics
git commit -m "Revert change to .gitmodules and update submodule pointers for ccpp-framework and ccpp-physics"
git push WHATEVER_YOUR_REMOTE_NAME_IS_LOCALLY doc_updates

We can check if the changes/hashes are ok and Jun can merge the fv3atm PR.

@climbfuji
Copy link
Copy Markdown
Collaborator

@ligiabernardet Now that the fv3atm has been merged you need to do the same for the ufs-weather-model PR. The correct has for fv3atm (i.e. git log in subdirectory FV3) is (the name noaa-emc/release/public-v1 could be different, depending on how you called the NOAA-EMC remote destination locally, I called it noaa-emc):

commit 3b2671b554c3f0a06a369019ba6901f66c6fcb6a (HEAD, noaa-emc/release/public-v1)
Author: ligiabernardet <ligia.bernardet@noaa.gov>
Date:   Tue Mar 31 19:55:55 2020 -0600

    Doc update for public release (submodules ccpp-physics and ccpp-framework) (#90)

    * Update .gitmodules and submodule pointers for ccpp-framework and ccpp-physics for code review and testing

    * Revert change to .gitmodules and update submodule pointers for ccpp-framework and ccpp-physics

    * Update submodule pointers for CCPP

@ligiabernardet
Copy link
Copy Markdown
Collaborator Author

ligiabernardet commented Apr 1, 2020 via email

@climbfuji
Copy link
Copy Markdown
Collaborator

This looks good to me, thanks. @junwang-noaa @DusanJovic-NOAA whenever it is convenient for you ...

@junwang-noaa junwang-noaa merged commit ea69e85 into ufs-community:release/public-v1 Apr 1, 2020
XiaSun-Atmos pushed a commit to XiaSun-Atmos/ufs-weather-model that referenced this pull request Aug 8, 2020
* Merge branch 'man_hafs_sas_without_updates_of_dtc_develop_49b73a8f4149ca88f071dbaae81f1769b120f1e0' into HEAD
* gfsphysics/physics/GFS_debug.F90: add capability to debug 1-d logical arrays
* Clean up error messages in gfsphysics/GFS_layer/GFS_typedefs.F90

Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
epic-cicd-jenkins pushed a commit that referenced this pull request Apr 17, 2023
Change Externals.cfg to point to dtc/develop for the NCAR fork of UFS…
epic-cicd-jenkins pushed a commit that referenced this pull request Apr 17, 2023
## DESCRIPTION OF CHANGES: 
Update hash of regional_workflow in Externals.cfg to use the latest tested version corresponding to PR #[414](https://github.com/NOAA-EMC/regional_workflow/pull/414) into regional_workflow.

## TESTS CONDUCTED: 
See PR #[414](https://github.com/NOAA-EMC/regional_workflow/pull/414) into regional_workflow.
mkavulich pushed a commit to mkavulich/ufs-weather-model that referenced this pull request Aug 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants