Skip to content

Commit 7b258f4

Browse files
committed
Changes per PR comments
1. change declaration of constant 2-D character array to allow initializing strings of different sizes. 2. pass optional args to mpas_log_write from close_file_with_message, even when not present. 3. use format of MPAS_IO_NETCDF when creating test data file.
1 parent 293caea commit 7b258f4

File tree

1 file changed

+4
-7
lines changed

1 file changed

+4
-7
lines changed

src/core_test/mpas_test_core_io.F

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,7 @@ subroutine close_file_with_message(fileHandle, message, args)
3232

3333
! log an error message
3434
if (present(message)) then
35-
if (present(args)) then
36-
ERROR_WRITE_ARGS(message, intArgs=args)
37-
else
38-
ERROR_WRITE(message)
39-
end if
35+
ERROR_WRITE_ARGS(message, intArgs=args)
4036
end if
4137

4238
! close the provided file
@@ -66,7 +62,8 @@ subroutine test_read_string_buffer_check(domain, ierr)
6662
integer :: local_ierr, i
6763
type(MPAS_IO_Handle_type) :: fileHandle
6864
character (len=StrKIND), dimension(1), parameter :: dimNamesString = ['StrLen']
69-
character (len=StrKIND), dimension(2), parameter :: dimNamesStringTime = ['StrLen', 'Time ']
65+
character (len=StrKIND), dimension(2), parameter :: dimNamesStringTime = &
66+
[character(len=StrKIND) :: 'StrLen', 'Time']
7067
character (len=32), parameter :: varName1 = 'stringVar'
7168
character (len=32), parameter :: varName2 = 'stringTimeVar'
7269
character (len=*), parameter :: varValue1 = 'This is a string'
@@ -80,7 +77,7 @@ subroutine test_read_string_buffer_check(domain, ierr)
8077
ierr = 0
8178

8279
! open a file to write char variables to
83-
fileHandle = MPAS_io_open(filename, MPAS_IO_WRITE, MPAS_IO_NETCDF4, domain % ioContext, &
80+
fileHandle = MPAS_io_open(filename, MPAS_IO_WRITE, MPAS_IO_NETCDF, domain % ioContext, &
8481
clobber_file=.true., truncate_file=.true., ierr=local_ierr)
8582
if (local_ierr /= MPAS_IO_NOERR) then
8683
ierr = 1

0 commit comments

Comments
 (0)