Skip to content

Begin NMM removal from source code #1584

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
davegill merged 36 commits into from
Nov 29, 2021
Merged

Begin NMM removal from source code #1584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
58efef4
Begin NMM removal from source code
davegill Nov 17, 2021
3110279
Remove NMM_CORE from external/RSL_LITE directory's files
davegill Nov 18, 2021
b82e040
Zap NMM refs in top-level Makefile
davegill Nov 18, 2021
0f5a02d
Zap NMM refs in Makefiles in frame and main directories
davegill Nov 18, 2021
cf8ea4b
Zap NMM refs from phys Makefile
davegill Nov 18, 2021
81c8977
Zap all NMM_CORE ifdefs in frame dir
davegill Nov 18, 2021
c770fed
Zap some NMM targets in main/depend.common
davegill Nov 18, 2021
85d1449
Zap NMM ifdefs inside of horiz interp file
davegill Nov 18, 2021
2e7657c
Remove NMM refs from CODEOWNERS file
davegill Nov 18, 2021
fbd543a
Zap some NMM refs from configure and compile scripts
davegill Nov 18, 2021
49ba3b5
Zap NMM ifdefs from dfi.F
davegill Nov 18, 2021
39eaf5d
Remove NMM and HWRF ifdefs in init_modules
davegill Nov 18, 2021
9a1b013
Remove ifdefs from input_wrf and output_wrf
davegill Nov 18, 2021
a00e054
More NMM ifdefs in share directory, another third
davegill Nov 18, 2021
a2e2d59
Remove NMM ifdefs from another third of share directory
davegill Nov 18, 2021
2ba664b
Zap NMM ifdefs, yet another third of share directory, almost there
davegill Nov 18, 2021
8330b1f
Last of share directory NMM ifdefs (first cut)
davegill Nov 18, 2021
4a8f1f8
Left in some NMM code, broke ARW input
davegill Nov 18, 2021
4f0d494
NO_NMM Feature 0301
davegill Nov 18, 2021
7c3ae81
trigger feature jenkins NO NMM
davegill Nov 18, 2021
231624a
NO_NMM WRFPlus test 10:53
davegill Nov 19, 2021
7486675
Remove debugging comment
davegill Nov 19, 2021
575d38f
zap "USE module_intermediate_nmm" in share directory
davegill Nov 19, 2021
903c560
Welp, zap, not comment out that USE :)
davegill Nov 19, 2021
aacd104
Another file in share dir with module_intermediate_nmm
davegill Nov 19, 2021
9b87494
Zap HWRF ifdefs in share directory
davegill Nov 19, 2021
c0b37a5
Zap HWRF ifdefs from module_dm.F
davegill Nov 22, 2021
50254f7
Zap HWRF ifdefs in frame directory
davegill Nov 22, 2021
f724416
Start HWRF zap in phys dir
davegill Nov 22, 2021
66d301d
Remove module_{mp,ra}_HWRF.F from phys dir - and associated
davegill Nov 22, 2021
f0f1051
trying NO_NMM 19:59
davegill Nov 23, 2021
ca0d8bb
Remove NMM and HWRF ifdefs from physics drivers
davegill Nov 24, 2021
4140643
Merge branch 'NO_NMM' of https://github.com/davegill/WRF into NO_NMM
davegill Nov 24, 2021
d3efee2
NO_NMM c5a.4xlarge ALL vs COUNT 13:51
davegill Nov 24, 2021
780119b
Fix dependency for DA, NMM module_io_quilt_new.F does not exist
davegill Nov 25, 2021
3810eee
4dvar 4x_and_xlarge var_mods NO_NMM 21:16
davegill Nov 25, 2021
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
2 changes: 0 additions & 2 deletions .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ README.md @wrf-model/global_owner
# Dynamics

/dyn_em/ @wrf-model/arw_dev
/dyn_nmm/ @wrf-model/hwrf_dev

# WRF-Hydro

Expand All @@ -101,7 +100,6 @@ README.md @wrf-model/global_owner
# Test directories

/test/em_* @wrf-model/arw_dev
/test/nmm_* @wrf-model/hwrf_dev
/test/em_fire/ @wrf-model/fire

# Executable directory
Expand Down
114 changes: 0 additions & 114 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,8 @@ DA_CONVERTOR_MODULES = $(DA_CONVERTOR_MOD_DIR) $(INCLUDE_MODULES)

#### 3.d. add macros to specify the modules for this core

NMM_MODULE_DIR = -I../dyn_nmm
NMM_MODULES = $(NMM_MODULE_DIR)

