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

time manager mixed precision #1091

Closed
wants to merge 10 commits into from
Closed

time manager mixed precision #1091

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aab52a1
add mixed precision for routines with real args
Dec 14, 2022
d16eb20
add tests for mixed precision routines
Dec 14, 2022
7c8523a
fix cmake, linter
Dec 14, 2022
99cf1ea
Merge remote-tracking branch 'upstream/mixedmode_base' into time_mana…
Jan 26, 2023
452e254
expand time_type_to_real, add to test
Mar 6, 2023
4ec74a2
Fix up real conversion interface and some more
Mar 9, 2023
bd0d275
Merge branch 'mixedmode' into time_manager_mp
rem1776 Mar 9, 2023
fbeefb0
rm trailing whitespace
Mar 10, 2023
87155c5
Merge branch 'time_manager_mp' of github.com:rem1776/FMS into time_ma…
Mar 10, 2023
0636439
fix line length
Mar 10, 2023
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
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@ foreach(kind ${kinds})
fms
fms2_io/include
mpp/include
time_manager/include
constants)
target_compile_definitions(${libTgt}_f PRIVATE "${fms_defs}")
target_compile_definitions(${libTgt}_f PRIVATE "${${kind}_defs}")
Expand Down Expand Up @@ -325,6 +326,7 @@ foreach(kind ${kinds})
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/fms2_io/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/time_manager/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mpp/include>)

