Skip to content

Atmosphere/deep cam cesm #30

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

Open
cenamiller wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Atmosphere/deep cam cesm #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
19219b0
Add a namelist option for deep atmosphere
HingOng Nov 22, 2024
e2e7f82
Add nondimensional radii for deep atmosphere
HingOng Nov 22, 2024
63d41a1
Declare the nondimensional radii as needed and use them in mpas_atm_c…
HingOng Nov 23, 2024
8d4bfcd
Move call atm_compute_nondimensional_radii before initialization
HingOng Nov 23, 2024
0dac860
Implement the deep atmosphere equations
HingOng Nov 23, 2024
1847051
Correct physics momentum tendency with rTildeEdge
HingOng Nov 23, 2024
df494b2
Merge tag 'v8.3.0' into atmosphere/deep_cam_cesm
HingOng Jun 16, 2025
bd63865
Merge remote-tracking branch 'upstream/hotfix-v8.3.1' into atmosphere…
HingOng Nov 19, 2025
12c8650
Merge master: add NCAR CI workflows for PR checks
cenamiller Apr 9, 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
26 changes: 26 additions & 0 deletions src/core_atmosphere/Registry.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,11 @@
description="Scale eddy viscosities with mesh-density function for horizontal diffusion"
possible_values=".true. or .false."/>

<nml_option name="config_deep_atmosphere" type="logical" default_value="false" in_defaults="true"
units="-"
description="Deep atmosphere configuration"
possible_values=".true. or .false."/>

<nml_option name="config_num_halos" type="integer" default_value="2" in_defaults="false"
units="-"
description="Number of halo layers for fields"
Expand Down Expand Up @@ -491,6 +496,10 @@
<var name="zb"/>
<var name="zb3"/>
<var name="dss"/>
<var name="rTildeCell"/>
<var name="rTildeLayer"/>
<var name="rTildeEdge"/>
<var name="rTildeVertex"/>
<var name="deriv_two"/>
<var name="defc_a"/>
<var name="defc_b"/>
Expand Down Expand Up @@ -901,6 +910,10 @@
<var name="fzm"/>
<var name="fzp"/>
<var name="zz"/>
<var name="rTildeCell"/>
<var name="rTildeLayer"/>
<var name="rTildeEdge"/>
<var name="rTildeVertex"/>
<var name="initial_time"/>
<var name="xtime"/>
<var name="Time"/>
Expand Down Expand Up @@ -1518,6 +1531,19 @@
<var name="dss" type="real" dimensions="nVertLevels nCells" units="unitless"
description="w-damping coefficient"/>

<!-- Nondimensional radii -->
<var name="rTildeCell" type="real" dimensions="nVertLevels nCells" units="unitless"
description="Nondimensional radius of cells"/>

<var name="rTildeLayer" type="real" dimensions="nVertLevelsP1 nCells" units="unitless"
description="Nondimensional radius of layer interfaces"/>

<var name="rTildeEdge" type="real" dimensions="nVertLevels nEdges" units="unitless"
description="Nondimensional radius of edges"/>

<var name="rTildeVertex" type="real" dimensions="nVertLevels nVertices" units="unitless"
description="Nondimensional radius of vertices"/>

<!-- Reference profiles -->
<var name="u_init" type="real" dimensions="nVertLevels" units="m s^{-1}"
description="u reference profile"/>
Expand Down
5 changes: 3 additions & 2 deletions src/core_atmosphere/diagnostics/mpas_pv_diagnostics.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1268,7 +1268,7 @@ subroutine atm_compute_pv_diagnostics(state, time_lev, diag, mesh)
integer :: iCell, k
integer, pointer :: nCells, nVertLevels, index_qv
real (kind=RKIND) :: pvuVal, missingVal, stratoPV
real (kind=RKIND), dimension(:,:), pointer :: theta, rho, theta_m, rho_zz, zz, dtheta_dt_mix, tend_theta_euler
real (kind=RKIND), dimension(:,:), pointer :: theta, rho, theta_m, rho_zz, zz, dtheta_dt_mix, tend_theta_euler, rTildeCell
type (field2DReal), pointer :: theta_f, uReconstructX_f, uReconstructY_f, uReconstructZ_f, w_f, epv_f
real (kind=RKIND), dimension(:,:,:), pointer :: scalars

Expand All @@ -1284,11 +1284,12 @@ subroutine atm_compute_pv_diagnostics(state, time_lev, diag, mesh)
call mpas_pool_get_array(diag, 'rho', rho)

call mpas_pool_get_array(mesh, 'zz', zz)
call mpas_pool_get_array(mesh, 'rTildeCell', rTildeCell)

do iCell=1,nCells
do k=1,nVertLevels
theta(k,iCell) = theta_m(k,iCell) / (1._RKIND + rvord * scalars(index_qv,k,iCell))
rho(k,iCell) = rho_zz(k,iCell) * zz(k,iCell)
rho(k,iCell) = rho_zz(k,iCell) * zz(k,iCell) / rTildeCell(k,iCell)**2 ! deep
end do
end do

Expand Down
Loading
Loading