[cmor] 123/190: Chekcing in version changes, getting ready for clim change

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository cmor.

commit 1c89ddcce5d8cf8fc3599769004ba96c16a40064
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Mon Jan 30 10:33:22 2012 -0800

    Chekcing in version changes, getting ready for clim change
---
 Test/t_cmor_fx_basin.f90 |  8 ++++++--
 configure                | 18 +++++++++---------
 configure.ac             |  2 +-
 include/cmor.h           |  2 +-
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/Test/t_cmor_fx_basin.f90 b/Test/t_cmor_fx_basin.f90
index 290c540..cbd2592 100644
--- a/Test/t_cmor_fx_basin.f90
+++ b/Test/t_cmor_fx_basin.f90
@@ -15,7 +15,7 @@ program t_cmor_fx_basin
   double precision, dimension(nlat_o+1) :: lat_o_bnds
   double precision, dimension(nlon_o)   :: lon_o
   double precision, dimension(nlon_o+1) :: lon_o_bnds
-
+  double precision, dimension(nlon_o,nlat_o) :: crap
   !--- Misc
   character(256)  :: outpath = 'TestMe'
   character(1024) :: source = 'CanESM2 2010 atmosphere: CanAM4 (AGCM15i, T63L35)'
@@ -25,7 +25,7 @@ program t_cmor_fx_basin
   character(256)  :: institution = &
     'CCCma (Canadian Centre for Climate Modelling and Analysis, Victoria, BC, Canada)'
   character(64)   :: institute_id = 'CCCma'
-  character(64)   :: experiment_id = 'piCOntrol'
+  character(64)   :: experiment_id = 'piControl'
   character(64)   :: contact = 'cccma_info at ec.gc.ca'
   character(64)   :: time_units = 'days since 1850-1-1'
   character(64)   :: calendar = '365_day'
@@ -61,6 +61,7 @@ program t_cmor_fx_basin
        source=trim(source),                                    &
        calendar=trim(calendar),                                &
        realization=1,                                &
+       institute_id = trim("hi"), &
        initialization_method=1,            &
        physics_version=1,                        &
        contact=trim(contact),                                  &
@@ -110,6 +111,9 @@ program t_cmor_fx_basin
       history=trim(var_history),         &
       comment=trim(var_comment) )
 
+
+  error_flag = cmor_write(curr_vid,crap)
+
   error_flag = cmor_close()
 
   if (error_flag.ne.0) then
diff --git a/configure b/configure
index f549947..891c009 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.8.0.
+# Generated by GNU Autoconf 2.61 for cmor 2.8.1.
 #
 # 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.8.0'
-PACKAGE_STRING='cmor 2.8.0'
+PACKAGE_VERSION='2.8.1'
+PACKAGE_STRING='cmor 2.8.1'
 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.8.0 to adapt to many kinds of systems.
+\`configure' configures cmor 2.8.1 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.8.0:";;
+     short | recursive ) echo "Configuration of cmor 2.8.1:";;
    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.8.0
+cmor configure 2.8.1
 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.8.0, which was
+It was created by cmor $as_me 2.8.1, 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.8.0, which was
+This file was extended by cmor $as_me 2.8.1, 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.8.0
+cmor config.status 2.8.1
 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 8180c6a..4e9804a 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.8.0, doutriaux1 at llnl.gov)
+AC_INIT(cmor, 2.8.1, doutriaux1 at llnl.gov)
 
 GIT_TAG=`./get_git_version.sh`
 
diff --git a/include/cmor.h b/include/cmor.h
index 056fcb4..5ac890b 100644
--- a/include/cmor.h
+++ b/include/cmor.h
@@ -3,7 +3,7 @@
 
 #define CMOR_VERSION_MAJOR 2
 #define CMOR_VERSION_MINOR 8
-#define CMOR_VERSION_PATCH 0
+#define CMOR_VERSION_PATCH 1
 
 #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