Skip to content

User/jpk/pbo diag #128

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

Merged
adcroft merged 3 commits into from
Apr 7, 2015
Merged

User/jpk/pbo diag #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88ac770
Initial implementation of pbo diag
jkrasting Apr 2, 2015
c7edd60
Added post_data call
jkrasting Apr 3, 2015
fa845b7
Addition of fluxes%p_surf only if ASSOCIATED
jkrasting Apr 6, 2015
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
2 changes: 1 addition & 1 deletion src/core/MOM.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1229,7 +1229,7 @@ subroutine step_MOM(fluxes, state, Time_start, time_interval, CS)

call cpu_clock_begin(id_clock_diagnostics)
call calculate_diagnostic_fields(u, v, h, CS%uh, CS%vh, CS%tv, &
CS%ADp, CS%CDp, CS%dt_trans, G, CS%diagnostics_CSp)
CS%ADp, CS%CDp, fluxes, CS%dt_trans, G, CS%diagnostics_CSp)
if (showCallTree) call callTree_waypoint("finished calculate_diagnostic_fields (step_MOM)")
call cpu_clock_end(id_clock_diagnostics)

Expand Down
40 changes: 33 additions & 7 deletions src/diagnostics/MOM_diagnostics.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ module MOM_diagnostics
use MOM_domains, only : To_North, To_East
use MOM_error_handler, only : MOM_error, FATAL, WARNING
use MOM_file_parser, only : get_param, log_version, param_file_type
use MOM_forcing_type, only : forcing
use MOM_grid, only : ocean_grid_type
use MOM_interface_heights, only : find_eta
use MOM_spatial_means, only : global_area_mean, global_layer_mean
Expand Down Expand Up @@ -119,7 +120,7 @@ module MOM_diagnostics
integer :: id_uhGM_Rlay = -1, id_vhGM_Rlay = -1, id_Rml = -1, id_Rcv = -1
integer :: id_cg1 = -1, id_Rd1 = -1, id_cfl_cg1 = -1, id_cfl_cg1_x = -1, id_cfl_cg1_y = -1
integer :: id_mass_wt = -1, id_temp_int = -1, id_salt_int = -1
integer :: id_col_ht = -1, id_col_mass = -1
integer :: id_col_ht = -1, id_col_mass = -1, id_pbo = -1
integer :: id_temp_global = -1, id_salt_global = -1
integer :: id_temp_layer_ave = -1, id_salt_layer_ave = -1

Expand All @@ -136,8 +137,8 @@ module MOM_diagnostics

contains

