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

Jump to bottom

Diagnostic tests #163

Merged
merged 5 commits into from
May 1, 2015
Merged

Diagnostic tests #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
568c54c
Call diag_mediator_end to close open files. Closes #156
May 1, 2015
b1ae675
Bugfix: Fl_itidal diagnostic shape incorrect. Closes #151
May 1, 2015
c464f2d
Only register N2, S2 diagnostics when the configuration supports them…
May 1, 2015
7f5cc91
Update diagnostic name, old name has been obsoleted. Closes #155
May 1, 2015
ad474f4
Maximum number of diagnostics increased in order to do exhaustive dia…
May 1, 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
3 changes: 2 additions & 1 deletion config_src/coupled_driver/ocean_model_MOM.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ module ocean_model_mod
use MOM, only : calculate_surface_state
use MOM_constants, only : CELSIUS_KELVIN_OFFSET
use MOM_diag_mediator, only : enable_averaging, disable_averaging
use MOM_diag_mediator, only : diag_mediator_close_registration
use MOM_diag_mediator, only : diag_mediator_close_registration, diag_mediator_end
use MOM_domains, only : pass_vector, AGRID, BGRID_NE, CGRID_NE
use MOM_error_handler, only : MOM_error, FATAL, WARNING, is_root_pe
use MOM_error_handler, only : callTree_enter, callTree_leave
Expand Down Expand Up @@ -504,6 +504,7 @@ subroutine ocean_model_end(Ocean_sfc, Ocean_state, Time)
! (in) Time - The model time, used for writing restarts.

call ocean_model_save_restart(Ocean_state, Time)
call diag_mediator_end(Time)
call MOM_end(Ocean_state%MOM_CSp)
if (Ocean_state%use_ice_shelf) call ice_shelf_end(Ocean_state%Ice_shelf_CSp)
end subroutine ocean_model_end
Expand Down
2 changes: 1 addition & 1 deletion src/core/MOM_forcing_type.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1523,7 +1523,7 @@ subroutine register_forcing_type_diags(Time, diag, use_temperature, handles)
cmor_standard_name='surface_downward_latent_heat_flux', &
cmor_long_name='Surface Downward Latent Heat Flux')

handles%id_lat_evap = register_diag_field('ocean_model', 'latent_evap', diag%axesT1, Time, &
handles%id_lat_evap = register_diag_field('ocean_model', 'latent_evap_diag', diag%axesT1, Time, &
'Latent heat flux into ocean due to evaporation/condensation', 'Watt/m^2')

handles%id_lat_fprec = register_diag_field('ocean_model', 'latent_fprec_diag', diag%axesT1, Time,&
Expand Down
2 changes: 1 addition & 1 deletion src/framework/MOM_diag_mediator.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ module MOM_diag_mediator
real, dimension(:,:,:), pointer :: mask3dCui => null()
real, dimension(:,:,:), pointer :: mask3dCvi => null()

#define MAX_NUM_DIAGNOSTICS 200
#define MAX_NUM_DIAGNOSTICS 2000
type(maskContainer), dimension(MAX_NUM_DIAGNOSTICS) :: maskList
integer, dimension(MAX_NUM_DIAGNOSTICS) :: CMORid

Expand Down
19 changes: 11 additions & 8 deletions src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,14 +824,17 @@ subroutine VarMix_init(Time, G, param_file, diag, CS)
'Length scale squared for mixing coefficient, at u-points', 'm^2')
CS%id_L2v = register_diag_field('ocean_model', 'L2v', diag%axesCv1, Time, &
'Length scale squared for mixing coefficient, at v-points', 'm^2')
CS%id_N2_u = register_diag_field('ocean_model', 'N2_u', diag%axesCui, Time, &
'Square of Brunt-Vaisala frequency, N^2, at u-points, as used in Visbeck et al.', 's^-2')
CS%id_N2_v = register_diag_field('ocean_model', 'N2_v', diag%axesCvi, Time, &
'Square of Brunt-Vaisala frequency, N^2, at v-points, as used in Visbeck et al.', 's^-2')
CS%id_S2_u = register_diag_field('ocean_model', 'S2_u', diag%axesCu1, Time, &
'Depth average square of slope magnitude, S^2, at u-points, as used in Visbeck et al.', 's^-2')
CS%id_S2_v = register_diag_field('ocean_model', 'S2_v', diag%axesCv1, Time, &
'Depth average square of slope magnitude, S^2, at v-points, as used in Visbeck et al.', 's^-2')

if (CS%use_stored_slopes) then
CS%id_N2_u = register_diag_field('ocean_model', 'N2_u', diag%axesCui, Time, &
'Square of Brunt-Vaisala frequency, N^2, at u-points, as used in Visbeck et al.', 's^-2')
CS%id_N2_v = register_diag_field('ocean_model', 'N2_v', diag%axesCvi, Time, &
'Square of Brunt-Vaisala frequency, N^2, at v-points, as used in Visbeck et al.', 's^-2')
CS%id_S2_u = register_diag_field('ocean_model', 'S2_u', diag%axesCu1, Time, &
'Depth average square of slope magnitude, S^2, at u-points, as used in Visbeck et al.', 's^-2')
CS%id_S2_v = register_diag_field('ocean_model', 'S2_v', diag%axesCv1, Time, &
'Depth average square of slope magnitude, S^2, at v-points, as used in Visbeck et al.', 's^-2')
endif
endif

call wave_speed_init(Time, G, param_file, diag, CS%wave_speed_CSp)
Expand Down
2 changes: 1 addition & 1 deletion src/parameterizations/vertical/MOM_set_diffusivity.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ subroutine set_diffusivity(u, v, h, u_h, v_h, tv, fluxes, optics, visc, dt, G, C
allocate(dd%Kd_itidal(isd:ied,jsd:jed,nz+1)) ; dd%Kd_itidal(:,:,:) = 0.0
endif
if ( (CS%id_Fl_itidal > 0) ) then
allocate(dd%Fl_itidal(isd:ied,jsd:jed,nz)) ; dd%Fl_itidal(:,:,:) = 0.0
allocate(dd%Fl_itidal(isd:ied,jsd:jed,nz+1)) ; dd%Fl_itidal(:,:,:) = 0.0
endif
if ( (CS%id_Polzin_decay_scale > 0) ) then
allocate(dd%Polzin_decay_scale(isd:ied,jsd:jed))
Expand Down