Skip to content

Commit 85713a4

Browse files
georgugeorgu
committed
lot of small stuff, nudging, 3d boxes
1 parent f18784a commit 85713a4

File tree

16 files changed

+302
-64
lines changed

16 files changed

+302
-64
lines changed

‎COMMIT‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
============================================================
22

3+
Fri Mar 6 18:40:10 CET 2020
4+
5+
lot of small stuff, nudging, 3d boxes
6+
7+
LOG | 119 ++++++++++++++++++++++++++++++++++++++++++++++++
8+
RELEASE_NOTES | 10 ++++
9+
fem3d/Makefile | 31 ++++++-------
10+
fem3d/elabtime.f | 6 +++
11+
fem3d/elabutil.f | 7 +--
12+
fem3d/extelab1.f | 11 ++++-
13+
fem3d/flxelab1.f | 9 +++-
14+
fem3d/mod_internal.f | 59 +++++++++++++++---------
15+
fem3d/new3di.f | 1 -
16+
fem3d/newclose.f | 42 +++++++++++------
17+
fem3d/subboxa.f | 6 +--
18+
fem3d/subflxa.f | 30 ++++++++++++
19+
fem3d/subver.f | 7 +--
20+
femdoc/final/shyfem.pdf | Bin 308972 -> 309037 bytes
21+
14 files changed, 276 insertions(+), 62 deletions(-)
22+
23+
============================================================
24+
325
Thu Mar 5 17:55:09 CET 2020
426

527
better nudging

‎LOG‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,123 @@
11

2+
06.03.2020
3+
4+
c ./femplot/supbas.f:
5+
c 13.02.2020 ggu rounding routines into new file subround.f
6+
c
7+
c ./fem3d/subvola.f:
8+
c 16.02.2020 ggu femtime eliminated
9+
c
10+
c ./fem3d/basutil.f:
11+
! 12.02.2020 ggu new command line option -reg (and breg)
12+
!
13+
c ./fem3d/shybas.f:
14+
c 13.02.2020 ggu new routine write_regular_depth() with -reg
15+
c
16+
c ./fem3d/subtime.f:
17+
c 08.02.2020 ggu utility routines copied to new file
18+
c 16.02.2020 ggu itunit eliminated
19+
c
20+
c ./fem3d/flxelab1.f:
21+
c 06.03.2020 ggu check for time step
22+
c
23+
c ./fem3d/sedi3d.f:
24+
! 16.02.2020 ggu femtime eliminated
25+
c
26+
c ./fem3d/subsss.f:
27+
c 13.02.2020 ggu rounding routines into new file subround.f
28+
c
29+
c ./fem3d/femelab1.f:
30+
! 03.03.2020 ggu do not open out.fem if bextract is true
31+
c
32+
c ./fem3d/subflx3d.f:
33+
c 16.02.2020 ggu femtime eliminated
34+
c 05.03.2020 ggu do not print flux divergence
35+
c
36+
c ./fem3d/subnsh.f:
37+
c 16.02.2020 ggu femtime finally eliminated
38+
c
39+
c ./fem3d/suboff.f:
40+
c 17.02.2020 ggu femtime eliminated
41+
c
42+
c ./fem3d/extelab1.f:
43+
c 03.02.2020 ggu cleaned, new headers for split
44+
c 06.03.2020 ggu check for time step
45+
c
46+
c ./fem3d/subtrace.f:
47+
c 16.02.2020 ggu femtime eliminated
48+
c
49+
c ./fem3d/new36.f:
50+
c 16.02.2020 ggu femtime eliminated
51+
c
52+
c ./fem3d/newbfm_internal.f:
53+
! 17.02.2020 ggu femtime eliminated
54+
c ./fem3d/shyelab_util.f:
55+
! 02.02.2020 ggu update for vorticity
56+
c
57+
c ./fem3d/subtimeutil.f:
58+
c 08.02.2020 ggu utilities in this new file
59+
c 16.02.2020 ggu itunit eliminated
60+
c 16.02.2020 ggu new routines get_time_iterations(), get_ddt()
61+
c
62+
c ./fem3d/mercury.f:
63+
c 17.02.2020 ggu femtime eliminated
64+
c
65+
c ./fem3d/newini.f:
66+
c 12.02.2020 ggu better error messages in set_last_layer()
67+
c
68+
c ./fem3d/elabtime.f:
69+
! 06.03.2020 ggu some enhancements
70+
c ./fem3d/subflxa.f:
71+
c 06.03.2020 ggu new flux0d, get_barotropic_flux()
72+
c
73+
c ./fem3d/subssed.f:
74+
! 20.02.2020 ggu new routine compute_bottom_flux()
75+
!
76+
c ./fem3d/subboxa.f:
77+
c 03.02.2020 ggu revisted 3d box averaging
78+
c 05.02.2020 ggu bug in box_3d_aver_vertical() corrected
79+
c 07.02.2020 ggu final version of box file
80+
c
81+
c ./fem3d/subtsuvfile.f:
82+
c 14.02.2020 ggu new routine ts_file_exists()
83+
c 04.03.2020 ggu iunit converted to id
84+
c
85+
c ./fem3d/subfemintp.f:
86+
! 03.02.2020 ggu cleaned, new routine call iff_write_dtime()
87+
! 14.02.2020 ggu new utility routine iff_file_exists()
88+
!
89+
c ./fem3d/newbcl.f:
90+
c 14.02.2020 ggu nudging enhanced with reading of tau values
91+
c 05.03.2020 ggu finished new nudging routines
92+
c
93+
c ./fem3d/subfil.f:
94+
c 03.03.2020 ggu better error messaging, if error return -1
95+
c
96+
c ./fem3d/subround.f:
97+
! 13.02.2020 ggu rounding routines in this extra file copied
98+
c
99+
c ./fem3d/suboutputd.f:
100+
c 06.02.2020 ggu new function function is_first_output_d()
101+
c
102+
c ./fem3d/mod_internal.f:
103+
! 06.03.2020 ggu custom routine set_fric_max()
104+
c ./fem3d/newpoi.f:
105+
! 16.02.2020 ggu femtime eliminated
106+
!
107+
c ./fem3d/newclose.f:
108+
! 05.03.2020 ggu output streamlined, set rfmax here
109+
!
110+
c ./fem3d/subsys.f:
111+
c 16.02.2020 ggu itunit not supported anymore
112+
c 05.03.2020 ggu documentation upgraded
113+
c
114+
c ./fem3d/elabutil.f:
115+
! 06.03.2020 ggu -checkdt also for ext and flx files
116+
!
117+
c ./fem3d/subn35.f:
118+
c 05.03.2020 ggu documentation upgraded
119+
120+
2121
31.01.2020
3122

4123
c ./fem3d/lgrelab1.f:

‎RELEASE_NOTES‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,14 @@
11

2+
06.03.2020 VERS_7_5_69 Vincenzo edition
3+
4+
boxmodel in 3D revisited
5+
better nudging with tau given by external file
6+
closing routines adjourned
7+
documentation upgraded
8+
routines for vorticity
9+
post processing checks for time step
10+
regular output from shybas
11+
212
31.01.2020 VERS_7_5_68 Brexit edition
313

414
lagrangian: integrated some parts of connectivity

‎VERSION‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
version 7_5_68 31-01-2020 VERS_7_5_68 commit_2020-03-06
2+
13
version 7_5_68 31-01-2020 VERS_7_5_68 commit_2020-03-05
24

35
version 7_5_68 31-01-2020 VERS_7_5_68 commit_2020-02-17

‎fem3d/Makefile‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ line_util.o: ../femlib/mod/basin.mod param.h
12631263
loading.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
12641264
param.h
12651265
mercury.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
1266-
../femlib/mod/mod_diff_visc_fric.mod femtime.h
1266+
../femlib/mod/mod_diff_visc_fric.mod
12671267
mod_shympi_dummy.o: ../femlib/mod/basin.mod \
12681268
../femlib/mod/levels.mod
12691269
mod_shympi_node.o: ../femlib/mod/basin.mod \
@@ -1281,8 +1281,7 @@ new36.o: ../femlib/mod/basin.mod \
12811281
../femlib/mod/mod_diff_visc_fric.mod \
12821282
../femlib/mod/mod_hydro.mod \
12831283
../femlib/mod/mod_hydro_print.mod \
1284-
../femlib/mod/shympi.mod close.h femtime.h \
1285-
mkonst.h
1284+
../femlib/mod/shympi.mod close.h mkonst.h
12861285
new3di.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
12871286
../femlib/mod/levels.mod \
12881287
../femlib/mod/mod_area.mod \
@@ -1322,10 +1321,10 @@ newbfm.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
13221321
newbfm_internal.o: ../femlib/mod/basin.mod \
13231322
../femlib/mod/levels.mod ../femlib/mod/mod_bfm.mod \
13241323
../femlib/mod/mod_layer_thickness.mod \
1325-
../femlib/mod/mod_sinking.mod femtime.h
1324+
../femlib/mod/mod_sinking.mod
13261325
newchao.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
13271326
../femlib/mod/mod_hydro.mod \
1328-
../femlib/mod/mod_hydro_baro.mod femtime.h param.h
1327+
../femlib/mod/mod_hydro_baro.mod
13291328
newchk.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
13301329
../femlib/mod/levels.mod \
13311330
../femlib/mod/mod_area.mod \
@@ -1438,8 +1437,7 @@ newpoi.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
14381437
../femlib/mod/mod_depth.mod \
14391438
../femlib/mod/mod_internal.mod \
14401439
../femlib/mod/mod_layer_thickness.mod \
1441-
../femlib/mod/mod_system.mod femtime.h mkonst.h \
1442-
pkonst.h
1440+
../femlib/mod/mod_system.mod mkonst.h pkonst.h
14431441
newrog.o: ../femlib/mod/basin.mod param.h
14441442
newstab.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
14451443
../femlib/mod/mod_diff_visc_fric.mod \
@@ -1511,7 +1509,7 @@ sedi3d.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
15111509
../femlib/mod/mod_sedtrans05.mod \
15121510
../femlib/mod/mod_ts.mod \
15131511
../femlib/mod/mod_waves.mod ../femlib/mod/para.mod \
1514-
femtime.h mkonst.h
1512+
mkonst.h
15151513
shybas.o: ../femlib/mod/basin.mod ../femlib/mod/basutil.mod \
15161514
../femlib/mod/clo.mod ../femlib/mod/evgeom.mod \
15171515
../femlib/mod/mod_depth.mod \
@@ -1725,7 +1723,7 @@ subflx3d.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
17251723
../femlib/mod/mod_geom_dynamic.mod \
17261724
../femlib/mod/mod_hydro.mod \
17271725
../femlib/mod/mod_hydro_baro.mod \
1728-
../femlib/mod/mod_hydro_vel.mod femtime.h
1726+
../femlib/mod/mod_hydro_vel.mod
17291727
subflxa.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
17301728
../femlib/mod/mod_conz.mod \
17311729
../femlib/mod/mod_sediment.mod \
@@ -1844,14 +1842,13 @@ subnosa.o: ../femlib/mod/basin.mod ../femlib/mod/mod_depth.mod \
18441842
subnsa.o: param.h simul.h
18451843
subnsh.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
18461844
../femlib/mod/nls.mod ../femlib/mod/shympi.mod \
1847-
femtime.h modules.h simul.h
1845+
modules.h simul.h
18481846
subnsu.o: ../femlib/mod/basin.mod
18491847
suboff.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
18501848
../femlib/mod/mod_hydro.mod \
18511849
../femlib/mod/mod_hydro_print.mod \
18521850
../femlib/mod/mod_hydro_vel.mod \
1853-
../femlib/mod/mod_ts.mod ../femlib/mod/shympi.mod \
1854-
femtime.h param.h
1851+
../femlib/mod/mod_ts.mod ../femlib/mod/shympi.mod
18551852
subous.o: ousinf.h
18561853
subousa.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
18571854
../femlib/mod/mod_depth.mod \
@@ -1897,8 +1894,10 @@ subshyutil2.o: ../femlib/mod/clo.mod ../femlib/mod/elabtime.mod \
18971894
../femlib/mod/shyutil.mod
18981895
subspk.o: ../femlib/mod/mod_system.mod \
18991896
../femlib/mod/mod_system_interface.mod
1900-
subssed.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
1901-
../femlib/mod/mod_conz.mod
1897+
subssed.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
1898+
../femlib/mod/levels.mod \
1899+
../femlib/mod/mod_conz.mod \
1900+
../femlib/mod/mod_layer_thickness.mod
19021901
substress.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
19031902
../femlib/mod/levels.mod \
19041903
../femlib/mod/mod_depth.mod \
@@ -1919,7 +1918,7 @@ subtrace.o: ../femlib/mod/basin.mod ../femlib/mod/levels.mod \
19191918
../femlib/mod/mod_geom_dynamic.mod \
19201919
../femlib/mod/mod_hydro.mod \
19211920
../femlib/mod/mod_hydro_baro.mod \
1922-
../femlib/mod/mod_hydro_vel.mod femtime.h param.h
1921+
../femlib/mod/mod_hydro_vel.mod param.h
19231922
subtsfile.o: ../femlib/mod/iso8601.mod
19241923
subtsuvfile.o: ../femlib/mod/intp_fem_file.mod
19251924
subuti.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
@@ -1933,7 +1932,7 @@ subuti.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
19331932
../femlib/mod/mod_ts.mod ../femlib/mod/shympi.mod \
19341933
pkonst.h
19351934
subvola.o: ../femlib/mod/basin.mod ../femlib/mod/mod_geom.mod \
1936-
femtime.h modules.h param.h volcomp.h
1935+
modules.h param.h volcomp.h
19371936
subwat.o: ../femlib/mod/basin.mod ../femlib/mod/evgeom.mod \
19381937
../femlib/mod/levels.mod \
19391938
../femlib/mod/mod_geom.mod \

‎fem3d/elabtime.f‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
! 16.02.2019 ggu changed VERS_7_5_60
3535
! 21.05.2019 ggu changed VERS_7_5_62
3636
! 21.07.2019 ggu handle and check time step
37+
! 06.03.2020 ggu some enhancements
3738

3839
!**************************************************************************
3940

@@ -269,6 +270,8 @@ subroutine check_timestep(dtime,dt,ichange)
269270
double precision, save :: dold = 0.
270271
double precision, save :: dlast = 0.
271272
double precision, save :: dtold = 0.
273+
double precision, save :: dtmin = 0.
274+
double precision, save :: dtmax = 0.
272275

273276
ichange = 0
274277

@@ -299,6 +302,9 @@ subroutine check_timestep(dtime,dt,ichange)
299302
ichange = -1
300303
end if
301304

305+
dtmin = min(dtmin,dt) !we still have to use this
306+
dtmax = max(dtmax,dt)
307+
302308
dold = dtime
303309
icall = icall + 1
304310

‎fem3d/elabutil.f‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
! 22.07.2019 ggu new routines for handling time step check
7777
! 13.12.2019 ggu new option -checkrain (bcheckrain)
7878
! 28.01.2020 ggu new option -vorticity (bvorticity)
79+
! 06.03.2020 ggu -checkdt also for ext and flx files
7980
!
8081
!************************************************************
8182

@@ -390,10 +391,10 @@ subroutine elabutil_set_extract_options
390391
end if
391392

392393
!if( bshowall .or. binputfile .or. bshyfile ) then
393-
if( bshowall .or. binputfile ) then
394+
!if( bshowall .or. binputfile ) then
394395
call clo_add_option('checkdt',.false.
395396
+ ,'check for change of time step')
396-
end if
397+
!end if
397398

398399
if( bshowall .or. binputfile ) then
399400
call clo_add_option('checkrain',.false.
@@ -634,9 +635,9 @@ subroutine elabutil_get_options(type,program)
634635
if( bshowall .or. bflxfile .or. bextfile ) then
635636
call clo_get_option('splitall',bsplitall)
636637
end if
638+
call clo_get_option('checkdt',bcheckdt)
637639
if( bshowall .or. binputfile ) then
638640
call clo_get_option('check',scheck)
639-
call clo_get_option('checkdt',bcheckdt)
640641
call clo_get_option('checkrain',bcheckrain)
641642
end if
642643
if( bshowall .or. bshyfile ) then

‎fem3d/extelab1.f‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
c 16.10.2018 ggu changed VERS_7_5_50
5151
c 16.02.2019 ggu changed VERS_7_5_60
5252
c 03.02.2020 ggu cleaned, new headers for split
53+
c 06.03.2020 ggu check for time step
5354
c
5455
c**************************************************************
5556

@@ -65,7 +66,7 @@ subroutine extelab
6566
use evgeom
6667
use levels
6768

68-
c elaborates nos file
69+
c elaborates ext file
6970

7071
implicit none
7172

@@ -90,6 +91,7 @@ subroutine extelab
9091
integer, allocatable :: naccu(:)
9192
double precision, allocatable :: accum(:,:,:)
9293

94+
logical btskip
9395
integer nread,nelab,nrec,nout,nin,nn
9496
integer nvers
9597
integer nknnos,nelnos,nvar
@@ -313,6 +315,11 @@ subroutine extelab
313315
call ext_peek_record(nin,nvers,atnew,ivarn,ierr)
314316
if( ierr .ne. 0 ) atnew = atime
315317

318+
if( ivar == 1 ) then
319+
call handle_timestep(atime,bcheckdt,btskip)
320+
if( btskip ) cycle
321+
end if
322+
316323
if( elabtime_over_time(atime,atnew,atold) ) exit
317324
if( .not. elabtime_in_time(atime,atnew,atold) ) cycle
318325
!if( .not. elabtime_check_time(atime,atnew,atold) ) cycle
@@ -427,6 +434,8 @@ subroutine extelab
427434
call dts_format_abs_time(atlast,dline)
428435
write(6,*) 'last time record: ',dline
429436

437+
call handle_timestep_last(bcheckdt)
438+
430439
write(6,*)
431440
write(6,*) nread,' data records read'
432441
write(6,*) nrec ,' time records read'

0 commit comments

Comments
 (0)