Skip to content
Snippets Groups Projects
Commit 7b7c3aee authored by Bouvry Arnaud's avatar Bouvry Arnaud
Browse files

Merge branch...

Merge branch '92-feature-set-start-and-end-year-as-input-parameters-in-get_n_years_daily_wd' into 'develop'

Resolve "[feature] set start and end year as input parameters in get_n_years_daily_WD"

See merge request !27
parents 5a11fc82 6f01100c
No related branches found
No related tags found
2 merge requests!32[feature] New module sky_model with Reinhart sky discretization scheme, water balance correction in GrasSim,!27Resolve "[feature] set start and end year as input parameters in get_n_years_daily_WD"
......@@ -86,14 +86,16 @@ class Weather_data:
def get_n_years_daily_WD(self, freq_deter, csv_file=None):
def get_n_years_daily_WD(self, freq_deter, start_year, end_year, csv_file=None):
self.nyears_daily_data = {}
if csv_file is not None:
daily_csv = pd.read_csv(os.path.join('INPUTS', 'WEATHER_FILES', csv_file + '.csv'))
new_index2 = pd.date_range("01-01-2005 00:00:00","31-12-2015 00:00:00", freq='D')
new_index2 = pd.date_range("01-01-"+str(start_year)+" 00:00:00",
"31-12-"+str(end_year)+" 00:00:00",
freq='D')
rain_vap_pressure = daily_csv.drop(['id','DAY'], axis=1).set_index(new_index2)
if (freq_deter == 8760 or freq_deter == 8784):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment