[cmor] 163/190: Fixed an error introduced when massively copy pasting cmor_isLongitude

[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 a6ff559c82b05a05447b8066dc4ff3e5912eb5d2
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Mon Jul 29 15:32:13 2013 -0700

    Fixed an error introduced when massively copy pasting cmor_isLongitude
---
 Src/cmor_axes.c                |  4 ++--
 Test/test_python_alastair_1.py | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Src/cmor_axes.c b/Src/cmor_axes.c
index ebc658f..3d36413 100644
--- a/Src/cmor_axes.c
+++ b/Src/cmor_axes.c
@@ -853,7 +853,7 @@ int cmor_treat_axis_values(int axis_id, double *values, int length, int n_reques
     	}
       }
     }
-    if (cmor_isLongitude(refaxis)==1) {
+    if ((isbounds==1) && (cmor_isLongitude(refaxis)==1)) {
         for(i=0;i<length/2;i++) {
             values[2*i ]+=360.*cmor_axes[axis_id].wrapping[i];
             values[2*i+1]+=360.*cmor_axes[axis_id].wrapping[i];
@@ -862,7 +862,7 @@ int cmor_treat_axis_values(int axis_id, double *values, int length, int n_reques
     /* ok now need to move the offset thing */
     if (axis->offset!=0) {
       if (isbounds==0) {
- 	for (i=0;i<length;i++) printf("%i : %f\n",i,values[i]); 
+ 	/*for (i=0;i<length;i++) printf("%i : %f\n",i,values[i]); */
 	tmplon = malloc(axis->offset*sizeof(double));
 	for (i=0;i<axis->offset;i++) {
 	  tmplon[i]=values[i];
diff --git a/Test/test_python_alastair_1.py b/Test/test_python_alastair_1.py
index 2dcac5e..52c3e02 100644
--- a/Test/test_python_alastair_1.py
+++ b/Test/test_python_alastair_1.py
@@ -16,7 +16,9 @@ error_flag = cmor.dataset(
        model_id="GICCM1", 
        institute_id="PCMDI",
        forcing="Nat, SO",
-       parent_experiment_id="lgm",branch_time=3.14159)
+       parent_experiment_id="lgm",
+       parent_experiment_rip="r1i1p1",
+       branch_time=3.14159)
   
 
 # creates 1 degree grid
@@ -26,7 +28,7 @@ alats = numpy.arange(180)-89.5
 bnds_lat = numpy.arange(181)-90
 alons=numpy.arange(360)+.5
 bnds_lon=numpy.arange(361)
-cmor.load_table("Tables/CMIP5_Amon")
+cmor.load_table("/git/cmip5-cmor-tables/Tables/CMIP5_Amon")
 ilat = cmor.axis(  
     table_entry='latitude',       
     units='degrees_north',          
@@ -45,7 +47,7 @@ ntimes=12
 plevs = numpy.array([100000., 92500, 85000, 70000, 60000, 50000, 40000, 30000, 25000,
    20000, 15000, 10000, 7000, 5000, 3000, 2000, 1000, 999, 998, 997, 996,
    995, 994])
-
+plevs=plevs[::-1]
 
 itim = cmor.axis(  
     table_entry='time',           
@@ -63,7 +65,7 @@ ilev = cmor.axis(
 var3d_ids = cmor.variable(    
     table_entry='ta',     
     units='K',           
-    axis_ids=numpy.array((ilev, ilon, ilat, 1073743064)),
+    axis_ids=numpy.array((ilev, ilon, ilat,itim)),
     missing_value=numpy.array([1.0e28,],dtype=numpy.float32)[0], 
     original_name='cloud')
 

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