Fix test_read_input_nml2 failure and test_diag_update_buffer.F90 seg fault : Cray

[laurenchilutti]

Description

Cray uses an IOSTAT of -4001 for end of file while other compilers typically use -1. Because of this, the do loop (shown below) will not exit on the condition if (stat.eq.-1) at Line 71

FMS/test_fms/mpp/test_read_input_nml.F90

Lines 68 to 79 in 2be8aa4

	n = 1
	do
	read(1, '(A)', iostat=stat) line
	if (stat.eq.-1) then
	exit
	end if
	if (input_nml_file(n).ne.line) then
	call mpp_error(FATAL, "data resident in ./input.nml does not match&
	& that read into input_nml_file by read_input_nml")
	end if
	n = n + 1
	end do

To fix: I took the approach seen in fortran standards (section 12.11.5 in the J3/23-007draft spec) and replaced if (stat.eq.-1) with if (stat < 0) to check for end of file and exit loop.

I also noticed that the tests were not matching the description here:

FMS/test_fms/mpp/test_read_input_nml.F90

Lines 51 to 56 in 2be8aa4

	! Test 1: Tests the subroutine on a valid input nml full of data,
	! with no arguments passed to read_input_nml()
	! Test 2: Tests the subroutine on a valid input nml full of data,
	! with a string passed to read_input_nml() in order to read a different nml
	! Test 4: Tests the subroutine on a valid empty input nml,
	! with no arguments passed to read_input_nml()

Previously, test 1 was reading a blank input.nml and test 2 was reading a blank input_alternate.nml. I have modified this so that there is data inside of input.nml and input_alternate.nml. Test 4 still tests a blank nml with the name input_blank.nml

Cray was failing to compile test_diag_update_buffer.F90 because of the 1 at the beginning of line 289

FMS/test_fms/diag_manager/test_diag_update_buffer.F90

Lines 288 to 290 in 2be8aa4

	field(i,j,k,l) = get_array_index_from_4D(i,j,k,l,NX,NY,NZ)
	1 TYPE IS (integer(kind=i8_kind))
	field(i,j,k,l) = get_array_index_from_4D(i,j,k,l,NX,NY,NZ)

I have removed the 1 and refactored the code a little bit - I am open to feedback on the changes I made and will undo if they are not helpful.

Fixes #1300

How Has This Been Tested?
make and make check on
C5
cce/15.0.1
cray-hdf5/1.12.2.3
cray-netcdf/4.9.0.3

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