From 40712be21b6de978acaef4e3b0ad20cc05111ab0 Mon Sep 17 00:00:00 2001 From: rem1776 Date: Fri, 14 Jul 2023 16:32:37 -0400 Subject: [PATCH] linter fixes --- test_fms/time_interp/test_time_interp.F90 | 24 +++++++++---------- time_interp/include/time_interp_external2.inc | 17 +++++++------ time_interp/time_interp_external2.F90 | 10 ++++++-- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/test_fms/time_interp/test_time_interp.F90 b/test_fms/time_interp/test_time_interp.F90 index b70fc05d37..c6bd222174 100644 --- a/test_fms/time_interp/test_time_interp.F90 +++ b/test_fms/time_interp/test_time_interp.F90 @@ -34,7 +34,7 @@ program test_time_interp integer :: index1, index2, mo, yr, outunit, ntest, nline real(TI_TEST_KIND_) :: weight real(TI_TEST_KIND_) :: ref_weights(num_Time), ref_weights_leap(num_Time) - real(TI_TEST_KIND_), parameter :: SMALL = 1.0e-8_kindl + real(TI_TEST_KIND_), parameter :: SMALL = 1.0e-8_kindl real(TI_TEST_KIND_), parameter :: midpoint = 0.483870967741935_kindl real(TI_TEST_KIND_), parameter :: day_before_leap_day = 0.964285714285714_kindl real(TI_TEST_KIND_), parameter :: day_before_leap_day_with_ly = 0.931034482758621_kindl @@ -57,16 +57,16 @@ program test_time_interp ref_weights(1) = 0.0 ! on 'edge' (timeList value) ref_weights(2) = midpoint ! rough midpoint of a month ie. jan 16 - ref_weights(3) = 0.0 - ref_weights(4) = 0.0 + ref_weights(3) = 0.0 + ref_weights(4) = 0.0 ref_weights(5) = midpoint - ref_weights(6) = 0.0 + ref_weights(6) = 0.0 ref_weights_leap(1) = 0.0 ! on 'edge' (timeList value) - ref_weights_leap(2) = day_before_leap_day ! feb 28th + ref_weights_leap(2) = day_before_leap_day ! feb 28th ref_weights_leap(3) = midpoint - ref_weights_leap(4) = 0.0 - ref_weights_leap(5) = day_before_leap_day + ref_weights_leap(4) = 0.0 + ref_weights_leap(5) = day_before_leap_day ref_weights_leap(6) = day_before_leap_day ! checks that 29th gives same result ! Tests with modulo time @@ -171,7 +171,7 @@ program test_time_interp call mpp_error(FATAL, "invalid result without modtime") if(abs(weight - ref_weights(ntest)) .gt. SMALL) & call mpp_error(FATAL, "test_time_interp: incorrect weight value with reference") - + enddo deallocate(Timelist) enddo @@ -220,11 +220,11 @@ program test_time_interp ! swap around ref numbers for different data set ref_weights_leap(1) = day_before_leap_day - ref_weights_leap(2) = day_before_leap_day ! feb 28th + ref_weights_leap(2) = day_before_leap_day ! feb 28th ref_weights_leap(3) = 0.0 ref_weights_leap(4) = day_before_leap_day_with_ly - ref_weights_leap(5) = 0.0 - ref_weights_leap(6) = 0.0 + ref_weights_leap(5) = 0.0 + ref_weights_leap(6) = 0.0 ! Tests of modulo time and leap year inconsistency Time_beg = set_date(1978, 1, 1) Time_end = set_date(1981, 1, 1) @@ -358,7 +358,7 @@ logical function is_valid_indices(ind1, ind2, tList, tintv, res_weight, mtime) integer, intent(in) :: ind1, ind2 type(time_type), intent(in) :: tList(:), tintv real(TI_TEST_KIND_), intent(in) :: res_weight - integer, intent(in) :: mtime + integer, intent(in) :: mtime integer :: i ! modulo_time determines wrap around diff --git a/time_interp/include/time_interp_external2.inc b/time_interp/include/time_interp_external2.inc index 4aed3aafc9..b4e6114e6d 100644 --- a/time_interp/include/time_interp_external2.inc +++ b/time_interp/include/time_interp_external2.inc @@ -55,7 +55,7 @@ subroutine TIME_INTERP_EXTERNAL_3D_(index, time, data, interp,verbose,horz_interp, mask_out, is_in, ie_in, & & js_in, je_in, window_id) - integer, intent(in) :: index !< index of external field from previous call + integer, intent(in) :: index !< index of external field from previous call !! to init_external_field type(time_type), intent(in) :: time !< target time for data real(FMS_TI_KIND_), dimension(:,:,:), intent(inout) :: data !< global or local data array @@ -103,7 +103,7 @@ nxw = iec-isc+1 nyw = jec-jsc+1 else - if(.not. present(is_in) .or. .not. present(ie_in) .or. .not. present(js_in) .or. .not. present(je_in) ) then + if(.not. present(is_in) .or. .not. present(ie_in) .or. .not. present(js_in) .or. .not. present(je_in))then call mpp_error(FATAL, 'time_interp_external: is_in, ie_in, js_in and je_in must be present ' // & 'when numwindows > 1, field='//trim(loaded_fields(index)%name)) endif @@ -156,8 +156,9 @@ else ! using time_interp_modulo if(loaded_fields(index)%have_modulo_times) then - call time_interp(time,loaded_fields(index)%modulo_time_beg, loaded_fields(index)%modulo_time_end, loaded_fields(index)%time(:), & - w2, t1, t2, loaded_fields(index)%correct_leap_year_inconsistency, err_msg=err_msg) + call time_interp(time,loaded_fields(index)%modulo_time_beg, loaded_fields(index)%modulo_time_end, & + loaded_fields(index)%time(:), w2, t1, t2, & + loaded_fields(index)%correct_leap_year_inconsistency, err_msg=err_msg) if(err_msg .NE. '') then filename = trim(loaded_fields(index)%fileobj%path) call mpp_error(FATAL,"time_interp_external 1: "//trim(err_msg)//& @@ -254,8 +255,9 @@ data = real(loaded_fields(index)%data(1,1,1,i1), FMS_TI_KIND_) else if(loaded_fields(index)%have_modulo_times) then - call time_interp(time,loaded_fields(index)%modulo_time_beg, loaded_fields(index)%modulo_time_end, loaded_fields(index)%time(:), & - w2, t1, t2, loaded_fields(index)%correct_leap_year_inconsistency, err_msg=err_msg) + call time_interp(time,loaded_fields(index)%modulo_time_beg, loaded_fields(index)%modulo_time_end, & + loaded_fields(index)%time(:), w2, t1, t2, & + loaded_fields(index)%correct_leap_year_inconsistency, err_msg=err_msg) if(err_msg .NE. '') then filename = trim(loaded_fields(index)%fileobj%path) call mpp_error(FATAL,"time_interp_external 3:"//trim(err_msg)//& @@ -288,7 +290,8 @@ if(i1<0.or.i2<0) & call mpp_error(FATAL,'time_interp_external : records were not loaded correctly in memory') - data = real(loaded_fields(index)%data(1,1,1,i1), FMS_TI_KIND_)*w1 + real(loaded_fields(index)%data(1,1,1,i2), FMS_TI_KIND_)*w2 + data = real(loaded_fields(index)%data(1,1,1,i1), FMS_TI_KIND_)*w1 & + & + real(loaded_fields(index)%data(1,1,1,i2), FMS_TI_KIND_)*w2 if (verb) then write(outunit,*) 'ibuf= ',loaded_fields(index)%ibuf write(outunit,*) 'i1,i2= ',i1, i2 diff --git a/time_interp/time_interp_external2.F90 b/time_interp/time_interp_external2.F90 index b4c54466bb..46cb78884b 100644 --- a/time_interp/time_interp_external2.F90 +++ b/time_interp/time_interp_external2.F90 @@ -836,8 +836,14 @@ subroutine load_record(field, rec, interp, is_in, ie_in, js_in, je_in, window_id if (interp%horizInterpReals4_type%is_allocated) then ! allocate (there may be a better way to do this, had issues with gnu) allocate(hi_tmp_msk_out(isw:iew,jsw:jew, SIZE(field%src_data,3))) - allocate(hi_tmp_data(LBOUND(field%data,1):UBOUND(field%data,1), LBOUND(field%data,2):UBOUND(field%data,2),LBOUND(field%data,3):UBOUND(field%data,3),LBOUND(field%data,4):UBOUND(field%data,4))) - allocate(hi_tmp_src_data(LBOUND(field%src_data,1):UBOUND(field%src_data,1), LBOUND(field%src_data,2):UBOUND(field%src_data,2),LBOUND(field%src_data,3):UBOUND(field%src_data,3),LBOUND(field%src_data,4):UBOUND(field%src_data,4))) + allocate(hi_tmp_data(LBOUND(field%data,1):UBOUND(field%data,1), & + LBOUND(field%data,2):UBOUND(field%data,2), & + LBOUND(field%data,3):UBOUND(field%data,3), & + LBOUND(field%data,4):UBOUND(field%data,4))) + allocate(hi_tmp_src_data(LBOUND(field%src_data,1):UBOUND(field%src_data,1), & + LBOUND(field%src_data,2):UBOUND(field%src_data,2), & + LBOUND(field%src_data,3):UBOUND(field%src_data,3), & + LBOUND(field%src_data,4):UBOUND(field%src_data,4))) ! assign if needed hi_tmp_data = real(field%data, r4_kind) hi_tmp_src_data = real(field%src_data, r4_kind)