ice, other minor changes

jalessandri · Apr 30, 2015 · 162997b · 162997b
1 parent 28b1622
commit 162997b
Show file tree

Hide file tree

Showing 39 changed files with 534 additions and 2,018 deletions.
diff --git a/COMMIT b/COMMIT
@@ -1,5 +1,52 @@
 ============================================================
 
+Thu Apr 30 15:01:41 CEST 2015
+
+ice, other minor changes
+
+ LOG                      |   24 ++
+ RELEASE_NOTES            |    7 +
+ fem3d/Makefile           |   15 +-
+ fem3d/lagrange_connect.f |  634 +--------------------------------
+ fem3d/lagrange_connect.h |   63 +----
+ fem3d/lagrange_larve.h   |   57 ---
+ fem3d/lagrange_main.f    |    8 +-
+ fem3d/meteo.h            |    3 +
+ fem3d/newini.f           |    6 +
+ fem3d/newnohydro.f       |  905 +---------------------------------------------
+ fem3d/nonhydro_pard.f    |   82 +----
+ fem3d/nonhydro_spk.f     |  157 --------
+ fem3d/nosinf.f           |   92 +++--
+ fem3d/ousaver.f          |    2 +-
+ fem3d/ousextr_cat.f      |   23 +-
+ fem3d/ousutil.f          |   64 ++++
+ fem3d/param.h            |    6 +-
+ fem3d/subapn.f           |  111 +++++--
+ fem3d/subfil.f           |   15 +-
+ fem3d/submet.f           |   10 +-
+ fem3d/submeteo2.f        |  124 ++++++-
+ fem3d/subn35.f           |   13 +-
+ fem3d/subous.f           |    2 +-
+ fem3d/subqfxt.f          |    2 +-
+ fem3d/subsys.f           |    3 +
+ fem3d/subtime.f          |    1 +
+ fem3d/subuti.f           |   26 +-
+ fem3d/subwrt.f           |    1 +
+ fem3d/vp.f               |    2 +-
+ femadj/param.h           |    6 +-
+ fembin/aver              |    5 +-
+ fembin/average           |    1 +
+ fembin/gp                |   21 +-
+ femdoc/final/shyfem.pdf  |  Bin 293716 -> 293784 bytes
+ femdoc/final/shyfem.ps   |  203 ++++++-----
+ femplot/param.h          |    6 +-
+ param.h                  |    6 +-
+ 37 files changed, 588 insertions(+), 2118 deletions(-)
+ deleted:
+    fem3d/lagrange_larve.h
+
+============================================================
+
 Thu Apr 23 15:44:45 CEST 2015
 
 New version 7_1_8

diff --git a/LOG b/LOG
@@ -1,4 +1,28 @@
 
+30.04.2015
+
+c ./fem3d/submeteo2.f:
+c 30.04.2015    ggu     ice integrated
+c
+c ./fem3d/submet.f:
+c 30.04.2015    ggu     ice cover implemented
+c
+c ./fem3d/subn35.f:
+c 28.04.2015    ggu     czdef is default for all areas not given
+c
+c ./fem3d/ousextr_cat.f:
+c 29.04.2015    ggu     mode 1 implemented
+c
+c ./fem3d/ousutil.f:
+c 29.04.2015    ggu     new helper routines for start/end time in file
+c
+c ./fem3d/subuti.f:
+c 29.04.2015    ggu     energy now in Joule
+c
+c ./fem3d/subapn.f:
+c 29.04.2015    ggu     generic changes - now works as anticipated
+
+
 23.04.2015
 
 lagrangian 3d

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
@@ -1,4 +1,11 @@
 
+30.04.2015    VERS_7_1_9
+
+	ice cover integrated
+	czdef default friction for all areas not given
+	minor changes
+	post processing - new initialization
+
 23.04.2015    VERS_7_1_8
 
 	lagrangian 3d finished !!!!

diff --git a/VERSION b/VERSION
@@ -1,3 +1,5 @@
+version  7_1_8    23-04-2015    VERS_7_1_8   commit_2015-04-30
+
 version  7_1_8    23-04-2015    VERS_7_1_8
 
 ========================================================== 23-04-2015 - 7_1_8

diff --git a/fem3d/Makefile b/fem3d/Makefile
@@ -839,8 +839,6 @@ ht.o: internal.h ts.h evmain.h nudging.h tides.h nbasin.h \
 intp.o: nbasin.h hydro.h param_dummy.h
 lagrange_back.o: depth.h nbasin.h hydro.h param.h basin.h \
 		hydro_print.h lagrange.h 
-lagrange_connect.o: depth.h nbasin.h param.h femtime.h lagrange.h \
-		lagrange_connect.h 
 lagrange_cont.o: param.h links.h basin.h lagrange.h
 lagrange_decay.o: param.h femtime.h lagrange.h
 lagrange_dif.o: param.h femtime.h lagrange.h
@@ -904,10 +902,6 @@ newfix.o: depth.h hydro_vel.h hydro.h internal.h param.h \
 newini.o: depth.h hydro.h internal.h param.h mkonst.h nlevel.h \
 		pkonst.h nbasin.h levels.h roughness.h basin.h \
 		diff_visc_fric.h 
-newnohydro.o: depth.h internal.h nlevel.h ev.h nohyd.h nbasin.h \
-		nohydlinks.h diff_visc_fric.h hydro_vel.h param.h \
-		hydro.h femtime.h pkonst.h levels.h links.h area.h \
-		basin.h hydro_print.h 
 newnudge.o: hydro.h param.h nudge.h femtime.h basin.h nudging.h
 newrog.o: param_dummy.h basin.h
 newsig.o: param_dummy.h levels.h nlevel.h
@@ -918,10 +912,6 @@ newtra.o: depth.h hydro_vel.h hydro.h param.h ev.h nlevel.h \
 		basin.h hydro_print.h aux_array.h 
 newtvd.o: depth.h hydro_vel.h param.h ev.h tvd.h levels.h basin.h \
 		hydro_print.h 
-nonhydro_pard.o: param.h param_dummy.h nohydlinks.h common.h \
-		levels.h nkonst.h nlevel.h 
-nonhydro_spk.o: param.h nohydlinks.h levels.h basin.h nlevel.h \
-		nohyd.h 
 nos2nc.o: depth.h hydro.h param.h levels.h evmain.h basin.h
 nos_elab.o: param.h basin.h
 nosadmin.o: param.h
@@ -1106,8 +1096,9 @@ 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 pkonst.h geom_dynamic.h \
-		levels.h hydro_baro.h basin.h links.h 
+subuti.o: depth.h hydro.h param.h ts.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 \