[cmor] 66/190: put back cell_measures instead of ext_cell_measures

[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 729ef40b5aec435397ff158aaec03a78ccf1a1e5
Author: Charles Doutriaux <doutriaux1 at llnl.gov>
Date:   Fri Nov 5 08:51:57 2010 -0700

    put back cell_measures instead of ext_cell_measures
---
 Src/cmor.c           | 4 ++--
 Src/cmor_variables.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Src/cmor.c b/Src/cmor.c
index 32a2504..3899789 100644
--- a/Src/cmor.c
+++ b/Src/cmor.c
@@ -2120,9 +2120,9 @@ int cmor_write(int var_id,void *data, char type, char *suffix, int ntimes_passed
 
     strncat(ctmp,ctmp3,CMOR_MAX_STRING-strlen(ctmp));
 
-    if (cmor_has_variable_attribute(var_id,"ext_cell_measures")==0) {
+    if (cmor_has_variable_attribute(var_id,"cell_measures")==0) {
       /*Ok does it contain "area" */
-      cmor_get_variable_attribute(var_id,"ext_cell_measures",&ctmp5[0]);
+      cmor_get_variable_attribute(var_id,"cell_measures",&ctmp5[0]);
       k=-1;
       if (strlen(ctmp5)>5) {
 	for (i=0;i<strlen(ctmp5)-5;i++) {
diff --git a/Src/cmor_variables.c b/Src/cmor_variables.c
index 49bebe0..99cd5ab 100644
--- a/Src/cmor_variables.c
+++ b/Src/cmor_variables.c
@@ -656,7 +656,7 @@ int cmor_variable(int *var_id, char *name, char *units, int ndims, int axes_ids[
     cmor_update_history(vrid,msg);
   }
   cmor_set_variable_attribute(vrid,"cell_methods",'c',refvar.cell_methods);
-  cmor_set_variable_attribute(vrid,"ext_cell_measures",'c',refvar.cell_measures);
+  cmor_set_variable_attribute(vrid,"cell_measures",'c',refvar.cell_measures);
   /*if ((refvar.positive!='\0') && (positive!=NULL) && (positive[0]!=refvar.positive)) cmor_vars[vrid].sign=-1;*/
   if ((positive!=NULL) && (positive[0]!='\0')) {
     if ((positive[0]!='d') && positive[0]!='u') {

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