[cmor] 43/190: 2010-08-23 : DRS was wrongly constructed for table Oclim
Alastair McKinstry
mckinstry at moszumanska.debian.org
Tue Jul 21 12:54:35 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 faaf159cca36f770398e5d231136ccdb3e09c588
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Mon Aug 23 18:59:46 2010 -0700
2010-08-23 : DRS was wrongly constructed for table Oclim
---
RELEASE-NOTES | 2 ++
Src/_cmormodule.c | 1 -
Src/cmor.c | 11 ++++++++++-
Src/cmor_variables.c | 1 -
configure | 22 +++++++++++-----------
configure.ac | 2 +-
include/cmor.h | 2 +-
7 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6d23743..a9f7531 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,5 @@
+2010-08-23 : tagging 2.2
+2010-08-23 : DRS was wrongly constructed for table Oclim
2010-08-23 : tagging 2.1
2010-08-23 : create_output_path doesn't need to be called b4 cmor_write any more.
2010-08-19 : dimensions were always stored as double regardless of what the table wanted. Fixed
diff --git a/Src/_cmormodule.c b/Src/_cmormodule.c
index 5c8c75b..1987caa 100644
--- a/Src/_cmormodule.c
+++ b/Src/_cmormodule.c
@@ -467,7 +467,6 @@ static PyObject *
bounds = (void *)bounds_array->data;
}
- printf("ok sending %i, %i, %s, %s, %i, %i, %c\n",zvar_id,axis_id, name, units, ndims, axes_ids[0], type);
ierr = cmor_zfactor(&zvar_id,axis_id, name, units, ndims, axes_ids, type, values, bounds);
if (axes!=NULL) {Py_DECREF(axes);}
if (values_array!=NULL) {Py_DECREF(values_array);}
diff --git a/Src/cmor.c b/Src/cmor.c
index bde2c6a..dc2f99f 100644
--- a/Src/cmor.c
+++ b/Src/cmor.c
@@ -3382,7 +3382,16 @@ int cmor_create_output_path(int var_id,char *outpath)
/*Ok in case of climatology needs to add "clim" to it */
if (cmor_tables[cmor_axes[cmor_vars[var_id].axes_ids[0]].ref_table_id].axes[cmor_axes[cmor_vars[var_id].axes_ids[0]].ref_axis_id].climatology==1) {
- strncat(tmp,"Clim",CMOR_MAX_STRING-strlen(tmp));
+ /* ok in some case the table fqcy already has the clim in it..... */
+ j=-1;
+ for (i=0;i<strlen(cmor_tables[cmor_vars[var_id].ref_table_id].frequency)-3;i++) {
+ if (strncmp(&cmor_tables[cmor_vars[var_id].ref_table_id].frequency[i],"Clim",4)==0) {
+ j=1;
+ break;
+ }
+ }
+ if (j==-1) strncat(tmp,"Clim",CMOR_MAX_STRING-strlen(tmp));
+ else strncpy(tmp,cmor_tables[cmor_vars[var_id].ref_table_id].frequency,CMOR_MAX_STRING);
}
strncattrim(outpath,tmp,CMOR_MAX_STRING-strlen(outpath));
strncat(outpath,"/",CMOR_MAX_STRING-strlen(outpath));
diff --git a/Src/cmor_variables.c b/Src/cmor_variables.c
index 881d961..f38be43 100644
--- a/Src/cmor_variables.c
+++ b/Src/cmor_variables.c
@@ -689,7 +689,6 @@ int cmor_variable(int *var_id, char *name, char *units, int ndims, int axes_ids[
/* before anything we copy axes_ids into laxes_ids */
for (i=0;i<ndims;i++) {
laxes_ids[i] = axes_ids[i];
- printf("%s: axes[%i] = %i\n",cmor_vars[vrid].id,i,laxes_ids[i]);
}
lndims=ndims;
aint=0; /* just to know if we deal with a grid */
diff --git a/configure b/configure
index 827ea65..d78db44 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.1.0.
+# Generated by GNU Autoconf 2.61 for cmor 2.2.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.1.0'
-PACKAGE_STRING='cmor 2.1.0'
+PACKAGE_VERSION='2.2.0'
+PACKAGE_STRING='cmor 2.2.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.1.0 to adapt to many kinds of systems.
+\`configure' configures cmor 2.2.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.1.0:";;
+ short | recursive ) echo "Configuration of cmor 2.2.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.1.0
+cmor configure 2.2.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.1.0, which was
+It was created by cmor $as_me 2.2.0, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -3741,7 +3741,7 @@ ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_fc_v_output" >&5
FCFLAGS=$ac_save_FFLAGS
-rm -f -r conftest*
+rm -f conftest*
# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
# /foo, /bar, and /baz are search directories for the Fortran linker.
@@ -3832,7 +3832,7 @@ ac_fc_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
echo "$ac_fc_v_output" >&5
FCFLAGS=$ac_save_FFLAGS
-rm -f -r conftest*
+rm -f conftest*
# On HP/UX there is a line like: "LPATH is: /foo:/bar:/baz" where
# /foo, /bar, and /baz are search directories for the Fortran linker.
@@ -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.1.0, which was
+This file was extended by cmor $as_me 2.2.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.1.0
+cmor config.status 2.2.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 0ebe530..2bd07fa 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.1.0, doutriaux1 at llnl.gov)
+AC_INIT(cmor, 2.2.0, doutriaux1 at llnl.gov)
GIT_TAG=`./get_git_version.sh`
diff --git a/include/cmor.h b/include/cmor.h
index d40ab14..711e642 100644
--- a/include/cmor.h
+++ b/include/cmor.h
@@ -19,7 +19,7 @@
#define CMOR_EXIT_ON_WARNING 2
#define CMOR_VERSION_MAJOR 2
-#define CMOR_VERSION_MINOR 1
+#define CMOR_VERSION_MINOR 2
#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