Skip to content

+Revise SIS2 available diags file to be like MOM6 #236

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

Open
Hallberg-NOAA wants to merge 1 commit into
base: dev/gfdl
Choose a base branch
from
Open

+Revise SIS2 available diags file to be like MOM6 #236

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 14 additions & 28 deletions src/SIS_diag_mediator.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,9 +1155,7 @@ integer function register_SIS_diag_field(module_name, field_name, axes_in, init_
if (is_root_pe() .and. (diag_CS%available_diag_doc_unit > 0)) then
msg = ''
if (present(cmor_field_name)) msg = 'CMOR equivalent is "'//trim(cmor_field_name)//'"'
cm_string = ''
!### Uncoment this to add cell methods:
! call attach_cell_methods(-1, axes, cm_string, cell_methods, x_cell_method, y_cell_method)
call attach_cell_methods(-1, axes, cm_string, cell_methods, x_cell_method, y_cell_method)
module_list = trim(module_list)//"}"
if (num_modnm <= 1) module_list = module_name
if (num_varnm <= 1) var_list = ''
Expand Down Expand Up @@ -1234,9 +1232,7 @@ logical function register_diag_field_expand_cmor(dm_id, module_name, field_name,
verbose=verbose, do_not_log=do_not_log, err_msg=err_msg, &
interp_method=interp_method, tile_count=tile_count)
if (.not. diag_cs%diag_as_chksum) &
cm_string = ''
!### Uncoment this to add cell methods:
! call attach_cell_methods(fms_id, axes, cm_string, cell_methods, x_cell_method, y_cell_method)
call attach_cell_methods(fms_id, axes, cm_string, cell_methods, x_cell_method, y_cell_method)

this_diag => null()
if (fms_id /= DIAG_FIELD_NOT_FOUND) then
Expand Down Expand Up @@ -1268,9 +1264,7 @@ logical function register_diag_field_expand_cmor(dm_id, module_name, field_name,
missing_value=SIS_missing_value, range=range, mask_variant=mask_variant, &
standard_name=trim(posted_cmor_standard_name), verbose=verbose, do_not_log=do_not_log, &
err_msg=err_msg, interp_method=interp_method, tile_count=tile_count)
cm_string = ''
!### Uncoment this to add cell methods:
! call attach_cell_methods(fms_id, axes, cm_string, cell_methods, x_cell_method, y_cell_method)
call attach_cell_methods(fms_id, axes, cm_string, cell_methods, x_cell_method, y_cell_method)

this_diag => null()
if (fms_id /= DIAG_FIELD_NOT_FOUND) then
Expand Down Expand Up @@ -1730,8 +1724,7 @@ function register_static_field(module_name, field_name, axes, &
endif

! Document diagnostics in list of available diagnostics
!### if (is_root_pe() .and. diag_CS%available_diag_doc_unit > 0) then
if (is_root_pe() .and. .false.) then ! Replace this to work like MOM6.
if (is_root_pe() .and. diag_CS%available_diag_doc_unit > 0) then
if (present(cmor_field_name)) then
call log_available_diag(associated(diag), module_name, field_name, '', '', diag_CS, &
long_name, units, standard_name, &
Expand Down Expand Up @@ -2164,34 +2157,27 @@ subroutine log_available_diag(used, module_name, field_name, cell_methods_string
character(len=240) :: mesg

if (used) then
mesg = '"'//trim(module_name)//'", "'//trim(field_name)//'" [Used]'
mesg = '"'//trim(field_name)//'" [Used]'
else
mesg = '"'//trim(module_name)//'", "'//trim(field_name)//'" [Unused]'
mesg = '"'//trim(field_name)//'" [Unused]'
endif
!### This form of output agrees with MOM6:
! if (used) then
! mesg = '"'//trim(field_name)//'" [Used]'
! else
! mesg = '"'//trim(field_name)//'" [Unused]'
! endif
if (len(trim((comment)))>0) then
write(diag_CS%available_diag_doc_unit, '(a,1x,"(",a,")")') trim(mesg),trim(comment)
else
write(diag_CS%available_diag_doc_unit, '(a)') trim(mesg)
endif
!### Thes should be uncommented later to align with MOM6.
! call describe_option("modules", module_name, diag_CS)
! if (present(dimensions)) then
! if (len(trim(dimensions)) > 0) then
! call describe_option("dimensions", dimensions, diag_CS)
! endif
! endif
call describe_option("modules", module_name, diag_CS)
if (present(dimensions)) then
if (len(trim(dimensions)) > 0) then
call describe_option("dimensions", dimensions, diag_CS)
endif
endif
if (present(long_name)) call describe_option("long_name", long_name, diag_CS)
if (present(units)) call describe_option("units", units, diag_CS)
if (present(standard_name)) &
call describe_option("standard_name", standard_name, diag_CS)
! if (len(trim((cell_methods_string)))>0) &
! call describe_option("cell_methods", trim(cell_methods_string), diag_CS)
if (len(trim((cell_methods_string)))>0) &
call describe_option("cell_methods", trim(cell_methods_string), diag_CS)
if (present(variants)) then ; if (len(trim(variants)) > 0) then
call describe_option("variants", variants, diag_CS)
endif ; endif
Expand Down