intermediate version

jalessandri · Apr 1, 2015 · c5799fd · c5799fd
1 parent ce75f32
commit c5799fd
Show file tree

Hide file tree

Showing 44 changed files with 1,572 additions and 126 deletions.
diff --git a/COMMIT b/COMMIT
@@ -1,5 +1,60 @@
 ============================================================
 
+Wed Apr  1 18:59:03 CEST 2015
+
+intermediate version
+
+ LOG                       |   20 +++
+ RELEASE_NOTES             |    4 +
+ fem3d/Makefile            |   16 ++-
+ fem3d/basin.h             |    2 +-
+ fem3d/basproj.f           |   20 ++--
+ fem3d/grd_extra.h         |    7 +-
+ fem3d/lagrange.h          |    9 ++
+ fem3d/lagrange_back.f     |   14 ++-
+ fem3d/lagrange_connect.h  |    4 +-
+ fem3d/lagrange_cont.f     |    3 +-
+ fem3d/lagrange_inout.f    |    1 +
+ fem3d/lagrange_main.f     |  148 ++++++++++++++++++++-
+ fem3d/lagrange_track.f    |  317 ++++++++++++++++++++++++++++++++++++++-------
+ fem3d/lagrange_vertical.f |  219 +++++++++++++++++++++++++++++++
+ fem3d/newconz.f           |    7 +-
+ fem3d/nos_elab.f          |    3 +
+ fem3d/nosaver_time.f      |   10 +-
+ fem3d/nosutil.f           |    1 +
+ fem3d/param.h             |    2 +-
+ fem3d/subbas.f            |    5 +
+ fem3d/subdts.f            |    3 +-
+ fem3d/subfemintp.f        |    3 +-
+ fem3d/subnev.f            |   68 ++++++++++
+ fem3d/subnsh.f            |    3 +-
+ fem3d/suboff.f            |    8 +-
+ fem3d/subsys.f            |    2 +-
+ fem3d/subuti.f            |    9 +-
+ fem3d/subwrt.f            |  149 +++++++++++++++++++--
+ fem3d/subxi.f             |  237 +++++++++++++++++++++++++++++++++
+ femadj/param.h            |    2 +-
+ femanim/Makefile          |   10 +-
+ fembin/cleansim.sh        |   15 ++
+ fembin/clo.sh             |   31 ++++-
+ fembin/plots              |    6 +-
+ femdoc/final/shyfem.pdf   |  Bin 293719 -> 293718 bytes
+ femdoc/final/shyfem.ps    |   30 ++--
+ femplot/Makefile          |    3 +
+ femplot/lagxitest.f       |  266 +++++++++++++++++++++++++++++++++++++
+ femplot/param.h           |    2 +-
+ femplot/supano.f          |    6 +-
+ femplot/supout.f          |    4 +-
+ param.h                   |    2 +-
+ 42 files changed, 1530 insertions(+), 141 deletions(-)
+ new file:
+   fem3d/lagrange_vertical.f
+   fem3d/subxi.f
+   fembin/cleansim.sh
+   femplot/lagxitest.f
+
+============================================================
+
 Thu Feb 26 18:42:10 CET 2015
 
 New version 7_1_6

diff --git a/LOG b/LOG
@@ -1,4 +1,24 @@
 
+01.04.2015
+
+intermediate version
+
+c ./fem3d/tmp/javier/subwrt.f:
+c 11.03.2015    ggu     introduced bstop, if early stop, write to file
+c
+c ./fem3d/subdts.f:
+c 31.03.2015    ggu     bug fix - month was 71/2, now 61/2
+c
+c ./fem3d/subnev.f:
+c 31.03.2015    ggu     new routines for internal coordinates
+c
+c ./fem3d/subwrt.f:
+c 31.03.2015    ggu     compute res time for different areas
+c
+c ./fem3d/subbas.f:
+c 31.03.2015    ggu     set iarnv on read
+
+
 27.02.2015
 
 aquabc_II added

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,4 +1,8 @@
 
+01.04.2015    VERS_7_1_7
+
+	intermediate version (3D lagrangian not finished)
+
 27.02.2015    VERS_7_1_6
 
 	new version of aquabc_II integrated

diff --git a/VERSION b/VERSION
@@ -1,3 +1,5 @@
+version  7_1_6    26-02-2015    VERS_7_1_6   commit_2015-04-01
+
 version  7_1_6    26-02-2015    VERS_7_1_6
 
 ========================================================== 26-02-2015 - 7_1_6

diff --git a/fem3d/Makefile b/fem3d/Makefile
@@ -156,7 +156,7 @@ SOBJS   = \
 	  debug.o subhisto.o subnosa.o subfvl.o \
 	  subeos.o sigmautil.o \
 	  nosutil.o ousutil.o subfemfile.o subvintp.o \
-	  genutil.o subfemintp.o subtsfile.o
+	  genutil.o subfemintp.o subtsfile.o subxi.o
 
 # general objects for 3D model ht
 
@@ -253,7 +253,7 @@ LAGRANGE =	lagrange_main.o \
 		lagrange_larve.o lagrange_flux.o \
 		lagrange_track.o lagrange_util_tr.o \
 		lagrange_decay.o \
-		lagrange_connect.o
+		lagrange_connect.o lagrange_vertical.o
 
 # heat flux module
 
@@ -851,9 +851,12 @@ lagrange_larve.o: param.h lagrange.h
 lagrange_main.o: nbasin.h param.h basin.h femtime.h lagrange.h
 lagrange_oil.o: nbasin.h param.h femtime.h ev.h lagrange.h \
 		aux_array.h 
-lagrange_track.o: hydro_vel.h param.h basin.h lagrange.h geom.h
+lagrange_track.o: hydro_vel.h param.h levels.h basin.h nlevel.h \
+		lagrange.h geom.h 
 lagrange_util.o: nbasin.h param_dummy.h ev.h basin.h
 lagrange_util_tr.o: param_dummy.h basin.h
+lagrange_vertical.o: depth.h hydro_vel.h hydro.h param.h levels.h \
+		basin.h 
 lgrelab.o: nbasin.h depth.h param.h basin.h
 lgrinf.o: param.h
 loading.o: nbasin.h param.h levels.h
@@ -1101,9 +1104,8 @@ subtime.o: femtime.h
 subtrace.o: hydro_vel.h hydro.h param.h femtime.h geom_dynamic.h \
 		hydro_baro.h levels.h basin.h 
 subtsuvfile.o: intp_fem_file.mod param.h
-subuti.o: depth.h hydro.h param.h ev.h nbasin.h pkonst.h \
-		geom_dynamic.h levels.h hydro_baro.h basin.h \
-		links.h 
+subuti.o: depth.h hydro.h param.h ev.h pkonst.h geom_dynamic.h \
+		levels.h hydro_baro.h basin.h links.h 
 subvola.o: param_dummy.h femtime.h nbasin.h volcomp.h modules.h \
 		basin.h geom.h aux_array.h 
 subwat.o: nbasin.h hydro.h param_dummy.h levels.h links.h ev.h \
@@ -1112,7 +1114,7 @@ subwaves.o: depth.h internal.h evmain.h nlevel.h nbasin.h meteo.h \
 		roughness.h geom.h aux_array.h waves.h hydro_vel.h \
 		param.h hydro.h femtime.h pkonst.h hydro_baro.h \
 		levels.h meteo_aux.h basin.h 
-subwrt.o: depth.h conz.h param.h nlevel.h femtime.h simul.h \
+subwrt.o: depth.h conz.h param.h ev.h nlevel.h femtime.h simul.h \
 		nbasin.h levels.h basin.h aux_array.h 
 tideg.o: depth.h nbasin.h pkonst.h hydro.h param.h basin.h tides.h
 ts2nc.o: depth.h hydro.h param.h levels.h basin.h evmain.h simul.h

diff --git a/fem3d/basin.h b/fem3d/basin.h
@@ -31,7 +31,7 @@ c include file if basin (BAS) is read
         common /ipev/ipev, /ipv/ipv
         integer iarv(neldim)
         common /iarv/iarv
-        integer iarnv(neldim)
+        integer iarnv(nkndim)
         common /iarnv/iarnv
 	save /nen3v/,/ipev/,/ipv/,/iarv/,/iarnv/
 
diff --git a/fem3d/basproj.f b/fem3d/basproj.f
@@ -83,11 +83,13 @@ program basproj
 
 c Klaipeda
 
-c	iproj = 4		     !UTM Lithuania
-c        c_param(1) = 24.             !longitude of origin (lon0)
-c        c_param(2) = -500000.        !false easting
-c        c_param(3) = 0.              !false northing
-c        c_param(4) = 0.9998          !scale factor
+	iproj = 4		     !UTM Lithuania
+        c_param(1) = 24.             !longitude of origin (lon0)
+        c_param(2) = -500000.        !false easting
+        c_param(3) = 0.              !false northing
+        c_param(2) = -220000.        !false easting
+        c_param(3) = +6100000.              !false northing
+        c_param(4) = 0.9998          !scale factor
 
 c ??
 
@@ -105,10 +107,10 @@ program basproj
 
 c Laguna di Marano-Grado
 
-	iproj = 1		     !Gauss-Boaga
-        c_param(1) = 2.              !fuse
-        c_param(2) = 0.              !shift in x
-        c_param(3) = 0.              !shift in y
+c	iproj = 1		     !Gauss-Boaga
+c        c_param(1) = 2.              !fuse
+c        c_param(2) = 0.              !shift in x
+c        c_param(3) = 0.              !shift in y
 
 c Turkey lake for Ali
 

