horiz interp mixed precision #1067

rem1776 · 2022-11-08T17:31:56Z

Description
updates horiz_interp for mixed precision and adds some derived types for both size reals
adds in explicit r4/r8 tests

How Has This Been Tested?
intel and gnu on amd

Checklist:

My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation
My changes generate no new warnings
Any dependent changes have been merged and published in downstream modules
New check tests, if applicable, are included
make distcheck passes

…ixed

mlee03 · 2022-11-22T13:32:59Z

horiz_interp/horiz_interp.inc

+          allocate(lon_src_1d(nlon_in), lat_src_1d(nlat_in))
+          allocate(lon_dst(nlon_out,nlat_out), lat_dst(nlon_out,nlat_out))
+          do i = 1, nlon_in
+             lon_src_1d(i) = (lon_in(i) + lon_in(i+1)) * 0.5


We should also make numerical values of the same precision: real(0.5, FMS_HI_KIND_)

mlee03 · 2022-11-23T13:25:50Z

horiz_interp/horiz_interp.inc

@@ -0,0 +1,818 @@
+


How about make a separate include directory in horiz_interp for the *fh and *inc files?

mlee03 · 2022-11-23T13:30:09Z

horiz_interp/horiz_interp.F90

- end function is_lat_lon
-
-!#####################################################################
+#undef FMS_HI_KIND


We should be consistent with mpp and have all the #defs and #undefs in a *.inc file. Perhaps separate *inc files for r4 and r8

mlee03 · 2022-11-23T13:30:59Z

horiz_interp/horiz_interp.F90

-
-!#####################################################################
+#undef FMS_HI_KIND
+#define FMS_HI_KIND 4


should use r4_kind instead of 4

mlee03 · 2022-11-23T13:53:52Z

horiz_interp/horiz_interp_bicubic.F90


  end subroutine horiz_interp_bicubic_del

+
+#undef FMS_HI_KIND


missing underscores for the macros

horiz_interp/horiz_interp_spherical.F90

horiz_interp/horiz_interp_conserve.F90

horiz_interp/include/horiz_interp.inc

…z_interp_mixed

mlee03 · 2023-03-23T17:11:55Z

diag_manager/diag_manager.F90

@@ -1473,6 +1473,7 @@ LOGICAL FUNCTION send_data_3d(diag_field_id, field, time, is_in, js_in, ks_in, &
                               ie_in=ie_in, je_in=je_in, ke_in=ke_in, weight=weight, err_msg=err_msg)
    endif
  END FUNCTION send_data_3d
+


extra line in diag_manager

mlee03 · 2023-03-23T17:14:28Z

horiz_interp/horiz_interp_bicubic.F90

@@ -102,650 +136,37 @@ subroutine horiz_interp_bicubic_init
     if(module_is_initialized) return
     call write_version_number("HORIZ_INTERP_BICUBIC_MOD", version)
     module_is_initialized = .true.
-     tpi = 2.0*PI
+     tpi = real(2.0*PI, R8_KIND)


just in case .... real(2.0_r8_kind*PI, r8_kind) (pi is already r8)

mlee03 · 2023-03-23T17:15:24Z

