several small changes

jalessandri · Oct 17, 2019 · 58fab1d · 58fab1d
1 parent e1dcae7
commit 58fab1d
Show file tree

Hide file tree

Showing 16 changed files with 101 additions and 379 deletions.
diff --git a/COMMIT b/COMMIT
@@ -1,5 +1,32 @@
 ============================================================
 
+Thu Oct 17 16:36:54 CEST 2019
+
+several small changes
+
+ Makefile                  |   2 +-
+ Rules.make                |   2 +-
+ fem3d/submeteo2.f         |  18 +++-
+ fem3d/subqfxt.f           |   5 +
+ fem3d/subshy.f            |   5 +
+ fem3d/subshyutil.f        |  32 ++++++
+ fem3d/subsys.f            |  13 ++-
+ fembfm/BFM0D.F90          | 247 ----------------------------------------------
+ fembfm/README             |   7 --
+ fembfm/bfm_compile.sh     |  82 ---------------
+ fembfm/bfm_insert.pl      |  29 ------
+ femcheck/rules/Rules.dist |   2 +-
+ femdoc/final/shyfem.pdf   | Bin 305436 -> 305980 bytes
+ femdoc/git.tex            |   7 +-
+ 14 files changed, 72 insertions(+), 379 deletions(-)
+ deleted:
+    fembfm/BFM0D.F90
+    fembfm/README
+    fembfm/bfm_compile.sh
+    fembfm/bfm_insert.pl
+
+============================================================
+
 Thu Oct 17 11:57:38 CEST 2019
 
 new framework for BFM model

diff --git a/Makefile b/Makefile
@@ -116,7 +116,7 @@ fem: checkv directories links test_executable
 	@femcheck/check_compilation.sh -quiet
 
 bfm_compile:
-	@fembfm/bfm_compile.sh $(BFMDIR)
+	@fembfm1/bfm_compile.sh $(BFMDIR)
 
 nograph: checkv directories links test_executable
 	@$(FEMBIN)/recursivemake fem $(FEMNOGRAPH)

diff --git a/Rules.make b/Rules.make
@@ -200,7 +200,7 @@ ECOLOGICAL = NONE
 #   4) unpack in a directory of your choice
 #   5) specify this directory in BFMDIR below
 #   6) run "make bfm_compile"
-# if everything SHYFEM can be compiled with BFM support:
+# if everything is ok, SHYFEM can be compiled with BFM support:
 #   "make fem"
 #   
 ##############################################

diff --git a/VERSION b/VERSION
@@ -1,5 +1,7 @@
 version  7_5_64    19-07-2019    VERS_7_5_64   commit_2019-10-17
 
+version  7_5_64    19-07-2019    VERS_7_5_64   commit_2019-10-17
+
 version  7_5_64    19-07-2019    VERS_7_5_64   commit_2019-10-01
 
 version  7_5_64    19-07-2019    VERS_7_5_64   commit_2019-09-27

diff --git a/fem3d/submeteo2.f b/fem3d/submeteo2.f
@@ -88,6 +88,7 @@
 c 27.12.2018	ggu	changed VERS_7_5_54
 c 16.02.2019	ggu	changed VERS_7_5_60
 c 13.03.2019	ggu	changed VERS_7_5_61
+c 17.10.2019	ggu	check number of meteo variables written
 c
 c notes :
 c
@@ -478,10 +479,11 @@ subroutine output_meteo_data
 
 	use mod_meteo
 
-	integer id
-	integer,save :: nvar = 1
-	double precision dtime
-	logical, save :: b2d = .true.
+	integer			:: id
+	integer			:: nvar_act
+	double precision 	:: dtime
+	integer, parameter	:: nvar = 1
+	logical, save 		:: b2d = .true.
 
 	logical has_output_d,next_output_d
 
@@ -501,8 +503,16 @@ subroutine output_meteo_data
 	call get_act_dtime(dtime)
         id = nint(da_met(4))
 
+	call shy_reset_nvar_act(id)
         call shy_write_scalar_record2d(id,dtime,85,metice)
 	!call shy_write_scalar_record2d(id,dtime,28,metws)
+	call shy_get_nvar_act(id,nvar_act)
+
+	if( nvar /= nvar_act ) then
+	  write(6,*) 'nvar,nvar_act: ',nvar,nvar_act
+	  write(6,*) 'number of variables written differs from nvar'
+	  stop 'error stop output_meteo_data: nvar /= nvar_act'
+	end if
 
 	end subroutine output_meteo_data
 

diff --git a/fem3d/subqfxt.f b/fem3d/subqfxt.f
@@ -261,6 +261,11 @@ subroutine qflux3d(dtime,dt,nkn,nlvddi,temp,dq)
 c		0. ->	everything is absorbed in first layer
 c botabs	1. ->	bottom absorbs remaining radiation
 c		0. ->	everything is absorbed in last layer
