rm whitespace and fix missed compile errors in time_interp

NOAA-GFDL · Jun 3, 2024 · 5d04cfd · 5d04cfd
1 parent 5f83a86
commit 5d04cfd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/horiz_interp/include/horiz_interp_conserve.inc b/horiz_interp/include/horiz_interp_conserve.inc
@@ -216,6 +216,7 @@ subroutine HORIZ_INTERP_CONSERVE_NEW_1DX1D_ ( Interp, lon_in, lat_in, lon_out, l
     !-----------------------------------------------------------------------
 
     Interp% HI_KIND_TYPE_ % is_allocated = .true.
+    Interp% interp_method = CONSERVE
 
   end subroutine HORIZ_INTERP_CONSERVE_NEW_1DX1D_
 
@@ -387,7 +388,7 @@ subroutine HORIZ_INTERP_CONSERVE_NEW_1DX1D_ ( Interp, lon_in, lat_in, lon_out, l
     deallocate(i_src, j_src, i_dst, j_dst, xgrid_area, dst_area )
 
     Interp% HI_KIND_TYPE_ % is_allocated = .true.
-    Interp% interp_method = CONSERVE 
+    Interp% interp_method = CONSERVE
 
   end subroutine HORIZ_INTERP_CONSERVE_NEW_1DX2D_
 
@@ -499,7 +500,7 @@ subroutine HORIZ_INTERP_CONSERVE_NEW_1DX1D_ ( Interp, lon_in, lat_in, lon_out, l
     deallocate(i_src, j_src, i_dst, j_dst, xgrid_area, dst_area)
 
     Interp% HI_KIND_TYPE_ % is_allocated = .true.
-    Interp% interp_method = CONSERVE 
+    Interp% interp_method = CONSERVE
 
   end subroutine HORIZ_INTERP_CONSERVE_NEW_2DX1D_
 
@@ -609,7 +610,7 @@ subroutine HORIZ_INTERP_CONSERVE_NEW_1DX1D_ ( Interp, lon_in, lat_in, lon_out, l
     deallocate(i_src, j_src, i_dst, j_dst, xgrid_area, dst_area )
 
     Interp% HI_KIND_TYPE_ % is_allocated = .true.
-    Interp% interp_method = CONSERVE 
+    Interp% interp_method = CONSERVE
 
   end subroutine HORIZ_INTERP_CONSERVE_NEW_2DX2D_
 

diff --git a/horiz_interp/include/horiz_interp_spherical.inc b/horiz_interp/include/horiz_interp_spherical.inc
@@ -189,7 +189,7 @@
     Interp%nlon_src = map_src_xsize; Interp%nlat_src = map_src_ysize
     Interp%nlon_dst = map_dst_xsize; Interp%nlat_dst = map_dst_ysize
     Interp% HI_KIND_TYPE_ % is_allocated = .true.
-    Interp% interp_method = SPHERICA 
+    Interp% interp_method = SPHERICA
 
     return
 

diff --git a/test_fms/horiz_interp/test_horiz_interp.F90 b/test_fms/horiz_interp/test_horiz_interp.F90
@@ -1071,7 +1071,7 @@ subroutine test_assignment()
         call horiz_interp_del(Interp_new1)
         call horiz_interp_del(Interp_new2)
         call horiz_interp_del(Interp_cp)
-        ! test deletion after direct calls 
+        ! test deletion after direct calls
         call horiz_interp_conserve_new(Interp_new1, lon_in_1d, lat_in_1d, lon_out_1d, lat_out_1d)
         call horiz_interp_del(Interp_new1)
         call horiz_interp_conserve_new(Interp_new1, lon_in_1d, lat_in_1d, lon_out_2d, lat_out_2d)
@@ -1102,7 +1102,7 @@ subroutine test_assignment()
         call horiz_interp_del(Interp_new1)
         call horiz_interp_del(Interp_new2)
         call horiz_interp_del(Interp_cp)
-        ! test deletion after direct calls 
+        ! test deletion after direct calls
         ! this set up is usually done within horiz_interp_new
         nlon_in  = size(lon_in_1d(:))-1;  nlat_in  = size(lat_in_1d(:))-1
         nlon_out = size(lon_out_1d(:))-1; nlat_out = size(lat_out_1d(:))-1

diff --git a/time_interp/include/time_interp_external2.inc b/time_interp/include/time_interp_external2.inc
@@ -29,7 +29,7 @@
       real(FMS_TI_KIND_), dimension(:,:), intent(inout) :: data_in
       integer, intent(in), optional :: interp
       logical, intent(in), optional :: verbose
-      type(horiz_interp_type),intent(in), optional :: horz_interp
+      type(horiz_interp_type),intent(inout), optional :: horz_interp
       logical, dimension(:,:), intent(out), optional :: mask_out !< set to true where output data is valid
       integer,                  intent(in), optional :: is_in, ie_in, js_in, je_in
       integer,                  intent(in), optional :: window_id
@@ -61,7 +61,7 @@
         real(FMS_TI_KIND_), dimension(:,:,:),  intent(inout)           :: time_data !< global or local data array
         integer,                    intent(in), optional :: interp
         logical,                    intent(in), optional :: verbose !< flag for debugging
-        type(horiz_interp_type),    intent(in), optional :: horz_interp
+        type(horiz_interp_type),    intent(inout), optional :: horz_interp
         logical, dimension(:,:,:), intent(out), optional :: mask_out !< set to true where output data is valid
         integer,                    intent(in), optional :: is_in, ie_in, js_in, je_in
         integer,                    intent(in), optional :: window_id

diff --git a/time_interp/include/time_interp_external2_bridge.inc b/time_interp/include/time_interp_external2_bridge.inc
@@ -30,7 +30,7 @@
       real(FMS_TI_KIND_), dimension(:,:), intent(inout) :: data_in !< global or local data array
       integer, intent(in), optional :: interp !< hardcoded to linear
       logical, intent(in), optional :: verbose !< flag for debugging
-      type(horiz_interp_type),intent(in), optional :: horz_interp !< horizontal interpolation type
+      type(horiz_interp_type),intent(inout), optional :: horz_interp !< horizontal interpolation type
       logical, dimension(:,:), intent(out), optional :: mask_out !< set to true where output data is valid
       integer,                  intent(in), optional :: is_in, ie_in, js_in, je_in !< horizontal indices for load_record
       integer,                  intent(in), optional :: window_id !< harcoded to 1 in load_record
@@ -60,7 +60,7 @@
       real(FMS_TI_KIND_), dimension(:,:,:),  intent(inout) :: time_data !< global or local data array
       integer,                    intent(in), optional :: interp !< hardcoded to linear
       logical,                    intent(in), optional :: verbose !< flag for debugging
-      type(horiz_interp_type),    intent(in), optional :: horz_interp !< horizontal interpolation type
+      type(horiz_interp_type),    intent(inout), optional :: horz_interp !< horizontal interpolation type
       logical, dimension(:,:,:), intent(out), optional :: mask_out !< set to true where output data is valid
       integer,                    intent(in), optional :: is_in, ie_in !<  x horizontal indices for load_record
       integer,                    intent(in), optional :: js_in, je_in !< y horizontal indices for load_record

diff --git a/time_interp/time_interp_external2.F90 b/time_interp/time_interp_external2.F90
@@ -753,7 +753,7 @@ end subroutine set_time_modulo
 subroutine load_record(field, rec, interp, is_in, ie_in, js_in, je_in, window_id_in)
   type(ext_fieldtype),     intent(inout)        :: field
   integer            ,     intent(in)           :: rec    ! record number
-  type(horiz_interp_type), intent(in), optional :: interp
+  type(horiz_interp_type), intent(inout), optional :: interp
   integer,                 intent(in), optional :: is_in, ie_in, js_in, je_in
   integer,                 intent(in), optional :: window_id_in