subroutine calculate_diagnostic_fields(u, v, h, uh, vh, tv, ADp, CDp, dt, G, &
CS, eta_bt)
subroutine calculate_diagnostic_fields(u, v, h, uh, vh, tv, ADp, CDp, fluxes, &
dt, G, CS, eta_bt)
real, dimension(NIMEMB_,NJMEM_,NKMEM_), intent(in) :: u
real, dimension(NIMEM_,NJMEMB_,NKMEM_), intent(in) :: v
real, dimension(NIMEM_,NJMEM_,NKMEM_), intent(in) :: h
Expand All @@ -146,6 +147,7 @@ subroutine calculate_diagnostic_fields(u, v, h, uh, vh, tv, ADp, CDp, dt, G, &
type(thermo_var_ptrs), intent(in) :: tv
type(accel_diag_ptrs), intent(in) :: ADp
type(cont_diag_ptrs), intent(in) :: CDp
type(forcing), intent(in) :: fluxes
real, intent(in) :: dt
type(ocean_grid_type), intent(inout) :: G
type(diagnostics_CS), intent(inout) :: CS
Expand Down Expand Up @@ -243,7 +245,7 @@ subroutine calculate_diagnostic_fields(u, v, h, uh, vh, tv, ADp, CDp, dt, G, &
call post_data(CS%id_salt_global, salt_global, CS%diag)
endif

call calculate_vertical_integrals(h, tv, G, CS)
call calculate_vertical_integrals(h, tv, fluxes, G, CS)

if ((CS%id_Rml > 0) .or. (CS%id_Rcv > 0) .or. ASSOCIATED(CS%h_Rlay) .or. &
ASSOCIATED(CS%uh_Rlay) .or. ASSOCIATED(CS%vh_Rlay) .or. &
Expand Down Expand Up @@ -478,9 +480,10 @@ subroutine find_weights(Rlist, R_in, k, nz, wt, wt_p)

end subroutine find_weights

subroutine calculate_vertical_integrals(h, tv, G, CS)
subroutine calculate_vertical_integrals(h, tv, fluxes, G, CS)
real, dimension(NIMEM_,NJMEM_,NKMEM_), intent(in) :: h
type(thermo_var_ptrs), intent(in) :: tv
type(forcing), intent(in) :: fluxes
type(ocean_grid_type), intent(inout) :: G
type(diagnostics_CS), intent(inout) :: CS
! This subroutine calculates the vertical integrals of several tracers, along
Expand All @@ -489,6 +492,7 @@ subroutine calculate_vertical_integrals(h, tv, G, CS)

! Arguments: h - Layer thickness, in m or kg m-2.
! (in) tv - a structure pointing to various thermodynamic variables.
! (in) fluxes - a structure containing the surface fluxes.
! (in) G - The ocean's grid structure.
! (in) CS - The control structure returned by a previous call to
! diagnostics_init.
Expand All @@ -500,6 +504,9 @@ subroutine calculate_vertical_integrals(h, tv, G, CS)
! non-Boussinesq models this is well-defined, but for Boussiensq
! models, this is either the integral of in-situ density
! (for col_mass) or the reference density (for mass_wt).
btm_pres,&! The pressure at the ocean bottom, or CMIP variable 'pbo'.
! This is the column mass multiplied by gravity plus the pressure
! at the ocean surface.
tr_int ! The vertical integral of a tracer times the conserved density,
! (Rho_0 in a Boussinesq model) in TR kg m-2.
real, dimension(SZI_BK_(G),SZJ_BK_(G)) :: & !These variables are on block indices
Expand Down Expand Up @@ -546,7 +553,7 @@ subroutine calculate_vertical_integrals(h, tv, G, CS)
call post_data(CS%id_col_ht, z_bot, CS%diag)
endif

if (CS%id_col_mass > 0) then
if (CS%id_col_mass > 0 .or. CS%id_pbo > 0) then
do j=js,je ; do i=is,ie ; mass(i,j) = 0.0 ; enddo ; enddo
if (G%Boussinesq) then
if (associated(tv%eqn_of_state)) then
Expand Down Expand Up @@ -587,7 +594,23 @@ subroutine calculate_vertical_integrals(h, tv, G, CS)
mass(i,j) = mass(i,j) + G%H_to_kg_m2*h(i,j,k)
enddo ; enddo ; enddo
endif
call post_data(CS%id_col_mass, mass, CS%diag)
if (CS%id_col_mass > 0) then
call post_data(CS%id_col_mass, mass, CS%diag)
endif
if (CS%id_pbo > 0) then
do j=js,je ; do i=is,ie ; btm_pres(i,j) = 0.0 ; enddo ; enddo
! 'pbo' is defined as the sea water pressure at the sea floor
! pbo = (mass * g) + pso
! where pso is the sea water pressure at sea water surface
! note that pso is equivalent to fluxes%p_surf
do j=js,je ; do i=is,ie
btm_pres(i,j) = mass(i,j) * G%g_Earth
if (ASSOCIATED(fluxes%p_surf)) then
btm_pres(i,j) = btm_pres(i,j) + fluxes%p_surf(i,j)
endif
enddo ; enddo
call post_data(CS%id_pbo, btm_pres, CS%diag)
endif
endif

end subroutine calculate_vertical_integrals
Expand Down Expand Up @@ -1040,6 +1063,9 @@ subroutine MOM_diagnostics_init(MIS, ADp, CDp, Time, G, param_file, diag, CS)
'The column integrated in situ density', 'kg m-2')
CS%id_col_ht = register_diag_field('ocean_model', 'col_height', diag%axesT1, Time, &
'The height of the water column', 'm')
CS%id_pbo = register_diag_field('ocean_model', 'pbo', diag%axesT1, Time, &
long_name='Sea Water Pressure at Sea Floor', standard_name='sea_water_pressure_at_sea_floor', &
units='Pa')

call set_dependent_diagnostics(MIS, ADp, CDp, G, CS)

Expand Down