Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMOR 3.9.0 #761

Merged
merged 5 commits into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
executor: << parameters.os >>
environment:
PKG_NAME: "cmor"
VERSION: "3.8.0"
VERSION: "3.9.0"
PYTHON_VERSION: << parameters.python_version >>
CHANNELS: "-c conda-forge"
steps:
Expand Down Expand Up @@ -197,7 +197,7 @@ workflows:
matrix:
parameters:
os: [ linux ]
python_version: [ "3.8", "3.9", "3.10", "3.11", "3.12" ]
python_version: [ "3.9", "3.10", "3.11", "3.12" ]
name: build-<< matrix.os >>-<< matrix.python_version >>

- upload:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/nightly-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ jobs:
C_COMPILER: clang_osx-64
FORTRAN_COMPILER: gfortran_osx-64
PROJECT_DIR: workdir/macos_64
python_version: ['3.8', '3.9', '3.10', '3.11', '3.12']
python_version: ['3.9', '3.10', '3.11', '3.12']
runs-on: ${{ matrix.runner.RUNNER_OS }}
env:
PACKAGE_NAME: cmor
PACKAGE_VERSION: 3.8.0
PACKAGE_VERSION: 3.9.0
PYTHON_VERSION: ${{ matrix.python_version }}
CONDA_FORGE_CHANNEL: conda-forge
CONDA_USER: pcmdi
Expand Down
2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"title": "PCMDI/CMOR: CMOR v3.9.0",
"version": "v3.9.0",
"upload_type": "software",
"publication_date": "2024-08-xx",
"publication_date": "2024-08-28",
"creators": [
{
"name": "Mauzey, Chris",
Expand Down
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,5 @@ authors:
title: "The Climate Model Output Rewriter (CMOR)"
version: 3.9.0
doi: 10.5281/zenodo.592733
date-released: 2024-08-xx
date-released: 2024-08-28
url: "https://github.com/PCMDI/cmor"
4 changes: 2 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
INSTALLATION INSTRUCTIONS
-------------------------
Climate Model Output Rewriter (CMOR) version 3.8.0 installation instructions.
Climate Model Output Rewriter (CMOR) version 3.9.0 installation instructions.


DOWNLOAD
Expand All @@ -13,7 +13,7 @@ cd CMOR

INSTALLATION
------------
CMOR 3.8.0 requires external packages that need to be installed first.
CMOR 3.9.0 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!
Expand Down
2 changes: 1 addition & 1 deletion Src/cmor_fortran_interface.f90
Original file line number Diff line number Diff line change
Expand Up @@ -825,7 +825,7 @@ end function cmor_close_cff
integer, parameter:: CMOR_EXIT_ON_MAJOR = 0
integer, parameter:: CMOR_EXIT_ON_WARNING = 2

real, parameter:: CMOR_VERSION = 3.8
real, parameter:: CMOR_VERSION = 3.9
real, parameter:: CMOR_CF_VERSION = 1.7

integer, parameter:: CMOR_WARNING = 20
Expand Down
2 changes: 1 addition & 1 deletion cmip6-cmor-tables
18 changes: 9 additions & 9 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 cmor 3.8.0.
# Generated by GNU Autoconf 2.71 for cmor 3.9.0.
#
# Report bugs to <[email protected]>.
#
Expand Down Expand Up @@ -611,8 +611,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='cmor'
PACKAGE_TARNAME='cmor'
PACKAGE_VERSION='3.8.0'
PACKAGE_STRING='cmor 3.8.0'
PACKAGE_VERSION='3.9.0'
PACKAGE_STRING='cmor 3.9.0'
PACKAGE_BUGREPORT='[email protected]'
PACKAGE_URL=''

Expand Down Expand Up @@ -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.8.0 to adapt to many kinds of systems.
\`configure' configures cmor 3.9.0 to adapt to many kinds of systems.

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

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

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of cmor 3.8.0:";;
short | recursive ) echo "Configuration of cmor 3.9.0:";;
esac
cat <<\_ACEOF

Expand Down Expand Up @@ -1464,7 +1464,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
cmor configure 3.8.0
cmor configure 3.9.0
generated by GNU Autoconf 2.71

Copyright (C) 2021 Free Software Foundation, Inc.
Expand Down Expand Up @@ -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.8.0, which was
It was created by cmor $as_me 3.9.0, which was
generated by GNU Autoconf 2.71. Invocation command line was

$ $0$ac_configure_args_raw
Expand Down Expand Up @@ -5741,7 +5741,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.8.0, which was
This file was extended by cmor $as_me 3.9.0, which was
generated by GNU Autoconf 2.71. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5796,7 +5796,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.8.0
cmor config.status 3.9.0
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 @@ -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.8.0],[[email protected]])
AC_INIT([cmor],[3.9.0],[[email protected]])

GIT_TAG=`cd $srcdir ; ./get_git_version.sh`

Expand Down
2 changes: 1 addition & 1 deletion include/cmor.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define CMOR_H

#define CMOR_VERSION_MAJOR 3
#define CMOR_VERSION_MINOR 8
#define CMOR_VERSION_MINOR 9
#define CMOR_VERSION_PATCH 0

#define CMOR_CF_VERSION_MAJOR 1
Expand Down
2 changes: 1 addition & 1 deletion setup.py.in
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ print('src:',srcfiles)
print('macros:',macros)

setup (name = "CMOR",
version='3.8.0',
version='3.9.0',
author='Chris Mauzey, AIMS',
description = "Python Interface to CMOR output library",
url = "http://cmor.llnl.gov/",
Expand Down