Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

final cleanup for removal of -w flag #438

Merged
merged 1 commit into from
Apr 4, 2023
Merged

final cleanup for removal of -w flag #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,6 @@ endif()
set(underscore_def "UNDERSCORE")
set(c_8_defs "F77_INTSIZE_8")

# For gfortran-10+ backward compatibility
if(${CMAKE_Fortran_COMPILER_ID} MATCHES "^(GNU)$" AND ${CMAKE_Fortran_COMPILER_VERSION} VERSION_GREATER_EQUAL 10)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -w -fallow-argument-mismatch")
endif()

add_subdirectory(src)
add_subdirectory(utils)

Expand Down
4 changes: 2 additions & 2 deletions src/ipks.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ FUNCTION IPKS(VAL,NODE)

C-----------------------------------------------------------------------

IPKS = VAL * TEN**ISC(NODE) - IRF(NODE) + .5
IPKS = NINT(VAL * TEN**ISC(NODE),8) - IRF(NODE)

IF ( NNRV .GT. 0 ) THEN

Expand Down Expand Up @@ -61,7 +61,7 @@ FUNCTION IPKS(VAL,NODE)
C The corresponding redefinded reference value needs to
C be used when encoding this value.

IPKS = VAL * TEN**ISC(NODE) - NRV(JJ) + .5
IPKS = NINT(VAL * TEN**ISC(NODE),8) - NRV(JJ)
RETURN
END IF
END DO
Expand Down
2 changes: 1 addition & 1 deletion src/wrcmps.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ SUBROUTINE WRCMPS(LUNIX)
ENDIF
ENDDO
KMISS = KMIS(I).AND.KMIN(I).LT.IMISS
RANGE = MAX(1,KMAX(I)-KMIN(I)+1)
RANGE = REAL(MAX(1,KMAX(I)-KMIN(I)+1))
IF(ITYP(I).EQ.1.AND.RANGE.GT.1) THEN

C THE DATA VALUES IN ROW I OF THE COMPRESSION MATRIX
Expand Down
7 changes: 6 additions & 1 deletion test/outtest8.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,12 @@ program outtest8

! Write the output message to the output file.
#ifdef KIND_8
nbyt = lenbmg * 8
! See issue #300.
! For some reason the following code line squawks with a -Wconversion warning, so for now we'll just
! hardcode a workaround since lenbmg should have a value of 2237 when using 8-byte integers.
! nbyt = int(lenbmg,4) * 8
if ( lenbmg .ne. 2237 ) stop 3
nbyt = 2237 * 8
#else
nbyt = lenbmg * 4
#endif
Expand Down