Skip to content

Commit

Permalink
Version 5.1.5: Rhubarb Pi
Browse files Browse the repository at this point in the history
  • Loading branch information
czender committed Mar 14, 2023
1 parent 1b91b2a commit eb8561d
Show file tree
Hide file tree
Showing 11 changed files with 52 additions and 47 deletions.
2 changes: 1 addition & 1 deletion bld/nco.spec
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ fi
# %{_libdir}/libnco++.so

%changelog
* Tue Feb 10 2023 Charlie Zender <zender@uci.edu> - 5.1.5-1
* Tue Mar 14 2023 Charlie Zender <zender@uci.edu> - 5.1.5-1
- new upstream 5.1.5

* Tue Jan 10 2023 Charlie Zender <zender@uci.edu> - 5.1.4-1
Expand Down
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.71 for NCO netCDF Operators 5.1.5-beta01.
# Generated by GNU Autoconf 2.71 for NCO netCDF Operators 5.1.5.
#
# Report bugs to <nco-bugs@lists.sourceforge.net>.
#
Expand Down Expand Up @@ -623,8 +623,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='NCO netCDF Operators'
PACKAGE_TARNAME='nco'
PACKAGE_VERSION='5.1.5-beta01'
PACKAGE_STRING='NCO netCDF Operators 5.1.5-beta01'
PACKAGE_VERSION='5.1.5'
PACKAGE_STRING='NCO netCDF Operators 5.1.5'
PACKAGE_BUGREPORT='nco-bugs@lists.sourceforge.net'
PACKAGE_URL=''

Expand Down Expand Up @@ -1429,7 +1429,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures NCO netCDF Operators 5.1.5-beta01 to adapt to many kinds of systems.
\`configure' configures NCO netCDF Operators 5.1.5 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

Expand Down Expand Up @@ -1501,7 +1501,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of NCO netCDF Operators 5.1.5-beta01:";;
short | recursive ) echo "Configuration of NCO netCDF Operators 5.1.5:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1672,7 +1672,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
NCO netCDF Operators configure 5.1.5-beta01
NCO netCDF Operators configure 5.1.5
generated by GNU Autoconf 2.71

Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2428,7 +2428,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by NCO netCDF Operators $as_me 5.1.5-beta01, which was
It was created by NCO netCDF Operators $as_me 5.1.5, which was
generated by GNU Autoconf 2.71. Invocation command line was

$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -4315,7 +4315,7 @@ fi

# Define the identity of the package.
PACKAGE='nco'
VERSION='5.1.5-beta01'
VERSION='5.1.5'


printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h
Expand Down Expand Up @@ -22439,7 +22439,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by NCO netCDF Operators $as_me 5.1.5-beta01, which was
This file was extended by NCO netCDF Operators $as_me 5.1.5, which was
generated by GNU Autoconf 2.71. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -22507,7 +22507,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
NCO netCDF Operators config.status 5.1.5-beta01
NCO netCDF Operators config.status 5.1.5
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"

Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
# 20170808: Choose between traditional version and Git-based version
# If Git, consider that Linux dynamic libraries will have full messy name, MacOS will not
# https://stackoverflow.com/questions/43526939/how-to-insert-git-based-version-in-autoconf-managed-project
AC_INIT([NCO netCDF Operators],[5.1.5-beta01],[nco-bugs@lists.sourceforge.net],[nco])
AC_INIT([NCO netCDF Operators],[5.1.5],[nco-bugs@lists.sourceforge.net],[nco])

# Print GNU copyright in configure script
AC_COPYRIGHT
Expand Down
4 changes: 2 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
nco (5.1.5-1) unstable; urgency=low

* new upstream version fxm:
* new upstream version Rhubarb Pi: all: tgl->abs, NCZarr chk drc, dnd rgl fl; ncrcat: no_cll_mth; ncremap eamxx pdq plev, CF, prs_stt_usr fix plev_nm, ps_rtn, mss_val var_lst_zmid

-- Charlie Zender <zender@uci.edu> Tue, 10 Feb 2023 12:26:01 -0700
-- Charlie Zender <zender@uci.edu> Tue, 14 Mar 2023 12:26:02 -0700

nco (5.1.4-1) unstable; urgency=low

Expand Down
4 changes: 2 additions & 2 deletions doc/ANNOUNCE
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ KNOWN PROBLEMS DUE TO NCO:
This section of ANNOUNCE reports and reminds users of the
existence and severity of known, not yet fixed, problems.
These problems occur with NCO 5.1.4 built/tested under
MacOS 13.1 with netCDF 4.9.1-RC2 on HDF5 1.12.2 and with
Linux with netCDF 4.8.1 on HDF5 1.8.19.
MacOS 13.2 with netCDF 4.9.1 on HDF5 1.12.2 and with
Linux with netCDF 4.9.1 on HDF5 1.8.19.

A. NOT YET FIXED (NCO problem)
Correctly read arrays of NC_STRING with embedded delimiters in ncatted arguments
Expand Down
4 changes: 4 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
2023-03-14 Charlie Zender <zender@uci.edu>

* NCO 5.1.5 release procedure:
cd ~/nco;git commit -a -m 'Version 5.1.5: Rhubarb Pi';git push
git tag -a 5.1.5 -m 'all: tgl->abs, NCZarr chk drc, dnd rgl fl; ncrcat: no_cll_mth; ncremap eamxx pdq plev, CF, prs_stt_usr fix plev_nm, ps_rtn, mss_val var_lst_zmid';git push --tags

* NCO 5.1.5-beta01 release procedure:
cd ~/nco;git commit -a -m 'Version 5.1.5-beta01: Heisler Picnic';git push
git tag -a 5.1.5-beta01 -m 'all: tgl->abs, NCZarr chk drc, dnd rgl fl; ncrcat: no_cll_mth; ncremap eamxx pdq plev, CF, prs_stt_usr fix plev_nm, ps_rtn, mss_val var_lst_zmid';git push --tags
Expand Down
2 changes: 1 addition & 1 deletion doc/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.1.5-beta01
5.1.5
49 changes: 25 additions & 24 deletions doc/index.shtml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Try to disable Spammers' machines:
<p><h1 align="center">Bienvenue sur le netCDF Operator (NCO) site</h1>

<p><h2>
Current stable NCO version is 5.1.4 released <!--#flastmod file="src/nco-5.1.4.tar.gz"-->
Current stable NCO version is 5.1.5 released <!--#flastmod file="src/nco-5.1.5.tar.gz"-->
</h2>

<table border=0 width=100%>
Expand Down Expand Up @@ -155,7 +155,8 @@ and
<h2>Recent Releases &amp; Milestones</h2>

<ul>
<li>2023 Feb&nbsp;09: 5.1.5 <i>In Progress...</i>
<li>2023 Jun&nbsp;XX: 5.1.6 <i>In Progress...</i>
<li>2023 Mar&nbsp;14: 5.1.5 Small features/fixes
<li>2023 Jan&nbsp;10: 5.1.4 Depth Interpolation
<li>2022 Nov&nbsp;28: 5.1.3 EAMxx fix
<li>2022 Nov&nbsp;18: 5.1.2 EAMxx
Expand Down Expand Up @@ -644,7 +645,7 @@ Identical copies of those tarballs are also stored
<a href="http://nco.sf.net/src">here</a> on SourceForge for historical
continuity.
You may retrieve the source of tagged versions directly with, e.g.,
<tt>git clone -b 5.1.4 http://github.com/nco/nco.git nco-5.1.4</tt></a>.
<tt>git clone -b 5.1.5 http://github.com/nco/nco.git nco-5.1.5</tt></a>.
<ul>
<li><b>NCO 5.1.6</b>: (<i>Future</i>)
netCDF4 user-defined types support;
Expand Down Expand Up @@ -765,7 +766,7 @@ Or, alternatively, permanently add conda-forge (which teems with goodies besides
&lsquo;<tt>conda config --add channels conda-forge</tt>&rsquo;, then
install NCO with &lsquo;<tt>conda install nco</tt>&rsquo;.
The default NCO installed by <tt>conda</tt> is generally within a month of the latest release.
<li><a href="https://github.com/conda-forge/nco-feedstock">nco-5.1.4</a> Executables Anaconda-compatible. Maintained by Filipe Fernandes.</li>
<li><a href="https://github.com/conda-forge/nco-feedstock">nco-5.1.5</a> Executables Anaconda-compatible. Maintained by Filipe Fernandes.</li>
Thanks to Rich Signell, Filipe Fernandes, Pedro Vicente, Xylar Asay-Davis and others for developing and maintaining the NCO package for conda.
</ul>

Expand All @@ -774,16 +775,16 @@ Thanks to Rich Signell, Filipe Fernandes, Pedro Vicente, Xylar Asay-Davis and ot
<h3><a href="http://www.debian.org">Debian</a> and <a href="http://www.ubuntu.com">Ubuntu</a> GNU/Linux</a></h3>
<ul>
<!--
<li><a href="http://www.debian.org">Debian</a> and <a href="http://www.ubuntu.com">Ubuntu</a> GNU/Linux-compatible Intel systems, prebuilt binary executable <a href="http://www.debian.org">deb</a>: <a href="http://packages.debian.org/testing/math/nco.html">nco-5.1.4</a></li>
<li><a href="http://www.debian.org">Debian</a> and <a href="http://www.ubuntu.com">Ubuntu</a> GNU/Linux-compatible Intel systems, prebuilt binary executable <a href="http://www.debian.org">deb</a>: <a href="http://packages.debian.org/testing/math/nco.html">nco-5.1.5</a></li>
-->
<a href="http://packages.debian.org/unstable/science/nco">Debian NCO</a> and
<a href="https://launchpad.net/ubuntu/+source/nco">Ubuntu NCO</a> homepages.
&lsquo;<tt>aptitude install nco</tt>&rsquo; installs the standard NCO for your Debian-compatible&nbsp;OS.
NCO packages in the Debian/Ubuntu repositories (e.g., Sid and Raring) generally lag the packages distributed here by 6&ndash;12 months.
<a name="beta"></a><a name="prerelease"> <!-- http://nco.sf.net#beta -->
Newer (beta- or pre-release) packages are often available for intrepid Debian/Ubuntu users as described <a href="https://github.com/nco/nco/tree/master/doc/beta.txt">here</a>.
<dt>Debian package for most recent NCO release (install with, e.g., &lsquo;<tt>dpkg --install nco_5.1.4-1_i386.deb</tt>&rsquo;):</dt>
<li><a href="https://launchpad.net/ubuntu/+source/nco/5.1.4-1">nco_5.1.4-1_amd64.deb</a> : Executables AMD64-compatible</li>
<dt>Debian package for most recent NCO release (install with, e.g., &lsquo;<tt>dpkg --install nco_5.1.5-1_i386.deb</tt>&rsquo;):</dt>
<li><a href="https://launchpad.net/ubuntu/+source/nco/5.1.5-1">nco_5.1.5-1_amd64.deb</a> : Executables AMD64-compatible</li>
Thanks to Daniel Baumann, Sebastian Couwenberg, Barry deFreese, Francesco Lovergine,
Brian Mays, Rorik Peterson, and Matej Vela for their help packaging
NCO for Debian over the years.
Expand Down Expand Up @@ -825,12 +826,12 @@ Thanks to Gavin Burris and Kyle Wilcox for documenting build procedures for RHEL
<h3><a href="http://www.apple.com/macosx/">Mac&nbsp;OS&nbsp;Darwin</a></h3>
<ul>
<!--
# MacOS 13.1.0 (Ventura) systems (firn, sastrugi, spectral):
# MacOS 13.2 (Ventura) systems (firn, sastrugi, spectral):
/usr/bin/scp ~/nco/doc/index.shtml zender,nco@web.sf.net:/home/project-web/nco/htdocs
cd ~/bin;tar cvzf ${DATA}/nco-5.1.4.macos.13.1.tar.gz nc*;scp ${DATA}/nco-5.1.4.macos.13.1.tar.gz zender,nco@web.sf.net:/home/project-web/nco/htdocs/src
cd ~/bin;tar cvzf ${DATA}/nco-5.1.5.macos.13.2.tar.gz nc*;scp ${DATA}/nco-5.1.5.macos.13.2.tar.gz zender,nco@web.sf.net:/home/project-web/nco/htdocs/src
-->
The most up-to-date executables are probably those in the tarball below. Those unfamiliar with installing executables from tarballs may try the (older) <a href="http://en.wikipedia.org/wiki/Apple_Disk_Image">DMG</a> files (you may need to add <tt>/opt/local/bin</tt> to your executable path to access those operators).
<li><a href="src/nco-5.1.4.macos.13.1.tar.gz">nco-5.1.4.macos.13.1.tar.gz</a> (<!--#fsize file="src/nco-5.1.4.macos.13.1.tar.gz"-->): Executables MacOS 13.1-compatible (last updated <!--#flastmod file="src/nco-5.1.4.macos.13.1.tar.gz"-->). Maintained by NCO Project.</li>
<li><a href="src/nco-5.1.5.macos.13.2.tar.gz">nco-5.1.5.macos.13.2.tar.gz</a> (<!--#fsize file="src/nco-5.1.5.macos.13.2.tar.gz"-->): Executables MacOS 13.2-compatible (last updated <!--#flastmod file="src/nco-5.1.5.macos.13.2.tar.gz"-->). Maintained by NCO Project.</li>
<li><a href="http://fink.sf.net">Fink</a> packages for <a href="http://fink.sf.net/pdb/package.php/nco">NCO</a>: Currently NCO 4.9.5. Maintained by Alexander Hansen.</li>
<li><a href="http://brew.sh">Homebrew</a> packages for <a href="https://formulae.brew.sh/formula/nco">NCO</a>: Currently NCO 5.1.1. Install with &lsquo;<tt>brew install nco</tt>&rsquo;. Maintained by Carlo Cabrera, Ian Lancaster, Alejandro Soto, and others over the years.</li>
<li><a href="http://trac.macosforge.org/projects/macports/wiki">MacPorts</a> infrastructure for <a href="https://ports.macports.org/port/nco">NCO</a>: <a href="https://ports.macports.org/port/nco">Portfile</a>: Currently NCO 5.1.1. Install with &lsquo;<tt>sudo port install nco</tt>&rsquo;. Maintained by Takeshi Enomoto.</li>
Expand Down Expand Up @@ -1033,12 +1034,12 @@ On the <a href="https://sourceforge.net/p/nco/bugs">Bug Tickets</a> site.</li>
The simplest way to acquire the source is to download the compressed tarball:
<ul>
<li>
<!-- scp ${DATA}/nco-5.1.4.tar.gz zender,nco@web.sf.net:/home/project-web/nco/htdocs/src -->
<a href="https://github.com/nco/nco/archive/5.1.4.tar.gz">nco-5.1.4.tar.gz</a>
(<!--#fsize file="src/nco-5.1.4.tar.gz"--> compressed tar-file)<br>
<!--#exec cmd="openssl dgst -md5 src/nco-5.1.4.tar.gz"--><br>
<!--#exec cmd="openssl dgst -sha1 src/nco-5.1.4.tar.gz"--><br>
<!--#exec cmd="openssl dgst -sha256 src/nco-5.1.4.tar.gz"-->
<!-- scp ${DATA}/nco-5.1.5.tar.gz zender,nco@web.sf.net:/home/project-web/nco/htdocs/src -->
<a href="https://github.com/nco/nco/archive/5.1.5.tar.gz">nco-5.1.5.tar.gz</a>
(<!--#fsize file="src/nco-5.1.5.tar.gz"--> compressed tar-file)<br>
<!--#exec cmd="openssl dgst -md5 src/nco-5.1.5.tar.gz"--><br>
<!--#exec cmd="openssl dgst -sha1 src/nco-5.1.5.tar.gz"--><br>
<!--#exec cmd="openssl dgst -sha256 src/nco-5.1.5.tar.gz"-->
</li>
</ul>

Expand All @@ -1059,8 +1060,8 @@ To avoid the churn that comes with using the latest snapshot,
potential contributors may wish to retrieve a recent tagged (i.e.,
stable and released) version,
This command retrieves the entire NCO repository (&lt; 20&nbsp;MB) and
then checks out NCO version <tt>5.1.4</tt>:
<p><tt>git clone https://github.com/nco/nco.git;cd nco;git checkout 5.1.4</tt></p>
then checks out NCO version <tt>5.1.5</tt>:
<p><tt>git clone https://github.com/nco/nco.git;cd nco;git checkout 5.1.5</tt></p>
However, the most efficient way to actively track and develop NCO is to
retrieve the current (&ldquo;bleeding edge&rdquo;) NCO snapshot.
This command retrieves the latest NCO master branch into a local
Expand All @@ -1070,12 +1071,12 @@ directory named <tt>nco</tt>:
Track changes to the development version using
<p><tt>cd nco;git pull</tt></p>
One difference between running a "tagged" release
(e.g., <tt>5.1.4</tt>) and the development version is that the
(e.g., <tt>5.1.5</tt>) and the development version is that the
tagged release operators will print a valid version number (e.g.,
<tt>5.1.4</tt>) when asked to do so with the <tt>-r</tt> flag
<tt>5.1.5</tt>) when asked to do so with the <tt>-r</tt> flag
(e.g., <tt>ncks -r</tt>).
Snapshots will include the sub-version and patch-level in the version
information (e.g., <tt>5.1.4-alpha06</tt>).
information (e.g., <tt>5.1.5-alpha06</tt>).

<!--
<a name="doxy"></a>
Expand Down Expand Up @@ -1257,9 +1258,9 @@ As of 20131101 there is no Cygwin package for ANTLR, and the Cygwin netCDF packa

<li>Once you have installed the pre-requisites as shown above, you may then build the latest stable NCO and install it in, e.g., <tt>/usr/local</tt> with:
<tt>
<dt>wget https://github.com/nco/nco/archive/5.1.4.tar.gz</dt>
<dt>tar xvzf 5.1.4.tar.gz</dt>
<dt>cd nco-5.1.4</dt>
<dt>wget https://github.com/nco/nco/archive/5.1.5.tar.gz</dt>
<dt>tar xvzf 5.1.5.tar.gz</dt>
<dt>cd nco-5.1.5</dt>
<dt>./configure --prefix=/usr/local</dt>
<dt>make</dt>
<dt>sudo make install</dt>
Expand Down
6 changes: 3 additions & 3 deletions doc/nco.texi
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,11 @@ Octave TeXInfo manual shows clean TeXInfo structure
@setfilename nco.info

@c Define edition, date, ...
@set nco-edition 5.1.5-beta01
@set doc-edition 5.1.5-beta01
@set nco-edition 5.1.5
@set doc-edition 5.1.5
@set copyright-years 1995--2023
@set update-year 2023
@set update-date 7 March 2023
@set update-date 14 March 2023
@set update-month March 2023

@settitle @acronym{NCO} @value{nco-edition} User Guide
Expand Down
4 changes: 2 additions & 2 deletions src/nco/nco.h
Original file line number Diff line number Diff line change
Expand Up @@ -376,14 +376,14 @@ extern "C" {
# define NCO_VERSION_PATCH 5
#endif /* !NCO_VERSION_PATCH */
#ifndef NCO_VERSION_NOTE
# define NCO_VERSION_NOTE "-beta01" /* Blank for final versions, non-blank (e.g., "-beta37") for pre-release versions */
# define NCO_VERSION_NOTE "" /* Blank for final versions, non-blank (e.g., "-beta37") for pre-release versions */
#endif /* !NCO_VERSION_NOTE */
#ifndef NCO_LIB_VERSION
/* Define NC_LIB_VERSION as three-digit number for arithmetic comparisons by CPP */
# define NCO_LIB_VERSION ( NCO_VERSION_MAJOR * 100 + NCO_VERSION_MINOR * 10 + NCO_VERSION_PATCH )
#endif /* !NCO_LIB_VERSION */
#ifndef NCO_VERSION
# define NCO_VERSION "5.1.5-beta01"
# define NCO_VERSION "5.1.5"
#endif /* !NCO_VERSION */

/* Compatibility tokens new to netCDF4 netcdf.h: */
Expand Down
2 changes: 1 addition & 1 deletion src/nco/nco_scm.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ nco_nmn_get(void) /* [fnc] Return mnemonic that describes current NCO version */
/* Purpose: Return mnemonic describing current NCO version
20191221: ncremap/ncclimo print left quote and first word of this string, so one-word strings look best
20200117: fixed this limitation, multi-word versions work fine */
return "Heisler Picnic";
return "Rhubarb Pi";
} /* !nco_nmn_get() */

void
Expand Down

0 comments on commit eb8561d

Please sign in to comment.