Fix bugs for gfortran: fortran interface to self. Refers to https://s…

…tackoverflow.com/questions/32161560/fortran-interface-to-itself-produces-annoying-error
crazyzlj · Apr 22, 2020 · 9a12d04 · 9a12d04
1 parent 5e892f4
commit 9a12d04
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -18,20 +18,20 @@ foreach(F77FILE ${F77SRCS})
             if(${_FOUND_LEN72} GREATER -1)
                 set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS /4L72)
             else()
-                set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS /4L79)
+                set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS /4L80)
             endif()
         else()
             if(${_FOUND_LEN72} GREATER -1)
                 set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -72)
             else()
-                set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -79)
+                set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -80)
             endif()
         endif()
     else() # gfortran tested only
         if(${_FOUND_LEN72} GREATER -1)
             set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -ffixed-line-length-72)
         else()
-            set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -ffixed-line-length-79)
+            set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -ffixed-line-length-80)
         endif()
     endif()
 endforeach()
@@ -59,7 +59,7 @@ if((NOT MSVC) AND (${First_Line_Of_Main_File} MATCHES "      include 'modparm.f'
     endif ()
     # Build main.f first which includes modparm.f (i.e., parm.mod)
     add_custom_command(OUTPUT main.o
-                       COMMAND ${CMAKE_Fortran_COMPILER} ${Compile_Flags_List} -ffixed-line-length-79 -c
+                       COMMAND ${CMAKE_Fortran_COMPILER} ${Compile_Flags_List} -ffixed-line-length-80 -c
                                ${CMAKE_CURRENT_SOURCE_DIR}/modparm.f ${CMAKE_CURRENT_SOURCE_DIR}/main.f)
     # Build other source files that depend on main.o
     foreach(SRCFILE ${F77SRCS} ${F90SRCS})
@@ -71,7 +71,7 @@ if((NOT MSVC) AND (${First_Line_Of_Main_File} MATCHES "      include 'modparm.f'
         endif()
         # Set compile flag according to Fortran line format. These should be consistent with settings above.
         if(${ext} STREQUAL ".f")
-            set(Format_Flag "-ffixed-line-length-79")
+            set(Format_Flag "-ffixed-line-length-80")
         else()
             set(Format_Flag "-ffree-line-length-none")
         endif()

diff --git a/src/HQDAV.f90 b/src/HQDAV.f90
@@ -2,8 +2,8 @@ SUBROUTINE HQDAV(A,CBW,QQ,SSS,ZCH,ZX,CHW,FPW,jrch)
 !     adopted from APEX1501 by Jaehak Jeong 2017
 !     THIS SUBPROGRAM COMPUTES FLOW AREA AND DEPTH GIVEN RATE in a reach
 
-      USE PARM
-      
+      USE PARM, except_this_one => HQDAV
+
       real*8, intent (in out) :: A, ZX, CHW, FPW
       real*8, intent (in) :: CBW, QQ, SSS, ZCH
       integer, intent (in) :: jrch

diff --git a/src/atri.f b/src/atri.f
@@ -39,7 +39,7 @@ function atri(at1,at2,at3,at4i) result (r_atri)
 
 !!    ~ ~ ~ ~ ~ ~ END SPECIFICATIONS ~ ~ ~ ~ ~ ~
 
-      use parm
+      use parm, except_this_one => atri
 
       real*8, intent (in) :: at1, at2, at3
       integer, intent (in out) :: at4i

diff --git a/src/layersplit.f b/src/layersplit.f
@@ -1,6 +1,6 @@
       subroutine layersplit(dep_new)
 
-      use parm
+      use parm, except_this_one => layersplit
       integer nly,n,j
 	integer :: flag
 	real*8, intent(in):: dep_new

diff --git a/src/ndenit.f b/src/ndenit.f
@@ -1,7 +1,7 @@
       subroutine ndenit(k,j,cdg,wdn,void)
 !!    this subroutine computes denitrification 
 
-	use parm
+	use parm, except_this_one => ndenit
 	integer :: k,j
 	real*8 :: cdg, wdn, void
 

diff --git a/src/regres.f b/src/regres.f
@@ -50,7 +50,7 @@ real*8 function regres(k) result (r_regres)
 
 !!    ~ ~ ~ ~ ~ ~ END SPECIFICATIONS ~ ~ ~ ~ ~ ~
 
-      use parm
+      use parm, except_this_one => regres
 
       integer, intent (in) :: k
       real*8, dimension (5,3) :: beta

diff --git a/src/rsedaa.f b/src/rsedaa.f
@@ -24,7 +24,7 @@ subroutine rsedaa(years)
 
 !!    ~ ~ ~ ~ ~ ~ END SPECIFICATIONS ~ ~ ~ ~ ~ ~
 
-      use parm
+      use parm, except_this_one => rsedaa
 
       real*8, intent (in) :: years
       integer :: j

diff --git a/src/tair.f b/src/tair.f
@@ -37,7 +37,7 @@ function tair(hr,jj) result (r_tair)
 !!    Hydrology-Vrije Universiteit Brussel, Belgium
 !!    subroutine modified by SLN
 
-      use parm
+      use parm, except_this_one => tair
 
       integer, intent (in) ::  jj
       real*8, intent(in) :: hr

diff --git a/src/vbl.f b/src/vbl.f
@@ -50,7 +50,7 @@ subroutine vbl(evx,spx,pp,qin,ox,vx1,vy,yi,yo,ysx,vf,vyf,aha)
 
 !!    ~ ~ ~ ~ ~ ~ END SPECIFICATIONS ~ ~ ~ ~ ~ ~
 
-      use parm
+      use parm, except_this_one => vbl
 
       real*8, intent (in) :: evx, spx, pp, qin, ox, yi, yo, ysx
       real*8, intent (in) :: vf, vyf, aha