Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
2d96219
Initial implementation of NSSL 2-moment microphysics
MicroTed Aug 23, 2022
8669ec4
Added a package (nssl_moments) to turn on 3-moment version of NSSL m…
MicroTed Sep 12, 2022
5eebcc8
Limit ice crystal effective radius to 130um to stay within allowed R…
MicroTed Sep 12, 2022
80cab0e
Enable substepping for mp_nssl2m when dt_dyn is large (automaticall…
MicroTed Sep 13, 2022
4421a8b
Added new variables to LBC code in time_integration
MicroTed Sep 15, 2022
9f19611
Add support for compression for netcdf4
MicroTed Sep 30, 2022
c576543
Hack to set chunksizes along the nCells dimension. Chunksize is nCel…
MicroTed Oct 2, 2022
37e3be9
Added check in Makefile for HDF5 env. variable, which seems to be ne…
MicroTed Oct 3, 2022
29392b2
Fixed out-of-bounds problem with dimnames array
MicroTed Dec 14, 2022
628d38b
Add support for 3D reflectivity output (refl10cm) from Thompson scheme
MicroTed Jan 25, 2023
82ae39f
Merge branch 'nssl2m-deflate' of https://github.com/MicroTed/MPAS-Mod…
MicroTed Jan 25, 2023
bce5f23
Added mp_nssl2m to schemes that support calculated effective radii.
MicroTed Jun 7, 2023
9a12dbd
Merge branch 'release-v8.0.0' into nssl2m-deflate
MicroTed Jun 29, 2023
9b69530
Registry.xml : Add variables/packages and control flags for NSSL micr…
MicroTed Aug 23, 2023
806ffab
Merge remote-tracking branch 'origin/hotfix-v8.0.1' into v801-nssl3m
MicroTed Aug 23, 2023
782f2f7
Merge branch 'develop' into dev-nssl3m
MicroTed Aug 23, 2023
4b1f7bb
Added surface accumulation/rate for hail (separate from graupel)
MicroTed Aug 23, 2023
a5fc16f
Reverted 2 files that had changes to enable variable compression wit…
MicroTed Aug 31, 2023
f574fcb
Formatting updates
MicroTed Jan 19, 2024
d15f47e
Merge remote-tracking branch 'origin/develop' into dev-nssl3m
MicroTed Jan 19, 2024
a2653eb
mpas_atm_time_integration.F : add lines to get indices for added sca…
MicroTed Feb 7, 2024
11be8ae
Merge remote-tracking branch 'origin/hotfix-v8.2.1' into dev-nssl3m
MicroTed Aug 22, 2024
c9da5f1
In core_atmosphere:
MicroTed Aug 24, 2024
6a53ac8
Merge branch 'dev-nssl3m' of https://github.com/MicroTed/MPAS-Model i…
MicroTed Aug 24, 2024
5088057
mpas_atmphys_control.F : fixed whitespace
MicroTed Aug 24, 2024
62f1bcb
ccpp_kind_types.F : removed extra line break
MicroTed Aug 24, 2024
80ce2d0
Registry.xml : Removed nssl2m (for now) from tendencies; some logic…
MicroTed Aug 28, 2024
bf686a6
mpas_atmphys_driver_microphysics.F: Pass value for f_cn to NSSL mic…
MicroTed Sep 6, 2024
77be86f
module_mp_nssl_2mom.F: set default droplet nucleation to option 5 (i…
MicroTed Sep 6, 2024
ded92f2
module_mp_nssl_2mom.F : Reduced max hail diam; Relaxed high Vt warning
MicroTed Sep 8, 2024
e5a275a
mpas_atmphys_packages.F : add write statements for NSSL mp config va…
MicroTed Sep 11, 2024
d1c66bb
module_mp_nssl_2mom.F : Fixed out of bounds bug in the sedimentation
MicroTed Sep 13, 2024
b450aef
Fixed default value of config_nssl_cccn; Fixed issue when CCN predic…
MicroTed Sep 29, 2024
25f57e9
Reverted auto setting of ihlcnh for 2-moment that was meant for testing
MicroTed Oct 2, 2024
7d4db36
core_atmosphere/Registry.xml : Fixed default value of nssl_cccn
MicroTed Feb 20, 2025
6b078a5
Merge branch 'dev-nssl3m' of https://github.com/MicroTed/MPAS-Model i…
MicroTed Feb 20, 2025
90bf977
Reset change in Registry.xml
MicroTed Feb 20, 2025
ec369ca
Merge remote-tracking branch 'upstream/hotfix-v8.2.3' into v8.2.3-nssl
MicroTed Feb 20, 2025
26fc6ef
module_mp_nssl_2mom.F : Update for better reflectivity conservation …
MicroTed Feb 21, 2025
1a07166
Merge remote-tracking branch 'origin/develop' into dev-nssl3m
MicroTed Feb 21, 2025
8d7c872
module_mp_nssl_2mom.F: Update a comment
MicroTed Jul 3, 2025
6a7a06f
Merge remote-tracking branch 'upstream/develop' into dev-nssl3m
MicroTed Jul 3, 2025
996c441
A couple fixes for the refl10cm array
MicroTed Jul 3, 2025
c2d1638
core_atmosphere/Registry.xml : add LBC arrays for reflectivity moments
MicroTed Aug 12, 2025
601f60b
Merge remote-tracking branch 'upstream/develop' into dev-nssl3m
MicroTed Aug 12, 2025
40ba788
NSSL microphysics:
MicroTed Aug 12, 2025
2b54835
Fixed case error in src/core_atmosphere/physics/Makefile
MicroTed Aug 12, 2025
2eef643
Update Externals.cfg to point to minor update of NSSL-MP
MicroTed Nov 20, 2025
840ef2d
Merge remote-tracking branch 'upstream/develop' into dev-nssl3m
MicroTed Nov 20, 2025
f64de80
11/24/2025:
MicroTed Nov 24, 2025
ad5b97a
mpas_atmphys_todynamics.F : For MYNN, apply tendency for 'nc' (drop…
MicroTed Jan 21, 2026
ee6a5e1
mpas_atmphys_driver_pbl.F : Separate f_nc from aerosol flags
MicroTed Apr 2, 2026
563ad41
mpas_atmphys_driver_microphysics.F : Fix an issue in the NSSL2M ini…
MicroTed Apr 16, 2026
21c1e9f
Merge branch 'develop' into dev-nssl3m
MicroTed Apr 16, 2026
3ba32dd
Added physics_noaa/NSSL-MP to Makefile include paths to fix errors …
MicroTed Apr 24, 2026
f1fdaf6
NSSL-MP: Update version of NSSl-MP (Externals.cfg) and modify code t…
MicroTed Jun 1, 2026
35b2c83
Removed docs/README.NSSLmp and added instead to physics_noaa/NSSL-MP
MicroTed Jun 1, 2026
e99e0ae
Fix path errors to NSSL-MP in a couple Makefiles (no impact)
MicroTed Jun 1, 2026
7881421
core_atmosphere/CMakeLists.txt : Comment out unneeded git calls
MicroTed Jun 11, 2026
50b4593
Merge remote-tracking branch 'tedsrepo/develop' into dev-nssl3m
MicroTed Jun 15, 2026
25fac9e
Externals.cfg: change location of NSSL-MP to ufs-community
MicroTed Aug 15, 2026
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
23 changes: 23 additions & 0 deletions src/core_atmosphere/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,28 @@ set(ATMOSPHERE_CORE_PHYSICS_NOAA_SOURCES

list(TRANSFORM ATMOSPHERE_CORE_PHYSICS_NOAA_SOURCES PREPEND physics/physics_noaa/UGWP/)

# set(ATMOSPHERE_CORE_PHYSICS_NSSL-MP_DIR ${CMAKE_CURRENT_SOURCE_DIR}/physics/physics_noaa/NSSL-MP)
#
# if(NOT EXISTS ${ATMOSPHERE_CORE_PHYSICS_NSSL-MP_DIR})
# set(PHYSICS_NSSL-MP_REPO_URL "https://github.com/NOAA-National-Severe-Storms-Laboratory/NSSL-MP.git")
# execute_process(COMMAND git clone ${PHYSICS_NSSL-MP_REPO_URL} ${ATMOSPHERE_CORE_PHYSICS_NSSL-MP_DIR}
# RESULT_VARIABLE GIT_CLONE_RESULT
# OUTPUT_VARIABLE GIT_CLONE_OUTPUT
# ERROR_VARIABLE GIT_CLONE_ERROR)
# if(NOT GIT_CLONE_RESULT EQUAL 0)
# message(FATAL_ERROR "Git clone failed with error: ${GIT_CLONE_ERROR}")
# endif()
#
# else()
# message(STATUS "Directory ${DIR_TO_CHECK} already exists, skipping clone")
# endif()

set(ATMOSPHERE_CORE_PHYSICS_NSSL-MP_SOURCES
module_mp_nssl_2mom.F90
MPAS/mp_nssl.F90
)
list(TRANSFORM ATMOSPHERE_CORE_PHYSICS_NSSL-MP_SOURCES PREPEND physics/physics_noaa/NSSL-MP/)

set(ATMOSPHERE_CORE_PHYSICS_NOAMP_UTILITY_SOURCES
CheckNanMod.F90
Machine.F90
Expand Down Expand Up @@ -355,6 +377,7 @@ add_library(core_atmosphere ${ATMOSPHERE_CORE_SOURCES}
${ATMOSPHERE_CORE_PHYSICS_MMM_SOURCES}
${ATMOSPHERE_CORE_PHYSICS_WRF_SOURCES}
${ATMOSPHERE_CORE_PHYSICS_NOAA_SOURCES}
${ATMOSPHERE_CORE_PHYSICS_NSSL-MP_SOURCES}

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know cmake very well, but I see that other packages have explicit source file lists. I can add that for NSSLmp if that's needed.

${ATMOSPHERE_CORE_DIAGNOSTIC_SOURCES}
${ATMOSPHERE_CORE_DYNAMICS_SOURCES})

Expand Down
7 changes: 7 additions & 0 deletions src/core_atmosphere/Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,12 @@ repo_url = https://github.com/NOAA-GSL/UGWP.git
tag = MPAS_20241223
required = True

[NSSL-MP]
local_path = ./physics_noaa/NSSL-MP
protocol = git
repo_url = https://github.com/ufs-community/NSSL-MP.git
tag = MPAS-2026-08
required = True

[externals_description]
schema_version = 1.0.0
11 changes: 8 additions & 3 deletions src/core_atmosphere/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,13 @@ clean:
.F.o:
$(RM) $@ $*.mod
ifeq "$(GEN_F90)" "true"
$(CPP) $(CPPFLAGS) $(PHYSICS) $(CHEMISTRY) $(CPPINCLUDES) -I./inc -I../framework $< > $*.f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I./physics -I./dynamics -I./diagnostics -I./physics/physics_wrf -I./physics/physics_mmm -I./physics/physics_noaa/UGWP $(MPAS_ESMF_INC) -I./chemistry
$(CPP) $(CPPFLAGS) $(PHYSICS) $(CHEMISTRY) $(CPPINCLUDES) -I./inc $< > $*.f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I../framework -I../operators -I./physics \
-I./dynamics -I./diagnostics -I./physics/physics_wrf -I./physics/physics_mmm \
-I./physics/physics_noaa/UGWP -I./physics/physics_noaa/NSSL-MP $(MPAS_ESMF_INC) -I./chemistry
else
$(FC) $(CPPFLAGS) $(PHYSICS) $(CHEMISTRY) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I./inc -I../framework -I../operators -I./physics -I./dynamics -I./diagnostics -I./physics/physics_wrf -I./physics/physics_mmm -I./physics/physics_noaa/UGWP $(MPAS_ESMF_INC) -I./chemistry
$(FC) $(CPPFLAGS) $(PHYSICS) $(CHEMISTRY) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) \
-I./inc -I../framework -I../operators -I./physics -I./dynamics -I./diagnostics \
-I./physics/physics_wrf -I./physics/physics_mmm -I./physics/physics_noaa/UGWP \
-I./physics/physics_noaa/NSSL-MP $(MPAS_ESMF_INC) -I./chemistry
endif
292 changes: 228 additions & 64 deletions src/core_atmosphere/Registry.xml

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions src/core_atmosphere/dynamics/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@ clean:
.F.o:
$(RM) $@ $*.mod
ifeq "$(GEN_F90)" "true"
$(CPP) $(CPPFLAGS) $(PHYSICS) $(CPPINCLUDES) -I../../framework $< > $*.f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I.. -I../../framework -I../../operators -I../physics -I../physics/physics_wrf -I../physics/physics_mmm $(MPAS_ESMF_INC)
$(CPP) $(CPPFLAGS) $(PHYSICS) $(CPPINCLUDES) $< > $*.f90
$(FC) $(FFLAGS) -c $*.f90 $(FCINCLUDES) -I.. -I../../framework -I../../operators -I../physics \
-I../physics/physics_wrf -I../physics/physics_mmm -I../physics/physics_noaa/NSSL-MP $(MPAS_ESMF_INC)
else
$(FC) $(CPPFLAGS) $(PHYSICS) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I.. -I../../framework -I../../operators -I../physics -I../physics/physics_wrf -I../physics/physics_mmm $(MPAS_ESMF_INC)
$(FC) $(CPPFLAGS) $(PHYSICS) $(FFLAGS) -c $*.F $(CPPINCLUDES) $(FCINCLUDES) -I.. -I../../framework \
-I../../operators -I../physics -I../physics/physics_wrf -I../physics/physics_noaa/NSSL-MP \
-I../physics/physics_mmm $(MPAS_ESMF_INC)
endif
8 changes: 5 additions & 3 deletions src/core_atmosphere/mpas_atm_core.F
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ function atm_core_init(domain, startTimeStamp) result(ierr)
call mpas_pool_get_subpool(block % structs, 'mesh', mesh)
call mpas_pool_get_subpool(block % structs, 'state', state)

call atm_mpas_init_block(domain % dminfo, domain % streamManager, block, mesh, dt)
call atm_mpas_init_block(domain % dminfo, domain % streamManager, block, mesh, dt, domain%namelist_filename)

call mpas_pool_get_array(state, 'xtime', xtime, 1)
xtime = startTimeStamp
Expand Down Expand Up @@ -363,7 +363,7 @@ subroutine atm_simulation_clock_init(core_clock, configs, ierr)
end subroutine atm_simulation_clock_init


subroutine atm_mpas_init_block(dminfo, stream_manager, block, mesh, dt)
subroutine atm_mpas_init_block(dminfo, stream_manager, block, mesh, dt, namelist_filename)

use atm_time_integration
use mpas_rbf_interpolation
Expand All @@ -384,6 +384,7 @@ subroutine atm_mpas_init_block(dminfo, stream_manager, block, mesh, dt)
type (block_type), intent(inout) :: block
type (mpas_pool_type), intent(inout) :: mesh !MGD does this need to be a pointer?
real (kind=RKIND), intent(in) :: dt
character(len=StrKIND), intent(in) :: namelist_filename

type (mpas_pool_type), pointer :: state
type (mpas_pool_type), pointer :: diag
Expand Down Expand Up @@ -592,7 +593,8 @@ subroutine atm_mpas_init_block(dminfo, stream_manager, block, mesh, dt)

!initialization of all physics:
call physics_init(dminfo, stream_manager, clock, block % configs, mesh, diag, tend, tend_physics, state, 1, &
diag_physics, diag_physics_noahmp, ngw_input, atm_input, sfc_input, output_noahmp)
diag_physics, diag_physics_noahmp, ngw_input, atm_input, sfc_input, output_noahmp, &
namelist_filename)
endif
#endif

Expand Down
19 changes: 14 additions & 5 deletions src/core_atmosphere/physics/Makefile
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_UGWP core_physics_wrf core_physics_noahmp core_physics
$(MAKE) lookup_tables core_physics_init core_physics_mmm core_microphysics core_UGWP core_physics_wrf core_physics_noahmp core_physics

dummy:
echo "****** compiling physics ******"
Expand Down Expand Up @@ -60,6 +60,9 @@ lookup_tables:
core_physics_mmm: core_physics_init
(cd physics_mmm; $(MAKE) -f Makefile.mpas all)

core_microphysics: core_physics_init core_physics_mmm
(cd physics_noaa/NSSL-MP; ln -sf ./MPAS/Makefile .; ln -sf ./MPAS/mp_nssl.F90 .; $(MAKE) COREDEF="$(COREDEF)")

core_UGWP: core_physics_init
(cd physics_noaa/UGWP; $(MAKE) all)

Expand All @@ -73,7 +76,7 @@ core_physics_noahmp:

core_physics_init: $(OBJS_init)

core_physics: core_physics_wrf core_physics_noahmp
core_physics: core_microphysics 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 @@ -253,6 +256,7 @@ clean:
( cd physics_noahmp/drivers/mpas; $(MAKE) clean )
( cd physics_noahmp/src; $(MAKE) clean )
( cd physics_noahmp/utility; $(MAKE) clean )
( if [ -d physics_noaa/NSSL-MP ]; then cd physics_noaa/NSSL-MP; $(MAKE) clean; fi )
( if [ -d physics_noaa/UGWP ]; then cd physics_noaa/UGWP; $(MAKE) clean; fi )
@# Certain systems with intel compilers generate *.i files
@# This removes them during the clean process
Expand All @@ -261,8 +265,13 @@ clean:
.F.o:
$(RM) $@ $*.mod
ifeq "$(GEN_F90)" "true"
$(CPP) $(CPPFLAGS) $(COREDEF) $(HYDROSTATIC) $(CPPINCLUDES) -I../../framework $< > $*.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./physics_noaa/UGWP -I.. -I../../framework $(MPAS_ESMF_INC)
$(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./physics_noaa/UGWP -I./physics_noaa/NSSL-MP -I.. -I../../framework $(MPAS_ESMF_INC)
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./physics_noaa/UGWP -I.. -I../../framework $(MPAS_ESMF_INC)
$(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./physics_noaa/UGWP \
-I./physics_noaa/NSSL-MP -I.. -I../../framework $(MPAS_ESMF_INC)
endif
8 changes: 8 additions & 0 deletions src/core_atmosphere/physics/mpas_atmphys_control.F
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,16 @@ subroutine physics_namelist_check(configs)
end if

!cloud microphysics scheme:
if( config_microp_scheme .eq. 'mp_nssl2m' ) then
config_microp_scheme = 'mp_nssl' ! backward compatibility
write(mpas_err_message,'(A)') &
'NOTE: config_microp_scheme: value of mp_nssl2m is obsolete, please use mp_nssl'
call physics_message(mpas_err_message)
end if

if(.not. (config_microp_scheme .eq. 'off' .or. &
config_microp_scheme .eq. 'mp_kessler' .or. &
config_microp_scheme .eq. 'mp_nssl' .or. &
config_microp_scheme .eq. 'mp_thompson' .or. &
config_microp_scheme .eq. 'mp_thompson_aerosols' .or. &
config_microp_scheme .eq. 'mp_wsm6')) then
Expand Down
Loading