Changeset 3615


Ignore:
Timestamp:
17/03/08 01:15:33 (11 years ago)
Author:
astephen
Message:

Fixing some bugs and inconsistencies.

Location:
nappy/trunk/nappy
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • nappy/trunk/nappy/na_file/na_core.py

    r3433 r3615  
    1515 
    1616# Imports from standard python library 
     17import copy 
    1718import re 
    1819 
     
    5556        return self.na_dict 
    5657 
     58    def setNADict(self, na_dict): 
     59        """ 
     60        Dynamic setting of the na_dict dictionary. 
     61        """ 
     62        self.na_dict = copy.deepcopy(na_dict) 
     63 
    5764    def __getitem__(self, item): 
    5865        """ 
  • nappy/trunk/nappy/nc_interface/na_content_collector.py

    r3522 r3615  
    44 
    55""" 
    6 cdms_to_na.py 
    7 ============= 
    8  
    9 Holds the class CDMSToNA that converts a set of CDMS variables and global attributes. 
     6na_content_collector.py 
     7======================= 
     8 
     9Holds the class NAContentCollector that converts a set of CDMS variables and global attributes to a NASA Ames dictionary. 
    1010 
    1111""" 
  • nappy/trunk/nappy/nc_interface/na_to_cdms.py

    r3470 r3615  
    198198        self.cdms_variables = [] 
    199199 
    200         if self.variables == None:     
     200        if self.variables in (None, "all"):     
    201201            for var_number in range(self.na_file_obj.NV): 
    202202                self.cdms_variables.append(self._convertNAToCdmsVariable(var_number)) 
     
    256256        self.cdms_aux_variables = [] 
    257257 
    258         if self.aux_variables == None:     
     258        if self.aux_variables in (None, "all"): 
    259259            for avar_number in range(self.na_file_obj.NAUXV): 
    260260                self.cdms_aux_variables.append(self._convertNAAuxToCdmsVariable(avar_number)) 
  • nappy/trunk/nappy/nc_interface/nc_to_na.py

    r3469 r3615  
    5050        >>>    c = nc_to_na.NCToNA("old_file.nc")  
    5151        >>>    c.convert() 
    52         >>>    c.writeNAFiles("new_file.na", delimiter="csv")  
     52        >>>    c.writeNAFiles("new_file.na", delimiter=",")  
    5353 
    5454        OR: 
Note: See TracChangeset for help on using the changeset viewer.