From 18c1336f298f7280ee592e7b9026b47c656eeefe Mon Sep 17 00:00:00 2001
From: Ignacio Pisso <Ignacio.Pisso@nilu.no>
Date: Sun, 1 Mar 2015 17:02:04 +0100
Subject: [PATCH] correct missing trailing slash (/) in readpaths.f90. issue a
warning.
---
src/readpaths.f90 | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/src/readpaths.f90 b/src/readpaths.f90
index 8ed7ac71..850238d1 100755
--- a/src/readpaths.f90
+++ b/src/readpaths.f90
@@ -62,20 +62,32 @@ subroutine readpaths !(pathfile)
read(unitpath,'(a)',err=998) path(i)
length(i)=index(path(i),' ')-1
+
+ if (verbosity.gt.0) then
+ print*, 'path read', i, '=', path(i)
+ end if
+ end do
+
+
+ do i=1,numpath
+
string_test = path(i)
character_test = string_test(length(i):length(i))
!print*, 'character_test, string_test ', character_test, string_test
if ((character_test .NE. '/') .AND. (i .LT. 4)) then
- print*, 'WARNING: path not ending in /'
+ print*, 'readpaths> WARNING: path not ending in /'
print*, path(i)
path(i) = string_test(1:length(i)) // '/'
length(i)=length(i)+1
print*, 'fix: padded with /'
print*, path(i)
- print*, 'length(i) increased 1'
+ print*, 'length(i) increased 1', length(i)
endif
- end do
+
+ end do
+
+
! Check whether any nested subdomains are to be used
!***************************************************
@@ -94,9 +106,18 @@ subroutine readpaths !(pathfile)
30 numbnests=i-1
+ if (verbosity.gt.0) then
+ do i=1,numpath
+ print*, 'path tested', i, '=', path(i)
+ end do
+ end if
+
close(unitpath)
return
+
+
+
998 write(*,*) ' #### TRAJECTORY MODEL ERROR! ERROR WHILE #### '
write(*,*) ' #### READING FILE PATHNAMES. #### '
stop
--
GitLab