horiz_interp/horiz_interp_bilinear.F90

  end interface

 !> @addtogroup horiz_interp_bilinear_mod
 !> @{

-  real, parameter :: epsln=1.e-10
+  real(r8_kind), parameter :: epsln=1.d-10


1.e-10_r8_kind

mlee03 · 2023-03-23T17:18:37Z

horiz_interp/horiz_interp_spherical.F90

  integer, parameter :: num_nbrs_default = 4
-  real,    parameter :: large=1.e20
-  real,    parameter :: epsln=1.e-10
+  real(R8_KIND),    parameter :: large=1.d20


mlee03 · 2023-03-23T17:18:45Z

horiz_interp/horiz_interp_spherical.F90

-  real,    parameter :: large=1.e20
-  real,    parameter :: epsln=1.e-10
+  real(R8_KIND),    parameter :: large=1.d20
+  real(R8_KIND),    parameter :: epsln=1.d-10


mlee03 · 2023-03-23T19:13:24Z

horiz_interp/include/horiz_interp_conserve.inc

       enddo
    enddo

    !  --- area of output grid boxes ---

    do n = 1, nlat_out
       do m = 1, nlon_out
-          Interp%area_dst(m,n) = dlon_out(m) * dsph_out(n)
+          Interp%HI_KIND_TYPE_%area_dst(m,n) = dlon_out(m) * dsph_out(n)


math here too

mlee03 · 2023-03-23T19:34:55Z

horiz_interp/include/horiz_interp_spherical.inc

-    if(dot < -1.) dot = -1.
-    spherical_distance = acos(dot)
+    if(dot > 1.0_kindl)  dot = 1.0_kindl
+    if(dot < real(-1.d0, FMS_HI_KIND_)) dot = -1.0_kindl


for consistency, 1.0_kindl

mlee03 · 2023-03-23T19:35:58Z

horiz_interp/include/horiz_interp_spherical.inc

          do while (continue_search .and. step_size > 0)
             do while (step <= map_src_size .and. continue_search)
                ! count land points as nearest neighbors
-                d = spherical_distance(theta_dst(i,j),phi_dst(i,j),theta_src(step),phi_src(step))
+                d = HORIZ_INTERP_SPHERICAL_DISTANCE_(theta_dst(i,j),phi_dst(i,j),theta_src(step),phi_src(step))


these got changed to macros, there are several more in this subroutine

mlee03 · 2023-03-23T19:39:02Z

horiz_interp/include/horiz_interp_bicubic.inc

+              2*0.0_kindl, -1.0_kindl, 1.0_kindl, 6*0.0_kindl, -1.0_kindl, 1.0_kindl, 2*0.0_kindl, 2.0_kindl,         &
+              -2.0_kindl, 2*0.0_kindl, -1.0_kindl, 1.0_kindl/
+
+

      d1d2=d1*d2
      do i=1,4


line 493, 0.0_kindl

mlee03 · 2023-03-23T19:40:25Z

horiz_interp/include/horiz_interp_bicubic.inc

-      real    :: tavr
-      integer :: ipass = 0
+      integer, parameter :: kindl = FMS_HI_KIND_
+      real(FMS_HI_KIND_), parameter    :: blank = real(-1.d30, FMS_HI_KIND_)


for consistency, 1.e30_lkind

rem1776 · 2023-03-24T16:50:45Z

@mlee03 this is updated now, anything I didn't comment on should be fixed.

mlee03 · 2023-03-24T16:25:17Z

test_fms/horiz_interp/test_horiz_interp.F90

+    real(HI_TEST_KIND_), allocatable, dimension(:,:)   :: lat_out_2D, lon_out_2D
+    real(HI_TEST_KIND_), allocatable, dimension(:,:,:) :: wghts
+    !! array sizes and number of lat/lon per index
+    integer :: dlon_src, dlat_src, dlon_dst, dlat_dst


should be real

mlee03 · 2023-03-27T11:42:17Z

test_fms/horiz_interp/test_horiz_interp.F90

+    real(HI_TEST_KIND_), parameter :: SMALL = 1.0e-10_lkind
+
+    ! set up longitude and latitude of source/destination grid.
+    dlon_src = (lon_src_end-lon_src_beg)/ni_src


real(ni_src,HI_TEST_KIND_) and below too

mlee03 · 2023-03-27T11:42:34Z

test_fms/horiz_interp/test_horiz_interp.F90

+
+    allocate(lon_in_1D(ni_src+1), lat_in_1D(nj_src+1))
+    do i = 1, ni_src+1
+        lon_in_1D(i) = lon_src_beg + (i-1)*dlon_src


real(i-1, Hi_TEST_KIND_)

…re, and fms_mod (#1239) * feat: mixed precision axis_utils2 (#1104) * feat: mixed precision fms_mod (#1147) * feat: horiz interp mixed precision (#1067) * mixed precision sat_vapor_pressure (#1095) * feat: add mixed precision axis_utils unit tests (#1172) * fix: move type definitions to before first usage to fix nvhpc bug (#1187) * fix: change allocatable type for intel errors (#1221) Co-authored-by: Caitlyn McAllister <[email protected]> Co-authored-by: Jesse Lentz <[email protected]> Co-authored-by: MiKyung Lee <[email protected]>

…re, and fms_mod (#1239) (#1258) * feat: mixed precision axis_utils2 (#1104) * feat: mixed precision fms_mod (#1147) * feat: horiz interp mixed precision (#1067) * mixed precision sat_vapor_pressure (#1095) * feat: add mixed precision axis_utils unit tests (#1172) * fix: move type definitions to before first usage to fix nvhpc bug (#1187) * fix: change allocatable type for intel errors (#1221) Co-authored-by: Caitlyn McAllister <[email protected]> Co-authored-by: Jesse Lentz <[email protected]> Co-authored-by: MiKyung Lee <[email protected]>

rem1776 added 7 commits October 26, 2022 17:53

extend derived type and add overloads to bicubic

0f24cdf

add parameterized derived type for reals

b631819

add missed macros

e8316ee

add allocation checks

945e149

rename routines to all caps, add test

ee812a3

remove parameterized type for gnu and add to cmake

2141ff1

clean up comments

8d1c8af

rem1776 requested review from mlee03 and mcallic2 November 8, 2022 17:31

rem1776 requested review from bensonr and thomas-robinson as code owners November 8, 2022 17:31

rem1776 added 12 commits November 15, 2022 13:26

add include files to makefile, change brackets to quotes

fc7e297

add license header and doxygen comments for includes

0fc55af

Merge remote-tracking branch 'upstream/mixedmode' into horiz_interp_m…

b5cd82c

…ixed

remove whitespace

1c0f739

add real casts to any loose reals

449b839

Merge remote-tracking branch 'upstream/mixedmode' into horiz_interp_m…

ead452a

…ixed

add include directory, headers and comments

be4b399

rm whitespace

f734c08

gcc fix for old data block assignment

ea3fa83

line lengths

35aac33

update cmake paths

5422672

missed some headers in makefile

e806f45

mcallic2 approved these changes Dec 13, 2022

View reviewed changes

mlee03 reviewed Dec 13, 2022

View reviewed changes

rem1776 added 5 commits December 21, 2022 13:27

Change macros to add trailing underscore

ca37853

address review comments

54a7aa0

line length and typo fixes

14fd854

missed a &

f102556

change real module parameters to r8

378ce98

rem1776 added 4 commits March 17, 2023 14:55

change type name

e5cdc90

Merge branch 'horiz_interp_mixed' of github.com:rem1776/FMS into hori…

d402cc9

…z_interp_mixed

linter + test type names

9705003

linter fixes

95fd9df

mcallic2 approved these changes Mar 20, 2023

View reviewed changes

rem1776 added 7 commits March 21, 2023 14:25

fix stack size issues with nml change, add some clocks

489b6c5

ci + whitespace

9ede143

update error checking for CI failures

cea5bd1

fix last ci gnu issue (hopefully)+typo in dim size

f537bf6

linter

187fe83

missed r8 check

215ce93

missed review changes

497f255

mlee03 reviewed Mar 23, 2023

View reviewed changes

add dealloc checks

093f303

mcallic2 approved these changes Mar 24, 2023

View reviewed changes

rem1776 added 2 commits March 24, 2023 11:37

updates for review comments

a0c996f

finish the rest of the comments

847fd85

mlee03 reviewed Mar 24, 2023

View reviewed changes

rem1776 added 2 commits March 24, 2023 13:36

change ints to reals

8af3295

fix any lingering warnings

92ee422

mlee03 reviewed Mar 27, 2023

View reviewed changes

linter and missing casts

31bea03

mlee03 approved these changes Mar 28, 2023

View reviewed changes

rem1776 merged commit cdabf07 into NOAA-GFDL:mixedmode Mar 29, 2023

rem1776 added a commit to rem1776/FMS that referenced this pull request May 3, 2023

feat: horiz interp mixed precision (NOAA-GFDL#1067)

785a474

rem1776 added a commit to rem1776/FMS that referenced this pull request May 25, 2023

feat: horiz interp mixed precision (NOAA-GFDL#1067)

db74d68

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

horiz interp mixed precision #1067

horiz interp mixed precision #1067

rem1776 commented Nov 8, 2022

mlee03 Nov 22, 2022

mlee03 Nov 23, 2022

mlee03 Nov 23, 2022

mlee03 Nov 23, 2022

mlee03 Nov 23, 2022

mlee03 Mar 23, 2023

mlee03 Mar 23, 2023

mlee03 Mar 23, 2023

mlee03 Mar 23, 2023

mlee03 Mar 23, 2023

mlee03 Mar 23, 2023

mlee03 Mar 23, 2023

mlee03 Mar 23, 2023

mlee03 Mar 23, 2023

mlee03 Mar 23, 2023

rem1776 commented Mar 24, 2023

mlee03 Mar 24, 2023

mlee03 Mar 27, 2023

mlee03 Mar 27, 2023

horiz interp mixed precision #1067

horiz interp mixed precision #1067

Conversation

rem1776 commented Nov 8, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rem1776 commented Mar 24, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment