Ignore:
Timestamp:
24/06/10 09:12:36 (9 years ago)
Author:
astephen
Message:

tidying

File:
1 edited

Legend:

Unmodified
Added
Removed
  • cows_wps/trunk/process_modules/extract_uk_station_data.py

    r7016 r7068  
    8181 
    8282        # Now check limit on number of station IDs 
    83         """ 
    84         n_src_ids = len(StationsIDs) 
    85         if n_src_ids > 100 and chunk_size == "decadal": 
     83        nStations = len(StationsIDs) 
     84        if nStations > 100 and TimeChunk == "decadal": 
    8685            raise Exception("The number of selected station IDs has been calculated to be greater than 100. Please select a chunk size other than 'decadal' for such as large volume of data.") 
    8786 
    88         N_YEARS = ? 
    89         if n_years > 1 and n_src_ids > 100: 
     87        nYears = int(EndDateTime[:4]) - int(StartDateTime[:4]) 
     88 
     89        if nYears > 1 and nStations > 100: 
    9090            raise Exception("The number of selected station IDs has been calculated to be greater than 100. Please select a time window no longer than 1 year.") 
    91         """ 
    9291 
    9392        self._addFileToFileSet(sf_path, "Station IDs file used for extraction of station data.", FLAG.DATA) 
Note: See TracChangeset for help on using the changeset viewer.