Skip to content

Commit 9f3c4ce

Browse files
committed
Merge branch 'develop' into release/MAPL-v3
2 parents e145fc4 + ca04152 commit 9f3c4ce

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

base/NCIO.F90

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5163,12 +5163,12 @@ function create_flipped_field(field,rc) result(flipped_field)
51635163
end function create_flipped_field
51645164

51655165
subroutine MAPL_ReadTilingNC4(File, GridName, im, jm, nx, ny, n_Grids, iTable, rTable, N_PfafCat, AVR,rc)
5166-
character(*), intent(IN) :: File
5167-
character(*), optional, intent(out) :: GridName(:)
5168-
integer, optional, intent(out) :: IM(:), JM(:)
5169-
integer, optional, intent(out) :: nx, ny, n_Grids
5170-
integer, optional, allocatable, intent(out) :: iTable(:,:)
5171-
real(kind=8), optional, allocatable, intent(out) :: rTable(:,:)
5166+
character(*), intent(IN) :: File
5167+
character(*), optional, intent(out) :: GridName(:)
5168+
integer, optional, intent(out) :: IM(:), JM(:)
5169+
integer, optional, intent(out) :: nx, ny, n_Grids
5170+
integer, optional, allocatable, intent(out) :: iTable(:,:)
5171+
real(kind=REAL64), optional, allocatable, intent(out) :: rTable(:,:)
51725172
integer, optional, intent(out) :: N_PfafCat
51735173
real, optional, pointer, intent(out) :: AVR(:,:) ! used by GEOSgcm
51745174
integer, optional, intent(out) :: rc
@@ -5182,11 +5182,11 @@ subroutine MAPL_ReadTilingNC4(File, GridName, im, jm, nx, ny, n_Grids, iTable, r
51825182
class(*), pointer :: attr_val(:)
51835183
class(*), pointer :: char_val
51845184
integer, allocatable :: tmp_int(:)
5185-
real(kind=8), allocatable :: fr(:)
5185+
real(kind=REAL64),allocatable :: fr(:)
51865186

51875187
integer :: NumCol
51885188
integer, allocatable :: iTable_(:,:)
5189-
real(kind=8), allocatable :: rTable_(:,:)
5189+
real(kind=REAL64), allocatable :: rTable_(:,:)
51905190

51915191
call formatter%open(File, pFIO_READ, rc=status)
51925192
meta = formatter%read(rc=status)

base/tests/utCFIO_Array.F90

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
Program utCFIO
88

9+
use, intrinsic :: iso_fortran_env, only: REAL64
910
use ESMF
1011

1112
use MAPL_BaseMod
@@ -332,7 +333,7 @@ subroutine MAPL_GridGetLatLons ( grid, lons, lats )
332333

333334
type(ESMF_Array) :: eARRAY(2)
334335

335-
real(KIND=8), pointer :: R8D2(:,:)
336+
real(KIND=REAL64), pointer :: R8D2(:,:)
336337
real, pointer :: lons2d(:,:), lats2d(:,:)
337338
real, pointer :: LONSLocal(:,:), LATSlocal(:,:)
338339
integer :: IM_WORLD, JM_WORLD, dims(3)

0 commit comments

Comments
 (0)