diff --git a/fem3d/grd_extra.h b/fem3d/grd_extra.h
@@ -10,7 +10,7 @@ c extra data structure for grd files
 	integer nli			!number of lines read
 	integer iplv(nlidim)		!external line numbers
 
-	integer iarnv(nkndim)		!types for nodes
+	!integer iarnv(nkndim)		!types for nodes
 	integer iarlv(nkndim)		!types for lines
 
 	real hllv(nlidim)		!depth of lines
@@ -20,11 +20,12 @@ c extra data structure for grd files
 
 	common /nli/nli
 	common /iplv/iplv
-	common /iarnv/iarnv
+	!common /iarnv/iarnv
 	common /iarlv/iarlv
 	common /hllv/hllv
 	common /ipntlv/ipntlv
 	common /inodlv/inodlv
 
-	save /nli/,/iplv/,/iarnv/,/iarlv/,/hllv/,/ipntlv/,/inodlv/
+	!save /nli/,/iplv/,/iarnv/,/iarlv/,/hllv/,/ipntlv/,/inodlv/
+	save /nli/,/iplv/,/iarlv/,/hllv/,/ipntlv/,/inodlv/
 
diff --git a/fem3d/lagrange.h b/fem3d/lagrange.h
@@ -15,6 +15,9 @@ c******************************************************************
 
 c-------------------------------------------------- main variables
 
+	logical bsurf				!particle only in surface layer
+	parameter ( bsurf = .true. )
+
         integer nbdy				!total number of particles
         integer idbdy				!max id used
         integer lunit				!unit for messages
@@ -35,6 +38,9 @@ c-------------------------------------------------- main variables
         integer ie_body(nbdydim)		!element number
         common /ie_body/ie_body
 
+        integer l_body(nbdydim)			!layer
+        common /l_body/l_body
+
         real x_body(nbdydim)			!x-coordinate
         common /x_body/x_body
 
@@ -44,6 +50,9 @@ c-------------------------------------------------- main variables
 	real z_body(nbdydim)			!z-coordinate
 	common /z_body/z_body
 
+	double precision xi_body(3,nbdydim)	!internal coordinate
+	common /xi_body/xi_body
+
 	real tin(nbdydim)			!time of release
 	common /tin/tin
 

diff --git a/fem3d/lagrange_back.f b/fem3d/lagrange_back.f
@@ -73,21 +73,29 @@ subroutine drogue_back
         include 'param.h'
 	include 'lagrange.h'
 
-	integer i,ie,id
-	real x,y
+	integer i,ie,id,lb
+	real x,y,z
 	real dt,ttime
 
 	call get_timestep(dt)
 
         do i=1,nback
           x=x_back(i)
           y=y_back(i)
+          z=z_body(i)
+          lb=l_body(i)
+
           ie=ie_back(i)
 	  id = id_body(i)
+
 	  ttime=dt
-          call track_body(i,id,x,y,ie,ttime)
+          call track_body(i,id,x,y,z,lb,ie,ttime)
+
           x_back(i)=x
           y_back(i)=y
+          z_body(i)=z
+          l_body(i)=lb
+
           ie_back(i)=ie
         end do
 

diff --git a/fem3d/lagrange_connect.h b/fem3d/lagrange_connect.h
@@ -5,8 +5,8 @@ c include file for connectivity simulations
         parameter ( nconnect_dim = 50 )
 
         real lagr_connect_pps
-        parameter ( lagr_connect_pps = 1./3600. )
-        !parameter ( lagr_connect_pps = 0. )
+        !parameter ( lagr_connect_pps = 1./3600. )
+        parameter ( lagr_connect_pps = 0. )
 
         real r_connect_radius
         !parameter ( r_connect_radius = 2000. )

diff --git a/fem3d/lagrange_cont.f b/fem3d/lagrange_cont.f
@@ -207,7 +207,7 @@ subroutine lagr_continuous_release_pps_ppv
 	      else
 	        q = dist_node(k1,k2) / totdist
 	      end if
-	write(333,*) it,i,q
+	!write(333,*) it,i,q
 	      q = max(q,0.)
 	      rp = rp + q*pps*dt
 	      np = rp
@@ -372,6 +372,7 @@ subroutine release_on_point(ppts,ie,x,y,n)
 	do i=1,n
 	  rt = ggrand(77)			!vary time
 	  call insert_particle(ie,rt,x,y)
+	  !write(55,*) 'gguuyy particle: ',ie,rt,x,y
 	end do
 
 	end

diff --git a/fem3d/lagrange_inout.f b/fem3d/lagrange_inout.f
@@ -58,6 +58,7 @@ subroutine insert_particle(ie,rtime,x,y)
 	zst(nbdy) = z
 
         ie_body(nbdy)=ie
+        l_body(nbdy)=1
         x_body(nbdy)=x
         y_body(nbdy)=y
 	z_body(nbdy) = z