target_include_directories(${libTgt} INTERFACE
Expand Down
45 changes: 42 additions & 3 deletions test_fms/time_manager/test_time_manager.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,20 @@ program test_time_manager
use constants_mod, only: constants_init, rseconds_per_day=>seconds_per_day
use time_manager_mod, only: time_type, set_date, get_date, set_time, set_calendar_type, real_to_time_type
use time_manager_mod, only: length_of_year, leap_year, days_in_month, days_in_year, print_time
use time_manager_mod, only: set_ticks_per_second, get_ticks_per_second
use time_manager_mod, only: set_ticks_per_second, get_ticks_per_second, safe_rtoi
use time_manager_mod, only: decrement_date, increment_date, get_time, increment_time, decrement_time
use time_manager_mod, only: JULIAN, GREGORIAN, THIRTY_DAY_MONTHS, NOLEAP
use time_manager_mod, only: operator(-), operator(+), operator(*), operator(/), &
operator(>), operator(>=), operator(==), operator(/=), &
operator(<), operator(<=), operator(//), assignment(=)
use platform_mod

implicit none

type(time_type) :: Time, Time0, time1, time2
real :: xx
real(r4_kind) :: rtoi4
real(r8_kind) :: rtoi8
integer :: yr, mo, day, hr, min, sec, ticks
integer :: yr0, mo0, day0, hr0, min0, sec0, ticks0
integer :: year, month, dday, days_this_month
Expand All @@ -47,6 +50,7 @@ program test_time_manager
character(len=23), allocatable, dimension(:) :: test_date
character(len=8) :: test_name
character(len=256) :: out_msg
integer, parameter :: do_floor = 0, do_nearest = 1

!: for testing set/get_date_gregorian
integer, parameter :: days_in_400_year_period = 146097
Expand All @@ -57,11 +61,11 @@ program test_time_manager
& test8 =.true.
logical :: test9 =.true.,test10=.true.,test11=.true.,test12=.true.,test13=.true.,test14=.true.,test15=.true., &
& test16=.true.
logical :: test17=.true.,test18=.true.,test19=.true.,test20=.true.
logical :: test17=.true.,test18=.true.,test19=.true.,test20=.true., test21=.true., test22=.true.

namelist / test_nml / test1 ,test2 ,test3 ,test4 ,test5 ,test6 ,test7 ,test8, &
test9 ,test10,test11,test12,test13,test14,test15,test16, &
test17,test18,test19,test20
test17,test18,test19,test20,test21, test22

call fms_init
call constants_init
Expand Down Expand Up @@ -680,6 +684,41 @@ program test_time_manager
enddo
write(outunit,'(a)') 'set_date_gregorian and get_date_gregorian tests successful'
endif
!! mixed precision tests
if(test21) then
!! check r4 overloads from original real_to_time_type test
write(outunit,'(/,a)') '################################# test21 #################################'
call print_time(real_to_time_type(real(86401.1, r4_kind)), 'real_to_time_type(86401.1):', unit=outunit)
Time = real_to_time_type(real(-1.0, r4_kind), err_msg)
if(err_msg == '') then
call mpp_error(FATAL, 'test21 fails: did not get the expected error message')
else
write(outunit,'(a)') 'test successful: '//trim(err_msg)
endif
!! check equality between r4 and r8 returned types
if ( real_to_time_type(real(86401.1, r4_kind)) .ne. real_to_time_type(real(86401.1, r8_kind))) then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you think it would make a difference if using 86401.1_r4_kind and 86401.1_r8_kind?

call mpp_error(FATAL, 'test21 fails: r4 and r8 values return different time_types')
endif
endif

if(test22) then
!! check rounding routine works with mixed precision
rtoi4 = 213.6232323_r4_kind
rtoi8 = 213.6232323_r8_kind
if ( safe_rtoi(rtoi4, do_floor) .ne. safe_rtoi(rtoi8, do_floor) .and. &
safe_rtoi(rtoi4, do_floor) .eq. 213) call mpp_error(FATAL, "safe_rtoi failed on"// &
"mixed precision do_floor")
if ( safe_rtoi(rtoi4, do_nearest) .ne. safe_rtoi(rtoi8, do_nearest) .and. &
safe_rtoi(rtoi4, do_nearest) .eq. 214) call mpp_error(FATAL, "safe_rtoi failed on"// &
"mixed precision do_nearest")
rtoi4 = 86401.5_r4_kind
rtoi8 = 86401.5_r8_kind
if ( safe_rtoi(rtoi4, do_floor) .ne. safe_rtoi(rtoi8, do_floor)) call mpp_error(FATAL, "safe_rtoi failed on"// &
"mixed precision do_floor")
if ( safe_rtoi(rtoi4, do_nearest) .ne. safe_rtoi(rtoi8, do_nearest)) call mpp_error(FATAL, "safe_rtoi failed on"// &
"mixed precision do_nearest")

endif

call fms_end

Expand Down
6 changes: 6 additions & 0 deletions test_fms/time_manager/test_time_manager2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,9 @@ test16=.false.
test17=.false.
test18=.false.
test19=.false.
test20=.false.
test21=.false.
test22=.false.
/
_EOF

Expand Down Expand Up @@ -85,5 +88,8 @@ test_next "invalid dates"
test_next "gregorian calendar"
test_next "length_of_year"
test_next "real_to_time_type"
test_next "compare updated set/get_date_gregorian"
test_next "real_to_time_type mixed precision"
test_next "safe_rtoi mixed precision"

test_done
10 changes: 8 additions & 2 deletions time_manager/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# Ed Hartnett 2/22/19

# Include .h and .mod files.
AM_CPPFLAGS = -I$(top_srcdir)/include
AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/time_manager/include
AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)

# Build these uninstalled convenience libraries.
Expand All @@ -32,7 +32,13 @@ noinst_LTLIBRARIES = libtime_manager.la
# Each convenience library depends on its source.
libtime_manager_la_SOURCES = \
time_manager.F90 \
get_cal_time.F90
get_cal_time.F90 \
include/time_manager.inc \
include/get_cal_time.inc \
include/time_manager_r4.fh \
include/time_manager_r8.fh \
include/get_cal_time_r4.fh \
include/get_cal_time_r8.fh

get_cal_time_mod.$(FC_MODEXT): time_manager_mod.$(FC_MODEXT)

Expand Down
Loading