this is already squashed/merged (pushed from chey), but unable to get back to master w/out committing 
this again
Merge branch 'master' of github.com:wrf-model/WRF into wrf_mpas_phys_mp_wsm6

# Conflicts:
#	phys/module_mp_wsm6.F
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch wrf_mpas_phys_mp_wsm6
# Your branch is up to date with 'origin/wrf_mpas_phys_mp_wsm6'.
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   Makefile
#	modified:   README
#	new file:   README.WRFPLUS
#	modified:   Registry/Registry.EM
#	modified:   Registry/Registry.EM_CHEM
#	modified:   Registry/Registry.EM_COMMON
#	new file:   Registry/Registry.EM_COMMON.tladj
#	modified:   Registry/Registry.NMM
#	new file:   Registry/Registry.tladj
#	modified:   Registry/registry.chem
#	modified:   Registry/registry.dimspec
#	new file:   Registry/registry.em_shared_collection
#	modified:   Registry/registry.fire
#	modified:   Registry/registry.hyb_coord
#	modified:   Registry/registry.noahmp
#	new file:   Registry/registry.trad_fields
#	modified:   Registry/registry.var
#	modified:   Registry/registry.var_chem
#	new file:   Registry/registry.wrfplus
#	modified:   arch/postamble_new
#	new file:   chem/KPP/inc/racm_soa_vbs_het/extra_args_to_update_rconst_racm_soa_vbs_het.inc
#	new file:   chem/KPP/inc/racm_soa_vbs_het/extra_args_update_rconst_racm_soa_vbs_het.inc
#	new file:   chem/KPP/inc/racm_soa_vbs_het/extra_decls_update_rconst_racm_soa_vbs_het.inc
#	new file:   chem/KPP/inc/racm_soa_vbs_het/kpp_mechd_a_racm_soa_vbs_het.inc
#	new file:   chem/KPP/inc/racm_soa_vbs_het/kpp_mechd_b_racm_soa_vbs_het.inc
#	new file:   chem/KPP/inc/racm_soa_vbs_het/kpp_mechd_e_racm_soa_vbs_het.inc
#	new file:   chem/KPP/inc/racm_soa_vbs_het/kpp_mechd_ia_racm_soa_vbs_het.inc
#	new file:   chem/KPP/inc/racm_soa_vbs_het/kpp_mechd_ib_racm_soa_vbs_het.inc
#	new file:   chem/KPP/inc/racm_soa_vbs_het/kpp_mechd_ibu_racm_soa_vbs_het.inc
#	new file:   chem/KPP/inc/racm_soa_vbs_het/kpp_mechd_l_racm_soa_vbs_het.inc
#	new file:   chem/KPP/inc/racm_soa_vbs_het/kpp_mechd_u_racm_soa_vbs_het.inc
#	modified:   chem/KPP/kpp/kpp-2.1/src/gen.c
#	new file:   chem/KPP/mechanisms/racm_soa_vbs_het/atoms_red
#	new file:   chem/KPP/mechanisms/racm_soa_vbs_het/racm_soa_vbs_het.def
#	new file:   chem/KPP/mechanisms/racm_soa_vbs_het/racm_soa_vbs_het.eqn
#	new file:   chem/KPP/mechanisms/racm_soa_vbs_het/racm_soa_vbs_het.kpp
#	new file:   chem/KPP/mechanisms/racm_soa_vbs_het/racm_soa_vbs_het.spc
#	new file:   chem/KPP/mechanisms/racm_soa_vbs_het/racm_soa_vbs_het_wrfkpp.equiv
#	modified:   chem/Makefile
#	modified:   chem/aerosol_driver.F
#	modified:   chem/chem_driver.F
#	modified:   chem/chemics_init.F
#	modified:   chem/convert_emiss.F
#	modified:   chem/depend.chem
#	modified:   chem/dry_dep_driver.F
#	modified:   chem/emissions_driver.F
#	modified:   chem/mechanism_driver.F
#	modified:   chem/module_HLaw.F
#	modified:   chem/module_add_emiss_burn.F
#	modified:   chem/module_aerosols_soa_vbs.F
#	modified:   chem/module_bioemi_megan2.F
#	modified:   chem/module_ctrans_grell.F
#	modified:   chem/module_data_soa_vbs.F
#	modified:   chem/module_dep_simple.F
#	modified:   chem/module_emissions_anthropogenics.F
#	modified:   chem/module_ftuv_driver.F
#	modified:   chem/module_input_chem_data.F
#	new file:   chem/module_isocom.F
#	new file:   chem/module_isofwd.F
#	new file:   chem/module_isorev.F
#	new file:   chem/module_isrpia_inc.F
#	modified:   chem/module_mosaic_sumpm.F
#	modified:   chem/module_optical_averaging.F
#	modified:   chem/module_phot_mad.F
#	modified:   chem/optical_driver.F
#	modified:   chem/photolysis_driver.F
#	modified:   clean
#	modified:   compile
#	modified:   configure
#	modified:   dyn_em/couple_or_uncouple_em.F
#	modified:   dyn_em/depend.dyn_em
#	modified:   dyn_em/module_advect_em.F
#	modified:   dyn_em/module_bc_em.F
#	modified:   dyn_em/module_big_step_utilities_em.F
#	modified:   dyn_em/module_diffusion_em.F
#	modified:   dyn_em/module_em.F
#	modified:   dyn_em/module_first_rk_step_part1.F
#	modified:   dyn_em/module_first_rk_step_part2.F
#	modified:   dyn_em/module_initialize_fire.F
#	modified:   dyn_em/module_initialize_heldsuarez.F
#	modified:   dyn_em/module_initialize_hill2d_x.F
#	new file:   dyn_em/module_initialize_ideal.F
#	modified:   dyn_em/module_initialize_les.F
#	modified:   dyn_em/module_initialize_real.F
#	modified:   dyn_em/module_initialize_scm_xy.F
#	modified:   dyn_em/module_initialize_tropical_cyclone.F
#	modified:   dyn_em/module_polarfft.F
#	modified:   dyn_em/module_small_step_em.F
#	modified:   dyn_em/module_stoch.F
#	modified:   dyn_em/nest_init_utils.F
#	modified:   dyn_em/solve_em.F
#	modified:   dyn_em/start_em.F
#	modified:   dyn_nmm/module_PHYSICS_CALLS.F
#	modified:   dyn_nmm/solve_nmm.F
#	modified:   dyn_nmm/start_domain_nmm.F
#	modified:   external/RSL_LITE/makefile
#	modified:   external/RSL_LITE/module_dm.F
#	modified:   frame/Makefile
#	modified:   frame/loop_based_x_shift_code.h
#	modified:   frame/loop_based_y_shift_code.h
#	modified:   frame/module_configure.F
#	modified:   inc/version_decl
#	modified:   main/depend.common
#	modified:   main/module_wrf_top.F
#	modified:   main/ndown_em.F
#	modified:   main/real_em.F
#	modified:   phys/Makefile
#	modified:   phys/module_bl_gwdo.F
#	modified:   phys/module_bl_mynn.F
#	modified:   phys/module_bl_ysu.F
#	modified:   phys/module_cu_gf_deep.F
#	new file:   phys/module_cu_ksas.F
#	modified:   phys/module_cu_mskf.F
#	modified:   phys/module_cu_ntiedtke.F
#	modified:   phys/module_cumulus_driver.F
#	modified:   phys/module_diag_afwa.F
#	new file:   phys/module_diag_functions.F
#	modified:   phys/module_diag_hailcast.F
#	modified:   phys/module_diag_misc.F
#	new file:   phys/module_diag_trad_fields.F
#	modified:   phys/module_diagnostics_driver.F
#	new file:   phys/module_dust_emis.F
#	modified:   phys/module_fddaobs_rtfdda.F
#	modified:   phys/module_fr_fire_atm.F
#	modified:   phys/module_fr_fire_core.F
#	modified:   phys/module_fr_fire_driver.F
#	modified:   phys/module_fr_fire_driver_wrf.F
#	modified:   phys/module_fr_fire_model.F
#	modified:   phys/module_fr_fire_phys.F
#	modified:   phys/module_fr_fire_util.F
#	modified:   phys/module_lightning_driver.F
#	modified:   phys/module_microphysics_driver.F
#	modified:   phys/module_mp_morr_two_moment.F
#	new file:   phys/module_mp_morr_two_moment_aero.F
#	modified:   phys/module_mp_nssl_2mom.F
#	modified:   phys/module_mp_thompson.F
#	modified:   phys/module_mp_wdm6.F
#	modified:   phys/module_mp_wsm6.F
#	modified:   phys/module_pbl_driver.F
#	modified:   phys/module_physics_addtendc.F
#	modified:   phys/module_physics_init.F
#	new file:   phys/module_ra_effective_radius.F
#	new file:   phys/module_ra_rrtmg_lwk.F
#	modified:   phys/module_ra_rrtmg_sw.F
#	modified:   phys/module_ra_rrtmg_swf.F
#	new file:   phys/module_ra_rrtmg_swk.F
#	modified:   phys/module_radiation_driver.F
#	new file:   phys/module_sf_gecros.F
#	modified:   phys/module_sf_mynn.F
#	modified:   phys/module_sf_noahdrv.F
#	modified:   phys/module_sf_noahlsm.F
#	modified:   phys/module_sf_noahmpdrv.F
#	modified:   phys/module_sf_noahmplsm.F
#	modified:   phys/module_sf_ruclsm.F
#	modified:   phys/module_sf_sfclay.F
#	modified:   phys/module_sf_sfclayrev.F
#	modified:   phys/module_surface_driver.F
#	modified:   run/MPTABLE.TBL
#	modified:   run/README.namelist
#	modified:   share/Makefile
#	modified:   share/dfi.F
#	modified:   share/input_wrf.F
#	modified:   share/module_bc.F
#	modified:   share/module_check_a_mundo.F
#	modified:   share/module_optional_input.F
#	modified:   share/output_wrf.F
#	modified:   share/solve_interface.F
#	modified:   share/start_domain.F
#	modified:   test/em_b_wave/namelist.input
#	modified:   test/em_b_wave/namelist.input.backwards
#	modified:   test/em_convrad/namelist.input
#	modified:   test/em_esmf_exp/namelist.input.jan00.ESMFSST
#	modified:   test/em_esmf_exp/namelist.input.jan00.NETCDFSST
#	modified:   test/em_fire/namelist.input_hill_simple
#	modified:   test/em_fire/namelist.input_two_fires
#	modified:   test/em_grav2d_x/namelist.input
#	modified:   test/em_grav2d_x/namelist.input.100m
#	modified:   test/em_grav2d_x/namelist.input.200m
#	modified:   test/em_grav2d_x/namelist.input.400m
#	modified:   test/em_heldsuarez/namelist.input
#	modified:   test/em_hill2d_x/extras/namelist.input-100m_hill-10mps-N^2=0.0001-30km_deep-20km_damping-dampcoef=0.1-etac=0.2
#	modified:   test/em_hill2d_x/extras/namelist.input-700m_hill-15mps-n^2=0.0001-25km_deep-15km_damping-dampcoef=0.08-etac=0.2
#	modified:   test/em_hill2d_x/extras/namelist.input-HILL
#	modified:   test/em_hill2d_x/extras/namelist.input-HILL-51
#	modified:   test/em_hill2d_x/extras/namelist.input-HILL-schar
#	modified:   test/em_hill2d_x/namelist.input
#	modified:   test/em_les/namelist.input
#	modified:   test/em_les/namelist.input.SGP
#	modified:   test/em_les/namelist.input_shalconv
#	modified:   test/em_quarter_ss/namelist.input
#	modified:   test/em_quarter_ss/namelist.input_2to1
#	modified:   test/em_quarter_ss/namelist.input_3to1
#	modified:   test/em_quarter_ss/namelist.input_4to1
#	modified:   test/em_quarter_ss/namelist.input_5to1
#	modified:   test/em_real/namelist.input
#	modified:   test/em_real/namelist.input.4km
#	modified:   test/em_real/namelist.input.chem
#	modified:   test/em_real/namelist.input.diags
#	modified:   test/em_real/namelist.input.fire
#	modified:   test/em_real/namelist.input.global
#	modified:   test/em_real/namelist.input.jan00
#	modified:   test/em_real/namelist.input.jun01
#	modified:   test/em_real/namelist.input.ndown_1
#	modified:   test/em_real/namelist.input.ndown_2
#	modified:   test/em_real/namelist.input.ndown_3
#	modified:   test/em_real/namelist.input.volc
#	modified:   test/em_scm_xy/namelist.input
#	modified:   test/em_seabreeze2d_x/namelist.input
#	modified:   test/em_seabreeze2d_x/namelist.input.windfarm
#	modified:   test/em_squall2d_x/namelist.input
#	modified:   test/em_squall2d_y/namelist.input
#	modified:   test/em_tropical_cyclone/namelist.input
#	modified:   tools/gen_scalar_indices.c
#	modified:   var/build/da.make
#	modified:   var/da/da_define_structures/da_allocate_y.inc
#	modified:   var/da/da_define_structures/da_allocate_y_radar.inc
#	modified:   var/da/da_define_structures/da_deallocate_observations.inc
#	modified:   var/da/da_define_structures/da_define_structures.f90
#	modified:   var/da/da_main/da_update_firstguess.inc
#	modified:   var/da/da_obs_io/da_obs_io.f90
#	modified:   var/da/da_obs_io/da_read_obs_radar.inc
#	modified:   var/da/da_radar/da_ao_stats_radar.inc
#	modified:   var/da/da_radar/da_get_innov_vector_radar.inc
#	modified:   var/da/da_radar/da_jo_and_grady_radar.inc
#	modified:   var/da/da_radar/da_oi_stats_radar.inc
#	modified:   var/da/da_radar/da_radar.f90
#	modified:   var/da/da_radar/da_transform_xtoy_radar.inc
#	modified:   var/da/da_radar/da_transform_xtoy_radar_adj.inc
#	modified:   var/da/da_setup_structures/da_setup_obs_structures_radar.inc
#	modified:   var/da/da_synop/da_get_innov_vector_synop.inc
#	deleted:    var/obsproc/MAP_plot/Dir_map/Map.F.new
#	deleted:    var/obsproc/MAP_plot/Dir_map/Map.Ftemp
#	modified:   var/obsproc/src/module_qc.F90
#	new file:   wrftladj/Makefile
#	new file:   wrftladj/adBuffer.F
#	new file:   wrftladj/adStack.c
#	new file:   wrftladj/depend.wrftladj
#	new file:   wrftladj/jcdfi.F
#	new file:   wrftladj/mediation_pertmod_io.F
#	new file:   wrftladj/module_adtl_grid_utilities.F
#	new file:   wrftladj/module_advect_em_ad.F
#	new file:   wrftladj/module_advect_em_tl.F
#	new file:   wrftladj/module_bc_ad.F
#	new file:   wrftladj/module_bc_em_ad.F
#	new file:   wrftladj/module_bc_em_tl.F
#	new file:   wrftladj/module_bc_tl.F
#	new file:   wrftladj/module_big_step_utilities_em_ad.F
#	new file:   wrftladj/module_big_step_utilities_em_tl.F
#	new file:   wrftladj/module_bl_gwdo_ad.F
#	new file:   wrftladj/module_bl_gwdo_tl.F
#	new file:   wrftladj/module_bl_surface_drag.F
#	new file:   wrftladj/module_bl_surface_drag_ad.F
#	new file:   wrftladj/module_bl_surface_drag_tl.F
#	new file:   wrftladj/module_cu_du.F
#	new file:   wrftladj/module_cu_du_ad.F
#	new file:   wrftladj/module_cu_du_tl.F
#	new file:   wrftladj/module_cumulus_driver_ad.F
#	new file:   wrftladj/module_cumulus_driver_tl.F
#	new file:   wrftladj/module_diffusion_em_ad.F
#	new file:   wrftladj/module_diffusion_em_tl.F
#	new file:   wrftladj/module_em_ad.F
#	new file:   wrftladj/module_em_tl.F
#	new file:   wrftladj/module_first_rk_step_part1_ad.F
#	new file:   wrftladj/module_first_rk_step_part1_tl.F
#	new file:   wrftladj/module_first_rk_step_part2_ad.F
#	new file:   wrftladj/module_first_rk_step_part2_tl.F
#	new file:   wrftladj/module_linked_list2.F
#	new file:   wrftladj/module_microphysics_driver_ad.F
#	new file:   wrftladj/module_microphysics_driver_tl.F
#	new file:   wrftladj/module_microphysics_zero_out_ad.F
#	new file:   wrftladj/module_microphysics_zero_out_tl.F
#	new file:   wrftladj/module_mp_mkessler.F
#	new file:   wrftladj/module_mp_mkessler_ad.F
#	new file:   wrftladj/module_mp_mkessler_tl.F
#	new file:   wrftladj/module_mp_nconvp.F
#	new file:   wrftladj/module_mp_nconvp_ad.F
#	new file:   wrftladj/module_mp_nconvp_tl.F
#	new file:   wrftladj/module_pbl_driver_ad.F
#	new file:   wrftladj/module_pbl_driver_tl.F
#	new file:   wrftladj/module_physics_addtendc_ad.F
#	new file:   wrftladj/module_physics_addtendc_tl.F
#	new file:   wrftladj/module_physics_init_ad.F
#	new file:   wrftladj/module_physics_init_tl.F
#	new file:   wrftladj/module_sfs_driver_ad.F
#	new file:   wrftladj/module_sfs_driver_tl.F
#	new file:   wrftladj/module_sfs_nba_ad.F
#	new file:   wrftladj/module_sfs_nba_tl.F
#	new file:   wrftladj/module_small_step_em_ad.F
#	new file:   wrftladj/module_small_step_em_tl.F
#	new file:   wrftladj/solve_em_ad.F
#	new file:   wrftladj/solve_em_tl.F
#	new file:   wrftladj/start_domain_em_ad.int
#	new file:   wrftladj/start_domain_em_tl.int
#	new file:   wrftladj/start_em_ad.F
#	new file:   wrftladj/start_em_tl.F
#
