Skip to content

Commit

Permalink
big release introducing modules
Browse files Browse the repository at this point in the history
  • Loading branch information
@georgu
georgu committed Jul 10, 2015
1 parent 83f3cfb commit c1567b8
Show file tree
Hide file tree
Showing 161 changed files with 6,716 additions and 1,855 deletions.
216 changes: 216 additions & 0 deletions COMMIT
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,221 @@
============================================================

Fri Jul 10 17:23:16 CEST 2015

big release introducing modules

LOG | 6 +
Makefile | 1 +
RELEASE_NOTES | 14 +
Rules.make | 22 +-
cp_fem.sh | 36 ++
fem3d/Makefile | 150 ++++--
fem3d/bashsigma.f | 5 +-
fem3d/basinf.f | 72 +++
fem3d/bin/handle_common.sh | 5 +-
fem3d/bin/newsubst.pl | 60 ++-
fem3d/bnd.h | 7 +-
fem3d/check_debug.f | 16 +-
fem3d/chezy.h | 4 +-
fem3d/common.h | 2 +-
fem3d/cp_fem3d.sh | 19 -
fem3d/grdutil.f | 60 +++
fem3d/ht.f | 117 ++++-
fem3d/incstats.pl | 74 +++
fem3d/incstats.sh | 4 +
fem3d/lagrange_track.f | 2 +
fem3d/links.f | 10 +-
fem3d/meteo_aux.h | 23 +-
fem3d/mod/marco.zip | Bin 5119 -> 0 bytes
fem3d/mod/mod_diff_visc_fric.f | 80 ---
fem3d/mod/mod_hydro_baro.f | 48 --
fem3d/mod/mod_hydro_print.f | 80 ---
fem3d/mod/mod_levels.f | 71 ---
fem3d/mod/mod_roughness.f | 42 --
fem3d/mod_area.f | 54 ++
fem3d/mod_aux_array.f | 103 ++++
fem3d/mod_bclfix.f | 72 +++
fem3d/mod_bnd.f | 91 ++++
fem3d/mod_bnd_aux.f | 60 +++
fem3d/mod_bndo.f | 99 ++++
fem3d/mod_bound_dynamic.f | 71 +++
fem3d/mod_bound_geom.f | 222 ++++++++
fem3d/mod_conz.f | 57 ++
fem3d/mod_depth.f | 95 ++++
fem3d/mod_diff_aux.f | 42 ++
fem3d/mod_diff_visc_fric.f | 78 +++
fem3d/mod_fluidmud.f | 116 ++++
fem3d/mod_geom.f | 102 ++++
fem3d/mod_geom_dynamic.f | 69 +++
fem3d/mod_gotm_aux.f | 93 ++++
fem3d/mod_hydro.f | 170 +++---
fem3d/mod_hydro_baro.f | 49 ++
fem3d/mod_hydro_print.f | 87 +++
fem3d/mod_hydro_vel.f | 149 +++---
fem3d/mod_internal.f | 89 ++++
fem3d/mod_meteo.f | 111 ++++
fem3d/mod_nohyd.f | 54 ++
fem3d/mod_nudging.f | 39 ++
fem3d/mod_roughness.f | 42 ++
fem3d/mod_sinking.f | 50 ++
fem3d/mod_system.f | 78 +++
fem3d/mod_tides.f | 5 +-
fem3d/mod_ts.f | 106 ++++
fem3d/mod_turbulence.f | 60 +++
fem3d/mod_tvd.f | 45 ++
fem3d/mod_waves.f | 104 ++++
fem3d/nbvdim.h | 4 +
fem3d/netcdf.f | 8 +-
fem3d/new3di.f | 14 +-
fem3d/newchk.f | 2 +
fem3d/newcon.f | 40 +--
fem3d/newdum.f | 249 +++++++++-
fem3d/newdum1.f | 25 +
fem3d/newdum_out.f | 17 +
fem3d/newexpl.f | 6 +-
fem3d/newini.f | 12 +-
fem3d/newlevels.f | 10 +
fem3d/newnudge.f | 70 +++
fem3d/noselab.f | 1 +
fem3d/nosextr_nodes.f | 4 +
fem3d/nosutil.f | 29 +
fem3d/ousutil.f | 29 +
fem3d/prep_fem3d.sh | 21 +-
fem3d/sedtrans05.f | 2 +
fem3d/simsys_lp.f | 6 +
fem3d/simsys_pard.f | 6 +
fem3d/simsys_spk.f | 6 +
fem3d/subapn.f | 16 +-
fem3d/subbas.f | 95 +++-
fem3d/subbnd.f | 130 ++----
fem3d/subbndo.f | 26 +-
fem3d/subbnds.f | 14 +-
fem3d/subboxa.f | 2 +-
fem3d/subcmv.f | 14 +-
fem3d/subcoo.f | 3 +
fem3d/subcst.f | 14 +-
fem3d/subcus.f | 124 +++---
fem3d/subdif.f | 2 -
fem3d/subdim.f | 46 +-
fem3d/subele.f | 60 +--
fem3d/subeos.f | 40 +-
fem3d/subets.f | 48 +-
fem3d/subetsa.f | 23 +-
fem3d/subfemfile.f | 18 +-
fem3d/subfemintp.f | 6 +-
fem3d/subflx.f | 28 +-
fem3d/subflx3d.f | 56 +-
fem3d/subflxa.f | 56 +-
fem3d/subflxu.f | 36 +-
fem3d/subgotm.f | 120 ++---
fem3d/subgrd.f | 15 +
fem3d/subinterpol.f | 18 +-
fem3d/subinterpol1.f | 5 +-
fem3d/sublnka.f | 203 +-------
fem3d/sublnkd.f | 227 ++++++++
fem3d/submet.f | 4 +-
fem3d/subn11.f | 77 ++--
fem3d/subnev_new.f | 1129 ++++++++++++++++++++++++++++++++++++++++
fem3d/subnos.f | 74 ++--
fem3d/subnosa.f | 8 +-
fem3d/subnsh.f | 11 +-
fem3d/suboff.f | 12 +-
fem3d/subous.f | 84 ++--
fem3d/subousa.f | 2 +-
fem3d/subpard.f | 2 +
fem3d/subqfxt.f | 15 +-
fem3d/subres.f | 156 +++---
fem3d/subros.f | 2 +-
fem3d/subrst.f | 4 +-
fem3d/subspk.f | 22 +-
fem3d/subsrt.f | 5 +-
fem3d/subsss.f | 34 +-
fem3d/subuti.f | 6 +-
fem3d/subwat.f | 4 +-
fem3d/subwrt.f | 29 +-
fem3d/vp.f | 188 +++----
fem3d/weutro.f | 2 +-
femadj/adj5el.f | 2 +-
femadj/adjele.f | 34 +-
femadj/adjplo.f | 6 +-
femadj/adjvar.f | 6 +-
fembin/vpgrd | 3 +-
femdoc/final/shyfem.pdf | Bin 294942 -> 294942 bytes
femdoc/final/shyfem.ps | 26 +-
femgotm/eqstate.F90 | 1 +
femgotm/kpp.F90 | 4 +
femgotm/turbulence.F90 | 14 +
femplot/Makefile | 38 +-
femplot/basin.h | 2 +-
femplot/ev.h | 2 +
femplot/evmain.h | 2 +
femplot/geom.h | 4 +-
femplot/line_nodes.f | 8 +-
femplot/mod_hydro_plot.f | 75 +++
femplot/mod_plot2d.f | 66 +++
femplot/mod_plot3d.f | 63 +++
femplot/plot_aux.h | 16 +-
femplot/plot_aux_3d.h | 16 +
femplot/plotsim.f | 151 +++++-
femplot/supano.f | 1 +
femplot/supbas.f | 6 +-
femplot/supdep.f | 11 +-
femplot/supdum.f | 108 ++++
femplot/suplin1.f | 1 +
femplot/supout.f | 55 ++-
femplot/supsim.f | 12 +-
femplot/supver.f | 1 +
prep_dirs.sh | 45 ++
prep_fem.sh | 32 ++
163 files changed, 6511 insertions(+), 1868 deletions(-)
new file:
cp_fem.sh
fem3d/incstats.pl
fem3d/incstats.sh
fem3d/mod_area.f
fem3d/mod_aux_array.f
fem3d/mod_bclfix.f
fem3d/mod_bnd.f
fem3d/mod_bnd_aux.f
fem3d/mod_bndo.f
fem3d/mod_bound_dynamic.f
fem3d/mod_bound_geom.f
fem3d/mod_conz.f
fem3d/mod_depth.f
fem3d/mod_diff_aux.f
fem3d/mod_fluidmud.f
fem3d/mod_geom.f
fem3d/mod_geom_dynamic.f
fem3d/mod_gotm_aux.f
fem3d/mod_internal.f
fem3d/mod_meteo.f
fem3d/mod_nohyd.f
fem3d/mod_nudging.f
fem3d/mod_sinking.f
fem3d/mod_system.f
fem3d/mod_ts.f
fem3d/mod_turbulence.f
fem3d/mod_tvd.f
fem3d/mod_waves.f
fem3d/nbvdim.h
fem3d/newdum1.f
fem3d/newdum_out.f
fem3d/sublnkd.f
fem3d/subnev_new.f
femplot/mod_hydro_plot.f
femplot/mod_plot2d.f
femplot/mod_plot3d.f
femplot/plot_aux_3d.h
femplot/supdum.f
prep_dirs.sh
prep_fem.sh
deleted:
fem3d/cp_fem3d.sh
fem3d/mod/marco.zip
fem3d/mod/mod_levels.f

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

Fri Jun 5 16:22:29 CEST 2015

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

10.07.2015

c ./fem3d/subbnd.f:
c 23.06.2015 ggu setbc() deleted, nrz,nrq eliminated


05.06.2015

c ./femplot/supsim.f:
Expand Down
1 change: 1 addition & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ param:

directories:
-mkdir -p tmp
-mkdir -p femlib/mod

links:
-rm -f bin lib
Expand Down
14 changes: 14 additions & 0 deletions RELEASE_NOTES
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@

10.07.2015 VERS_7_1_50

this is a big release of changes
nobody should really use this version
this is only used to prepare the new major version with
modules instead of common blocks (inludes)
and arrays allocated on the heap
most of the conversion has been finished, but some points
still have to be done
some files will not be converted before the next major release:
lagrange
box
bfm

05.06.2015 VERS_7_1_12

some more work for transition to module structure
Expand Down
22 changes: 17 additions & 5 deletions Rules.make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@ DISTRIBUTION_TYPE = experimental
DEFDIR = $(HOME)
FEMDIR = ..
DIRLIB = $(FEMDIR)/femlib
MODDIR =
MODDIR = $(DIRLIB)/mod

LIBX = -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib/X11 -lX11

Expand Down Expand Up @@ -299,16 +301,21 @@ WARNING = true
#
##############################################

FGNU_GENERAL =
ifdef MODDIR
FGNU_GENERAL = -J$(MODDIR)
endif

FGNU_PROFILE =
ifeq ($(PROFILE),true)
FGNU_PROFILE = -p
endif

FGNU_WARNING =
ifeq ($(WARNING),true)
FGNU_NOOPT = -Wall -pedantic
FGNU_NOOPT = -Wall -Wtabs -Wno-unused -Wno-uninitialized
FGNU_NOOPT = -Wall -Wtabs -Wno-unused
FGNU_WARNING = -Wall -pedantic
FGNU_WARNING = -Wall -Wtabs -Wno-unused -Wno-uninitialized
FGNU_WARNING = -Wall -Wtabs -Wno-unused
endif

FGNU_NOOPT =
Expand Down Expand Up @@ -347,7 +354,7 @@ ifeq ($(FORTRAN_COMPILER),GNU_GFORTRAN)
F95 = $(FGNU95)
LINKER = $(F77)
LFLAGS = $(FGNU_OPT) $(FGNU_PROFILE) $(FGNU_OMP)
FFLAGS = $(LFLAGS) $(FGNU_NOOPT) $(FGNU_WARNING)
FFLAGS = $(LFLAGS) $(FGNU_NOOPT) $(FGNU_WARNING) $(FGNU_GENERAL)
FINFOFLAGS = -v
endif

Expand Down Expand Up @@ -486,6 +493,11 @@ FINTEL_ERSEM = $(DEFINES)

#-------------------------------------------------

FINTEL_GENERAL =
ifdef MODDIR
FINTEL_GENERAL = -module $(MODDIR)
endif

FINTEL_PROFILE =
ifeq ($(PROFILE),true)
FINTEL_PROFILE = -p
Expand Down Expand Up @@ -532,7 +544,7 @@ ifeq ($(FORTRAN_COMPILER),INTEL)
F95 = $(F77)
LINKER = $(F77)
LFLAGS = $(FINTEL_OPT) $(FINTEL_PROFILE) $(FINTEL_OMP)
FFLAGS = $(LFLAGS) $(FINTEL_NOOPT) $(FINTEL_WARNING)
FFLAGS = $(LFLAGS) $(FINTEL_NOOPT) $(FINTEL_WARNING) $(FINTEL_GENERAL)
FINFOFLAGS = -v
endif

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_12 05-06-2015 VERS_7_1_12 commit_2015-07-10

version 7_1_12 05-06-2015 VERS_7_1_12

========================================================== 05-06-2015 - 7_1_12
Expand Down
36 changes: 36 additions & 0 deletions cp_fem.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/bin/sh
#
#---------------------------------------------------

dirs="fem3d femplot"

if [ $# -eq 0 ]; then
echo "Usage: cp_fem.sh number"
exit 1
fi

number=$1

for dir in $dirs
do
d=${dir}_$number
if [ -d $d ]; then
echo "directory exists... cannot copy: $d"
exit 1
fi
done

for dir in $dirs
do
d=${dir}_$number
echo "copying from $dir to $d"
mkdir $d
cp $dir/* $d
done

dir=fem3d/bin
d=fem3d_$number/bin
echo "copying from $dir to $d"
mkdir $d
cp $dir/* $d

Loading

0 comments on commit c1567b8

Please sign in to comment.