Skip to content

Commit

Permalink
new intermediate version
Browse files Browse the repository at this point in the history
  • Loading branch information
@georgu
georgu committed Jul 13, 2015
1 parent c72af4e commit 1ce091d
Show file tree
Hide file tree
Showing 40 changed files with 1,040 additions and 965 deletions.
50 changes: 50 additions & 0 deletions COMMIT
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,55 @@
============================================================

Mon Jul 13 18:04:55 CEST 2015

new intermediate version

fem3d/Makefile | 47 +++--
fem3d/bin/handle_common.sh | 2 +-
fem3d/bin/newsubst.pl | 16 ++-
fem3d/ht.f | 13 ++-
fem3d/new3di.f | 58 +++----
fem3d/newbcl.f | 129 +++++++-------
fem3d/newchk.f | 72 +++-----
fem3d/newcon.f | 9 +-
fem3d/newconz.f | 43 ++---
fem3d/newdum.f | 66 -------
fem3d/newdum_basin.f | 68 +++++++
fem3d/newdum_levels.f | 49 +++++
fem3d/newexpl.f | 53 ++----
fem3d/newfix.f | 14 +-
fem3d/newini.f | 92 ++++++++--
fem3d/newlevels.f | 150 +++------------
fem3d/newnudge.f | 10 +-
fem3d/newstab.f | 81 ++++----
fem3d/newtra.f | 12 +-
fem3d/newtvd.f | 70 ++++----
fem3d/param.h | 6 +-
fem3d/prep_fem3d.sh | 4 +-
fem3d/subgotm.f | 2 +
fem3d/subgrd.f | 118 ++++++------
fem3d/subnsh.f | 30 +++-
fem3d/suboff.f | 432 +++++++++++++++++++-------------------------
fem3d/subres.f | 38 ++--
fem3d/subtsuvfile.f | 15 +-
fem3d/subwrt.f | 168 ++++++++++-------
femadj/param.h | 6 +-
fembin/gitcommit | 1 +
fembin/mail_shyfem.sh | 26 ++--
femdoc/final/shyfem.pdf | Bin 294942 -> 294949 bytes
femdoc/final/shyfem.ps | 26 ++--
femplot/param.h | 6 +-
femplot/prep_femplot.sh | 40 ++++
femplot/supout.f | 1 -
param.h | 6 +-
38 files changed, 1001 insertions(+), 978 deletions(-)
new file:
fem3d/newdum_basin.f
fem3d/newdum_levels.f
femplot/prep_femplot.sh

============================================================

Fri Jul 10 17:24:56 CEST 2015

New version 7_1_50
Expand Down
2 changes: 2 additions & 0 deletions VERSION
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
version 7_1_50 10-07-2015 VERS_7_1_50 commit_2015-07-13

version 7_1_50 10-07-2015 VERS_7_1_50

========================================================== 10-07-2015 - 7_1_50
Expand Down
47 changes: 27 additions & 20 deletions fem3d/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,10 +134,11 @@ NEWOBJS = \
newini.o newtra.o \
newchao.o \
newcon.o newconz.o \
newchk.o newdum.o newdum1.o newfix.o \
newchk.o newfix.o \
newtvd.o newstab.o newsig.o \
newnudge.o \
$(MODULES)
$(MODULES) \
newdum.o newdum_basin.o newdum_levels.o

# objects for library

Expand Down Expand Up @@ -230,8 +231,9 @@ VPOBJS = \
subsrt.o subgrd.o \
subsss.o subscn.o subnsu.o \
subapn.o subnsa.o subnls.o subsys.o subdum.o \
grdutil.o \
newdum.o
grdutil.o newdum_basin.o \

#newdum.o

# objects for output routines

Expand All @@ -243,18 +245,20 @@ OUTOBJS = $(PARMOD) subnls.o subsss.o subscn.o \
debug.o subreg.o subnev.o \
subfemfile.o subtsfile.o \
subvintp.o subver.o sigmautil.o suboutput.o \
subclo.o newdum.o \
mod_depth.o mod_hydro.o mod_geom.o mod_hydro_print.o
subclo.o \
mod_depth.o mod_hydro.o mod_geom.o mod_hydro_print.o \
mod_bound_geom.o mod_bnd.o newlevels.o \
newdum.o newdum_basin.o newdum_levels.o

RSTOBJS = subrst.o ecological_dummy.o newlevels.o \
RSTOBJS = subrst.o ecological_dummy.o \
mod_ts.o mod_conz.o mod_hydro_vel.o mod_geom_dynamic.o

BASEXTRA = subgeo.o subgrd.o subsrt.o sublnka.o links.o sublnku.o \
subinterpol.o subinterpol1.o subnos.o

GENOBJS = newlevels.o
NOSOBJS = subnos.o nosutil.o genutil.o subeos.o newlevels.o
OUSOBJS = subous.o ousutil.o genutil.o newlevels.o
NOSOBJS = subnos.o nosutil.o genutil.o subeos.o
OUSOBJS = subous.o ousutil.o genutil.o
ETSOBJS = subets.o etsutil.o genutil.o subetsm.o
NOSOUSOBJS = subnos.o nosutil.o subous.o ousutil.o subets.o etsutil.o \
genutil.o
Expand Down Expand Up @@ -960,30 +964,31 @@ newconz.o: depth.h conz.h param.h bound_names.h ts.h nlevel.h \
newcra.o: depth.h hydro.h param.h bound_dynamic.h mkonst.h \
femtime.h ev.h pkonst.h hydro_baro.h basin.h \
bnd_aux.h
newdum.o: nbasin.h param.h nlevel.h bound_geom.h nbound.h
newdum.o: nbasin.h param.h bound_geom.h nbound.h
newdum1.o: param.h ../femlib/mod/levels.mod levels.h nlevel.h
newdum_basin.o: param.h
newdum_levels.o: param.h nlevel.h
newexpl.o: depth.h internal.h ts.h ev.h nlevel.h bound_geom.h \
nbasin.h diff_visc_fric.h aux_array.h geom.h \
hydro_vel.h param.h hydro.h pkonst.h levels.h \
geom_dynamic.h basin.h hydro_print.h
newfix.o: depth.h hydro_vel.h hydro.h internal.h param.h \
bound_names.h nlevel.h femtime.h bclfix.h nbasin.h \
levels.h geom_dynamic.h basin.h aux_array.h
geom_dynamic.h levels.h basin.h aux_array.h
newini.o: hydro.h internal.h param.h mkonst.h nlevel.h nbasin.h \
pkonst.h levels.h roughness.h basin.h \
diff_visc_fric.h
../femlib/mod/levels.mod: newlevels.o
newlevels.o: ../femlib/mod/nls.mod
../femlib/mod/mod_nudge.mod: newnudge.o
newnudge.o: hydro.h param.h nudge.h femtime.h basin.h nudging.h
newrog.o: param.h basin.h
newstab.o: conz.h param.h nlevel.h nbasin.h levels.h basin.h \
diff_visc_fric.h stab.h aux_array.h
newstab.o: nbasin.h conz.h param.h levels.h nlevel.h basin.h \
stab.h diff_visc_fric.h aux_array.h
newtra.o: depth.h hydro_vel.h hydro.h param.h nlevel.h ev.h \
nbasin.h geom_dynamic.h levels.h hydro_baro.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
newtvd.o: depth.h hydro_vel.h param.h nlevel.h ev.h tvd.h nbasin.h \
levels.h basin.h hydro_print.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
Expand Down Expand Up @@ -1150,11 +1155,12 @@ subnev_new.o: nbasin.h param.h basin.h
subnos.o: nosinf.h
subnosa.o: depth.h nbasin.h param.h
subnsa.o: param.h simul.h
subnsh.o: param.h semi.h nlevel.h femtime.h simul.h modules.h \
levels.h basin.h
subnsh.o: param.h semi.h nlevel.h femtime.h simul.h nbasin.h \
modules.h levels.h basin.h ../femlib/mod/nls.mod
subnsu.o: param.h basin.h
suboff.o: hydro_vel.h nbasin.h hydro.h param.h levels.h ts.h \
femtime.h hydro_print.h
../femlib/mod/mod_offline.mod: suboff.o
suboff.o: hydro_vel.h hydro.h param.h ts.h femtime.h nlevel.h \
nbasin.h levels.h hydro_print.h
subous.o: ousinf.h
subousa.o: depth.h hydro.h param.h nlevel.h femtime.h simul.h \
nbasin.h levels.h
Expand Down Expand Up @@ -1192,6 +1198,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
../femlib/mod/mod_renewal_time.mod: subwrt.o
subwrt.o: depth.h conz.h param.h ev.h nlevel.h femtime.h simul.h \
nbasin.h levels.h basin.h
tideg.o: depth.h nbasin.h pkonst.h hydro.h param.h basin.h tides.h
Expand Down
2 changes: 1 addition & 1 deletion fem3d/bin/handle_common.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
bindir=/home/georg/fem/fem3d/bin

what=$1
shift
[ -n "$what" ] && shift
files=$*

if [ -z "$files" ]; then
Expand Down
16 changes: 14 additions & 2 deletions fem3d/bin/newsubst.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1199,6 +1199,10 @@ sub inc2use {
include2use($fortran,"nbasin.h","basin","nkn,nel,ngr,mbw");
include2use($fortran,"levels.h","levels");
include2use($fortran,"nlevel.h","levels","nlvdi,nlv");
include2use($fortran,"ev.h","evgeom");
include2use($fortran,"evmain.h","evgeom");

# return;

include2use($fortran,"hydro.h","mod_hydro");
include2use($fortran,"hydro_vel.h","mod_hydro_vel");
Expand All @@ -1208,6 +1212,8 @@ sub inc2use {
include2use($fortran,"diff_visc_fric.h","mod_diff_visc_fric");
include2use($fortran,"roughness.h","mod_roughness");

# return;

include2use($fortran,"ts.h","mod_ts");
include2use($fortran,"area.h","mod_area");
include2use($fortran,"aux_array.h","mod_aux_array");
Expand All @@ -1222,6 +1228,8 @@ sub inc2use {
include2use($fortran,"nohyd.h","mod_nohyd");
include2use($fortran,"nudging.h","mod_nudging");

# return;

include2use($fortran,"bclfix.h","mod_bclfix");
include2use($fortran,"fluidmud.h","mod_fluidmud");
include2use($fortran,"sinking.h","mod_sinking");
Expand All @@ -1231,12 +1239,12 @@ sub inc2use {
include2use($fortran,"meteo.h","mod_meteo");
include2use($fortran,"meteo_aux.h","mod_meteo");

# return;

include2use($fortran,"geom.h","mod_geom");
include2use($fortran,"geom_aux.h","mod_geom");
include2use($fortran,"links.h","mod_geom");

include2use($fortran,"ev.h","evgeom");
include2use($fortran,"evmain.h","evgeom");
include2use($fortran,"conz.h","mod_conz");

include2use($fortran,"bound_geom.h","mod_bound_geom");
Expand All @@ -1245,12 +1253,16 @@ sub inc2use {
include2use($fortran,"nbound.h","mod_bnd");
include2use($fortran,"nbvdim.h","mod_bnd");

# return;

include2use($fortran,"tvd.h","mod_tvd");
include2use($fortran,"tides.h","mod_tides");

include2use($fortran,"subbndo.h","mod_bndo");
include2use($fortran,"nudge.h","mod_nudge");

# return;

include2use($fortran,"plot_aux_3d.h","mod_plot3d");
include2use($fortran,"plot_aux.h","mod_plot2d");
include2use($fortran,"hydro_plot.h","mod_hydro_plot");
Expand Down
13 changes: 12 additions & 1 deletion fem3d/ht.f
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,7 @@ subroutine debug_output(it)
include 'diff_visc_fric.h'
include 'roughness.h'
include 'hydro_vel.h'
include 'gotm_aux.h'

include 'ts.h'

Expand All @@ -575,20 +576,30 @@ subroutine debug_output(it)
call debug_output_record(3*nel,3,zenv,'zenv')
call debug_output_record(nkn,1,zov,'zov')
call debug_output_record(nkn,1,znv,'znv')
call debug_output_record(nlvdim*nel,nlvdim,hdeov,'hdeov')

call debug_output_record(nlvdim*nel,nlvdim,utlov,'utlov')
call debug_output_record(nlvdim*nel,nlvdim,vtlov,'vtlov')
call debug_output_record(nlvdim*nel,nlvdim,utlnv,'utlnv')
call debug_output_record(nlvdim*nel,nlvdim,vtlnv,'vtlnv')

call debug_output_record(nlvdim*nkn,nlvdim,saltv,'saltv')
call debug_output_record(nlvdim*nkn,nlvdim,tempv,'tempv')
call debug_output_record((nlvdim+1)*nkn,nlvdim+1,visv,'visv')
call debug_output_record((nlvdim+1)*nkn,nlvdim+1,wlov,'wlov')
call debug_output_record((nlvdim+1)*nkn,nlvdim+1,wlnv,'wlnv')

call debug_output_record(nkn,1,z0bk,'z0bk')
call debug_output_record(nkn,1,tauxnv,'tauxnv')
call debug_output_record(nkn,1,tauynv,'tauynv')

call debug_output_record(nlvdim*nel,nlvdim,hdeov,'hdeov')
call debug_output_record(nlvdim*nel,nlvdim,hdenv,'hdenv')
call debug_output_record(nlvdim*nkn,nlvdim,hdkov,'hdkov')
call debug_output_record(nlvdim*nkn,nlvdim,hdknv,'hdknv')

call debug_output_record(nlvdim*nkn,nlvdim,hdknv,'shearf2')
call debug_output_record(nlvdim*nkn,nlvdim,hdknv,'buoyf2')

write(66) 0,0

end
Expand Down
Loading

0 comments on commit 1ce091d

Please sign in to comment.