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.

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

Diagnostic scaling fixes #991

Merged
merged 11 commits into from
Sep 6, 2019
Merged

Diagnostic scaling fixes #991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
dfc2d0d
Diagnostic dimensional scaling fixes
marshallward Aug 30, 2019
033bca2
Correct tendency scaling; update KE coversions
marshallward Sep 3, 2019
8965e71
More KE tendency dimensional scaling
marshallward Sep 4, 2019
d9d1e1f
Merge branch 'dev/gfdl' into tendency_scaling
marshallward Sep 4, 2019
95a6779
Barotropic transport diagnostic scaling
marshallward Sep 4, 2019
8b53862
Merge branch 'tendency_scaling' of https://github.com/marshallward/MO…
marshallward Sep 4, 2019
833ad46
Diagnostic global average dimensional fix
marshallward Sep 4, 2019
89b736f
(+) Tracer diffusive flux diagnostic scaling
marshallward Sep 4, 2019
7036236
Dimensional scaling of MEKE_src
marshallward Sep 5, 2019
d64b472
Unsplit timestep diag fixes (CAu, etc)
marshallward Sep 5, 2019
c9f9787
ALE and mixed layer scaling diag fixes
marshallward Sep 5, 2019
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/ALE/MOM_ALE.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,9 +246,9 @@ subroutine ALE_register_diags(Time, G, GV, US, diag, CS)
! These diagnostics of the state variables before ALE are useful for
! debugging the ALE code.
CS%id_u_preale = register_diag_field('ocean_model', 'u_preale', diag%axesCuL, Time, &
'Zonal velocity before remapping', 'm s-1')
'Zonal velocity before remapping', 'm s-1', conversion=US%L_T_to_m_s)
CS%id_v_preale = register_diag_field('ocean_model', 'v_preale', diag%axesCvL, Time, &
'Meridional velocity before remapping', 'm s-1')
'Meridional velocity before remapping', 'm s-1', conversion=US%L_T_to_m_s)
CS%id_h_preale = register_diag_field('ocean_model', 'h_preale', diag%axesTL, Time, &
'Layer Thickness before remapping', get_thickness_units(GV), v_extensive=.true.)
CS%id_T_preale = register_diag_field('ocean_model', 'T_preale', diag%axesTL, Time, &
Expand Down
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 @@ -2371,7 +2371,7 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, restart_CSp, &
call register_surface_diags(Time, G, CS%sfc_IDs, CS%diag, CS%tv)
call register_diags(Time, G, GV, US, CS%IDs, CS%diag)
call register_transport_diags(Time, G, GV, US, CS%transport_IDs, CS%diag)
call register_tracer_diagnostics(CS%tracer_Reg, CS%h, Time, diag, G, GV, &
call register_tracer_diagnostics(CS%tracer_Reg, CS%h, Time, diag, G, GV, US, &
CS%use_ALE_algorithm)
if (CS%use_ALE_algorithm) then
call ALE_register_diags(Time, G, GV, US, diag, CS%ALE_CSp)
Expand Down
35 changes: 20 additions & 15 deletions src/core/MOM_barotropic.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4205,13 +4205,13 @@ subroutine barotropic_init(u, v, h, eta, Time, G, GV, US, param_file, diag, CS,
'Barotropic meridional acceleration from baroclinic terms', 'm s-2', conversion=US%L_T2_to_m_s2)

CS%id_eta_bt = register_diag_field('ocean_model', 'eta_bt', diag%axesT1, Time, &
'Barotropic end SSH', thickness_units)
'Barotropic end SSH', thickness_units, conversion=GV%H_to_m)
CS%id_ubt = register_diag_field('ocean_model', 'ubt', diag%axesCu1, Time, &
'Barotropic end zonal velocity', 'm s-1', conversion=US%L_T_to_m_s)
CS%id_vbt = register_diag_field('ocean_model', 'vbt', diag%axesCv1, Time, &
'Barotropic end meridional velocity', 'm s-1', conversion=US%L_T_to_m_s)
CS%id_eta_st = register_diag_field('ocean_model', 'eta_st', diag%axesT1, Time, &
'Barotropic start SSH', thickness_units)
'Barotropic start SSH', thickness_units, conversion=GV%H_to_m)
CS%id_ubt_st = register_diag_field('ocean_model', 'ubt_st', diag%axesCu1, Time, &
'Barotropic start zonal velocity', 'm s-1', conversion=US%L_T_to_m_s)
CS%id_vbt_st = register_diag_field('ocean_model', 'vbt_st', diag%axesCv1, Time, &
Expand All @@ -4221,31 +4221,34 @@ subroutine barotropic_init(u, v, h, eta, Time, G, GV, US, param_file, diag, CS,
CS%id_vbtav = register_diag_field('ocean_model', 'vbtav', diag%axesCv1, Time, &
'Barotropic time-average meridional velocity', 'm s-1', conversion=US%L_T_to_m_s)
CS%id_eta_cor = register_diag_field('ocean_model', 'eta_cor', diag%axesT1, Time, &
'Corrective mass flux', 'm s-1')
'Corrective mass flux', 'm s-1', conversion=GV%H_to_m)
CS%id_visc_rem_u = register_diag_field('ocean_model', 'visc_rem_u', diag%axesCuL, Time, &
'Viscous remnant at u', 'nondim')
CS%id_visc_rem_v = register_diag_field('ocean_model', 'visc_rem_v', diag%axesCvL, Time, &
'Viscous remnant at v', 'nondim')
CS%id_gtotn = register_diag_field('ocean_model', 'gtot_n', diag%axesT1, Time, &
'gtot to North', 'm s-2', conversion=US%L_T_to_m_s**2)
'gtot to North', 'm s-2', conversion=GV%m_to_H*(US%L_T_to_m_s**2))
CS%id_gtots = register_diag_field('ocean_model', 'gtot_s', diag%axesT1, Time, &
'gtot to South', 'm s-2', conversion=US%L_T_to_m_s**2)
'gtot to South', 'm s-2', conversion=GV%m_to_H*(US%L_T_to_m_s**2))
CS%id_gtote = register_diag_field('ocean_model', 'gtot_e', diag%axesT1, Time, &
'gtot to East', 'm s-2', conversion=US%L_T_to_m_s**2)
'gtot to East', 'm s-2', conversion=GV%m_to_H*(US%L_T_to_m_s**2))
CS%id_gtotw = register_diag_field('ocean_model', 'gtot_w', diag%axesT1, Time, &
'gtot to West', 'm s-2', conversion=US%L_T_to_m_s**2)
'gtot to West', 'm s-2', conversion=GV%m_to_H*(US%L_T_to_m_s**2))
CS%id_eta_hifreq = register_diag_field('ocean_model', 'eta_hifreq', diag%axesT1, Time, &
'High Frequency Barotropic SSH', thickness_units)
'High Frequency Barotropic SSH', thickness_units, conversion=GV%H_to_m)
CS%id_ubt_hifreq = register_diag_field('ocean_model', 'ubt_hifreq', diag%axesCu1, Time, &
'High Frequency Barotropic zonal velocity', 'm s-1', conversion=US%L_T_to_m_s)
CS%id_vbt_hifreq = register_diag_field('ocean_model', 'vbt_hifreq', diag%axesCv1, Time, &
'High Frequency Barotropic meridional velocity', 'm s-1', conversion=US%L_T_to_m_s)
CS%id_eta_pred_hifreq = register_diag_field('ocean_model', 'eta_pred_hifreq', diag%axesT1, Time, &
'High Frequency Predictor Barotropic SSH', thickness_units)
'High Frequency Predictor Barotropic SSH', thickness_units, &
conversion=GV%H_to_m)
CS%id_uhbt_hifreq = register_diag_field('ocean_model', 'uhbt_hifreq', diag%axesCu1, Time, &
'High Frequency Barotropic zonal transport', 'm3 s-1')
'High Frequency Barotropic zonal transport', 'm3 s-1', &
conversion=GV%H_to_m*US%L_to_m*US%L_T_to_m_s)
CS%id_vhbt_hifreq = register_diag_field('ocean_model', 'vhbt_hifreq', diag%axesCv1, Time, &
'High Frequency Barotropic meridional transport', 'm3 s-1')
'High Frequency Barotropic meridional transport', 'm3 s-1', &
conversion=GV%H_to_m*US%L_to_m*US%L_T_to_m_s)
CS%id_frhatu = register_diag_field('ocean_model', 'frhatu', diag%axesCuL, Time, &
'Fractional thickness of layers in u-columns', 'nondim')
CS%id_frhatv = register_diag_field('ocean_model', 'frhatv', diag%axesCvL, Time, &
Expand All @@ -4255,9 +4258,11 @@ subroutine barotropic_init(u, v, h, eta, Time, G, GV, US, param_file, diag, CS,
CS%id_frhatv1 = register_diag_field('ocean_model', 'frhatv1', diag%axesCvL, Time, &
'Predictor Fractional thickness of layers in v-columns', 'nondim')
CS%id_uhbt = register_diag_field('ocean_model', 'uhbt', diag%axesCu1, Time, &
'Barotropic zonal transport averaged over a baroclinic step', 'm3 s-1')
'Barotropic zonal transport averaged over a baroclinic step', 'm3 s-1', &
conversion=GV%H_to_m*US%L_to_m*US%L_T_to_m_s)
CS%id_vhbt = register_diag_field('ocean_model', 'vhbt', diag%axesCv1, Time, &
'Barotropic meridional transport averaged over a baroclinic step', 'm3 s-1')
'Barotropic meridional transport averaged over a baroclinic step', 'm3 s-1', &
conversion=GV%H_to_m*US%L_to_m*US%L_T_to_m_s)

