prepared for new release

jalessandri · May 21, 2019 · 6faf7c6 · 6faf7c6
1 parent cc422f4
commit 6faf7c6
Show file tree

Hide file tree

Showing 7 changed files with 126 additions and 10 deletions.
diff --git a/COMMIT b/COMMIT
@@ -1,5 +1,18 @@
 ============================================================
 
+Tue May 21 15:25:26 CEST 2019
+
+prepared for new release
+
+ LOG                     |  87 ++++++++++++++++++++++++++++++++++++++++++++++++
+ RELEASE_NOTES           |  11 ++++++
+ fem3d/subfemintp.f      |  16 +++++----
+ fem3d/subver.f          |   7 ++--
+ femdoc/final/shyfem.pdf | Bin 305579 -> 305577 bytes
+ 5 files changed, 111 insertions(+), 10 deletions(-)
+
+============================================================
+
 Tue May 21 10:53:03 CEST 2019
 
 still more on revision log programs

diff --git a/LOG b/LOG
@@ -1,4 +1,91 @@
 
+21.05.2019
+
+c ./femplot/colutils.f:
+! 13.03.2019    ggu     changed VERS_7_5_61
+c ./femplot/suplin.f:
+c 16.05.2019    ggu     wrong call to insert_between_layers()
+c
+c ./femplot/supiso.f:
+c 14.03.2019    ggu     allow for plotting constant element value
+c
+c ./fem3d/rstinf.f:
+! 03.05.2019    ggu     adapted
+c
+c ./fem3d/elab_nc.f:
+! 14.05.2019    ggu     changes in nc_output_record()
+! 16.05.2019    ggu     new aux variable to write nc_records (rncaux)
+! 16.05.2019    ggu     also hydro output fixed
+c
+c ./fem3d/femelab1.f:
+! 24.04.2019    ggu     write also fem file for extracted node
+! 24.04.2019    ggu     correct regpar if lon > 180
+c
+c ./fem3d/subreg.f:
+c 14.05.2019	ggu	in fm_extra_setup() use double precision
+c
+c ./fem3d/shyelab_output.f:
+! 14.05.2019    ggu     for nc_output use interpolated values, allow ivar=1
+! 16.05.2019    ggu     write regular grid information
+!
+c ./fem3d/subclo.f:
+! 15.05.2019    ggu     nicer error reporting
+!
+c ./fem3d/new3di.f:
+c 16.04.2019    ggu	introduced rcomputev for excluding elements (rcomp)
+c
+c ./fem3d/mod_arrays.f:
+! 14.03.2019	ggu	written from scratch
+! 12.04.2019	ggu	added double precision
+c ./fem3d/rst2shy.f:
+! 03.05.2019    ggu     written from rstinf.f
+c
+c ./fem3d/gotm3d.f:
+! 13.03.2019	ggu	changed VERS_7_5_61
+c ./fem3d/elab_regular.f:
+! 16.05.2019    ggu     new routine fem_reg_print()
+c
+c ./fem3d/bc2fem.f:
+! 13.03.2019	ggu	changed VERS_7_5_61
+c
+c ./fem3d/tselab1.f:
+! 15.05.2019	ggu	new option -date0
+! 16.05.2019	ggu	use sdate0 for date string
+c
+c ./fem3d/subcus.f:
+c 16.04.2019	ggu	small changes in close_inlets1() (bfill)
+c
+c ./fem3d/shyelab_extract.f:
+! 24.04.2019    ggu     written from scratch
+!
+c ./fem3d/nc2fem.f:
+! 23.04.2019    ggu     bug fix in parse_strings - n was changed
+!
+c ./fem3d/subrst.f:
+! 03.05.2019    ggu     return iconz in rst_skip_record()
+! 03.05.2019    ggu     new routine to check if rst file (rst_is_rst_file)
+!
+c ./fem3d/netcdf.f:
+c 14.05.2019    ggu	wrong definition of dimensions in nc_write_data_3d_reg
+c 16.05.2019    ggu	new version of nc_rewrite_3d_reg(), new nc_set_quiet()
+c
+c ./fem3d/mod_internal.f:
+! 11.04.2019	ggu	added rcomputev
+c ./fem3d/subdef.f:
+c 03.05.2019    ggu     new routines to get extension and name
+c
+c ./fem3d/newclose.f:
+! 14.03.2019	ggu	re-written for new framework
+! 12.04.2019	ggu	first finished draft
+! 17.04.2019	ggu	tested on old venlag62
+!
+c ./fem3d/subwrt.f:
+c 29.04.2019	ggu	fix computation for too low concentrations (climit)
+c
+c ./fem3d/elabutil.f:
+! 15.05.2019	ggu	new option -date0 (sdate0)
+
+
 13.03.2019
 
 c ./femplot/supsim.f:

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,4 +1,15 @@
 
+21.05.2019	VERS_7_5_62
+
+	various bug fixes in plotting(suplin.f,supiso.f)
+	output to nc files upgraded
+	some bug fixes in netcdf.f
+	in fm_extra_setup() use double precision
+	in new3di,mod_internal.f introduced rcomputev excluding elements (rcomp)
+	new application rst2shy
+	new file newclose.f
+	in subwrt.f fix problem with too low concentration
+
 13.03.2019	VERS_7_5_61
 
 	new routines for tidal potential

diff --git a/VERSION b/VERSION
@@ -1,5 +1,7 @@
 version  7_5_61    13-03-2019    VERS_7_5_61   commit_2019-05-21
 
+version  7_5_61    13-03-2019    VERS_7_5_61   commit_2019-05-21
+
 version  7_5_61    13-03-2019    VERS_7_5_61   commit_2019-05-19
 
 version  7_5_61    13-03-2019    VERS_7_5_61   commit_2019-05-18

diff --git a/fem3d/subfemintp.f b/fem3d/subfemintp.f
@@ -301,14 +301,16 @@ subroutine iff_close_file(id)
 
 	integer iunit
 
-	iunit = pinfo(id)%iunit
-	!write(6,*) 'iff_close_file: ',id,iunit
+        iunit = pinfo(id)%iunit
+        if( iunit <= 0 ) return
+
+        !write(6,*) 'iff_close_file: ',id,iunit
+
+        pinfo(id)%iformat = iform_closed
+        pinfo(id)%iunit = -2
+        call iff_allocate_file_arrays(id,0,0,0)
 
-	pinfo(id)%iformat = iform_closed
-	call iff_allocate_file_arrays(id,0,0,0)
-	!write(6,*) 'iff_close_file: ',id,iunit
-	close(iunit)
-	pinfo(id)%iunit = -2
+        close(iunit)
 
 	end subroutine iff_close_file
 

diff --git a/fem3d/subver.f b/fem3d/subver.f
@@ -361,6 +361,7 @@
 c 14.02.2019	ggu	version 7.5.55	San Valentine's release '
 c 16.02.2019	ggu	version 7.5.60	copyrighted release
 c 13.03.2019	ggu	version 7.5.61
+c 21.05.2019	ggu	version 7.5.62
 c
 c*****************************************************************
 
@@ -370,15 +371,15 @@ module shyfem_version
 
 c DOCS	START	P_version
 c
-c \newcommand{\VERSION}{7.5.61}
-c \newcommand{\version}{7\_5\_61}
+c \newcommand{\VERSION}{7.5.62}
+c \newcommand{\version}{7\_5\_62}
 c \newcommand{\COMMIT}{2019-05-21}
 c
 c DOCS	END
 
         implicit none
 
-        character*10, parameter :: version = '7.5.61'
+        character*10, parameter :: version = '7.5.62'
         character*10, parameter :: commit  = '2019-05-21'
         character*17, parameter :: text    = 'SHYFEM VERSION = '
 

diff --git a/femdoc/final/shyfem.pdf b/femdoc/final/shyfem.pdf