Skip to content
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

Jump to bottom

Reimplementing MYNN-EDMF as a submodule #64

Open
wants to merge 1 commit into
base: gsl/develop
Choose a base branch
from
+14 −8,902
Open

Reimplementing MYNN-EDMF as a submodule #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -4,3 +4,6 @@
[submodule "src/core_atmosphere/physics/UGWP"]
path = src/core_atmosphere/physics/UGWP
url = https://github.com/mdtoyNOAA/UGWP.git
[submodule "src/core_atmosphere/physics/MYNN-EDMF"]
path = src/core_atmosphere/physics/MYNN-EDMF
url = https://github.com/NCAR/MYNN-EDMF.git
1 change: 1 addition & 0 deletions src/core_atmosphere/physics/MYNN-EDMF
Open in desktop
Submodule MYNN-EDMF added at c9ce94
16 changes: 10 additions & 6 deletions src/core_atmosphere/physics/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ endif

all:
./../tools/manage_externals/checkout_externals --externals ./../Externals.cfg
$(MAKE) lookup_tables core_physics_init core_physics_mmm core_microphysics core_UGWP core_physics_wrf core_physics_noahmp core_physics
$(MAKE) lookup_tables core_physics_init core_physics_mmm core_microphysics core_UGWP core_mynnedmf core_physics_wrf core_physics_noahmp core_physics

dummy:
echo "****** compiling physics ******"
Expand Down Expand Up @@ -68,6 +68,9 @@ core_microphysics: core_physics_init core_physics_mmm
core_UGWP: core_physics_init
(cd UGWP; $(MAKE) all)

core_mynnedmf: core_physics_init core_physics_mmm
(cd MYNN-EDMF; cp ./MPAS/Makefile .; cp ./MPAS/module_mynnedmf_driver.F90 .; cp ./MPAS/module_mynnedmf_common.F90 .; $(MAKE) all)

core_physics_wrf: core_physics_init core_physics_mmm core_UGWP
(cd physics_wrf; $(MAKE) all COREDEF="$(COREDEF)")

Expand All @@ -78,7 +81,7 @@ core_physics_noahmp:

core_physics_init: $(OBJS_init)

core_physics: core_microphysics core_physics_wrf core_physics_noahmp
core_physics: core_microphysics core_mynnedmf core_physics_wrf core_physics_noahmp
($(MAKE) phys_interface COREDEF="$(COREDEF)")
ar -ru libphys.a $(OBJS_init) $(OBJS)
($(MAKE) -C ./physics_mmm -f Makefile.mpas physics_mmm_lib)
Expand Down Expand Up @@ -266,6 +269,7 @@ clean:
( cd physics_noahmp/utility; $(MAKE) clean )
( cd TEMPO; $(MAKE) clean )
( cd UGWP; $(MAKE) clean )
( cd MYNN-EDMF; $(MAKE) clean )
@# Certain systems with intel compilers generate *.i files
@# This removes them during the clean process
$(RM) *.i
Expand All @@ -274,16 +278,16 @@ clean:
$(RM) $@ $*.mod
ifeq "$(GEN_F90)" "true"
$(CPP) $(CPPFLAGS) $(COREDEF) $(HYDROSTATIC) $(CPPINCLUDES) $< > $*.f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noahmp -I./physics_noahmp/utility -I./physics_noahmp/drivers/mpas -I./physics_noahmp/src -I./TEMPO -I./UGWP -I.. -I../../framework -I../../external/esmf_time_f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noahmp -I./physics_noahmp/utility -I./physics_noahmp/drivers/mpas -I./physics_noahmp/src -I./TEMPO -I./UGWP -I./MYNN-EDMF -I.. -I../../framework -I../../external/esmf_time_f90
else
$(FC) $(CPPFLAGS) $(COREDEF) $(HYDROSATIC) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noahmp -I./physics_noahmp/utility -I./physics_noahmp/drivers/mpas -I./physics_noahmp/src -I./TEMPO -I./UGWP -I.. -I../../framework -I../../external/esmf_time_f90
$(FC) $(CPPFLAGS) $(COREDEF) $(HYDROSATIC) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./physics_noahmp -I./physics_noahmp/utility -I./physics_noahmp/drivers/mpas -I./physics_noahmp/src -I./TEMPO -I./UGWP -I./MYNN-EDMF -I.. -I../../framework -I../../external/esmf_time_f90
endif

.F90.o:
$(RM) $@ $*.mod
ifeq "$(GEN_F90)" "true"
$(CPP) $(CPPFLAGS) $(COREDEF) $(HYDROSTATIC) $(CPPINCLUDES) $< > $*.f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./TEMPO -I./UGWP -I.. -I../../framework -I../../external/esmf_time_f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./TEMPO -I./UGWP -I./MYNN-EDMF -I.. -I../../framework -I../../external/esmf_time_f90
else
$(FC) $(CPPFLAGS) $(COREDEF) $(HYDROSATIC) $(FFLAGS) -c $*.F90 $(CPPINCLUDES) $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./TEMPO -I./UGWP -I.. -I../../framework -I../../external/esmf_time_f90
$(FC) $(CPPFLAGS) $(COREDEF) $(HYDROSATIC) $(FFLAGS) -c $*.F90 $(CPPINCLUDES) $(FCINCLUDES) -I./physics_mmm -I./physics_wrf -I./TEMPO -I./UGWP -I./MYNN-EDMF -I.. -I../../framework -I../../external/esmf_time_f90
endif
13 changes: 0 additions & 13 deletions src/core_atmosphere/physics/physics_wrf/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,6 @@ OBJS = \
module_mp_thompson_aerosols.o \
module_mp_thompson_cldfra3.o \
module_mp_wsm6.o \
module_mynnedmf.o \
module_mynnedmf_driver.o \
module_mynnedmf_common.o \
module_ra_cam.o \
module_ra_cam_support.o \
module_ra_rrtmg_lw.o \
Expand Down Expand Up @@ -79,16 +76,6 @@ module_bl_mynn.o: \
bl_mynn_post.o \
bl_mynn_pre.o

module_mynnedmf_common.o: \
../mpas_atmphys_constants.o

module_mynnedmf.o: \
module_cam_error_function.o \
module_mynnedmf_common.o

module_mynnedmf_driver.o: \
module_mynnedmf.o

module_mynnsfclay_driver.o: \
module_mynnsfclay.o \
module_mynnsfclay_pre.o
Expand Down
Loading