From 1f88ab6d3eb7d51bee302cfc769bb40f8a6d3209 Mon Sep 17 00:00:00 2001 From: Anthony Islas Date: Thu, 5 Feb 2026 16:28:40 -0700 Subject: [PATCH 1/2] Add MMM-physics as a git submodule --- .gitmodules | 3 +++ phys/Makefile | 6 ++++++ phys/physics_mmm | 1 + 3 files changed, 10 insertions(+) create mode 160000 phys/physics_mmm diff --git a/.gitmodules b/.gitmodules index 41f7345dd5..a89d57094a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [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 diff --git a/phys/Makefile b/phys/Makefile index 5eda61c111..d6d98add18 100644 --- a/phys/Makefile +++ b/phys/Makefile @@ -283,6 +283,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 clean: @ echo 'use the clean script' diff --git a/phys/physics_mmm b/phys/physics_mmm new file mode 160000 index 0000000000..0ea59b1cd6 --- /dev/null +++ b/phys/physics_mmm @@ -0,0 +1 @@ +Subproject commit 0ea59b1cd673006ee7a9a9958c533a6a0e354243 From 7199282c61f703703d66903a28c0ec4950c3c5fc Mon Sep 17 00:00:00 2001 From: Anthony Islas Date: Fri, 6 Feb 2026 16:46:18 -0700 Subject: [PATCH 2/2] Revise submodule addition to fully replace manage_externals and not split MYNN submodules logic --- .gitmodules | 6 +++--- arch/Externals.cfg | 8 -------- phys/Makefile | 12 ++++++------ 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.gitmodules b/.gitmodules index c071453480..8fb2d8a9d1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,12 +4,12 @@ [submodule ".ci/hpc-workflows"] path = .ci/hpc-workflows url = https://github.com/islas/hpc-workflows -[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-EDMF"] + path = phys/MYNN-EDMF + url = https://github.com/NCAR/MYNN-EDMF [submodule "phys/MYNN-SFC"] path = phys/MYNN-SFC url = https://github.com/NCAR/MYNN-SFC.git diff --git a/arch/Externals.cfg b/arch/Externals.cfg index 48cd9b11e0..d8dc664cad 100644 --- a/arch/Externals.cfg +++ b/arch/Externals.cfg @@ -1,10 +1,2 @@ -[MMM-physics] -local_path = ./phys/physics_mmm -protocol = git -repo_url = https://github.com/NCAR/MMM-physics.git -tag = 20240626-MPASv8.2 - -required = True - [externals_description] schema_version = 1.0.0 diff --git a/phys/Makefile b/phys/Makefile index 13de660d26..ab46dbf68f 100644 --- a/phys/Makefile +++ b/phys/Makefile @@ -277,6 +277,12 @@ submodules : else \ echo No action required for NoahMP 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_bl_mynnedmf.F \) -o \( ! -f module_bl_mynnedmf_common.F \) -o \ \( ! -f module_bl_mynnedmf_driver.F \) ] ; then \ echo Pulling in MYNN-EDMF submodule ; \ @@ -287,12 +293,6 @@ 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 \