Update to 2009Rev510

Author: crazyzlj

VERSIONS

@@ -1,3 +1,3 @@
 VERSION_MAJOR 2009
-VERSION_MINOR 486
+VERSION_MINOR 510
 VERSION_PATCH

src/CMakeLists.txt

@@ -5,17 +5,32 @@ set(swatexe swat)
 file(GLOB F77SRCS *.f)
 
 ### Set Fortran line format for source file
+## Special sources that have fixed length of 79
+set(LEN79_SRCS "bmp_det_pond" "bmpinit" "ovr_sed" "percmain" "readbsn" "rthsed")
 foreach(F77FILE ${F77SRCS})
     get_filename_component(CORENAME ${F77FILE} NAME_WE)
+    list(FIND LEN79_SRCS ${CORENAME} _FOUND_LEN79)
     if(${CMAKE_Fortran_COMPILER} MATCHES "ifort.*")
         # ifort, reference https://software.intel.com/en-us/node/678225
-        if(MSVC) # ifort integrated in Microsoft Visual Studio
-            set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS /4L72)
+        if(MSVC) # ifort integrated in Microsoft Visual Studio            
+            if(${_FOUND_LEN79} GREATER -1)
+                set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS /4L79)
+            else()
+                set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS /4L72)
+            endif()
         else()
-            set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -72)
+            if(${_FOUND_LEN79} GREATER -1)
+                set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -79)
+            else()
+                set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -72)
+            endif()
         endif()
     else() # gfortran tested only
-        set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -ffixed-line-length-72)
+        if(${_FOUND_LEN79} GREATER -1)
+            set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -ffixed-line-length-79)
+        else()
+            set_source_files_properties(${F77FILE} PROPERTIES COMPILE_FLAGS -ffixed-line-length-72)
+        endif()
     endif()
 endforeach()
 
@@ -42,6 +57,10 @@ 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.
         set(Format_Flag "-ffixed-line-length-72")
+        list(FIND LEN79_SRCS ${CORENAME} _FOUND_LEN79)
+        if(${_FOUND_LEN79} GREATER -1)
+            set(Format_Flag "-ffixed-line-length-79")
+        endif()
         add_custom_command(OUTPUT ${CORENAME}.o
                            COMMAND ${CMAKE_Fortran_COMPILER} ${Compile_Flags_List} ${Format_Flag} -c
                            ${SRCFILE} DEPENDS main.o)

src/addh.f

@@ -71,7 +71,8 @@ subroutine addh
 
 !! add hydrograph points (hourly time step)
       if (ievent > 2) then
-        do kk = 1, 24
+   !     do kk = 1, 24
+        do kk = 1, nstep  ! modified for urban modeling by J.Jeong 4/15/2008
           if (hhvaroute(2,inum1,kk) + hhvaroute(2,inum2,kk) > 0.1) then
             hhvaroute(1,ihout,kk) = (hhvaroute(1,inum1,kk) *            &
      &                  hhvaroute(2,inum1,kk) + hhvaroute(1,inum2,kk) * &
@@ -80,7 +81,8 @@ subroutine addh
           end if
         end do
         do ii = 2, mvaro
-          do kk = 1, 24
+   !       do kk = 1, 24
+          do kk = 1, nstep  ! modified for urban modeling by J.Jeong 4/15/2008
             hhvaroute(ii,ihout,kk) = hhvaroute(ii,inum1,kk) +           &
      &                                            hhvaroute(ii,inum2,kk)
           end do