[cmor] 42/190: 2010-08-23 : tagging 2.1 2010-08-23 : create_output_path doesn't need to be called b4 cmor_write any more.
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 211442a8c60a7fa3d1a413b3287de4ce0f67e7f0
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date: Mon Aug 23 11:38:06 2010 -0700
2010-08-23 : tagging 2.1
2010-08-23 : create_output_path doesn't need to be called b4 cmor_write any more.
---
RELEASE-NOTES | 2 ++
Src/cmor.c | 7 +++++++
Src/cmor_variables.c | 2 --
compile_line.txt.in | 4 ++--
configure | 18 +++++++++---------
configure.ac | 2 +-
include/cmor.h | 4 ++--
7 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0251b07..6d23743 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,5 @@
+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
2010-08-19 : go thru cmor_create_path to figure out isfixed and set frequency, even if directory layout is not required.
2010-08-19 : checker: works with version number of format major.minor.patch
diff --git a/Src/cmor.c b/Src/cmor.c
index 3a47fd5..bde2c6a 100644
--- a/Src/cmor.c
+++ b/Src/cmor.c
@@ -3295,6 +3295,13 @@ int cmor_create_output_path(int var_id,char *outpath)
/* experiment id */
cmor_get_cur_dataset_attribute("experiment_id",tmp);
+ /* ok here we check the exptid is ok */
+ if (cmor_check_expt_id(tmp,cmor_vars[var_id].ref_table_id,"experiment","experiment_id")!=0) {
+ snprintf(tmp2,CMOR_MAX_STRING,"Invalid dataset experiment id: %s, check against table: %s",tmp,cmor_tables[cmor_vars[var_id].ref_table_id].table_id);
+ cmor_handle_error(tmp2,CMOR_NORMAL);
+ cmor_pop_traceback();
+ return 1;
+ }
/* ok here we need to reset the expt id to the shrt name if necessary */
for (i=0;i<=cmor_tables[cmor_vars[var_id].ref_table_id].nexps;i++) {
/* printf("i: %i, lng expt: %s\n",i,cmor_tables[cmor_vars[var_id].ref_table_id].expt_ids[i]); */
diff --git a/Src/cmor_variables.c b/Src/cmor_variables.c
index 87fa8de..881d961 100644
--- a/Src/cmor_variables.c
+++ b/Src/cmor_variables.c
@@ -695,7 +695,6 @@ int cmor_variable(int *var_id, char *name, char *units, int ndims, int axes_ids[
aint=0; /* just to know if we deal with a grid */
/* ok we need to replace grids definitions with the grid axes */
for (i=0;i<ndims;i++) {
- printf("ok lookinga t axes: %i, %s\n",laxes_ids[i],refvar.id);
if (laxes_ids[i]>cmor_naxes) {
sprintf(msg,"For variable (%s) you requested axis_id (%i) that has not been defined yet",cmor_vars[vrid].id,laxes_ids[i]);
cmor_handle_error(msg,CMOR_CRITICAL);
@@ -730,7 +729,6 @@ int cmor_variable(int *var_id, char *name, char *units, int ndims, int axes_ids[
}
/* for(i=0;i<refvar.ndims;i++) fprintf(stderr,"after the grid id section: %i, id: %i\n",i,laxes_ids[i]); */
olndims = lndims;
- printf("ok: %i, %i, %i\n",refvar.ndims,aint,lndims);
if (refvar.ndims+aint!=lndims) {
lndims=0;
/* ok before we panic we check if there is a "dummy" dim */
diff --git a/compile_line.txt.in b/compile_line.txt.in
index 253280d..8a63c29 100644
--- a/compile_line.txt.in
+++ b/compile_line.txt.in
@@ -1,5 +1,5 @@
# The following line will compile "C" code mycode.c with cmor, additional libraries mycode.c may requires should be added to this line
- @CC@ @DEBUG@ @MACROS@ @CFLAGS@ @CPPFLAGS@ mycode.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @HDF5CFLAGS@ @HDF5LDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZLDFLAGS@ -o mycode
+ @CC@ @DEBUG@ @MACROS@ @CFLAGS@ @CPPFLAGS@ mycode.c -L at prefix@/lib -I at prefix@/include -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZLDFLAGS@ -o mycode
# The following line will compile "FORTRAN" code mycode.f90 with cmor, additional libraries mycode.f90 may requires should be added to this line
- at FC@ @DEBUG@ @FCFLAGS@ mycode.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @HDF5CFLAGS@ @HDF5LDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o mycode
+ at FC@ @DEBUG@ @FCFLAGS@ mycode.f90 -L at prefix@/lib -L. -lcmor @NCCFLAGS@ @NCLDFLAGS@ @UDUNITS2LDFLAGS@ @UDUNITS2FLAGS@ @UUIDLDFLAGS@ @UUIDFLAGS@ @ZFLAGS@ @ZLDFLAGS@ -o mycode
diff --git a/configure b/configure
index 9e2a035..827ea65 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.0.2.
+# Generated by GNU Autoconf 2.61 for cmor 2.1.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.0.2'
-PACKAGE_STRING='cmor 2.0.2'
+PACKAGE_VERSION='2.1.0'
+PACKAGE_STRING='cmor 2.1.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.0.2 to adapt to many kinds of systems.
+\`configure' configures cmor 2.1.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.0.2:";;
+ short | recursive ) echo "Configuration of cmor 2.1.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.0.2
+cmor configure 2.1.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.0.2, which was
+It was created by cmor $as_me 2.1.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.0.2, which was
+This file was extended by cmor $as_me 2.1.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.0.2
+cmor config.status 2.1.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 694d71a..0ebe530 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.0.2, doutriaux1 at llnl.gov)
+AC_INIT(cmor, 2.1.0, doutriaux1 at llnl.gov)
GIT_TAG=`./get_git_version.sh`
diff --git a/include/cmor.h b/include/cmor.h
index be4a4e4..d40ab14 100644
--- a/include/cmor.h
+++ b/include/cmor.h
@@ -19,8 +19,8 @@
#define CMOR_EXIT_ON_WARNING 2
#define CMOR_VERSION_MAJOR 2
-#define CMOR_VERSION_MINOR 0
-#define CMOR_VERSION_PATCH 2
+#define CMOR_VERSION_MINOR 1
+#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