+c---------------------------------------------------------
+c format of heat file containing time series (4 data columns):
+c    time srad airt rhum cc
+c in case of iheat==7 the columns are:
+c    time srad qsens qlat qlong
 c---------------------------------------------------------
 
 	baverevap = .false.

diff --git a/fem3d/subshy.f b/fem3d/subshy.f
@@ -55,6 +55,7 @@
 ! 13.03.2019	ggu	changed VERS_7_5_61
 ! 12.07.2019	ggu	some changes to shy_info()
 ! 13.09.2019	ggu	error handling in shy_peek_record
+! 17.10.2019	ggu	introduced nvar_act
 !
 !**************************************************************
 !**************************************************************
@@ -102,6 +103,7 @@ module shyfile
 	  character*80 :: filename
 	  logical :: is_allocated
 	  logical :: is_opened
+	  integer :: nvar_act		!number of actually written records
 	end type entry
 
 	integer, save, private :: idlast = 0
@@ -185,6 +187,7 @@ subroutine shy_init_id(id)
 	pentry(id)%filename = ' '
 	pentry(id)%is_allocated = .false.
 	pentry(id)%is_opened = .false.
+	pentry(id)%nvar_act = 0
 
 	end subroutine shy_init_id
 
@@ -1362,6 +1365,8 @@ subroutine shy_write_record(id,dtime,ivar,n,m,lmax,nlvddi,c,ierr)
      +			,i=1,n*m )
 	end if
 
+	pentry(id)%nvar_act = pentry(id)%nvar_act + 1
+
 	if( b3d ) deallocate(il)
 
 	end subroutine shy_write_record

diff --git a/fem3d/subshyutil.f b/fem3d/subshyutil.f
@@ -55,6 +55,7 @@
 ! 13.03.2019	ggu	changed VERS_7_5_61
 ! 12.07.2019	ggu	some comments for shy_write_scalar_record()
 ! 27.09.2019	ggu	some lines commented for hydro output (HYD1)
+! 17.10.2019	ggu	routines to check number of variables written (nvar_act)
 !
 ! notes :
 !
@@ -964,6 +965,37 @@ subroutine shy_write_hydro_records(id,dtime,nlvddi,z,ze,u,v)
 
 	end
 
+!****************************************************************
+!****************************************************************
+!****************************************************************
+
+	subroutine shy_reset_nvar_act(id)
+
+	use shyfile
+
+	implicit none
+
+	integer id
+
+	pentry(id)%nvar_act = 0
+
+	end
+
+!****************************************************************
+
+	subroutine shy_get_nvar_act(id,nvar_act)
+
+	use shyfile
+
+	implicit none
+
+	integer id
+	integer nvar_act
+
+	nvar_act = pentry(id)%nvar_act
+
+	end
+
 !****************************************************************
 ! next two debug routines to be deleted later
 !****************************************************************

diff --git a/fem3d/subsys.f b/fem3d/subsys.f
@@ -680,9 +680,13 @@ subroutine nlsinh_general
 c		\item[4] Following Dejak
 c		\item[5] As in the GOTM model
 c		\item[6] Using the COARE3.0 module
-c		\item[7] Read  sensible, latent and longwave fluxes from file
+c		\item[7] Read sensible, latent and longwave fluxes from file
+c		\item[7] Read heat fluxes directly from file. The columns
+c		in the data file must be "time srad qsens qlat qlong".
 c		\item[8] Heat fluxes as Pettenuzzo et al., 2010
 c		\end{description}
+c		Except when |iheat| is 7, the time series file has
+c		the columns "time srad airt rhum cc".
 
 	call addpar('iheat',1.)		!type of heat flux routine
 
@@ -1520,16 +1524,17 @@ subroutine nlsinh_waves
 c DOCS  START   P_wave
 c
 c The following parameters activate the wind wave module and define
-c which kind of wind wave model has to be used.
-!c |waves|      Wave module section name.
+c which kind of wind wave model has to be used. These parameters must
+c be in section |waves|.
 
         call sctpar('waves')             !sets waves section
         call sctfnm('waves')
 
 c |iwave|	Type of wind wave model and coupling procedure (default 0):
 c		\begin{description}
 c		\item[0] No wind wave model called 
-c		\item[1] The parametric wind wave model is called (see file subwave.f)
+c		\item[1] The parametric wind wave model is called 
+c		(see file subwave.f)
 c		\item[$>$1] The spectral wind wave model WWMIII is called
 c		\item[2] ... wind from SHYFEM, radiation stress formulation
 c		\item[3] ... wind from SHYFEM, vortex force formulation