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

Fix register_diag_field axes_grp pointer init #1456

Merged
merged 3 commits into from
Aug 7, 2021
Merged

Fix register_diag_field axes_grp pointer init #1456

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2995cff
Fix register_diag_field axes_grp pointer init
marshallward Jul 28, 2021
717076b
Merge branch 'dev/gfdl' into diag_d2_ptr_fix
Hallberg-NOAA Aug 6, 2021
5cdc20d
Merge branch 'dev/gfdl' into diag_d2_ptr_fix
marshallward Aug 7, 2021
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
11 changes: 6 additions & 5 deletions src/framework/MOM_diag_mediator.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1969,10 +1969,10 @@ integer function register_diag_field(module_name, field_name, axes_in, init_time
!! integrated). Default/absent for intensive.
! Local variables
real :: MOM_missing_value
type(diag_ctrl), pointer :: diag_cs => NULL()
type(axes_grp), pointer :: remap_axes => null()
type(axes_grp), pointer :: axes => null()
type(axes_grp), pointer :: axes_d2 => null()
type(diag_ctrl), pointer :: diag_cs
type(axes_grp), pointer :: remap_axes
type(axes_grp), pointer :: axes
type(axes_grp), pointer :: axes_d2
integer :: dm_id, i, dl
character(len=256) :: msg, cm_string
character(len=256) :: new_module_name
Expand Down Expand Up @@ -2097,8 +2097,8 @@ integer function register_diag_field(module_name, field_name, axes_in, init_time

new_module_name = trim(module_name)//'_d2'

axes_d2 => null()
if (axes_in%rank == 3 .or. axes_in%rank == 2 ) then
axes_d2 => null()
if (axes_in%id == diag_cs%axesTL%id) then
axes_d2 => diag_cs%dsamp(dl)%axesTL
elseif (axes_in%id == diag_cs%axesBL%id) then
Expand Down Expand Up @@ -2129,6 +2129,7 @@ integer function register_diag_field(module_name, field_name, axes_in, init_time
//trim(new_module_name)//"-"//trim(field_name))
endif
endif

! Register the native diagnostic
if (associated(axes_d2)) then
active = register_diag_field_expand_cmor(dm_id, new_module_name, field_name, axes_d2, &
Expand Down