| @@ -29,9 +29,9 @@ |
| |
| year = self.parseData(line, "YEAR") |
| month = self.parseData(line, "MONTH") |
| - dt_min = datetime.date(year, month, 1) |
| + dt_min = datetime.datetime(year, month, 1) |
| days = monthrange(year, month)[1] |
| - dt_max = datetime.date(year, month, days) |
| + dt_max = datetime.datetime(year, month, days) |
| |
| if start_date and dt_max < start_date: continue |
| if end_date and dt_min > end_date: break |
| @@ -41,7 +41,7 @@ |
| if element in self.params: |
| days = monthrange(year, month)[1] |
| for day in range(1, days+1): |
| - dt = datetime.date(year, month, day) |
| + dt = datetime.datetime(year, month, day) |
| |
| if start_date and dt < start_date: continue |
| if end_date and dt > end_date: break |
| @@ -365,24 +365,24 @@ |
| if testNew: |
| maca_dir = '/mnt/Climate/MACA/new' |
| ncfiles = [ |
| - ['nwcsc_historical_{model}.nc', datetime.date(1950, 1, 1), datetime.date(2005, 12, 31)], |
| + ['nwcsc_historical_{model}.nc', datetime.datetime(1950, 1, 1), datetime.datetime(2005, 12, 31)], |
| ] |
| |
| if not forecast_option or forecast_option == 'rcp45': |
| - ncfiles.append(['nwcsc_rcp45_{model}.nc', datetime.date(2006, 1, 1), datetime.date(2099, 12, 31)]) |
| + ncfiles.append(['nwcsc_rcp45_{model}.nc', datetime.datetime(2006, 1, 1), datetime.datetime(2099, 12, 31)]) |
| elif forecast_option == 'rcp85': |
| - ncfiles.append(['nwcsc_rcp85_{model}.nc', datetime.date(2006, 1, 1), datetime.date(2099, 12, 31)]) |
| + ncfiles.append(['nwcsc_rcp85_{model}.nc', datetime.datetime(2006, 1, 1), datetime.datetime(2099, 12, 31)]) |
| |
| else: |
| maca_dir = '/mnt/Climate/MACA' |
| ncfiles = [ |
| - ['nwcsc_historical.nc', datetime.date(1950, 1, 1), datetime.date(2005, 12, 31)], |
| + ['nwcsc_historical.nc', datetime.datetime(1950, 1, 1), datetime.datetime(2005, 12, 31)], |
| ] |
| |
| if not forecast_option or forecast_option == 'rcp45': |
| - ncfiles.append(['nwcsc_rcp45.nc', datetime.date(2006, 1, 1), datetime.date(2099, 12, 31)]) |
| + ncfiles.append(['nwcsc_rcp45.nc', datetime.datetime(2006, 1, 1), datetime.datetime(2099, 12, 31)]) |
| elif forecast_option == 'rcp85': |
| - ncfiles.append(['nwcsc_rcp85.nc', datetime.date(2006, 1, 1), datetime.date(2099, 12, 31)]) |
| + ncfiles.append(['nwcsc_rcp85.nc', datetime.datetime(2006, 1, 1), datetime.datetime(2099, 12, 31)]) |
| |
| # get centroid of input_zone_file and map it to the available latitudes and longitudes |
| names = [] |
| @@ -1377,9 +1377,9 @@ |
| d = { |
| "postgres_user": "csip", |
| "postgres_pw": "ids12_foTT", |
| - "postgres_host": "erams.com", |
| + "postgres_host": "129.82.20.125", |
| "postgres_db": "csip_wrap", |
| - "postgres_port": 5433 |
| + "postgres_port": 5432 |
| } |
| return d |
| |