[cmor] 26/190: 2010-06-09 : cmor axis entry "requested_bounds" now is also valid used to be "bounds_requested"

[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 d9c861d27e40fbd85528c474e28f6c9a8cb193cb
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Wed Jun 9 17:07:41 2010 -0700

    2010-06-09 : cmor axis entry "requested_bounds" now is also valid used to be "bounds_requested"
---
 RELEASE-NOTES   |  1 +
 Src/cmor_axes.c | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 46d29d8..bafaaf7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,4 @@
+2010-06-09 : cmor axis entry "requested_bounds" now is also valid used to be "bounds_requested"
 2010-06-09 : cmor_axis non-monotnic error was showing incoorect set of bad values
 2010-06-09 : changed absolute mean error from CRITICAL to NORMAL if less than an order of magnitude off
 2010-06-09 : tables generated with min/max now being 3 sigma (from 2) and (20% form 5%)
diff --git a/Src/cmor_axes.c b/Src/cmor_axes.c
index f1fe4d6..21c918c 100644
--- a/Src/cmor_axes.c
+++ b/Src/cmor_axes.c
@@ -11,14 +11,14 @@ 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) || ((strcmp(calendar,"GREGORIAN")==0) ))*ical = cdStandard;
-  else if ((strcmp(calendar,"standard")==0) || ((strcmp(calendar,"STANDARD")==0) )) *ical = cdStandard;
-  else if ((strcmp(calendar,"proleptic_gregorian")==0) || ((strcmp(calendar,"PROLEPTIC_GREGORIAN")==0) )) *ical = cdMixed;
-  else if ((strcmp(calendar,"noleap")==0) || ((strcmp(calendar,"NOLEAP")==0) )) *ical = cdNoLeap;
-  else if ((strcmp(calendar,"365_day")==0) || ((strcmp(calendar,"365_DAY")==0) )) *ical = cdNoLeap;
-  else if ((strcmp(calendar,"360_day")==0) || ((strcmp(calendar,"360_DAY")==0) )) *ical = cd360;
-  else if ((strcmp(calendar,"julian")==0) || ((strcmp(calendar,"JULIAN")==0) )) *ical = cdJulian;
-  else if ((strcmp(calendar,"none")==0) || ((strcmp(calendar,"NONE")==0) )) *ical = cdClim;
+  if (strcmp(calendar,"gregorian")==0)*ical = cdStandard;
+  else if (strcmp(calendar,"standard")==0) *ical = cdStandard;
+  else if (strcmp(calendar,"proleptic_gregorian")==0) *ical = cdMixed;
+  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;
+  else if (strcmp(calendar,"julian")==0) *ical = cdJulian;
+  else if (strcmp(calendar,"none")==0) *ical = cdClim;
   else {
     cmor_pop_traceback();
     return 1;
@@ -1433,7 +1433,7 @@ int cmor_set_axis_def_att(cmor_axis_def_t *axis,char att[CMOR_MAX_STRING],char v
   else if (strcmp(att,"coords_attrib")==0) {
     strncpytrim(axis->cname,val,CMOR_MAX_STRING);
   }
-  else if (strcmp(att,"bounds_requested")==0) { /* requested values for axis */
+  else if ((strcmp(att,"bounds_requested")==0) || (strcmp(att,"requested_bounds")==0)) { /* requested values for axis */
     dim[0]='\0';
     n=0;
     for(i=0;i<strlen(val);i++) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cmor.git