Skip to content

Add MMM-physics as a git submodule #2282

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

Merged
islas merged 3 commits into from
Feb 10, 2026
Merged

Add MMM-physics as a git submodule #2282

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f88ab6
Add MMM-physics as a git submodule
islas Feb 5, 2026
4750498
Merge branch 'develop' of https://github.com/wrf-model/WRF into conve…
islas Feb 6, 2026
7199282
Revise submodule addition to fully replace manage_externals and not s…
islas Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
[submodule "phys/MYNN-EDMF"]
path = phys/MYNN-EDMF
url = https://github.com/NCAR/MYNN-EDMF
[submodule "phys/physics_mmm"]
path = phys/physics_mmm
url = https://github.com/NCAR/MMM-physics.git
[submodule "phys/MYNN-SFC"]

@dudhia dudhia Feb 6, 2026

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.

Can we put this above MYNN-EDMF in order?

@islas islas Feb 6, 2026

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.

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?

@dudhia dudhia Feb 6, 2026

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.

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.

@islas islas Feb 6, 2026

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.

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.

@mgduda mgduda Feb 6, 2026

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

@dudhia dudhia Feb 6, 2026

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.

TEMPO is not merged yet, but I resolved that conflict. It was added to older code that didn't have MYNNSFC yet.

@islas islas Feb 6, 2026

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.

@dudhia For #2270, even after the merge conflict being resolved it looks like it will place the submodule between the two MYNN submodules.

And very well, I'll make the changes to the .gitmodules and Makefile to ensure MYNN colocality.

@dudhia dudhia Feb 7, 2026

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.

Yes, the conflict resolution didn't allow me to swap them just allow both.

path = phys/MYNN-SFC
url = https://github.com/NCAR/MYNN-SFC.git
6 changes: 6 additions & 0 deletions phys/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,12 @@ submodules :
else \
echo No action required for MYNN-EDMF submodule ; \
fi
@if [ \( ! -f phys/physics_mmm/README.md \) ] ; then \
echo Pulling in MMM-physics submodule ; \
( cd .. ; git submodule update --init --recursive ) ; \
else \
echo No action required for MMM-physics submodule ; \
fi
@if [ \( ! -f module_sf_mynnsfc_driver.F \) -o \( ! -f module_sf_mynnsfc_common.F \) -o \
\( ! -f module_sf_mynnsfc_land.F \) -o \( ! -f module_sf_mynnsfc_water.F \) -o \
\( ! -f module_sf_mynnsfc_ice.F \) ] ; then \
Expand Down
1 change: 1 addition & 0 deletions phys/physics_mmm
Open in desktop
Submodule physics_mmm added at 0ea59b