populate_string added to utils

SHYFEM-model · georgu · Apr 23, 2021 · Dec 21, 2020 · Mar 11, 2021 · Mar 24, 2021
commit 5c33fc90666c63f1aad6ba09b0affa96b24994a5
diff --git a/COMMIT b/COMMIT
@@ -1,5 +1,22 @@
 ============================================================
 
+Thu Apr 22 16:31:05 CEST 2021
+
+populate_string added to utils
+
+ fem3d/Makefile     | 5 +++--
+ fem3d/extelab1.f   | 2 ++
+ fem3d/femelab1.f   | 2 ++
+ fem3d/flxelab1.f   | 2 ++
+ fem3d/lgrelab.f    | 2 ++
+ fem3d/shyelab.f    | 2 ++
+ fem3d/shyelab1.f   | 2 ++
+ fem3d/substrings.f | 2 +-
+ fem3d/tselab1.f    | 2 ++
+ 9 files changed, 18 insertions(+), 3 deletions(-)
+
+============================================================
+
 Thu Apr 22 16:16:40 CEST 2021
 
 some errors fixed due to bounds check

diff --git a/VERSION b/VERSION
@@ -1,5 +1,7 @@
 version  7_5_70    19-05-2020    VERS_7_5_70   commit_2021-04-22
 
+version  7_5_70    19-05-2020    VERS_7_5_70   commit_2021-04-22
+
 version  7_5_70    19-05-2020    VERS_7_5_70   commit_2021-04-20
 
 version  7_5_70    19-05-2020    VERS_7_5_70   commit_2021-04-20

diff --git a/fem3d/Makefile b/fem3d/Makefile
@@ -535,8 +535,9 @@ EXEINFO  = rstinf rst2shy tselab \
 		femelab femelab2 \
 		femintp \
 		femtide \
-		shypart shyparts
-# also include femcombine
+		shypart shyparts \
+		femcombine
+
 EXESPLIT = 
 EXELAP   =  
 EXEBAS   = 

diff --git a/fem3d/extelab1.f b/fem3d/extelab1.f
@@ -152,6 +152,8 @@ subroutine extelab
 	call clo_get_next_file(file)
 	nin = ifileo(0,file,'unform','old')
 
+        call populate_strings
+
         call ext_is_ext_file(nin,nvers)
         if( nvers .le. 0 ) then
           write(6,*) 'nvers: ',nvers

diff --git a/fem3d/femelab1.f b/fem3d/femelab1.f
@@ -172,6 +172,8 @@ subroutine allocate_vars(nvar,np,lmax,hlv,hd,ilhkv
         call clo_get_next_file(infile)
 	if( infile .eq. ' ' ) stop
 
+        call populate_strings
+
 	np = 0
 	call fem_file_read_open(infile,np,iformat,iunit)
 	if( iunit .le. 0 ) stop

diff --git a/fem3d/flxelab1.f b/fem3d/flxelab1.f
@@ -135,6 +135,8 @@ subroutine flxelab
         call clo_get_next_file(file)
         nin = ifileo(0,file,'unform','old')
 
+        call populate_strings
+
         call flx_is_flx_file(nin,nvers)
         if( nvers .le. 0 ) then
           write(6,*) 'nvers: ',nvers

diff --git a/fem3d/lgrelab.f b/fem3d/lgrelab.f
@@ -85,6 +85,8 @@ program lgrelab
 	write(6,*) 'mtype,nvers: ',mtype,nvers
 	if( mtype .ne. 367265 ) stop 'error stop: mtype'
 
+	call populate_strings
+
 	allocate(ielems(0:3,nel))
 
 	do i=0,3

diff --git a/fem3d/shyelab.f b/fem3d/shyelab.f
@@ -63,6 +63,8 @@ program shyelab
 	call clo_get_last_file(file)
 	call check_file_type(file,type)
 
+	call populate_strings
+
 	if( type == 'NONE' ) then
 	  call elabutil_init('NONE','shyelab')
 	else if( type == 'NOTEXIST' ) then

diff --git a/fem3d/shyelab1.f b/fem3d/shyelab1.f
@@ -166,6 +166,8 @@ subroutine shyelab1
 
 	!call shympi_init(.false.)
 
+        call populate_strings
+
 	!--------------------------------------------------------------
 	! open input files
 	!--------------------------------------------------------------

diff --git a/fem3d/substrings.f b/fem3d/substrings.f
@@ -1082,7 +1082,7 @@ subroutine list_strings
 !****************************************************************
 !****************************************************************
 
-	recursive subroutine populate_strings
+	subroutine populate_strings
 
 ! populates string information
 !

diff --git a/fem3d/tselab1.f b/fem3d/tselab1.f
@@ -91,6 +91,8 @@ subroutine tselab
         call clo_get_next_file(infile)
 	if( infile .eq. ' ' ) stop
 
+        call populate_strings
+
         if( .not. check_ts_file(infile) ) then
           stop 'error stop tselab: not a valid time series file'
         end if