Skip to content

Commit

Permalink
...and still going
Browse files Browse the repository at this point in the history
  • Loading branch information
georgu committed May 14, 2020
1 parent 78ca90e commit 6b5a626
Show file tree
Hide file tree
Showing 22 changed files with 135 additions and 63 deletions.
1 change: 0 additions & 1 deletion BUG
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@


#------------------------------------------------------------------------
#
# Copyright (C) 1985-2018 Georg Umgiesser
Expand Down
25 changes: 0 additions & 25 deletions CHANGES

This file was deleted.

61 changes: 60 additions & 1 deletion COMMIT
Original file line number Diff line number Diff line change
@@ -1,5 +1,64 @@
============================================================

Thu May 14 13:42:43 CEST 2020

...and still going

BUG | 1 -
CHANGES | 25 ---
COMMIT | 2 +-
Dockerfile | 4 +-
LOG | 2 -
Makefile | 1 +
VERSION | 32 ++--
fem3d/MPI_todo | 30 ----
fem3d/info/INFO_INTERNAL_MEMO | 197 +++++++++++++++++++++++
fem3d/info/INFO_MPI_todo | 30 ++++
fem3d/info/INFO_WARNINGS | 178 +++++++++++++++++++++
fem3d/info/INTERNAL_MEMO | 197 -----------------------
fem3d/info/WARNINGS | 178 ---------------------
femcheck/INFO_INSTALL | 65 ++++++++
femcheck/INSTALL-LIST | 64 --------
femcheck/copyright/revision_log.pl | 24 ++-
femcheck/copyright/revision_log.pm | 32 +++-
femdoc/INFO_LAGRANGE | 75 +++++++++
femdoc/INFO_LOG | 17 ++
femdoc/LAGRANGE | 75 ---------
femdoc/LOG | 17 --
grid/info/BUGS | 12 --
grid/info/GRIDLOG | 320 -------------------------------------
grid/info/INFORMAT | 66 --------
grid/info/INFO_BUGS | 12 ++
grid/info/INFO_FORMAT | 66 ++++++++
grid/info/INFO_INTERNAL | 72 +++++++++
grid/info/INFO_LOG | 320 +++++++++++++++++++++++++++++++++++++
grid/info/INTERNAL | 72 ---------
post/info/CALCOMP | 26 ---
post/info/EPS | 37 -----
post/info/INFO_CALCOMP | 26 +++
post/info/INFO_EPS | 38 +++++
post/info/INFO_LOG | 33 ++++
post/info/LOG | 33 ----
35 files changed, 1195 insertions(+), 1184 deletions(-)
deleted:
CHANGES
renamed:
fem3d/info/INTERNAL_MEMO -> fem3d/info/INFO_INTERNAL_MEMO
fem3d/MPI_todo -> fem3d/info/INFO_MPI_todo
fem3d/info/WARNINGS -> fem3d/info/INFO_WARNINGS
femcheck/INSTALL-LIST -> femcheck/INFO_INSTALL
femdoc/LAGRANGE -> femdoc/INFO_LAGRANGE
femdoc/LOG -> femdoc/INFO_LOG
grid/info/BUGS -> grid/info/INFO_BUGS
grid/info/INFORMAT -> grid/info/INFO_FORMAT
grid/info/INTERNAL -> grid/info/INFO_INTERNAL
grid/info/GRIDLOG -> grid/info/INFO_LOG
post/info/CALCOMP -> post/info/INFO_CALCOMP
post/info/EPS -> post/info/INFO_EPS
post/info/LOG -> post/info/INFO_LOG

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

Thu May 14 10:24:45 CEST 2020

still going...
Expand Down Expand Up @@ -23529,7 +23588,7 @@ M makefile

#------------------------------------------------------------------------
#
Copyright (C) 1985-2020 Georg Umgiesser
# Copyright (C) 1985-2020 Georg Umgiesser
#
# This file is part of SHYFEM.
#
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
FROM debian:stretch

#------------------------------------------------------------------------
#
Expand All @@ -8,6 +7,8 @@ FROM debian:stretch
#
#------------------------------------------------------------------------

FROM debian:stretch

RUN apt-get update && apt-get install -y \
g++ \
gfortran \
Expand All @@ -28,3 +29,4 @@ ENV PATH "/root/shyfem/bin:${PATH}"

# run tests
CMD ./examples/mar_menor/run.sh

2 changes: 0 additions & 2 deletions LOG
Original file line number Diff line number Diff line change
Expand Up @@ -4625,8 +4625,6 @@ c 02.05.2012 ggu new routine ideci()

conservation of tracers in ht must still be looked at

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

#------------------------------------------------------------------------
#
# Copyright (C) 1985-2018 Georg Umgiesser
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@ cleanlocal:
-rm -f changed_zip.zip
-rm -f *~
-rm -f *.tmp *.bak *.out
-rm -f *.revnew
-rm -f ggg hhh
-rm -f errout.dat a.out plot.ps
-rm -f .memory
Expand Down
32 changes: 11 additions & 21 deletions VERSION
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
commit_2020-05-14
version 7_5_69 06-03-2020 VERS_7_5_69 commit_2020-05-14

commit_2020-05-14
version 7_5_69 06-03-2020 VERS_7_5_69 commit_2020-05-14

commit_2020-05-14
version 7_5_69 06-03-2020 VERS_7_5_69 commit_2020-05-14

commit_2020-05-14
version 7_5_69 06-03-2020 VERS_7_5_69 commit_2020-05-14

version 7_5_69 06-03-2020 VERS_7_5_69 commit_2020-05-14

--------------------------------------------------------------------------

Copyright (C) 1985-2020 Georg Umgiesser

This file is part of SHYFEM.

--------------------------------------------------------------------------
version 7_5_69 06-03-2020 VERS_7_5_69 commit_2020-05-13

version 7_5_69 06-03-2020 VERS_7_5_69 commit_2020-05-10
Expand Down Expand Up @@ -10661,11 +10655,7 @@ c
c weutro.h:
c 24.08.2004 ggu some new variables (idbox, wdebug etc)
c
c--------------------------------------------------------------
c--------------------------------------------------------------
c EUTRO.CMN
c--------------------------------------------------------------
c--------------------------------------------------------------
c
c weutro_light.f:
c 20.08.2004 ggu written from scratch
Expand Down Expand Up @@ -12714,34 +12704,34 @@ c
cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc


-------------------------------------------------------------------- 08.08.1997
==================================================================== 08.08.1997

all: param.h -> defines.h
param.gen -> param.h

-------------------------------------------------------------------- 25.07.1997
==================================================================== 25.07.1997

ht08: call to sp135r in main -> we need chezy again
old model can run with this, czv is just
not needed

-------------------------------------------------------------------- 23.07.1997
==================================================================== 23.07.1997

newini: substituted iclin with bcolin (harmless change)


-------------------------------------------------------------------- 21.07.1997
==================================================================== 21.07.1997

new3di: substitutes new3d just the algorithm changes,
not the data structures
makefile: link with new objects (old objects have been
saved in NEW_OBJS, HP_OBJS)

-------------------------------------------------------------------- 19.06.1996
==================================================================== 19.06.1996

last version of old model : 19 June 1996

--------------------------------------------------------------------
====================================================================

#------------------------------------------------------------------------
#
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions femcheck/INSTALL-LIST → femcheck/INFO_INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#
#------------------------------------------------------------------------

# useful packages to install:

bash
make
Expand Down
24 changes: 21 additions & 3 deletions femcheck/copyright/revision_log.pl
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,11 @@
$::copyright = 0;
$::shyfem = 0;
$::manual = 0;
$::copyatend = 0;
$::cstyle_revlog = 0;

$::debug = 0;

#print STDERR "reading file $::file\n";

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

$::type = find_file_type($::file);
Expand All @@ -73,6 +72,8 @@
exit 0 if $::type eq "binary";
exit 0 if $::type eq "image";

#print STDERR "reading file $::file with type $::type\n";

#--------------------------------------------------------------
#--------------------------------------------------------------
#--------------------------------------------------------------
Expand Down Expand Up @@ -129,6 +130,7 @@ sub extract_header
my @body = ();

my $cc = quotemeta($::comchar);
$cc = "" if $::type eq "special";

my $in_header = 1;

Expand Down Expand Up @@ -201,6 +203,15 @@ sub extract_copy
}
}

if( $::copyright ) {
if( @header0 > 10 ) {
if( $::type ne "special" ) {
print STDERR " $::file has copyright at end of file\n";
}
$::copyatend = 1;
}
}

$::copyerror = 0;

if( $::copyright ) {
Expand Down Expand Up @@ -353,11 +364,16 @@ sub handle_copyright
{
my ($rev,$copy) = @_;

if( check_copyright($copy) ) {
if( check_copyright($copy) ) { # this is true if copy and unknown type
print " not changing copyright...\n";
return $copy;
}

if( $::newcopy and $::copyatend ) {
print "*** $::file has copyright at end of file... use --updatecopy\n";
return $copy;
}

if( $::updatecopy ) {
return $copy unless @$copy; #do not update if no copyright
} elsif( $::newcopy ) {
Expand Down Expand Up @@ -432,6 +448,8 @@ sub check_copyright
{
my ($copy) = @_;

return 0 if $::manual;

if( @$copy and $::type eq "unknown" ) {
print "*** $::file has copyright but has unknown type\n";
return 1;
Expand Down
32 changes: 30 additions & 2 deletions femcheck/copyright/revision_log.pm
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,8 @@ sub get_comment_char
return "#";
} elsif( $type eq "text" ) {
return "#";
} elsif( $type eq "special" ) {
return "#";
} elsif( $type eq "tex" ) {
return "%";
} elsif( $type eq "ps" ) {
Expand Down Expand Up @@ -665,9 +667,13 @@ sub find_file_type
return "grd";
} elsif( check_extension($file,".txt",".str",".make") ) {
return "text";
} elsif( check_extension($file,"akefile","README","TODO") ) {
} elsif( check_exact($file,"makefile","Makefile","README","TODO") ) {
return "text";
} elsif( check_exact($file,"VERSION","COMMIT","LOG","RELEASE_NOTES") ) {
return "special";
} elsif( check_exact($file,"FAQ","INFO","BUG","Dockerfile") ) {
return "text";
} elsif( check_extension($file,"FAQ","INFO") ) {
} elsif( check_start($file,"INFO_","Rules.") ) {
return "text";
} elsif( check_extension($file,".o",".a",".mod") ) {
return "binary";
Expand Down Expand Up @@ -695,6 +701,28 @@ sub check_extension
return 0;
}

sub check_start
{
my $file = shift;

foreach (@_) {
my $pattern = quotemeta($_);
return 1 if $file =~ /\/$pattern/ or $file =~ /^$pattern/;
}
return 0;
}

sub check_exact
{
my $file = shift;

foreach (@_) {
my $pattern = quotemeta($_);
return 1 if $file =~ /\/$pattern$/ or $file =~ /^$pattern$/;
}
return 0;
}

#------------------------------------------------------------------
#------------------------------------------------------------------
#------------------------------------------------------------------
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
15 changes: 8 additions & 7 deletions post/info/EPS → post/info/INFO_EPS
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

%------------------------------------------------------------------------
%
% Copyright (C) 1985-2018 Georg Umgiesser
%
% This file is part of SHYFEM.
%
%------------------------------------------------------------------------
#------------------------------------------------------------------------
#
# Copyright (C) 1985-2018 Georg Umgiesser
#
# This file is part of SHYFEM. (m)
#
#------------------------------------------------------------------------

/BeginEPSF {
/b4_Inc_state save def
Expand Down Expand Up @@ -35,3 +35,4 @@
/ClipRect { %% llx lly w h
Rect clip newpath
} bind def

File renamed without changes.

0 comments on commit 6b5a626

Please sign in to comment.