Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
67cff7f
kim-gwdo option that is revised from the ysu-gwdo
Jul 30, 2025
df35a58
Rename bl_ysu_gwdo to bl_kim_gwdo add namelist variables
Songyou184 Aug 2, 2025
8fea176
modified: src/core_init_atmosphere/mpas_init_atm_gwd.F
Songyou184 Aug 3, 2025
e0d347a
name list option
Songyou184 Aug 5, 2025
4d69f94
externals
Songyou184 Aug 21, 2025
2485f0e
modified: Registry.xml
Songyou184 Dec 23, 2025
e6b79d0
deleted: module_bl_gwdo.F-org
Songyou184 Dec 23, 2025
cf32904
Delete src/core_atmosphere/physics/mpas_atmphys_control.F-org
Songyou184 Dec 23, 2025
388a16f
Delete src/core_atmosphere/physics/mpas_atmphys_control.F-org2
Songyou184 Dec 23, 2025
ed694e1
Delete src/core_atmosphere/physics/mpas_atmphys_driver_gwdo.F-org
Songyou184 Dec 23, 2025
cbe8556
Delete src/core_atmosphere/physics/mpas_atmphys_driver_pbl.F-org
Songyou184 Dec 23, 2025
ec0ee61
Delete src/core_atmosphere/Registry.xml-org
Songyou184 Dec 23, 2025
6ad8b1d
Delete src/core_atmosphere/physics/mpas_atmphys_packages.F-org
Songyou184 Dec 23, 2025
1418628
Delete src/core_atmosphere/physics/mpas_atmphys_vars.F-org
Songyou184 Dec 23, 2025
a05c6ab
Delete src/core_atmosphere/physics/physics_wrf/module_sf_sfclayrev.F-org
Songyou184 Dec 23, 2025
94b21c2
Delete src/core_atmosphere/prt
Songyou184 Dec 23, 2025
679daf6
Delete src/core_atmosphere/physics/mpas_atmphys_driver_sfclayer.F-org
Songyou184 Dec 23, 2025
1f7856c
Delete src/core_atmosphere/physics/mpas_atmphys_vars.F-org2
Songyou184 Dec 23, 2025
c921068
modified: src/core_atmosphere/Externals.cfg
Songyou184 Dec 23, 2025
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
4 changes: 2 additions & 2 deletions src/core_atmosphere/Externals.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[MMM-physics]
local_path = ./physics_mmm
protocol = git
repo_url = https://github.com/NCAR/MMM-physics.git
tag = 20250616-MPASv8.3
repo_url = https://github.com/Songyou184/MMM-physics.git
branch=GWDO_SH
required = True

[GSL_UGWP]
Expand Down
173 changes: 106 additions & 67 deletions src/core_atmosphere/Registry.xml

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions src/core_atmosphere/mpas_atm_core.F
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ subroutine atm_mpas_init_block(dminfo, stream_manager, block, mesh, dt)
use mpas_vector_reconstruction
use mpas_stream_manager
use mpas_atm_boundaries, only : mpas_atm_setup_bdy_masks
use mpas_constants, only : omega
#ifdef DO_PHYSICS
! use mpas_atmphys_aquaplanet
use mpas_atmphys_control
Expand Down Expand Up @@ -405,6 +406,7 @@ subroutine atm_mpas_init_block(dminfo, stream_manager, block, mesh, dt)
real (kind=RKIND), dimension(:), pointer :: dvEdge, invDvEdge
real (kind=RKIND), dimension(:), pointer :: dcEdge, invDcEdge
real (kind=RKIND), dimension(:), pointer :: areaTriangle, invAreaTriangle
real (kind=RKIND), dimension(:), pointer :: fcell, latcell
integer, pointer :: nCells_ptr, nEdges_ptr, nVertices_ptr, nVertLevels_ptr, nEdgesSolve
integer :: nCells, nEdges, nVertices, nVertLevels
integer :: thread
Expand Down Expand Up @@ -444,6 +446,8 @@ subroutine atm_mpas_init_block(dminfo, stream_manager, block, mesh, dt)

call mpas_pool_get_array(mesh, 'areaTriangle', areaTriangle)
call mpas_pool_get_array(mesh, 'invAreaTriangle', invAreaTriangle)
call mpas_pool_get_array(mesh, 'fCell', fcell)
call mpas_pool_get_array(mesh, 'latCell', latcell)

call mpas_pool_get_dimension(mesh, 'nCells', nCells_ptr)
call mpas_pool_get_dimension(mesh, 'nEdges', nEdges_ptr)
Expand All @@ -469,6 +473,10 @@ subroutine atm_mpas_init_block(dminfo, stream_manager, block, mesh, dt)
invAreaTriangle(iVertex) = 1.0_RKIND / areaTriangle(iVertex)
end do

do iCell=1,nCells
fcell(iCell) = 2. * omega * sin(latcell(iCell))
end do

!!!!! End compute inverses
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

