Skip to content

574 diags reg no post #575

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
Hallberg-NOAA merged 2 commits into from
Aug 15, 2017
Merged

574 diags reg no post #575

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ada607
Don't register diagnostics conSST absSSS, abssalt, contemp unless
Aug 14, 2017
9183c22
Don't register h_pre_dyn, it is never posted. #574
Aug 14, 2017
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: 10 additions & 16 deletions src/core/MOM.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,6 @@ module MOM
integer :: id_T_vardec = -1
integer :: id_S_vardec = -1

! fields prior to doing dynamics
integer :: id_h_pre_dyn = -1

! diagnostic for fields prior to applying diapycnal physics
integer :: id_u_predia = -1
integer :: id_v_predia = -1
Expand Down Expand Up @@ -2469,15 +2466,16 @@ subroutine register_diags(Time, G, GV, CS, ADp)
'Sea Surface Salinity Squared', 'ppt**2', CS%missing, cmor_field_name='sossq', &
cmor_long_name='Square of Sea Surface Salinity ', cmor_units='ppt^2', &
cmor_standard_name='square_of_sea_surface_salinity')
CS%id_Tcon = register_diag_field('ocean_model', 'contemp', diag%axesTL, Time, &
'Conservative Temperature', 'Celsius')
CS%id_Sabs = register_diag_field('ocean_model', 'abssalt', diag%axesTL, Time, &
long_name='Absolute Salinity', units='g/Kg')
CS%id_sstcon = register_diag_field('ocean_model', 'conSST', diag%axesT1, Time, &
'Sea Surface Conservative Temperature', 'Celsius', CS%missing)
CS%id_sssabs = register_diag_field('ocean_model', 'absSSS', diag%axesT1, Time, &
'Sea Surface Absolute Salinity', 'g/Kg', CS%missing)

if (CS%use_conT_absS) then
CS%id_Tcon = register_diag_field('ocean_model', 'contemp', diag%axesTL, Time, &
'Conservative Temperature', 'Celsius')
CS%id_Sabs = register_diag_field('ocean_model', 'abssalt', diag%axesTL, Time, &
long_name='Absolute Salinity', units='g/Kg')
CS%id_sstcon = register_diag_field('ocean_model', 'conSST', diag%axesT1, Time, &
'Sea Surface Conservative Temperature', 'Celsius', CS%missing)
CS%id_sssabs = register_diag_field('ocean_model', 'absSSS', diag%axesT1, Time, &
'Sea Surface Absolute Salinity', 'g/Kg', CS%missing)
endif
endif

if (CS%use_temperature .and. CS%use_frazil) then
Expand Down Expand Up @@ -2563,10 +2561,6 @@ subroutine register_diags(Time, G, GV, CS, ADp)
endif
endif

! fields posted prior to dynamics step
CS%id_h_pre_dyn = register_diag_field('ocean_model', 'h_pre_dyn', diag%axesTL, Time, &
'Layer Thickness before dynamics step', thickness_units)

! diagnostics for values prior to diabatic and prior to ALE
CS%id_u_predia = register_diag_field('ocean_model', 'u_predia', diag%axesCuL, Time, &
'Zonal velocity before diabatic forcing', 'meter second-1')
Expand Down