Skip to content

Commit a646bb1

Browse files
davegilldavegill
authored
Begin NMM removal from source code (wrf-model#1584)
TYPE: feature removed KEYWORDS: NMM SOURCE: internal DESCRIPTION OF CHANGES: If we consider the act of adding in new features to the WRF repository as a "constructionist" activity, then this PR begins the largest deconstructionist effort ever undertake in WRF. The Philosophy of Deconstructivism places an emphasis on appearance. Perhaps the bard has a quote appropos to someone working on a commit for a PR, where that PR is at once a massive change and yet is intended to have exactly zero impact: _It is a tale. Told by an idiot, full of sound and fury, Signifying nothing._ LIST OF MODIFIED FILES: _Deleted:_ D Registry/Registry.NMM D dyn_nmm/BALANCE_COMS.F D dyn_nmm/BALANCE_PARS.F D dyn_nmm/BUCKETS.F D dyn_nmm/CLTEND.F D dyn_nmm/DSTRB.F D dyn_nmm/Makefile D dyn_nmm/NMM_NEST_UTILS1.F D dyn_nmm/RDTEMP.F D dyn_nmm/adve_optim.h D dyn_nmm/adve_orig.h D dyn_nmm/depend.dyn_nmm D dyn_nmm/init_modules_nmm.F D dyn_nmm/module_ADVECTION.F D dyn_nmm/module_BC_NMM.F D dyn_nmm/module_BNDRY_COND.F D dyn_nmm/module_CLDWTR.F D dyn_nmm/module_CTLBLK.F D dyn_nmm/module_DIFFUSION_NMM.F D dyn_nmm/module_GWD.F D dyn_nmm/module_HIFREQ.F D dyn_nmm/module_IGWAVE_ADJUST.F D dyn_nmm/module_INDX.F D dyn_nmm/module_MPP.F D dyn_nmm/module_MPPINIT.F D dyn_nmm/module_NEST_UTIL.F D dyn_nmm/module_NONHY_DYNAM.F D dyn_nmm/module_PHYSICS_CALLS.F D dyn_nmm/module_PRECIP_ADJUST.F D dyn_nmm/module_SMOOTH_TERRAIN.F D dyn_nmm/module_STATS_FOR_MOVE.F D dyn_nmm/module_TERRAIN.F D dyn_nmm/module_TIMERS.F D dyn_nmm/module_ZEROX.F D dyn_nmm/module_initialize_real.F D dyn_nmm/module_initialize_tropical_cyclone.F D dyn_nmm/module_membrane_mslp.F D dyn_nmm/module_relax.F D dyn_nmm/module_si_io_nmm.F D dyn_nmm/module_swath.F D dyn_nmm/module_tornado_genesis.F D dyn_nmm/module_tracker.F D dyn_nmm/nmm_get_cpu.c D dyn_nmm/nmm_loop_basemacros.h D dyn_nmm/nmm_loop_macros.h D dyn_nmm/shift_domain_nmm.F D dyn_nmm/solve_nmm.F D dyn_nmm/start_domain_nmm.F D frame/module_io_quilt_new.F D phys/module_mp_HWRF.F D phys/module_ra_HWRF.F D test/nmm_real/namelist.input D test/nmm_real/namelist.input.HWRF D test/nmm_real/tomorrow D test/nmm_tropical_cyclone/README.NMM.TROPICAL_CYCLONE D test/nmm_tropical_cyclone/input.d D test/nmm_tropical_cyclone/land.nml D test/nmm_tropical_cyclone/namelist.input D test/nmm_tropical_cyclone/namelist.wps D test/nmm_tropical_cyclone/sigma.d D test/nmm_tropical_cyclone/sound.d D test/nmm_tropical_cyclone/sound_gfdl.d D test/nmm_tropical_cyclone/sound_jordan.d D test/nmm_tropical_cyclone/sound_wet.d D test/nmm_tropical_cyclone/storm.center _Modified:_ M .github/CODEOWNERS M Makefile M clean M compile M configure M external/RSL_LITE/gen_comms.c M external/RSL_LITE/module_dm.F M external/RSL_LITE/tfp_tester.F M frame/Makefile M frame/module_bdywrite.F M frame/module_dm_stubs.F M frame/module_domain.F M frame/module_integrate.F M frame/module_io_quilt.F M frame/module_nesting.F M frame/module_wrf_error.F M main/Makefile M main/depend.common M phys/Makefile M phys/module_cumulus_driver.F M phys/module_diagnostics_driver.F M phys/module_fddagd_driver.F M phys/module_microphysics_driver.F M phys/module_pbl_driver.F M phys/module_radiation_driver.F M phys/module_surface_driver.F M share/dfi.F M share/init_modules.F M share/input_wrf.F M share/interp_fcn.F M share/mediation_feedback_domain.F M share/mediation_force_domain.F M share/mediation_integrate.F M share/mediation_interp_domain.F M share/mediation_nest_move.F M share/mediation_wrfmain.F M share/module_check_a_mundo.F M share/module_interp_store.F M share/module_model_constants.F M share/module_optional_input.F M share/module_soil_pre.F M share/module_trajectory.F M share/output_wrf.F M share/set_timekeeping.F M share/solve_interface.F M share/start_domain.F M share/wrf_ext_write_field.F M share/wrf_timeseries.F M var/build/depend.txt TESTS CONDUCTED: 1. No "problems" per se. Just removing deadwood code. 2. All Jenkins tests are a PASS. 3. DA code still builds. 4. Restart tests OK. 5. Results for each regression test are identical before vs after. 6. Results for larger tests cases are also bit-for-bit (Wei Wang). 7. Code passes DA regression tests (Jake Liu). RELEASE NOTE: Starting with release-v4.4, the NMM dynamical core and some NMM-specific source code are being removed from the WRF repository. WRF release-v4.3.x is the latest release with the NMM build options still available.
1 parent 8bec1d8 commit a646bb1

File tree

114 files changed

+39
-79683
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+39
-79683
lines changed

‎.github/CODEOWNERS

-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ README.md @wrf-model/global_owner
7474
# Dynamics
7575

7676
/dyn_em/ @wrf-model/arw_dev
77-
/dyn_nmm/ @wrf-model/hwrf_dev
7877

7978
# WRF-Hydro
8079

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

103102
/test/em_* @wrf-model/arw_dev
104-
/test/nmm_* @wrf-model/hwrf_dev
105103
/test/em_fire/ @wrf-model/fire
106104

107105
# Executable directory

‎Makefile

-114
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,8 @@ DA_CONVERTOR_MODULES = $(DA_CONVERTOR_MOD_DIR) $(INCLUDE_MODULES)
4141

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

44-
NMM_MODULE_DIR = -I../dyn_nmm
45-
NMM_MODULES = $(NMM_MODULE_DIR)
46-
4744
ALL_MODULES = \
4845
$(EM_MODULE_DIR) \
49-
$(NMM_MODULES) \
5046
$(INCLUDE_MODULES)
5147

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

179174

180-
nmm_wrf : wrf
181-
182-
183175
# Eulerian mass coordinate initializations
184176

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

886878

887-
#### nmm converter
888-
889-
### Idealized NMM tropical cyclone case
890-
nmm_tropical_cyclone : nmm_wrf
891-
@ echo '--------------------------------------'
892-
( cd main ; $(MAKE) MODULE_DIRS="$(ALL_MODULES)" SOLVER=nmm IDEAL_CASE=tropical_cyclone nmm_ideal )
893-
( cd test/nmm_tropical_cyclone ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
894-
( cd test/nmm_tropical_cyclone ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . )
895-
( cd test/nmm_tropical_cyclone ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
896-
( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . )
897-
( cd run ; if test -f namelist.input ; then \
898-
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
899-
/bin/rm -f namelist.input ; cp ../test/nmm_tropical_cyclone/namelist.input . )
900-
@echo "build started: $(START_OF_COMPILE)"
901-
@echo "build completed:" `date`
902-
903-
nmm_real : nmm_wrf
904-
@ echo '--------------------------------------'
905-
( cd main ; $(MAKE) MODULE_DIRS="$(ALL_MODULES)" SOLVER=nmm IDEAL_CASE=real real_nmm )
906-
( cd test/nmm_real ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . )
907-
( cd test/nmm_real ; /bin/rm -f real_nmm.exe ; ln -s ../../main/real_nmm.exe . )
908-
( cd test/nmm_real ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . )
909-
( cd test/nmm_real ; /bin/rm -f ETAMPNEW_DATA.expanded_rain ETAMPNEW_DATA RRTM_DATA ; \
910-
ln -sf ../../run/ETAMPNEW_DATA . ; \
911-
ln -sf ../../run/ETAMPNEW_DATA.expanded_rain . ; \
912-
ln -sf ../../run/RRTM_DATA . ; \
913-
ln -sf ../../run/RRTMG_LW_DATA . ; \
914-
ln -sf ../../run/RRTMG_SW_DATA . ; \
915-
ln -sf ../../run/CAM_ABS_DATA . ; \
916-
ln -sf ../../run/CAM_AEROPT_DATA . ; \
917-
ln -sf ../../run/CAMtr_volume_mixing_ratio.RCP4.5 . ; \
918-
ln -sf ../../run/CAMtr_volume_mixing_ratio.RCP6 . ; \
919-
ln -sf ../../run/CAMtr_volume_mixing_ratio.RCP8.5 CAMtr_volume_mixing_ratio ; \
920-
ln -sf ../../run/CAMtr_volume_mixing_ratio.A1B . ; \
921-
ln -sf ../../run/CAMtr_volume_mixing_ratio.A2 . ; \
922-
ln -sf ../../run/CLM_ALB_ICE_DFS_DATA . ; \
923-
ln -sf ../../run/CLM_ALB_ICE_DRC_DATA . ; \
924-
ln -sf ../../run/CLM_ASM_ICE_DFS_DATA . ; \
925-
ln -sf ../../run/CLM_ASM_ICE_DRC_DATA . ; \
926-
ln -sf ../../run/CLM_DRDSDT0_DATA . ; \
927-
ln -sf ../../run/CLM_EXT_ICE_DFS_DATA . ; \
928-
ln -sf ../../run/CLM_EXT_ICE_DRC_DATA . ; \
929-
ln -sf ../../run/CLM_KAPPA_DATA . ; \
930-
ln -sf ../../run/CLM_TAU_DATA . ; \
931-
ln -sf ../../run/ozone.formatted . ; \
932-
ln -sf ../../run/ozone_lat.formatted . ; \
933-
ln -sf ../../run/ozone_plev.formatted . ; \
934-
ln -sf ../../run/aerosol.formatted . ; \
935-
ln -sf ../../run/aerosol_lat.formatted . ; \
936-
ln -sf ../../run/aerosol_lon.formatted . ; \
937-
ln -sf ../../run/aerosol_plev.formatted . ; \
938-
ln -sf ../../run/eclipse_besselian_elements.dat . ; \
939-
ln -sf ../../run/capacity.asc . ; \
940-
ln -sf ../../run/coeff_p.asc . ; \
941-
ln -sf ../../run/coeff_q.asc . ; \
942-
ln -sf ../../run/constants.asc . ; \
943-
ln -sf ../../run/masses.asc . ; \
944-
ln -sf ../../run/termvels.asc . ; \
945-
ln -sf ../../run/kernels.asc_s_0_03_0_9 . ; \
946-
ln -sf ../../run/kernels_z.asc . ; \
947-
ln -sf ../../run/bulkdens.asc_s_0_03_0_9 . ; \
948-
ln -sf ../../run/bulkradii.asc_s_0_03_0_9 . ; \
949-
ln -sf ../../run/CCN_ACTIVATE.BIN . ; \
950-
ln -sf ../../run/p3_lookupTable_1.dat-5.3-2momI . ; \
951-
ln -sf ../../run/p3_lookupTable_1.dat-5.3-3momI . ; \
952-
ln -sf ../../run/p3_lookupTable_2.dat-2momI_v5.2.2 . ; \
953-
ln -sf ../../run/HLC.TBL . ; \
954-
ln -sf ../../run/wind-turbine-1.tbl . ; \
955-
ln -sf ../../run/ishmael-gamma-tab.bin . ; \
956-
ln -sf ../../run/ishmael-qi-qc.bin . ; \
957-
ln -sf ../../run/ishmael-qi-qr.bin . ; \
958-
ln -sf ../../run/BROADBAND_CLOUD_GODDARD.bin . ; \
959-
if [ $(RWORDSIZE) -eq 8 ] ; then \
960-
ln -sf ../../run/ETAMPNEW_DATA_DBL ETAMPNEW_DATA ; \
961-
ln -sf ../../run/ETAMPNEW_DATA.expanded_rain_DBL ETAMPNEW_DATA.expanded_rain ; \
962-
ln -sf ../../run/RRTM_DATA_DBL RRTM_DATA ; \
963-
fi )
964-
( cd test/nmm_real ; /bin/rm -f GENPARM.TBL ; ln -s ../../run/GENPARM.TBL . )
965-
( cd test/nmm_real ; /bin/rm -f LANDUSE.TBL ; ln -s ../../run/LANDUSE.TBL . )
966-
( cd test/nmm_real ; /bin/rm -f SOILPARM.TBL ; ln -s ../../run/SOILPARM.TBL . )
967-
( cd test/nmm_real ; /bin/rm -f VEGPARM.TBL ; ln -s ../../run/VEGPARM.TBL . )
968-
( cd test/nmm_real ; /bin/rm -f MPTABLE.TBL ; ln -s ../../run/MPTABLE.TBL . )
969-
( cd test/nmm_real ; /bin/rm -f tr49t67 ; ln -s ../../run/tr49t67 . )
970-
( cd test/nmm_real ; /bin/rm -f tr49t85 ; ln -s ../../run/tr49t85 . )
971-
( cd test/nmm_real ; /bin/rm -f tr67t85 ; ln -s ../../run/tr67t85 . )
972-
( cd test/nmm_real ; /bin/rm -f gribmap.txt ; ln -s ../../run/gribmap.txt . )
973-
( cd test/nmm_real ; /bin/rm -f grib2map.tbl ; ln -s ../../run/grib2map.tbl . )
974-
( cd test/nmm_real ; /bin/rm -f co2_trans ; ln -s ../../run/co2_trans . )
975-
( cd run ; /bin/rm -f real_nmm.exe ; ln -s ../main/real_nmm.exe . )
976-
( cd run ; if test -f namelist.input ; then \
977-
/bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \
978-
/bin/rm -f namelist.input ; cp ../test/nmm_real/namelist.input . )
979-
980-
981-
982-
# semi-Lagrangian initializations
983-
984-
985879
io :
986880
@ echo '--------------------------------------'
987881
( cd tools ; $(MAKE) standard.exe )
@@ -1155,14 +1049,6 @@ fortran_2003_fflush_test:
11551049
fortran_2008_gamma_test:
11561050
@cd tools ; /bin/rm -f fortran_2008_gamma_test.{exe,o} ; $(SFC) -o fortran_2008_gamma_test.exe fortran_2008_gamma_test.F ; cd ..
11571051

1158-
nmm_core :
1159-
@ echo '--------------------------------------'
1160-
if [ "`echo $(J) | sed -e 's/-j//g' -e 's/ \+//g'`" -gt "16" ] ; then \
1161-
( cd dyn_nmm ; $(MAKE) -j 16 ) ; \
1162-
else \
1163-
( cd dyn_nmm ; $(MAKE) $(J) ) ; \
1164-
fi
1165-
11661052
toolsdir :
11671053
@ echo '--------------------------------------'
11681054
if [ $(WRF_PLUS_CORE) -eq 0 ] ; then \

0 commit comments

Comments
 (0)