Expand Down
Binary file added src/core_atmosphere/physics/.a.swp
Binary file not shown.
17 changes: 11 additions & 6 deletions src/core_atmosphere/physics/mpas_atmphys_control.F
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,10 @@ module mpas_atmphys_control
! * in the mesoscale_reference suite, replaced the MM5 surface layer scheme with the MM5 revised surface layer
! scheme as the default option for config_sfclayer_scheme.
! Laura D. Fowler (laura@ucar.edu) / 2024-06-18.
! * renamed "bl_ysu_gwdo" to "bl_kim_gwdo"
! Songyou Hong (hong@ucar.edu) / 2025-08-24.
! * added the option bl_shinhong
! Songyou Hong (hong@ucar.edu) / 2025-11-27.


contains
Expand Down Expand Up @@ -133,7 +137,7 @@ subroutine physics_namelist_check(configs)
if (trim(config_microp_scheme) == 'suite') config_microp_scheme = 'mp_wsm6'
if (trim(config_convection_scheme) == 'suite') config_convection_scheme = 'cu_ntiedtke'
if (trim(config_pbl_scheme) == 'suite') config_pbl_scheme = 'bl_ysu'
if (trim(config_gwdo_scheme) == 'suite') config_gwdo_scheme = 'bl_ysu_gwdo'
if (trim(config_gwdo_scheme) == 'suite') config_gwdo_scheme = 'bl_kim_gwdo'
if (trim(config_radt_lw_scheme) == 'suite') config_radt_lw_scheme = 'rrtmg_lw'
if (trim(config_radt_sw_scheme) == 'suite') config_radt_sw_scheme = 'rrtmg_sw'
if (trim(config_radt_cld_scheme) == 'suite') config_radt_cld_scheme = 'cld_fraction'
Expand All @@ -145,7 +149,7 @@ subroutine physics_namelist_check(configs)
if (trim(config_microp_scheme) == 'suite') config_microp_scheme = 'mp_thompson'
if (trim(config_convection_scheme) == 'suite') config_convection_scheme = 'cu_grell_freitas'
if (trim(config_pbl_scheme) == 'suite') config_pbl_scheme = 'bl_mynn'
if (trim(config_gwdo_scheme) == 'suite') config_gwdo_scheme = 'bl_ysu_gwdo'
if (trim(config_gwdo_scheme) == 'suite') config_gwdo_scheme = 'bl_kim_gwdo'
if (trim(config_radt_lw_scheme) == 'suite') config_radt_lw_scheme = 'rrtmg_lw'
if (trim(config_radt_sw_scheme) == 'suite') config_radt_sw_scheme = 'rrtmg_sw'
if (trim(config_radt_cld_scheme) == 'suite') config_radt_cld_scheme = 'cld_fraction'
Expand Down Expand Up @@ -201,6 +205,7 @@ subroutine physics_namelist_check(configs)
!pbl scheme:
if(.not. (config_pbl_scheme .eq. 'off' .or. &
config_pbl_scheme .eq. 'bl_mynn' .or. &
config_pbl_scheme .eq. 'bl_shinhong' .or. &
config_pbl_scheme .eq. 'bl_ysu')) then

write(mpas_err_message,'(A,A20)') 'illegal value for pbl_scheme: ', &
Expand All @@ -211,7 +216,7 @@ subroutine physics_namelist_check(configs)

!gravity wave drag over orography scheme:
if(.not. (config_gwdo_scheme .eq. 'off' .or. &
config_gwdo_scheme .eq. 'bl_ysu_gwdo' .or. &
config_gwdo_scheme .eq. 'bl_kim_gwdo' .or. &
config_gwdo_scheme .eq. 'bl_ugwp_gwdo')) then

write(mpas_err_message,'(A,A20)') 'illegal value for gwdo_scheme: ', &
Expand Down Expand Up @@ -279,10 +284,10 @@ subroutine physics_namelist_check(configs)
else
if(config_pbl_scheme == 'bl_mynn') then
config_sfclayer_scheme = 'sf_mynn'
elseif(config_pbl_scheme == 'bl_ysu') then
elseif(config_pbl_scheme == 'bl_shinhong' .or. config_pbl_scheme == 'bl_ysu') then
if(config_sfclayer_scheme /= 'sf_monin_obukhov' .and. &
config_sfclayer_scheme /= 'sf_monin_obukhov_rev') then
write(mpas_err_message,'(A,A20)') 'wrong choice for surface layer scheme with YSU PBL: ', &
write(mpas_err_message,'(A,A20)') 'wrong choice for surface layer scheme with SHINHONG/YSU PBL: ', &
trim(config_sfclayer_scheme)
call physics_error_fatal(mpas_err_message)
endif
Expand Down Expand Up @@ -481,7 +486,7 @@ subroutine physics_compatibility_check(dminfo, blockList, streamManager, ierr)

call mpas_pool_get_config(blocklist % configs, 'config_gwdo_scheme', gwdo_scheme)

if (trim(gwdo_scheme) == 'bl_ysu_gwdo') then
if (trim(gwdo_scheme) == 'bl_kim_gwdo') then
maxvar2d_local = -huge(maxvar2d_local)
block => blockList
do while (associated(block))
Expand Down
1 change: 1 addition & 0 deletions src/core_atmosphere/physics/mpas_atmphys_driver.F
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ subroutine physics_driver(domain,itimestep,xtime_s)
config_sfclayer_scheme

logical, pointer:: config_oml1d
logical, pointer:: config_gwdo_nonhyd, config_kim_tofd
real(kind=RKIND),pointer:: config_bucket_radt

!local variables:
Expand Down
Loading