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

cpu_clock_id: synchro_flag arg changed to logical #1535

Merged
merged 2 commits into from
Oct 26, 2021
Merged

cpu_clock_id: synchro_flag arg changed to logical #1535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c053fdc
cpu_clock_id: synchro_flag arg changed to logical
marshallward Oct 25, 2021
5ffad6d
Merge branch 'dev/gfdl' into sync_clock_flag
Hallberg-NOAA Oct 26, 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
25 changes: 13 additions & 12 deletions config_src/infra/FMS1/MOM_cpu_clock_infra.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,24 @@ subroutine cpu_clock_end(id)
end subroutine cpu_clock_end

!> Returns the integer handle for a named CPU clock.
integer function cpu_clock_id( name, synchro_flag, grain )
integer function cpu_clock_id(name, sync, grain)
character(len=*), intent(in) :: name !< The unique name of the CPU clock
integer, optional, intent(in) :: synchro_flag !< An integer flag that controls whether the PEs
!! are synchronized before the cpu clocks start counting.
!! Synchronization occurs before the start of a clock if this
!! is odd, while additional (expensive) statistics can set
!! for other values. If absent, the default is taken from the
!! settings for FMS.
logical, optional, intent(in) :: sync !< A flag that controls whether the
!! PEs are synchronized before the cpu clocks start counting.
!! Synchronization occurs before the start of a clock if this
!! is enabled, while additional (expensive) statistics can
!! set for other values.
!! If absent, the default is taken from the settings for FMS.
integer, optional, intent(in) :: grain !< The timing granularity for this clock, usually set to
!! the values of CLOCK_COMPONENT, CLOCK_ROUTINE, CLOCK_LOOP, etc.

if (present(synchro_flag)) then
cpu_clock_id = mpp_clock_id(name, flags=synchro_flag, grain=grain)
else
cpu_clock_id = mpp_clock_id(name, flags=clock_flag_default, grain=grain)
endif
integer :: clock_flags

clock_flags = clock_flag_default
if (present(sync)) &
clock_flags = ibset(clock_flags, 0)

cpu_clock_id = mpp_clock_id(name, flags=clock_flags, grain=grain)
end function cpu_clock_id

end module MOM_cpu_clock_infra
25 changes: 13 additions & 12 deletions config_src/infra/FMS2/MOM_cpu_clock_infra.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,23 +71,24 @@ subroutine cpu_clock_end(id)
end subroutine cpu_clock_end

!> Returns the integer handle for a named CPU clock.
integer function cpu_clock_id( name, synchro_flag, grain )
integer function cpu_clock_id(name, sync, grain)
character(len=*), intent(in) :: name !< The unique name of the CPU clock
integer, optional, intent(in) :: synchro_flag !< An integer flag that controls whether the PEs
!! are synchronized before the cpu clocks start counting.
!! Synchronization occurs before the start of a clock if this
!! is odd, while additional (expensive) statistics can set
!! for other values. If absent, the default is taken from the
!! settings for FMS.
logical, optional, intent(in) :: sync !< A flag that controls whether the
!! PEs are synchronized before the cpu clocks start counting.
!! Synchronization occurs before the start of a clock if this
!! is enabled, while additional (expensive) statistics can
!! set for other values.
!! If absent, the default is taken from the settings for FMS.
integer, optional, intent(in) :: grain !< The timing granularity for this clock, usually set to
!! the values of CLOCK_COMPONENT, CLOCK_ROUTINE, CLOCK_LOOP, etc.

if (present(synchro_flag)) then
cpu_clock_id = mpp_clock_id(name, flags=synchro_flag, grain=grain)
else
cpu_clock_id = mpp_clock_id(name, flags=clock_flag_default, grain=grain)
endif
integer :: clock_flags

clock_flags = clock_flag_default
if (present(sync)) &
clock_flags = ibset(clock_flags, 0)

cpu_clock_id = mpp_clock_id(name, flags=clock_flags, grain=grain)
end function cpu_clock_id

end module MOM_cpu_clock_infra