diff --git a/.circleci/config.yml b/.circleci/config.yml index bdc61587..61777b04 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -115,7 +115,7 @@ jobs: executor: << parameters.os >> environment: PKG_NAME: "cmor" - VERSION: "3.7.2" + VERSION: "3.7.3" PYTHON_VERSION: << parameters.python_version >> CHANNELS: "-c conda-forge" steps: diff --git a/.zenodo.json b/.zenodo.json index ce53d67b..8d66ec6f 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -2,10 +2,10 @@ "description": "

Climate Model Output Rewriter

", "access_right": "open", "license": "BSD-3-Clause", - "title": "PCMDI/CMOR: CMOR v3.7.2", - "version": "v3.7.2", + "title": "PCMDI/CMOR: CMOR v3.7.3", + "version": "v3.7.3", "upload_type": "software", - "publication_date": "2023-03-23", + "publication_date": "2023-10-12", "creators": [ { "name": "Mauzey, Chris", diff --git a/INSTALL b/INSTALL index c0bb0a3b..5fddf5a6 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ INSTALLATION INSTRUCTIONS ------------------------- -Climate Model Output Rewriter (CMOR) version 3.7.2 installation instructions. +Climate Model Output Rewriter (CMOR) version 3.7.3 installation instructions. DOWNLOAD @@ -13,7 +13,7 @@ cd CMOR INSTALLATION ------------ -CMOR 3.7.2 requires external packages that need to be installed first. +CMOR 3.7.3 requires external packages that need to be installed first. It can be compiled/linked against either NetCDF3 or NetCDF4. If you decide to go with NetCDF4 be sure to build NetCDF4 with the --enable-netcdf-4 option! diff --git a/cmip6-cmor-tables b/cmip6-cmor-tables index fd896dc2..2b94d5a6 160000 --- a/cmip6-cmor-tables +++ b/cmip6-cmor-tables @@ -1 +1 @@ -Subproject commit fd896dc269c473b85b71004c43717135bbbbd02e +Subproject commit 2b94d5a6db25451e3aa92492c029477c0187b9d6 diff --git a/configure b/configure index f0aec1d2..3887e455 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for cmor 3.7.2. +# Generated by GNU Autoconf 2.71 for cmor 3.7.3. # # Report bugs to . # @@ -611,8 +611,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='cmor' PACKAGE_TARNAME='cmor' -PACKAGE_VERSION='3.7.2' -PACKAGE_STRING='cmor 3.7.2' +PACKAGE_VERSION='3.7.3' +PACKAGE_STRING='cmor 3.7.3' PACKAGE_BUGREPORT='mauzey1@llnl.gov' PACKAGE_URL='' @@ -1293,7 +1293,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 cmor 3.7.2 to adapt to many kinds of systems. +\`configure' configures cmor 3.7.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1360,7 +1360,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of cmor 3.7.2:";; + short | recursive ) echo "Configuration of cmor 3.7.3:";; esac cat <<\_ACEOF @@ -1464,7 +1464,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -cmor configure 3.7.2 +cmor configure 3.7.3 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1707,7 +1707,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 cmor $as_me 3.7.2, which was +It was created by cmor $as_me 3.7.3, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -5779,7 +5779,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 cmor $as_me 3.7.2, which was +This file was extended by cmor $as_me 3.7.3, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5834,7 +5834,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="\\ -cmor config.status 3.7.2 +cmor config.status 3.7.3 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b51a55cc..47410640 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl dnl Process this file with autoconf to produce a configure script. dnl AC_PREREQ([2.71]) -AC_INIT([cmor],[3.7.2],[mauzey1@llnl.gov]) +AC_INIT([cmor],[3.7.3],[mauzey1@llnl.gov]) GIT_TAG=`cd $srcdir ; ./get_git_version.sh` diff --git a/include/cmor.h b/include/cmor.h index 40ef8e94..b75fc7ed 100644 --- a/include/cmor.h +++ b/include/cmor.h @@ -3,7 +3,7 @@ #define CMOR_VERSION_MAJOR 3 #define CMOR_VERSION_MINOR 7 -#define CMOR_VERSION_PATCH 2 +#define CMOR_VERSION_PATCH 3 #define CMOR_CF_VERSION_MAJOR 1 #define CMOR_CF_VERSION_MINOR 7 diff --git a/setup.py.in b/setup.py.in index 4f793642..41d67883 100755 --- a/setup.py.in +++ b/setup.py.in @@ -52,7 +52,7 @@ print('src:',srcfiles) print('macros:',macros) setup (name = "CMOR", - version='3.7.2', + version='3.7.3', author='Chris Mauzey, AIMS', description = "Python Interface to CMOR output library", url = "http://cmor.llnl.gov/",