[cmor] 121/190: 2011-11-08 : Realized there was a difference in calendar names between cdtime and the CF conventions. CMOR now maps correctly the CF names to the cdtime names for correct internal processing. 2011-10-24 : Removed the treatlon in case 'X' axis has units not in degrees
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:45 UTC 2015
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cmor.
commit ceefdfdd7916c72db625caff67cda4c92da0fac5
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Tue Nov 8 16:48:11 2011 -0800
2011-11-08 : Realized there was a difference in calendar names between cdtime and the CF conventions. CMOR now maps correctly the CF names to the cdtime names for correct internal processing.
2011-10-24 : Removed the treatlon in case 'X' axis has units not in degrees
---
Lib/pywrapper.py | 8 ++++----
RELEASE-NOTES | 2 ++
Src/cmor_axes.c | 6 +++---
configure | 18 +++++++++---------
configure.ac | 2 +-
include/cmor.h | 4 ++--
6 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/Lib/pywrapper.py b/Lib/pywrapper.py
index 8f2bc27..a5fbcd7 100644
--- a/Lib/pywrapper.py
+++ b/Lib/pywrapper.py
@@ -762,17 +762,17 @@ def dataset(experiment_id,institution,source,calendar,outpath='.',realization=1,
elif calendar == cdtime.ClimCalendar:
calendar = "clim"
elif calendar == cdtime.DefaultCalendar:
- calendar = "proleptic_gregorian"
+ calendar = "standard"
elif calendar == cdtime.GregorianCalendar:
- calendar = "gregorian"
+ calendar = "proleptic_gregorian"
elif calendar == cdtime.JulianCalendar:
calendar = "julian"
elif calendar == cdtime.MixedCalendar:
- calendar= "mixed"
+ calendar= "standard"
elif calendar == cdtime.NoLeapCalendar:
calendar = "noleap"
elif calendar == cdtime.StandardCalendar:
- calendar = "standard"
+ calendar = "proleptic_gregorian"
elif calendar == cdtime.ClimLeapCalendar:
calendar = "climleap"
elif calendar is None:
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5fc5b52..0697090 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,5 @@
+2011-11-08 : Realized there was a difference in calendar names between cdtime and the CF conventions. CMOR now maps correctly the CF names to the cdtime names for correct internal processing.
+2011-10-24 : Removed the treatlon in case 'X' axis has units not in degrees
2011-06-23 : Tagging 2.7.1
2011-06-23 : removing sloppy print statements in python wrap
2011-06-21 : Tagging 2.7.0
diff --git a/Src/cmor_axes.c b/Src/cmor_axes.c
index 1ea0284..a578e20 100644
--- a/Src/cmor_axes.c
+++ b/Src/cmor_axes.c
@@ -11,9 +11,9 @@ int cuErrOpts =CU_VERBOSE;
int cmor_calendar_c2i(char *calendar, cdCalenType *ical) {
cmor_add_traceback("cmor_calendar_c2i");
cmor_is_setup();
- if (strcmp(calendar,"gregorian")==0)*ical = cdStandard;
- else if (strcmp(calendar,"standard")==0) *ical = cdStandard;
- else if (strcmp(calendar,"proleptic_gregorian")==0) *ical = cdMixed;
+ if (strcmp(calendar,"gregorian")==0)*ical = cdMixed;
+ else if (strcmp(calendar,"standard")==0) *ical = cdMixed;
+ else if (strcmp(calendar,"proleptic_gregorian")==0) *ical = cdStandard;
else if (strcmp(calendar,"noleap")==0) *ical = cdNoLeap;
else if (strcmp(calendar,"365_day")==0) *ical = cdNoLeap;
else if (strcmp(calendar,"360_day")==0) *ical = cd360;
diff --git a/configure b/configure
index 42875b7..f549947 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.61 for cmor 2.7.1.
+# Generated by GNU Autoconf 2.61 for cmor 2.8.0.
#
# Report bugs to <doutriaux1 at llnl.gov>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='cmor'
PACKAGE_TARNAME='cmor'
-PACKAGE_VERSION='2.7.1'
-PACKAGE_STRING='cmor 2.7.1'
+PACKAGE_VERSION='2.8.0'
+PACKAGE_STRING='cmor 2.8.0'
PACKAGE_BUGREPORT='doutriaux1 at llnl.gov'
ac_default_prefix=/usr/local/cmor
@@ -1185,7 +1185,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 2.7.1 to adapt to many kinds of systems.
+\`configure' configures cmor 2.8.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1251,7 +1251,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cmor 2.7.1:";;
+ short | recursive ) echo "Configuration of cmor 2.8.0:";;
esac
cat <<\_ACEOF
@@ -1350,7 +1350,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-cmor configure 2.7.1
+cmor configure 2.8.0
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1364,7 +1364,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 2.7.1, which was
+It was created by cmor $as_me 2.8.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -4989,7 +4989,7 @@ exec 6>&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 2.7.1, which was
+This file was extended by cmor $as_me 2.8.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5032,7 +5032,7 @@ Report bugs to <bug-autoconf at gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-cmor config.status 2.7.1
+cmor config.status 2.8.0
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 79f18e7..8180c6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl -*- Autoconf -*-
dnl Process this file with autoconf to produce a configure script.
dnl AC_PREREQ(2.59)
-AC_INIT(cmor, 2.7.1, doutriaux1 at llnl.gov)
+AC_INIT(cmor, 2.8.0, doutriaux1 at llnl.gov)
GIT_TAG=`./get_git_version.sh`
diff --git a/include/cmor.h b/include/cmor.h
index 0974356..056fcb4 100644
--- a/include/cmor.h
+++ b/include/cmor.h
@@ -2,8 +2,8 @@
#define CMOR_H
#define CMOR_VERSION_MAJOR 2
-#define CMOR_VERSION_MINOR 7
-#define CMOR_VERSION_PATCH 1
+#define CMOR_VERSION_MINOR 8
+#define CMOR_VERSION_PATCH 0
#define CMOR_CF_VERSION_MAJOR 1
#define CMOR_CF_VERSION_MINOR 4
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git
More information about the debian-science-commits
mailing list