ALL_MODULES = \
$(EM_MODULE_DIR) \
$(NMM_MODULES) \
$(INCLUDE_MODULES)

configcheck:
Expand Down Expand Up @@ -114,7 +110,6 @@ wrf : framework_only
$(MAKE) MODULE_DIRS="$(ALL_MODULES)" physics
if [ $(WRF_CHEM) -eq 1 ] ; then $(MAKE) MODULE_DIRS="$(ALL_MODULES)" chemics ; fi
if [ $(WRF_EM_CORE) -eq 1 ] ; then $(MAKE) MODULE_DIRS="$(ALL_MODULES)" em_core ; fi
if [ $(WRF_NMM_CORE) -eq 1 ] ; then $(MAKE) MODULE_DIRS="$(ALL_MODULES)" nmm_core ; fi
if [ $(WRF_HYDRO) -eq 1 ] ; then $(MAKE) MODULE_DIRS="$(ALL_MODULES)" wrf_hydro ; fi
( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em em_wrf )
( cd run ; /bin/rm -f wrf.exe ; ln -s ../main/wrf.exe . )
Expand Down Expand Up @@ -177,9 +172,6 @@ gen_be :
@echo "build completed:" `date`


nmm_wrf : wrf


# Eulerian mass coordinate initializations

em_fire : wrf
Expand Down Expand Up @@ -884,104 +876,6 @@ gocart_conv : wrf
/bin/rm -f namelist.input ; cp ../test/em_real/namelist.input . )


#### nmm converter

