Merge pull request #23 from kgerheiser/bugfix/unique-module-name

Change name of GDSWZD_MOD to avoid name conflict with ip
NOAA-EMC · Nov 19, 2020 · 89067de · 89067de
2 parents 72b9f57 + 7c0d7be
commit 89067de
Show file tree

Hide file tree

Showing 15 changed files with 20 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -147,7 +147,7 @@ SUBROUTINE POLATEV6(IPOPT,IGDTNUMI,IGDTMPLI,IGDTLENI, &
 !
 !$$$
 !
- USE GDSWZD_MOD
+ USE GDSWZD_MOD_ip2
 !
  IMPLICIT NONE
 !

diff --git 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)