Changeset 351 for nappy

Timestamp:

21/11/04 14:27:52 (16 years ago)

Author:

badc

Message:

* empty log message *

Location:

nappy/trunk

Files:

• cdms2na.py (modified) (5 diffs)
• naToCdms.py (modified) (1 diff)

nappy/trunk/cdms2na.py

@@ -1 +1 @@
 #!/usr/bin/env python
-#    Copyright (C) 2004 CCLRC & NERC( Natural Environment Research Council ).
-#    This software may be distributed under the terms of the
-#    Q Public License, version 1.0 or later. http://ndg.nerc.ac.uk/public_docs/QPublic_license.txt
+#   Copyright (C) 2004 CCLRC & NERC( Natural Environment Research Council ).
+#   This software may be distributed under the terms of the
+#   Q Public License, version 1.0 or later. http://ndg.nerc.ac.uk/public_docs/QPublic_license.txt
 
 helpMessage="""
@@ -27 +27 @@
 # Imports from python standard library
 import sys, os, time, string, fileinput, re
-sys.path.append("..")
+if len(sys.argv)>0:
+    sys.path.append(os.path.join("..", ".."))
+    sys.path.append("..")
 
 # Import cdat modules
@@ -117 +119 @@
     if hasattr(var, "long_name"): name=var.long_name
     if hasattr(var, "standard_name"): name=var.standard_name
-    if hasattr(var, "units") and not re.match("^\s+$", var.units): name="%s (%s)" % (name, var.units)    
-    # Do a check to see units are not duplicated
-    match=re.match("(.*\(%s\)\s*)\(%s\)(.*)$" % (var.units, var.units), name)
-    if match:
-        name=match.groups()[0]+match.groups()[1]
+    if hasattr(var, "units") and not re.match("^\s+$", var.units): 
+        name="%s (%s)" % (name, var.units)    
+        # Do a check to see units are not duplicated
+        match=re.match("(.*\(%s\)\s*)\(%s\)(.*)$" % (var.units, var.units), name)
+        if match:
+            name=match.groups()[0]+match.groups()[1]
         
     if name[-2:]=="()": name=name[:-2]
@@ -250 +253 @@
             else:
                 self.naDict["FFI"]=1001
-        print self.naDict["FFI"]
+        #print self.naDict["FFI"]
         axes=bestVar.getAxisList()
         
         # Get other variable info
-        for var in self.vars[:bestVarIndex]+self.vars[bestVarIndex:]:
+        for var in self.vars[:bestVarIndex-1]+self.vars[bestVarIndex:]:
             if len(var.shape)!=ndims or var.shape!=shape: 
                 # Could it be an auxiliary variable 
@@ -486 +489 @@
         
         if len(self.extra_comments[2])>0:
-            for excom in extra_comments[2]:
+            for excom in self.extra_comments[2]:
                 NCOM.append(excom)
         

nappy/trunk/naToCdms.py

@@ -242 +242 @@
                     axis.units=self.time_units
                     axis.long_name=axis.name="time (%s)" % self.time_units
-                
+                    if axis.units==None:  
+                        if units:
+                            axis.units=units    
+                        else:
+                            axis.units="Not known"
         return axis