Skip to content

NoahMP as a submodule in WRF #1646

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

Closed
davegill wants to merge 5 commits into from
Closed

NoahMP as a submodule in WRF #1646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
326ffc7
NoahMP as a submodule in WRF
davegill Jan 20, 2022
2937993
submodule update in physics Makefile
davegill Jan 20, 2022
10d0657
Successful build with NoahMP external repository
davegill Jan 20, 2022
7f2560f
jenkins seems mad 15:02
davegill Jan 20, 2022
435a4d7
Get to top level of tree to issue git submodule command
davegill Jan 20, 2022
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
@@ -0,0 +1,3 @@
[submodule "phys/noahmp"]
path = phys/noahmp
url = https://github.com/NCAR/noahmp
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1011,16 +1011,16 @@ chemics :
physics :
@ echo '--------------------------------------'
if [ $(WRF_CHEM) -eq 0 ] ; then \
( cd phys ; $(MAKE) CF2=" " ) ; \
( cd phys ; $(MAKE) submodules ; $(MAKE) CF2=" " ) ; \
else \
( cd phys ; $(MAKE) CF2="$(CHEM_FILES2)" ) ; \
( cd phys ; $(MAKE) submodules ; $(MAKE) CF2="$(CHEM_FILES2)" ) ; \
fi

physics_plus :
if [ $(WRF_PLUS_CORE) -eq 0 ] ; then \
( cd phys ; $(MAKE) PHYS_PLUS=" " PHYS_MP=" " PHYS_BL=" " PHYS_CU=" " ) ; \
( cd phys ; $(MAKE) submodules ; $(MAKE) PHYS_PLUS=" " PHYS_MP=" " PHYS_BL=" " PHYS_CU=" " ) ; \
else \
( cd phys ; $(MAKE) PHYS_PLUS="$(MODS4)" PHYS_MP="$(MODMP)" PHYS_BL="$(MODBL)" PHYS_CU="$(MODCU)" ) ; \
( cd phys ; $(MAKE) submodules ; $(MAKE) PHYS_PLUS="$(MODS4)" PHYS_MP="$(MODMP)" PHYS_BL="$(MODBL)" PHYS_CU="$(MODCU)" ) ; \
fi

wrftlmadj :
Expand Down
3 changes: 3 additions & 0 deletions clean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ if ( "$arg" == '-a' || "$arg" == '-aa' ) then
/bin/rm -f configure.wrf.backup
/bin/rm -f Registry/Registry.backup
/bin/rm -f run/namelist.input.backup.*
/bin/rm -f phys/module_sf_noahmpdrv.F phys/module_sf_noahmp_glacier.F \
phys/module_sf_noahmp_groundwater.F phys/module_sf_noahmplsm.F \
run/GENPARM.TBL run/MPTABLE.TBL run/SOILPARM.TBL
endif
endif

Expand Down
14 changes: 14 additions & 0 deletions phys/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,20 @@ include ../configure.wrf

non_nmm : $(MODULES) $(FIRE_MODULES) $(WIND_MODULES) $(OBJS) $(DIAGNOSTIC_MODULES_EM)

submodules :
@if [ \( ! -f module_sf_noahmpdrv.F \) -o \( ! -f module_sf_noahmp_glacier.F \) -o \
\( ! -f module_sf_noahmp_groundwater.F \) -o \( ! -f module_sf_noahmplsm.F \) ] ; then \
echo Pulling in NoahMP submodule ; \
( cd .. ; git submodule update --init --recursive ) ; \
ln -sf noahmp/drivers/wrf/module_sf_noahmpdrv.F . ; \
ln -sf noahmp/src/module_sf_noahmp_glacier.F . ; \
ln -sf noahmp/src/module_sf_noahmp_groundwater.F . ; \
ln -sf noahmp/src/module_sf_noahmplsm.F . ; \
( cd ../run ; ln -sf ../phys/noahmp/parameters/* . ) ; \
else \
echo No action required for NoahMP submodule ; \
fi

clean:
@ echo 'use the clean script'

Expand Down
3,075 changes: 0 additions & 3,075 deletions phys/module_sf_noahmp_glacier.F
View file
Open in desktop

This file was deleted.

Loading