if (use_BT_cont_type) then
CS%id_BTC_FA_u_EE = register_diag_field('ocean_model', 'BTC_FA_u_EE', diag%axesCu1, Time, &
Expand All @@ -4269,9 +4274,9 @@ subroutine barotropic_init(u, v, h, eta, Time, G, GV, US, param_file, diag, CS,
CS%id_BTC_FA_u_W0 = register_diag_field('ocean_model', 'BTC_FA_u_W0', diag%axesCu1, Time, &
'BTCont type near west face area', 'm2', conversion=US%L_to_m*GV%H_to_m)
CS%id_BTC_ubt_EE = register_diag_field('ocean_model', 'BTC_ubt_EE', diag%axesCu1, Time, &
'BTCont type far east velocity', 'm s-1')
'BTCont type far east velocity', 'm s-1', conversion=US%L_T_to_m_s)
CS%id_BTC_ubt_WW = register_diag_field('ocean_model', 'BTC_ubt_WW', diag%axesCu1, Time, &
'BTCont type far west velocity', 'm s-1')
'BTCont type far west velocity', 'm s-1', conversion=US%L_T_to_m_s)
CS%id_BTC_FA_v_NN = register_diag_field('ocean_model', 'BTC_FA_v_NN', diag%axesCv1, Time, &
'BTCont type far north face area', 'm2', conversion=US%L_to_m*GV%H_to_m)
CS%id_BTC_FA_v_N0 = register_diag_field('ocean_model', 'BTC_FA_v_N0', diag%axesCv1, Time, &
Expand Down
12 changes: 8 additions & 4 deletions src/core/MOM_dynamics_unsplit.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,13 +678,17 @@ subroutine initialize_dyn_unsplit(u, v, h, Time, G, GV, US, param_file, diag, CS
'Meridional Thickness Flux', flux_units, x_cell_method='sum', v_extensive=.true., &
conversion=H_convert*US%L_to_m**2*US%s_to_T)
CS%id_CAu = register_diag_field('ocean_model', 'CAu', diag%axesCuL, Time, &
'Zonal Coriolis and Advective Acceleration', 'meter second-2, conversion=US%L_T2_to_m_s2')
'Zonal Coriolis and Advective Acceleration', 'm s-2', &
conversion=US%L_T2_to_m_s2)
CS%id_CAv = register_diag_field('ocean_model', 'CAv', diag%axesCvL, Time, &
'Meridional Coriolis and Advective Acceleration', 'meter second-2', conversion=US%L_T2_to_m_s2)
'Meridional Coriolis and Advective Acceleration', 'm s-2', &
conversion=US%L_T2_to_m_s2)
CS%id_PFu = register_diag_field('ocean_model', 'PFu', diag%axesCuL, Time, &
'Zonal Pressure Force Acceleration', 'meter second-2', conversion=US%L_T2_to_m_s2)
'Zonal Pressure Force Acceleration', 'm s-2', &
conversion=US%L_T2_to_m_s2)
CS%id_PFv = register_diag_field('ocean_model', 'PFv', diag%axesCvL, Time, &
'Meridional Pressure Force Acceleration', 'meter second-2', conversion=US%L_T2_to_m_s2)
'Meridional Pressure Force Acceleration', 'm s-2', &
conversion=US%L_T2_to_m_s2)

id_clock_Cor = cpu_clock_id('(Ocean Coriolis & mom advection)', grain=CLOCK_MODULE)
id_clock_continuity = cpu_clock_id('(Ocean continuity equation)', grain=CLOCK_MODULE)
Expand Down
Loading