Skip to content

Commit

Permalink
big and various changes, omp, lagrange, ...
Browse files Browse the repository at this point in the history
  • Loading branch information
@georgu
georgu committed May 21, 2015
1 parent 8ec4a20 commit be785b2
Show file tree
Hide file tree
Showing 69 changed files with 3,156 additions and 1,001 deletions.
82 changes: 82 additions & 0 deletions COMMIT
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,87 @@
============================================================

Thu May 21 16:31:20 CEST 2015

big and various changes, omp, lagrange, ...

LOG | 97 +++
RELEASE_NOTES | 11 +
fem3d/Makefile | 57 +-
fem3d/bin/ht_struct.sh | 10 +
fem3d/etsinf.f | 38 +-
fem3d/etsutil.f | 63 ++-
fem3d/femelab.f | 7 +-
fem3d/flxinf.f | 7 +-
fem3d/geom.h | 4 +-
fem3d/lagrange.h | 69 +-
fem3d/lagrange_back.f | 22 +-
fem3d/lagrange_connect.f | 8 +-
fem3d/lagrange_cont.f | 23 +-
fem3d/lagrange_decay.f | 18 +-
fem3d/lagrange_init.f | 14 +-
fem3d/lagrange_inout.f | 189 +++--
fem3d/lagrange_larve.f | 17 +-
fem3d/lagrange_main.f | 91 ++-
fem3d/lagrange_sedim.f | 150 ++++
fem3d/lagrange_vertical.f | 201 ++++-
fem3d/lgrinf.f | 2 +-
fem3d/links.f | 76 ++
fem3d/links.h | 4 +-
fem3d/new3di.f | 186 ++---
fem3d/newbcl.f | 32 +-
fem3d/newcon.f | 185 +++--
fem3d/newini.f | 9 +-
fem3d/newlevels.f | 152 ++++
fem3d/newstab.f | 11 +-
fem3d/noselab.f | 454 +++++++++++
fem3d/nosinf.f | 1 +
fem3d/noswrite.f | 1 -
fem3d/subclo.f | 2 +-
fem3d/subdep.f | 4 +-
fem3d/subetsa.f | 112 ++--
fem3d/subetsm.f | 55 ++
fem3d/subexta.f | 89 ++-
fem3d/subfemfile.f | 25 +
fem3d/subflxa.f | 194 +++--
fem3d/subinterpol.f | 26 +-
fem3d/sublnka.f | 2 +
fem3d/submeteo2.f | 37 +
fem3d/subn35.f | 228 +++---
fem3d/subnls.f | 108 ++-
fem3d/subnsh.f | 6 +-
fem3d/suboff.f | 73 +-
fem3d/subsss.f | 97 +++
fem3d/subsys.f | 52 ++-
fem3d/subtsuvfile.f | 2 +-
fem3d/subuti.f | 94 +--
fem3d/subver.f | 4 +-
fem3d/subwrt.f | 92 ++-
fem3d/subxi.f | 61 +-
femadj/adj575.f | 2 +-
femadj/adj5el.f | 2 +-
fembin/gps | 1 +
fembin/heat524.pl | 21 +
fembin/mail_shyfem.sh | 8 +-
fembin/strparse.pl | 29 +-
femdoc/final/shyfem.pdf | Bin 293782 -> 294940 bytes
femdoc/final/shyfem.ps | 1983 +++++++++++++++++++++++----------------------
femlib/perl/str.pm | 36 +-
femplot/Makefile | 2 +-
femplot/col.f | 95 ++-
femplot/supano.f | 54 +-
femplot/suplag.f | 245 +++++-
femplot/suplin.f | 6 +-
67 files changed, 4077 insertions(+), 1979 deletions(-)
new file:
fem3d/bin/ht_struct.sh
fem3d/lagrange_sedim.f
fem3d/newlevels.f
fem3d/noselab.f
fem3d/subetsm.f
fembin/heat524.pl

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

Tue May 5 18:38:50 CEST 2015

New version 7_1_10
Expand Down
97 changes: 97 additions & 0 deletions LOG
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,101 @@

21.05.2015

c ./femplot/supano.f:
c 06.05.2015 ggu prepared for logarithmic color bar
c
c ./femplot/col.f:
c 06.05.2015 ggu logarithmic scale introduced (ilog, blog)
c
c ./fem3d/subetsa.f:
c 30.05.2015 ggu new read from STR file, using module ets
c
c ./fem3d/sublnka.f:
c 20.05.2015 ggu new call to mklenkii to set up lenkiiv
c
c ./fem3d/subnls.f:
c 12.05.2015 ggu new char table
c
c ./fem3d/tmp/al1/lagrange_sedim.f:
c 06.05.2015 ccf written from scratch
c
c ./fem3d/tmp/al1/lagrange_inout.f:
c 06.05.2015 ccf write relative total depth and type to output
c 07.05.2015 ccf assign settling velocity to particles
c
c ./fem3d/tmp/al1/lagrange_vertical.f:
c 06.05.2015 ccf included settling velocity for lagrangian
c
c ./fem3d/tmp/al1/suboff.f:
c 06.05.2015 ccf write offline to .off file
c read offline from offlin file in section name
c
c ./fem3d/lagrange_init.f:
c 20.05.2015 ccf give type to released particles
c
c ./fem3d/lagrange_sedim.f:
c 06.05.2015 ccf written from scratch
c
c ./fem3d/submeteo2.f:
c 12.05.2015 ggu introduced ia_icefree for icefree elements
c
c ./fem3d/newcon.f:
c 20.05.2015 ggu accumulate over nodes (for parallel version)
c
c ./fem3d/subn35.f:
c 12.05.2015 ggu rewritten with modules and allocatable
c
c ./fem3d/subinterpol.f:
c 06.05.2015 ggu set number of max iterations (imax)
c
c ./fem3d/subflxa.f:
c 20.05.2015 ggu modules introduced
c
c ./fem3d/links.f:
c 30.05.2015 ggu new subroutine mklenkii to compute lenkiiv
c
c ./fem3d/subexta.f:
c 20.05.2015 ggu modules introduced
c
c ./fem3d/new3di.f:
c 06.05.2015 ggu cleaning up of sp256f
c 20.05.2015 ggu&erp sp256v parallelized
c
c ./fem3d/subwrt.f:
c 20.05.2015 ggu rinside computed only once, bug fix for conz==0
c
c ./fem3d/lagrange_inout.f:
c 06.05.2015 ccf write relative total depth and type to output
c 07.05.2015 ccf assign settling velocity to particles
c
c ./fem3d/femelab.f:
! 20.05.2015 ggu use bhuman to convert to human readable time
c
c ./fem3d/etsutil.f:
c 30.05.2015 ggu new code for reading header 1 and 2 indipendently
c
c ./fem3d/subxi.f:
c 16.05.2015 ccf add some more check in xit_start_end for small numbers
c
c ./fem3d/lagrange_vertical.f:
c 06.05.2015 ccf included settling velocity for lagrangian
c 08.05.2015 ggu&ccf bug fix in track_xi_next_element
c 14.05.2015 ccf bug fix in track_xi
c
c ./fem3d/noselab.f:
c 06.05.2015 ggu noselab started
c
c ./fem3d/newstab.f:
c 20.05.2015 ggu always compute stability, call to conzstab changed
c
c ./fem3d/suboff.f:
c 06.05.2015 ccf write offline to .off file
c 06.05.2015 ccf read offline from offlin file in section name
c
c ./fem3d/subsss.f:
c 06.05.2015 ggu new routine logvals() for logarithmic values


04.05.2015

c ./fem3d/sublnka.f:
Expand Down
11 changes: 11 additions & 0 deletions RELEASE_NOTES
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@

21.05.2015 VERS_7_1_11

this is a big and unfocused release...
some central parts rewritten for OMP (new3di.f, newcon.f)
new data structure mklenkii
lagrangian completely rewritten (based on structure)
ext, flx, ets, frcition to modules
plotting with logarithmic scale and color bar
bug fixes in offline
ia_icefree for ice cover implemented

05.05.2015 VERS_7_1_10

ice cover bug eliminated
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_10 05-05-2015 VERS_7_1_10 commit_2015-05-21

version 7_1_10 05-05-2015 VERS_7_1_10

========================================================== 05-05-2015 - 7_1_10
Expand Down
57 changes: 35 additions & 22 deletions fem3d/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,11 @@ HTOBJS = \
subflxa.o subflx3d.o subflx.o subflxu.o \
subboxa.o \
newnohydro.o suboff.o \
subets.o subetsa.o \
subets.o subetsa.o subetsm.o \
$(IFF_FILES) \
$(ECOLOGICAL_OBJ) \
$(NETCDF_OBJ) $(PARALLEL_OBJ) \
subxi.o
subxi.o newlevels.o

# objects for pre-processor vp

Expand Down Expand Up @@ -235,7 +235,7 @@ BASEXTRA = subgeo.o subgrd.o subsrt.o sublnka.o links.o sublnku.o \

NOSOBJS = subnos.o nosutil.o genutil.o subeos.o
OUSOBJS = subous.o ousutil.o genutil.o
ETSOBJS = subets.o etsutil.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
GRDOBJS = subgrd.o grdutil.o subsrt.o subcoord.o
Expand All @@ -253,7 +253,7 @@ LAGRANGE = lagrange_main.o \
lagrange_inout.o lagrange_util.o \
lagrange_larve.o lagrange_flux.o \
lagrange_track.o lagrange_util_tr.o \
lagrange_decay.o \
lagrange_decay.o lagrange_sedim.o \
lagrange_connect.o lagrange_vertical.o

# heat flux module
Expand Down Expand Up @@ -301,7 +301,7 @@ EXEBAS = bastreat basbathy scalintp
EXEVAR = nosinit nosresidence scal_intp bashsigma
EXEUTIL = bc2fem

NOSVAR = nos_elab nossum nosdiff noswrite nosadmin
NOSVAR = nos_elab nossum nosdiff noswrite nosadmin noselab
NOSAVER = nosaver_basin nosaver_vert nosaver_time
NOSEXTR = nosextr_nodes nosextr_gis nosextr_records nosextr_custom \
nosextr_cat
Expand Down Expand Up @@ -563,6 +563,9 @@ nosextr_cat: nosextr_cat.o $(NOSOUSOBJS) $(OUTOBJS)
nosextr_fluxes: nosextr_fluxes.o $(NOSOUSOBJS) $(OUTOBJS)
$(LINKER) $(LFLAGS) $@.o $(NOSOUSOBJS) $(OUTOBJS) -o $@

noselab: noselab.o $(NOSOBJS) $(OUTOBJS)
$(LINKER) $(LFLAGS) $@.o $(NOSOBJS) $(OUTOBJS) -o $@

nosaver: $(NOSAVER)

nosaver_basin: nosaver_basin.o $(NOSOBJS) $(OUTOBJS)
Expand Down Expand Up @@ -818,7 +821,7 @@ bio3d.o: param.h nlevel.h mkonst.h nbasin.h levels.h basin.h \
bio3d_util.o: nbasin.h param.h levels.h donata.h
debug.o: debug_aux1.h
eosinf.o: param.h
etsinf.o: param.h
etsinf.o: param.h ets.mod
femelab.o: clo.mod
feminf.o: clo.mod
filetype.o: clo.mod
Expand All @@ -844,19 +847,22 @@ lagrange_decay.o: param.h femtime.h lagrange.h
lagrange_dif.o: param.h femtime.h lagrange.h
lagrange_flux.o: depth.h hydro.h param.h nlevel.h ev.h femtime.h \
lagrange.h nbasin.h levels.h basin.h links.h
lagrange_init.o: nbasin.h param.h basin.h aux_array.h
lagrange_inout.o: param.h basin.h ev.h nlevel.h femtime.h \
lagrange.h
lagrange_init.o: nbasin.h param.h basin.h lagrange.h aux_array.h
lagrange_inout.o: depth.h param.h ev.h nlevel.h femtime.h \
lagrange.h levels.h basin.h
lagrange_larve.o: param.h lagrange.h
lagrange_main.o: nbasin.h param.h basin.h femtime.h lagrange.h
lagrange_main.o: nbasin.h param.h basin.h femtime.h \
lgr_sedim_module.mod lagrange.h
lagrange_oil.o: nbasin.h param.h femtime.h ev.h lagrange.h \
aux_array.h
lgr_sedim_module.mod: lagrange_sedim.o
lagrange_sedim.o: param.h levels.h lagrange.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.h ev.h basin.h
lagrange_util_tr.o: param.h basin.h
lagrange_vertical.o: depth.h hydro_vel.h hydro.h param.h ev.h \
nlevel.h lagrange.h levels.h basin.h geom.h
lagrange_vertical.o: depth.h hydro_vel.h hydro.h param.h nlevel.h \
lagrange.h levels.h basin.h geom.h
lgrelab.o: nbasin.h depth.h param.h basin.h
lgrinf.o: param.h
loading.o: nbasin.h param.h levels.h
Expand All @@ -883,7 +889,7 @@ newchk.o: testbndo.h depth.h internal.h bound_dynamic.h ev.h \
geom_dynamic.h meteo_aux.h hydro_baro.h area.h \
basin.h hydro_print.h
newcon.o: testbndo.h depth.h bound_dynamic.h ts.h ev.h mkonst.h \
nlevel.h const_aux.h nbasin.h aux_array.h \
nlevel.h const_aux.h nbasin.h aux_array.h geom.h \
hydro_vel.h param.h hydro.h femtime.h diff_aux.h \
levels.h area.h basin.h hydro_print.h
newconz.o: depth.h conz.h param.h bound_names.h ts.h nlevel.h \
Expand All @@ -902,6 +908,8 @@ 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
levels.mod: newlevels.o
newlevels.o: nls.mod
newnudge.o: hydro.h param.h nudge.h femtime.h basin.h nudging.h
newrog.o: param.h basin.h
newsig.o: param.h levels.h nlevel.h
Expand All @@ -919,6 +927,7 @@ nosaver_basin.o: depth.h param.h basin.h
nosaver_time.o: param.h
nosaver_vert.o: depth.h param.h basin.h
nosdiff.o: param.h
noselab.o: param.h clo.mod
nosextr_cat.o: param.h
nosextr_custom.o: param.h basin.h
nosextr_fluxes.o: param.h basin.h simul.h
Expand Down Expand Up @@ -1008,15 +1017,18 @@ subele.o: depth.h hydro.h param.h ev.h nbasin.h levels.h basin.h \
area.h aux_array.h
subets.o: etsinf.h
subetsa.o: depth.h hydro.h param.h ts.h nlevel.h femtime.h tides.h \
simul.h nbasin.h levels.h modules.h hydro_print.h \
subetsa.h waves.h
subexta.o: param.h modules.h femtime.h hydro_print.h aux_array.h \
simul.h extra.h
simul.h nbasin.h nls.mod levels.h modules.h \
hydro_print.h ets.mod waves.h
ets.mod: subetsm.o
extra.mod: subexta.o
subexta.o: param.h nls.mod modules.h femtime.h hydro_print.h \
aux_array.h simul.h
intp_fem_file.mod: subfemintp.o
subflx3d.o: hydro_vel.h testbndo.h hydro.h param.h bound_dynamic.h \
femtime.h ev.h geom_dynamic.h hydro_baro.h \
levels.h links.h geom.h
subflxa.o: conz.h param.h subflxa.h modules.h ts.h femtime.h
flux.mod: subflxa.o
subflxa.o: conz.h param.h nls.mod modules.h ts.h femtime.h
subflxu.o: param.h levels.h links.h
subfvl.o: depth.h nbasin.h param.h levels.h area.h nlevel.h \
aux_array.h
Expand Down Expand Up @@ -1046,7 +1058,7 @@ submet.o: param.h bound_dynamic.h ts.h femtime.h ev.h nbasin.h \
aux_array.h
meteo_forcing_module.mod: submeteo2.o
submeteo2.o: depth.h param.h nlevel.h femtime.h intp_fem_file.mod \
nbasin.h meteo_aux.h levels.h meteo.h
nbasin.h meteo_aux.h levels.h meteo.h basin.h
submud.o: depth.h param.h bound_names.h bound_dynamic.h sinking.h \
ts.h nlevel.h bound_geom.h pkonst.h nbasin.h \
fluidmud.h levels.h roughness.h basin.h gotm_aux.h \
Expand All @@ -1056,8 +1068,9 @@ subn11.o: hydro.h param.h bound_dynamic.h nlevel.h mkonst.h \
femtime.h bound_geom.h pkonst.h intp_fem_file.mod \
nbasin.h geom_dynamic.h levels.h basin.h \
hydro_print.h bnd_aux.h
subn35.o: depth.h hydro.h param.h pkonst.h fluidmud.h levels.h \
basin.h roughness.h hydro_print.h chezy.h \
chezy.mod: subn35.o
subn35.o: depth.h hydro.h param.h pkonst.h fluidmud.h nls.mod \
levels.h basin.h roughness.h hydro_print.h \
diff_visc_fric.h
subnev.o: nbasin.h param.h basin.h ev.h
nls.mod: subnls.o
Expand Down Expand Up @@ -1107,7 +1120,7 @@ subwaves.o: depth.h internal.h evmain.h nlevel.h nbasin.h meteo.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 ev.h nlevel.h femtime.h simul.h \
nbasin.h levels.h basin.h aux_array.h
nbasin.h levels.h basin.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
tsinf.o: clo.mod
Expand Down
10 changes: 10 additions & 0 deletions fem3d/bin/ht_struct.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh

bin/newstruct.pl -struct=ht *.f > g1.txt # create structure

cat g1.txt | tr -d " \t" > g2.txt # delete spaces

sort g2.txt | uniq -c | sort -n > g3.txt # find occurence of calls

cat g3.txt

Loading

0 comments on commit be785b2

Please sign in to comment.