[cmor] 120/190: removed the treartlon in case 'X' axis has units not in degrees

[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 3057e8e93c36759c5c02e1e8625a8f120ba00f2e
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Mon Oct 24 15:11:24 2011 -0700

    removed the treartlon in case 'X' axis has units not in degrees
---
 Src/cmor_axes.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Src/cmor_axes.c b/Src/cmor_axes.c
index 4c0fcd3..1ea0284 100644
--- a/Src/cmor_axes.c
+++ b/Src/cmor_axes.c
@@ -305,18 +305,18 @@ int cmor_check_monotonic(double *values,int length, char *name,int isbounds, int
   int mono;
   int nloop;
   double *values2,tmp;
-  /* for (i=0;i<length;i++) printf("in monotonic: %i, %lf, %i\n",i,values[i],isbounds); */
+  /*for (i=0;i<length;i++) printf("in monotonic: %i, %lf, %i\n",i,values[i],isbounds);*/
   cmor_add_traceback("cmor_check_monotonic");
 
   refaxis = &cmor_tables[cmor_axes[axis_id].ref_table_id].axes[cmor_axes[axis_id].ref_axis_id];
-  if (refaxis->axis=='X') {
+  if ((refaxis->axis=='X')&& (strncmp(refaxis->units,"degrees",7)==0)) {
     treatlon=1;
   }
   /* ok ensure that values are monotonic */
   if (isbounds==1) {
     for (i=0;i<length/2-2;i++) {
       if (((values[2*i]-values[2*i+2])/(values[2*i+2]-values[2*i+4]))<0.) { 
-	if (refaxis->axis=='X') {
+	if ((refaxis->axis=='X') && (strncmp(refaxis->units,"degrees",7)==0)) {
 	  treatlon=1;
 	}
 	else {

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