Skip to content

Commit d9e2db8

Browse files
committed
Add time average manual pages
Correct authorship for some files in the man pages, change bug report address to GitHub issue URL, and add copyright year
1 parent 9059da6 commit d9e2db8

15 files changed

+367
-29
lines changed

configure.ac

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,12 @@ m4_define([git_revision],
3333
AC_REVISION([git_revision])
3434
m4_define([git_hashval],
3535
[m4_esyscmd_s([git rev-parse HEAD 2> /dev/null || echo "unknown githash"])])
36+
AC_REVISION([git_hashval])
3637
m4_define([git_date],
3738
[m4_esyscmd_s([git show --no-patch --format=%as HEAD 2> /dev/null || date +%Y-%m-%d])])
3839
AC_REVISION([git_date])
40+
m4_define([copyright_year],
41+
[m4_substr(git_date, 0, 4)])
3942

4043
AC_CONFIG_SRCDIR([src/land_utils/combine-ncc.F90])
4144
AC_CONFIG_MACRO_DIR([m4])
@@ -201,14 +204,20 @@ AS_IF([test $ac_cv_type_long_double_wider = no],
201204
AM_CONDITIONAL([HAVE_TEST25_INPUT], [test -e ${srcdir}/t/Test25-input/grid_spec.nc])
202205

203206
# Set macros
207+
AS_VAR_SET([GIT_REVISION], ["git_revision"])dnl
204208
AC_DEFINE([GIT_REVISION], ["git_revision"],
205209
[Holds the 'git describe' information if configure ran within a git working directory])dnl
210+
AC_SUBST(GIT_REVISION)dnl
211+
AS_VAR_SET([GIT_HEADHASH], ["git_hashval"])dnl
206212
AC_DEFINE([GIT_HEADHASH], ["git_hashval"],
207213
[Holds the 'git rev-parse HEAD' information if configure ran within a git working directory])dnl
208-
AC_DEFINE([COPYRIGHT_YEAR], ["m4_substr(git_date, 0, 4)"],
214+
AC_SUBST(GIT_HEADHASH)dnl
215+
AS_VAR_SET([COPYRIGHT_YEAR], ["copyright_year"])dnl
216+
AC_DEFINE([COPYRIGHT_YEAR], ["copyright_year"],
209217
[Year to place in Copyright notices printed with --version information])dnl
218+
AC_SUBST(COPYRIGHT_YEAR)dnl
210219

211-
#Code for setting rpath based ncview's configure.in code.
220+
# Code for setting rpath based ncview's configure.in code.
212221
AS_IF([test x$ac_compiler_gnu = xyes], [RPATH_FLAGS=""
213222
for word in $NETCDF_LDFLAGS $NETCDF_FCLDFLAGS
214223
do

man/Makefile.am

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,12 @@ EXTRA_DIST = \
2626
list_ncvars.txt \
2727
list_ncvars.csh.txt \
2828
mppnccombine.txt \
29+
plevel_interp.txt \
2930
plevel.sh.txt \
3031
scatter-ncc.txt \
32+
timavg.txt \
33+
timavg.csh.1 \
34+
time_average.txt \
3135
asciidoc.conf
3236

3337
# Documentation settings
@@ -45,9 +49,14 @@ man_MANS += \
4549
is-compressed.1 \
4650
list_ncvars.1 \
4751
list_ncvars.csh.1 \
52+
plevel_interp.1 \
4853
plevel.sh.1 \
4954
mppnccombine.1 \
50-
scatter-ncc.1
55+
scatter-ncc.1 \
56+
timavg.1 \
57+
timavg.csh.1 \
58+
time_average.1
59+
5160
endif
5261

5362
.txt.1:
@@ -56,6 +65,8 @@ endif
5665
-d manpage \
5766
-f manpage \
5867
-afre_version=$(PACKAGE_VERSION) \
68+
-apackage_bugreport=$(PACKAGE_BUGREPORT) \
69+
-acopyright_year=$(COPYRIGHT_YEAR) \
5970
--asciidoc-opts="-f $(ASCIIDOC_CFG)" \
6071
$<
6172

man/combine-ncc.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ https://cfconventions.org/Data/cf-conventions/cf-conventions-1.7/build/ch08s02.h
4343

4444
BUGS
4545
----
46-
Send bug reports to GFDL's help desk <oar.gfdl.help@noaa.gov>
46+
Open bug reports at {package_bugreport}.
4747

4848
AUTHORS
4949
-------
5050
Sergey Malyshev
5151

5252
COPYRIGHT AND LICENSE
5353
---------------------
54-
Copyright 2009-2024 Geophysical Fluid Dynamics Laboratory
54+
Copyright {copyright_year} Geophysical Fluid Dynamics Laboratory
5555

5656
The Flexible Modeling System (FMS) is free software; you can
5757
redistribute it and/or modify it and are expected to follow the terms

man/combine_restarts.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,15 @@ SEE ALSO
4444

4545
BUGS
4646
----
47-
Send bug reports to GFDL's help desk <oar.gfdl.help@noaa.gov>
47+
Open bug reports at {package_bugreport}.
4848

4949
AUTHORS
5050
-------
51-
Designed and written by
52-
Seth Underwood.
51+
Seth Underwood
5352

5453
COPYRIGHT AND LICENSE
5554
---------------------
56-
Copyright 2015, 2024 Geophysical Fluid Dynamics Laboratory
55+
Copyright {copyright_year} Geophysical Fluid Dynamics Laboratory
5756

5857
The Flexible Modeling System (FMS) is free software; you can
5958
redistribute it and/or modify it and are expected to follow the terms

man/decompress-ncc.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ https://cfconventions.org/Data/cf-conventions/cf-conventions-1.7/build/ch08s02.h
4646

4747
BUGS
4848
----
49-
Send bug reports to GFDL's help desk <oar.gfdl.help@noaa.gov>
49+
Open bug reports at {package_bugreport}.
5050

5151
AUTHORS
5252
-------
5353
Sergey Malyshev
5454

5555
COPYRIGHT AND LICENSE
5656
---------------------
57-
Copyright 2009-2024 Geophysical Fluid Dynamics Laboratory
57+
Copyright {copyright_year} Geophysical Fluid Dynamics Laboratory
5858

5959
The Flexible Modeling System (FMS) is free software; you can
6060
redistribute it and/or modify it and are expected to follow the terms

man/iceberg_comb.sh.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,15 @@ SEE ALSO
4040

4141
BUGS
4242
----
43-
Send bug reports to GFDL's Helpdesk <oar.gfdl.help@noaa.gov>
43+
Open bug reports at {package_bugreport}.
4444

4545
AUTHORS
4646
-------
47-
Designed and written by
48-
Niki Zadeh and
49-
Seth Underwood.
47+
Niki Zadeh and Seth Underwood
5048

5149
COPYRIGHT AND LICENSE
5250
---------------------
53-
Copyright 2015,2024 Geophysical Fluid Dynamics Laboratory
51+
Copyright {copyright_year} Geophysical Fluid Dynamics Laboratory
5452

5553
The Flexible Modeling System (FMS) is free software; you can
5654
redistribute it and/or modify it and are expected to follow the terms

man/is-compressed.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ https://cfconventions.org/Data/cf-conventions/cf-conventions-1.7/build/ch08s02.h
3535

3636
BUGS
3737
----
38-
Send bug reports to GFDL's help desk <oar.gfdl.help@noaa.gov>
38+
Open bug reports at {package_bugreport}.
3939

4040
AUTHORS
4141
-------
4242
Sergey Malyshev
4343

4444
COPYRIGHT AND LICENSE
4545
---------------------
46-
Copyright 2009-2024 Geophysical Fluid Dynamics Laboratory
46+
Copyright {copyright_year} Geophysical Fluid Dynamics Laboratory
4747

4848
The Flexible Modeling System (FMS) is free software; you can
4949
redistribute it and/or modify it and are expected to follow the terms

man/list_ncvars.csh.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ SEE ALSO
5959

6060
BUGS
6161
----
62-
Send bug reports to GFDL's help desk <oar.gfdl.help@noaa.gov>
62+
Open bug reports at {package_bugreport}.
6363

6464
AUTHORS
6565
-------
6666
Aleksey Yakovelv
6767

6868
COPYRIGHT AND LICENSE
6969
---------------------
70-
Copyright 2009, 2017, 2024 Geophysical Fluid Dynamics Laboratory
70+
Copyright {copyright_year} Geophysical Fluid Dynamics Laboratory
7171

7272
The Flexible Modeling System (FMS) is free software; you can
7373
redistribute it and/or modify it and are expected to follow the terms

man/list_ncvars.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,15 @@ SEE ALSO
7777

7878
BUGS
7979
----
80-
Send bug reports to GFDL's help desk <oar.gfdl.help@noaa.gov>
80+
Open bug reports at {package_bugreport}.
8181

8282
AUTHORS
8383
-------
84-
Aleksey Yakovelv
84+
Bruce Wyman
8585

8686
COPYRIGHT AND LICENSE
8787
---------------------
88-
Copyright 2009, 2017, 2024 Geophysical Fluid Dynamics Laboratory
88+
Copyright {copyright_year} Geophysical Fluid Dynamics Laboratory
8989

9090
The Flexible Modeling System (FMS) is free software; you can
9191
redistribute it and/or modify it and are expected to follow the terms

man/mppnccombine.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,15 +97,15 @@ a different blocking factor, simply multiply the estimate by k.
9797

9898
BUGS
9999
----
100-
Send bug reports to GFDL's help desk <oar.gfdl.help@noaa.gov>
100+
Open bug reports at {package_bugreport}.
101101

102102
AUTHORS
103103
-------
104104
Hans Vahlenkamp
105105

106106
COPYRIGHT AND LICENSE
107107
---------------------
108-
Copyright 2008-2024 Geophysical Fluid Dynamics Laboratory
108+
Copyright {copyright_year} Geophysical Fluid Dynamics Laboratory
109109

110110
The Flexible Modeling System (FMS) is free software; you can
111111
redistribute it and/or modify it and are expected to follow the terms

0 commit comments

Comments
 (0)