From ff73757731a467132bbf03861514e2ebbd31112b Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Thu, 19 Nov 2020 09:56:45 -0500 Subject: [PATCH 1/2] Change name of GDSWZD_MOD to GDSWZD_MOD_ip2 to avoid name clash with ip --- src/gdswzd_c.F90 | 2 +- src/gdswzd_mod.f90 | 6 +++--- src/polates0.f90 | 2 +- src/polates1.f90 | 2 +- src/polates2.f90 | 2 +- src/polates3.f90 | 2 +- src/polates4.f90 | 2 +- src/polates6.f90 | 2 +- src/polatev0.f90 | 2 +- src/polatev1.f90 | 2 +- src/polatev2.f90 | 2 +- src/polatev3.f90 | 2 +- src/polatev4.f90 | 2 +- src/polatev6.f90 | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/gdswzd_c.F90 b/src/gdswzd_c.F90 index 808cf2c..81f058a 100644 --- a/src/gdswzd_c.F90 +++ b/src/gdswzd_c.F90 @@ -198,7 +198,7 @@ SUBROUTINE GDSWZD_C(IGDTNUM,IGDTMPL,IGDTLEN,IOPT,NPTS,FILL, & ! USE, INTRINSIC :: ISO_C_BINDING - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 IMPLICIT NONE diff --git a/src/gdswzd_mod.f90 b/src/gdswzd_mod.f90 index 981e0bf..712b624 100644 --- a/src/gdswzd_mod.f90 +++ b/src/gdswzd_mod.f90 @@ -1,4 +1,4 @@ - MODULE GDSWZD_MOD + MODULE GDSWZD_MOD_IP2 !$$$ MODULE DOCUMENTATION BLOCK ! ! MODULE: GDSWZD_MOD GDS WIZARD MODULE @@ -23,7 +23,7 @@ MODULE GDSWZD_MOD ! 2015-01-21 GAYNO INITIAL VERSION FROM A MERGER OF ! ROUTINES GDSWIZ AND GDSWZD. ! -! USAGE: "USE GDSWZD_MOD" THEN CALL THE PUBLIC DRIVER +! USAGE: "USE GDSWZD_MOD_ip2" THEN CALL THE PUBLIC DRIVER ! ROUTINE "GDSWZD". ! ! ATTRIBUTES: @@ -585,4 +585,4 @@ SUBROUTINE GDSWZD_1D_ARRAY(IGDTNUM,IGDTMPL,IGDTLEN,IOPT,NPTS,FILL, & ! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - END SUBROUTINE GDSWZD_1D_ARRAY - END MODULE GDSWZD_MOD +END MODULE GDSWZD_MOD_IP2 diff --git a/src/polates0.f90 b/src/polates0.f90 index 41c594c..176222d 100644 --- a/src/polates0.f90 +++ b/src/polates0.f90 @@ -127,7 +127,7 @@ SUBROUTINE POLATES0(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! !$$$ ! - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 ! IMPLICIT NONE ! diff --git a/src/polates1.f90 b/src/polates1.f90 index cdf88bc..0fe3cb0 100644 --- a/src/polates1.f90 +++ b/src/polates1.f90 @@ -133,7 +133,7 @@ SUBROUTINE POLATES1(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! !$$$ ! - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 ! IMPLICIT NONE ! diff --git a/src/polates2.f90 b/src/polates2.f90 index 23beafc..a0e8afa 100644 --- a/src/polates2.f90 +++ b/src/polates2.f90 @@ -127,7 +127,7 @@ SUBROUTINE POLATES2(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! LANGUAGE: FORTRAN 90 ! !$$$ - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 ! IMPLICIT NONE ! diff --git a/src/polates3.f90 b/src/polates3.f90 index e72e4d5..fab1893 100644 --- a/src/polates3.f90 +++ b/src/polates3.f90 @@ -148,7 +148,7 @@ SUBROUTINE POLATES3(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! LANGUAGE: FORTRAN 90 ! !$$$ - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 IMPLICIT NONE ! diff --git a/src/polates4.f90 b/src/polates4.f90 index 9afd7c8..2e6a0b2 100644 --- a/src/polates4.f90 +++ b/src/polates4.f90 @@ -122,7 +122,7 @@ SUBROUTINE POLATES4(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! LANGUAGE: FORTRAN 90 ! !$$$ - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 ! IMPLICIT NONE ! diff --git a/src/polates6.f90 b/src/polates6.f90 index 616ffeb..c5b3b6a 100644 --- a/src/polates6.f90 +++ b/src/polates6.f90 @@ -126,7 +126,7 @@ SUBROUTINE POLATES6(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! LANGUAGE: FORTRAN 90 ! !$$$ - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 ! IMPLICIT NONE ! diff --git a/src/polatev0.f90 b/src/polatev0.f90 index 8863cbe..0ef96f2 100644 --- a/src/polatev0.f90 +++ b/src/polatev0.f90 @@ -147,7 +147,7 @@ SUBROUTINE POLATEV0(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! LANGUAGE: FORTRAN 90 ! !$$$ - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 ! IMPLICIT NONE ! diff --git a/src/polatev1.f90 b/src/polatev1.f90 index 00938b6..6850589 100644 --- a/src/polatev1.f90 +++ b/src/polatev1.f90 @@ -160,7 +160,7 @@ SUBROUTINE POLATEV1(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! !$$$ ! - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 ! IMPLICIT NONE ! diff --git a/src/polatev2.f90 b/src/polatev2.f90 index 12a1fa4..9a0cb96 100644 --- a/src/polatev2.f90 +++ b/src/polatev2.f90 @@ -151,7 +151,7 @@ SUBROUTINE POLATEV2(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! !$$$ ! - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 ! IMPLICIT NONE ! diff --git a/src/polatev3.f90 b/src/polatev3.f90 index 5557203..00d874d 100644 --- a/src/polatev3.f90 +++ b/src/polatev3.f90 @@ -159,7 +159,7 @@ SUBROUTINE POLATEV3(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! !$$$ ! - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 ! IMPLICIT NONE ! diff --git a/src/polatev4.f90 b/src/polatev4.f90 index 84168e9..72175f3 100644 --- a/src/polatev4.f90 +++ b/src/polatev4.f90 @@ -148,7 +148,7 @@ SUBROUTINE POLATEV4(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! !$$$ ! - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 ! IMPLICIT NONE ! diff --git a/src/polatev6.f90 b/src/polatev6.f90 index f9e5592..9d07fd3 100644 --- a/src/polatev6.f90 +++ b/src/polatev6.f90 @@ -147,7 +147,7 @@ SUBROUTINE POLATEV6(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, & ! !$$$ ! - USE GDSWZD_MOD + USE GDSWZD_MOD_ip2 ! IMPLICIT NONE ! From 7c0d7be5cc1f71fd2eaeb4dc6f16ec2533781258 Mon Sep 17 00:00:00 2001 From: kgerheiser Date: Thu, 19 Nov 2020 10:01:02 -0500 Subject: [PATCH 2/2] Add flags to build for GCC 10 --- tests/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8b55c4e..95d2fac 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -12,6 +12,10 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$") set(CMAKE_Fortran_FLAGS "-fdefault-real-8 -fno-range-check -g -fbacktrace -fcheck=bounds") endif() +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 -fallow-invalid-boz") +endif() + # Contains common routines used for testing such as reading and interpolating data add_library(test_library input_data_mod.f90 interp_mod.f90) target_link_libraries(test_library PUBLIC ip2::ip2_d)