### Idealized NMM tropical cyclone case
nmm_tropical_cyclone : nmm_wrf
@ echo '--------------------------------------'
( cd main ; $(MAKE) MODULE_DIRS="$(ALL_MODULES)" SOLVER=nmm IDEAL_CASE=tropical_cyclone nmm_ideal )
( cd test/nmm_tropical_cyclone ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
( cd test/nmm_tropical_cyclone ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . )
( cd test/nmm_tropical_cyclone ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . )
( cd run ; if test -f namelist.input ; then \
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
/bin/rm -f namelist.input ; cp ../test/nmm_tropical_cyclone/namelist.input . )
@echo "build started: $(START_OF_COMPILE)"
@echo "build completed:" `date`

nmm_real : nmm_wrf
@ echo '--------------------------------------'
( cd main ; $(MAKE) MODULE_DIRS="$(ALL_MODULES)" SOLVER=nmm IDEAL_CASE=real real_nmm )
( cd test/nmm_real ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
( cd test/nmm_real ; /bin/rm -f real_nmm.exe ; ln -s ../../main/real_nmm.exe . )
( cd test/nmm_real ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
( cd test/nmm_real ; /bin/rm -f ETAMPNEW_DATA.expanded_rain ETAMPNEW_DATA RRTM_DATA ; \
ln -sf ../../run/ETAMPNEW_DATA . ; \
ln -sf ../../run/ETAMPNEW_DATA.expanded_rain . ; \
ln -sf ../../run/RRTM_DATA . ; \
ln -sf ../../run/RRTMG_LW_DATA . ; \
ln -sf ../../run/RRTMG_SW_DATA . ; \
ln -sf ../../run/CAM_ABS_DATA . ; \
ln -sf ../../run/CAM_AEROPT_DATA . ; \
ln -sf ../../run/CAMtr_volume_mixing_ratio.RCP4.5 . ; \
ln -sf ../../run/CAMtr_volume_mixing_ratio.RCP6 . ; \
ln -sf ../../run/CAMtr_volume_mixing_ratio.RCP8.5 CAMtr_volume_mixing_ratio ; \
ln -sf ../../run/CAMtr_volume_mixing_ratio.A1B . ; \
ln -sf ../../run/CAMtr_volume_mixing_ratio.A2 . ; \
ln -sf ../../run/CLM_ALB_ICE_DFS_DATA . ; \
ln -sf ../../run/CLM_ALB_ICE_DRC_DATA . ; \
ln -sf ../../run/CLM_ASM_ICE_DFS_DATA . ; \
ln -sf ../../run/CLM_ASM_ICE_DRC_DATA . ; \
ln -sf ../../run/CLM_DRDSDT0_DATA . ; \
ln -sf ../../run/CLM_EXT_ICE_DFS_DATA . ; \
ln -sf ../../run/CLM_EXT_ICE_DRC_DATA . ; \
ln -sf ../../run/CLM_KAPPA_DATA . ; \
ln -sf ../../run/CLM_TAU_DATA . ; \
ln -sf ../../run/ozone.formatted . ; \
ln -sf ../../run/ozone_lat.formatted . ; \
ln -sf ../../run/ozone_plev.formatted . ; \
ln -sf ../../run/aerosol.formatted . ; \
ln -sf ../../run/aerosol_lat.formatted . ; \
ln -sf ../../run/aerosol_lon.formatted . ; \
ln -sf ../../run/aerosol_plev.formatted . ; \
ln -sf ../../run/eclipse_besselian_elements.dat . ; \
ln -sf ../../run/capacity.asc . ; \
ln -sf ../../run/coeff_p.asc . ; \
ln -sf ../../run/coeff_q.asc . ; \
ln -sf ../../run/constants.asc . ; \
ln -sf ../../run/masses.asc . ; \
ln -sf ../../run/termvels.asc . ; \
ln -sf ../../run/kernels.asc_s_0_03_0_9 . ; \
ln -sf ../../run/kernels_z.asc . ; \
ln -sf ../../run/bulkdens.asc_s_0_03_0_9 . ; \
ln -sf ../../run/bulkradii.asc_s_0_03_0_9 . ; \
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
ln -sf ../../run/p3_lookupTable_1.dat-5.3-2momI . ; \
ln -sf ../../run/p3_lookupTable_1.dat-5.3-3momI . ; \
ln -sf ../../run/p3_lookupTable_2.dat-2momI_v5.2.2 . ; \
ln -sf ../../run/HLC.TBL . ; \
ln -sf ../../run/wind-turbine-1.tbl . ; \
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
ln -sf ../../run/ishmael-qi-qc.bin . ; \
ln -sf ../../run/ishmael-qi-qr.bin . ; \
ln -sf ../../run/BROADBAND_CLOUD_GODDARD.bin . ; \
if [ $(RWORDSIZE) -eq 8 ] ; then \
ln -sf ../../run/ETAMPNEW_DATA_DBL ETAMPNEW_DATA ; \
ln -sf ../../run/ETAMPNEW_DATA.expanded_rain_DBL ETAMPNEW_DATA.expanded_rain ; \
ln -sf ../../run/RRTM_DATA_DBL RRTM_DATA ; \
fi )
( cd test/nmm_real ; /bin/rm -f GENPARM.TBL ; ln -s ../../run/GENPARM.TBL . )
( cd test/nmm_real ; /bin/rm -f LANDUSE.TBL ; ln -s ../../run/LANDUSE.TBL . )
( cd test/nmm_real ; /bin/rm -f SOILPARM.TBL ; ln -s ../../run/SOILPARM.TBL . )
( cd test/nmm_real ; /bin/rm -f VEGPARM.TBL ; ln -s ../../run/VEGPARM.TBL . )
( cd test/nmm_real ; /bin/rm -f MPTABLE.TBL ; ln -s ../../run/MPTABLE.TBL . )
( cd test/nmm_real ; /bin/rm -f tr49t67 ; ln -s ../../run/tr49t67 . )
( cd test/nmm_real ; /bin/rm -f tr49t85 ; ln -s ../../run/tr49t85 . )
( cd test/nmm_real ; /bin/rm -f tr67t85 ; ln -s ../../run/tr67t85 . )
( cd test/nmm_real ; /bin/rm -f gribmap.txt ; ln -s ../../run/gribmap.txt . )
( cd test/nmm_real ; /bin/rm -f grib2map.tbl ; ln -s ../../run/grib2map.tbl . )
( cd test/nmm_real ; /bin/rm -f co2_trans ; ln -s ../../run/co2_trans . )
( cd run ; /bin/rm -f real_nmm.exe ; ln -s ../main/real_nmm.exe . )
( cd run ; if test -f namelist.input ; then \
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
/bin/rm -f namelist.input ; cp ../test/nmm_real/namelist.input . )



# semi-Lagrangian initializations


io :
@ echo '--------------------------------------'
( cd tools ; $(MAKE) standard.exe )
Expand Down Expand Up @@ -1155,14 +1049,6 @@ fortran_2003_fflush_test:
fortran_2008_gamma_test:
@cd tools ; /bin/rm -f fortran_2008_gamma_test.{exe,o} ; $(SFC) -o fortran_2008_gamma_test.exe fortran_2008_gamma_test.F ; cd ..

nmm_core :
@ echo '--------------------------------------'
if [ "`echo $(J) | sed -e 's/-j//g' -e 's/ \+//g'`" -gt "16" ] ; then \
( cd dyn_nmm ; $(MAKE) -j 16 ) ; \
else \
( cd dyn_nmm ; $(MAKE) $(J) ) ; \
fi

toolsdir :
@ echo '--------------------------------------'
if [ $(WRF_PLUS_CORE) -eq 0 ] ; then \
Expand Down
Loading