Add MMM-physics as a git submodule#2282
Conversation
…rt_mmm_phys_git_submodule
| [submodule "phys/physics_mmm"] | ||
| path = phys/physics_mmm | ||
| url = https://github.com/NCAR/MMM-physics.git | ||
| [submodule "phys/MYNN-SFC"] |
There was a problem hiding this comment.
Can we put this above MYNN-EDMF in order?
There was a problem hiding this comment.
We could, but I don't think I understand why we would want to do that. Is there any particular reason to change the order?
There was a problem hiding this comment.
Currently it is between two MYNN packages, and also other new ones may be put after MYNN PBL. I already resolved one conflict for TEMPO being put there.
There was a problem hiding this comment.
I don't see that fix for TEMPO as it still between the two MYNN packages. Regardless, this is a metadata file for git to use where order should not matter.
There was a problem hiding this comment.
I think it comes down to a desire to keep the MYNN schemes together in the list of submodules (and similarly in the Makefile logic, I would assume). This seems reasonable enough to me.
There was a problem hiding this comment.
TEMPO is not merged yet, but I resolved that conflict. It was added to older code that didn't have MYNNSFC yet.
There was a problem hiding this comment.
Yes, the conflict resolution didn't allow me to swap them just allow both.
|
@islas Is this PR meant to address the build failures that we were seeing in the WRF "coop" container? |
|
Yes. This should resolve the issues as this will take the same logic path that our remaining external repos use. |
|
The regression test results: |
|
Will there be any problems if a contributor updates only the |
|
@mgduda Yes, sort of. Since manage_externals runs last of two, it will have priority when working. Although we don't often update this submodule, this could become confusing in the future. |
|
Perhaps it would be better overall if there were just one way of incorporating external repositories. |
|
Agreed. This proposed change was based on the assumption that we wanted to keep manage_externals in some capacity and avoid wholly switching the repo reference over. However, maybe the potential headache it could cause down the road is worth just addressing now. |
…plit MYNN submodules logic
TYPE: no impact
KEYWORDS: git, submodule, manage_externals
SOURCE: internal
DESCRIPTION OF CHANGES:
Problem:
MMM-physics (under
phys/physics_mmm) is currently the only external repository tracked with only manage_externals. This makes manage_externals and git two failure points for a proper clone of WRF to succeed.Solution:
Add MMM-physics as a git submodule using the original path of
phys/physics_mmm). To avoid confusion in managing two locations of the submodule (one in.gitmodulesand the other inarch/Externals.cfg) the MMM-physics repo is removed from manage_externals. From a user perspective, no change to the build process is evident.TESTS CONDUCTED: