.travis.yml

@@ -12,7 +12,7 @@ before_install:
   - if [[ "${CC}" == "gcc" || "${CC}" == "g++" ]]; then export CXX=g++; fi
   - if [[ "${CC}" == "clang" || "${CC}" == "clang++" ]]; then export CXX=clang++; fi
   - sudo apt-get update -qq
-  - sudo apt-get install -y -qq antlr libantlr-dev libnetcdfc7 libnetcdf-dev netcdf-bin udunits-bin libudunits2-0 libudunits2-dev
+  - sudo apt-get install -y -qq antlr libantlr-dev libnetcdf11 libnetcdf-dev netcdf-bin udunits-bin libudunits2-0 libudunits2-dev
   - ./configure
   - export DATA='/home/travis'
 

bld/Makefile

@@ -1270,7 +1270,7 @@ endif # endif OMP
 endif
 # endif LINUX, LINUXALPHA, LINUXAMD64, LINUXARM, FREEBSD, MACOSX
 
-# NB: Deprecated as of 201403. Now MACOSX is subsumed in LINUX
+# NB: Deprecated as of 201403. Now LINUX* subsumes MACOSX
 ifeq (${PVM_ARCH},MACOSXOLD)
 CXX := ${LINUX_CXX}
 # NB: -D_POSIX_SOURCE breaks MACOSX build in nco_fl_utl.c, nco_mmr.c

bld/nco.spec

@@ -2,17 +2,17 @@
 # http://cvs.fedoraproject.org/viewvc/devel/nco/nco.spec?view=co
 
 Name:           nco
-Version:        4.8.1
+Version:        4.9.0
 Release:        1%{?dist}
 Summary:        Programs that manipulate netCDF files
 Group:          Applications/Engineering
 License:        GPL3
 URL:            http://nco.sf.net/
 
-# Obtain NCO version 4.8.1-1 tar.gz from Sourceforge using CVS:
+# Obtain NCO version 4.9.0-1 tar.gz from Sourceforge using CVS:
 # cvs -d:pserver:anonymous@nco.cvs.sf.net:/cvsroot/nco login
-# cvs -z3 -d:pserver:anonymous@nco.cvs.sf.net:/cvsroot/nco co -r nco-4.8.1-1 -d nco-%{version} nco
-# tar czf nco-%{version}.tar.gz --exclude='nco-4.8.1/debian*' --exclude='.cvsignore' --exclude=ncap_lex.c --exclude='ncap_yacc.[ch]' ./nco-%{version}
+# cvs -z3 -d:pserver:anonymous@nco.cvs.sf.net:/cvsroot/nco co -r nco-4.9.0-1 -d nco-%{version} nco
+# tar czf nco-%{version}.tar.gz --exclude='nco-4.9.0/debian*' --exclude='.cvsignore' --exclude=ncap_lex.c --exclude='ncap_yacc.[ch]' ./nco-%{version}
 Source0:        nco-%{version}.tar.gz
 #Patch0:		nco_install_C_headers.patch
 #Patch1:         nco_find_udunits-dat.patch
@@ -108,6 +108,9 @@ fi
 # %{_libdir}/libnco++.so
 
 %changelog
+* Mon Dec 04 2019 Charlie Zender <zender@uci.edu> - 4.9.0-1
+- new upstream 4.9.0
+
 * Mon Jul 01 2019 Charlie Zender <zender@uci.edu> - 4.8.1-1
 - new upstream 4.8.1
 

bld/nco_dst.pl

@@ -5,20 +5,20 @@
 
 # Usage:
 # Export tagged, public versions
-# /usr/bin/scp ${DATA}/nco-4.8.1.tar.gz zender,nco@web.sf.net:/home/project-web/nco/htdocs/src
-
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --bld --cln nco-4.8.1 # Build, do not release on SF
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --bld --cln --sf nco-4.8.1 # Build, release on SF
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --nst_all nco-4.8.1 # Install, do not build
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --bld --cln --nst_all nco-4.8.1 # Build and install
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --acd_cnt nco-4.8.1
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --acd_prs nco-4.8.1
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --cgd_cnt nco-4.8.1
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --cray_prs nco-4.8.1
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --bbl_cnt nco-4.8.1
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --blk_cnt nco-4.8.1
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --dat_cnt nco-4.8.1
-# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --ute_prs nco-4.8.1
+# /usr/bin/scp ${DATA}/nco-4.9.0.tar.gz zender,nco@web.sf.net:/home/project-web/nco/htdocs/src
+
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --bld --cln nco-4.9.0 # Build, do not release on SF
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --bld --cln --sf nco-4.9.0 # Build, release on SF
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --nst_all nco-4.9.0 # Install, do not build
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --bld --cln --nst_all nco-4.9.0 # Build and install
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --acd_cnt nco-4.9.0
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --acd_prs nco-4.9.0
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --cgd_cnt nco-4.9.0
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --cray_prs nco-4.9.0
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --bbl_cnt nco-4.9.0
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --blk_cnt nco-4.9.0
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --dat_cnt nco-4.9.0
+# ${HOME}/nco/bld/nco_dst.pl --dbg=2 --cln --ute_prs nco-4.9.0
 
 # Export daily snapshot
 # ${HOME}/nco/bld/nco_dst.pl --dbg=2 
@@ -256,7 +256,7 @@ if($bld){
 # Set up FTP server
     chdir $dst_pth_pfx or die "$prg_nm: ERROR unable to chdir to $dst_pth_pfx: $!\n"; # $! is system error string
     cmd_prc("$cp_cmd $doc_fl ./$dst_vrs/doc"); # Copy derived documentation to source directory
-    cmd_prc("$tar_cmd cvzf $dst_fl --exclude='nco-4.8.1/debian*' --exclude='.cvsignore' --exclude=ncap_lex.c --exclude=ncap_yacc.[ch] ./$dst_vrs"); # Create gzipped tarfile
+    cmd_prc("$tar_cmd cvzf $dst_fl --exclude='nco-4.9.0/debian*' --exclude='.cvsignore' --exclude=ncap_lex.c --exclude=ncap_yacc.[ch] ./$dst_vrs"); # Create gzipped tarfile
     cmd_prc("$rsh_cmd $www_mch $rm_cmd $www_drc/src/$dst_fl"); # Remove any distribution with same name
     if($dly_snp){cmd_prc("$rsh_cmd $www_mch $rm_cmd -r $www_drc/src/nco-????????.tar.gz");} # Remove previous daily snapshots from WWW server
     cmd_prc("$rcp_cmd $dst_fl $www_mch:$www_drc/src"); # Copy local tarfile to WWW server

bm/NCO_rgr.pm

@@ -117,6 +117,8 @@ sub tst_rgr {
     # 470 (for library 4.7.0)
     # 471 (for library 4.7.1)
     # 472 (for library 4.7.2)
+    # 473 (for library 4.7.3)
+    # 474 (for library 4.7.4)
 
   if($exit_value == 410){print "netCDF version 4.1.x detected\n";}
   if($exit_value == 431){print "netCDF version 4.3.1 detected\n";}
@@ -134,6 +136,8 @@ sub tst_rgr {
   if($exit_value == 470){print "netCDF version 4.7.0 detected\n";}
   if($exit_value == 471){print "netCDF version 4.7.1 detected\n";}
   if($exit_value == 472){print "netCDF version 4.7.2 detected\n";}
+  if($exit_value == 473){print "netCDF version 4.7.3 detected\n";}
+  if($exit_value == 474){print "netCDF version 4.7.4 detected\n";}
 
   if($exit_value >= 400){$RUN_NETCDF4_TESTS=1;}
   if($exit_value >= 431){$RUN_NETCDF4_TESTS_VERSION_GE_431=1;}
@@ -2608,7 +2612,7 @@ if($RUN_NETCDF4_TESTS_VERSION_GE_431){
 #ncks #85
 #ncks -O -L 0 --cnk_min=1 --cnk_dmn lat,1 -v one ~/nco/data/hdn.nc ~/foo.nc
 #ncks -C -m --trd --hdn -v one -g g13 ~/foo.nc | grep _ChunkSizes
-    $dsc_sng="(Groups) Imposing zero deflation (-L 0) on already-chunked variable keeps uses specified not netCDF-default chunksizes (expect failure with netCDF 4.1.1-)";
+    $dsc_sng="(Groups) Imposing zero deflation (-L 0) on already-chunked variable keeps/uses specified chunksizes not netCDF-default chunksizes (expect failure with netCDF 4.1.1-)";
     $tst_cmd[0]="ncks -O -4 -L 0 --cnk_min=1 --cnk_dmn lat,1 -v one $nco_D_flg $in_pth_arg hdn.nc %tmp_fl_00%";
     $tst_cmd[1]="ncks -C -m --trd --hdn -v one -g g13 %tmp_fl_00% | grep _ChunkSizes";
     $tst_cmd[2]="one attribute 2: _ChunkSizes, size = 1 NC_INT, value = 1";

configure

 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for NCO netCDF Operators 4.8.1.
+# Generated by GNU Autoconf 2.69 for NCO netCDF Operators 4.9.0.
 #
 # Report bugs to <nco-bugs@lists.sourceforge.net>.
 #
@@ -592,8 +592,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='NCO netCDF Operators'
 PACKAGE_TARNAME='nco'
-PACKAGE_VERSION='4.8.1'
-PACKAGE_STRING='NCO netCDF Operators 4.8.1'
+PACKAGE_VERSION='4.9.0'
+PACKAGE_STRING='NCO netCDF Operators 4.9.0'
 PACKAGE_BUGREPORT='nco-bugs@lists.sourceforge.net'
 PACKAGE_URL=''
@@ -1388,7 +1388,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 4.8.1 to adapt to many kinds of systems.
+\`configure' configures NCO netCDF Operators 4.9.0 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1459,7 +1459,7 @@ fi
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of NCO netCDF Operators 4.8.1:";;
+     short | recursive ) echo "Configuration of NCO netCDF Operators 4.9.0:";;
    esac
   cat <<\_ACEOF
@@ -1625,7 +1625,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-NCO netCDF Operators configure 4.8.1
+NCO netCDF Operators configure 4.9.0
 generated by GNU Autoconf 2.69
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2491,7 +2491,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 4.8.1, which was
+It was created by NCO netCDF Operators $as_me 4.9.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
   $ $0 $@
@@ -3746,7 +3746,7 @@ fi
 # Define the identity of the package.
  PACKAGE='nco'
- VERSION='4.8.1'
+ VERSION='4.9.0'
 cat >>confdefs.h <<_ACEOF
@@ -21575,7 +21575,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 4.8.1, which was
+This file was extended by NCO netCDF Operators $as_me 4.9.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
   CONFIG_FILES    = $CONFIG_FILES
@@ -21641,7 +21641,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-NCO netCDF Operators config.status 4.8.1
+NCO netCDF Operators config.status 4.9.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"

configure.ac

@@ -54,7 +54,7 @@
 # 20170808: Choose between traditional version and Git-based version
 # If Git, consider that Linux dynamic libraries will have full messy name, MacOSX will not
 # https://stackoverflow.com/questions/43526939/how-to-insert-git-based-version-in-autoconf-managed-project
-AC_INIT([NCO netCDF Operators],[4.8.1],[nco-bugs@lists.sourceforge.net],[nco])
+AC_INIT([NCO netCDF Operators],[4.9.0],[nco-bugs@lists.sourceforge.net],[nco])
 
 # Print GNU copyright in configure script
 AC_COPYRIGHT

data/map_file_stats.nco

+// check the totals in a map file
+// usage:  ncap2 -v -O -S map_file_checker.nco  map_in.nc tot.nc
+
+
+pi=3.14159265358979323844;
+
+a=1;
+a@area_ttl=area_a.ttl();
+a@mask_ttl=mask_a.ttl().int();;
+a@frac_ttl=frac_a.ttl();
+a@frac_min=frac_a.min();
+a@frac_max=frac_a.max();
+a@frac_rms=(frac_a-1.0).rms();
+
+b=1;
+b@area_ttl=area_b.ttl();
+b@mask_ttl=mask_b.ttl();
+b@frac_ttl=frac_b.ttl();
+b@frac_min=frac_b.min();
+b@frac_max=frac_b.max();
+b@frac_rms=(frac_b-1.0).rms();
+
+s=1;
+s@S_ttl=S.ttl();
+
+
+print("map file statistics\n");
+print(a@area_ttl,"area_a total=%.15g steradians");
+print(a@area_ttl / 4.0 / pi *100.0, "  ( %.15f%% )\n"); 
+
+print(a@mask_ttl, "mask_a total=%d\n");
+print(a@frac_ttl, "frac_a total=%.15f ");
+print(a@frac_min, "min=%.15f ");
+print(a@frac_max, "max=%.15f ");
+print(a@frac_rms, "rms=%.15f\n");  
+
+print("\n");
+print(b@area_ttl,"area_b total=%.15g steradians");
+print(b@area_ttl / 4.0 / pi *100.0, "  ( %.15f%% )\n"); 
+
+print(b@mask_ttl, "mask_b total=%d\n");
+print(b@frac_ttl, "frac_b total=%.15f ");
+print(b@frac_min, "min=%.15f ");
+print(b@frac_max, "max=%.15f ");
+print(b@frac_rms, "rms=%.15f\n");  
+
+print("\n");
+print(s@S_ttl,"S weights  total=%.15f\n");

debian/changelog

-nco (4.8.1-2) UNRELEASED; urgency=medium
+nco (4.9.0-1) unstable; urgency=medium
 
+  * New upstream release.
   * Bump Standards-Version to 4.4.1, no changes.
+  * Drop spelling-errors.patch, applied upstream.
+  * Drop unused override for spelling-error-in-binary.
 
- -- Bas Couwenberg <sebastic@debian.org>  Wed, 10 Jul 2019 18:33:34 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 05 Dec 2019 05:32:58 +0100
 
 nco (4.8.1-1) unstable; urgency=medium
 

debian/lintian-overrides

-# False positive, string not included in source
-spelling-error-in-binary usr/bin/nc* ment meant
-
 # False positive on abbreviation for 'degree east'
 spelling-error-in-binary * degreeE degree
 

debian/patches/series

-spelling-errors.patch

debian/patches/spelling-errors.patch

-Description: Fix spelling errors.
- * didnt -> didn't
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://github.com/nco/nco/pull/141
-Applied-Upstream: https://github.com/nco/nco/commit/cf2a29f647d1755d600ad7184aae674c4ac1f50f
-
---- a/src/nco/nco_ply_lst.c
-+++ b/src/nco/nco_ply_lst.c
-@@ -218,7 +218,7 @@ int *pl_nbr)
-     else
-     {
-       if(nco_dbg_lvl_get() >=  nco_dbg_std ){
--        (void)fprintf(stdout, "%s: split wrapping didnt work on this polygon(%lu)\n", nco_prg_nm_get(), idx );
-+        (void)fprintf(stdout, "%s: split wrapping didn't work on this polygon(%lu)\n", nco_prg_nm_get(), idx );
-         (void)fprintf(stdout, "/********************************/\n");
-       }
-