Skip to content
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.

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

Add e_preale diagnostic #207

Merged
merged 1 commit into from
Jul 28, 2015
Merged
Changes from all commits
Commits
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
9 changes: 8 additions & 1 deletion src/core/MOM.F90
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@ module MOM
integer :: id_h_preale = -1
integer :: id_T_preale = -1
integer :: id_S_preale = -1
integer :: id_e_preale = -1

! The remainder provides pointers to child modules' control structures.
type(MOM_dyn_unsplit_CS), pointer :: dyn_unsplit_CSp => NULL()
Expand Down Expand Up @@ -726,7 +727,7 @@ subroutine step_MOM(fluxes, state, Time_start, time_interval, CS)
v, & ! v : meridional velocity component (m/s)
h ! h : layer thickness (meter (Bouss) or kg/m2 (non-Bouss))

real, dimension(SZI_(CS%G),SZJ_(CS%G),SZK_(CS%G)+1) :: eta_predia
real, dimension(SZI_(CS%G),SZJ_(CS%G),SZK_(CS%G)+1) :: eta_predia, eta_preale

real :: tot_wt_ssh, Itot_wt_ssh, I_time_int
real :: zos_area_mean, volo
Expand Down Expand Up @@ -942,6 +943,10 @@ subroutine step_MOM(fluxes, state, Time_start, time_interval, CS)
if (CS%id_h_preale > 0) call post_data(CS%id_h_preale, h, CS%diag)
if (CS%id_T_preale > 0) call post_data(CS%id_T_preale, CS%tv%T, CS%diag)
if (CS%id_S_preale > 0) call post_data(CS%id_S_preale, CS%tv%S, CS%diag)
if (CS%id_e_preale > 0) then
call find_eta(h, CS%tv, G%g_Earth, G, eta_preale)
call post_data(CS%id_e_preale, eta_preale, CS%diag)
endif

! Regridding/remapping is done here, at end of thermodynamics time step
! (that may comprise several dynamical time steps)
Expand Down Expand Up @@ -2380,6 +2385,8 @@ subroutine register_diags(Time, G, CS, ADp)
'Temperature before remapping', 'degC')
CS%id_S_preale = register_diag_field('ocean_model', 'S_preale', diag%axesTL, Time, &
'Salinity before remapping', 'ppt')
CS%id_e_preale = register_diag_field('ocean_model', 'e_preale', diag%axesTi, Time, &
'Interface Heights before remapping', 'meter')
endif
if (CS%use_temperature) then
CS%id_T_predia = register_diag_field('ocean_model', 'temp_predia', diag%axesTL, Time, &
Expand Down