Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update DO.py / fix solar #2141

Merged
merged 3 commits into from Jan 9, 2020
Merged

Update DO.py / fix solar #2141

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b08e31f
Update DO.py / fix solar
alixunderplatz Jan 6, 2020
00b7f74
fix mapping
alixunderplatz Jan 6, 2020
4da35a7
Merge branch 'master' into Update_DO-parser
Jan 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 7 additions & 5 deletions parsers/DO.py
View file
Open in desktop
Expand Up @@ -21,7 +21,8 @@
u'Total T\xe9rmico': 'Thermal',
u'Total E\xf3lico': 'Wind',
u'Total Hidroel\xe9ctrica': 'Hydro',
'Total Generado': 'Generated'
u'Total Solar': 'Solar',
u'Total Generado': 'Generated'
}

# Power plant types
Expand All @@ -31,7 +32,7 @@
thermal_plants = {
u'AES ANDRES': 'gas',
u'BARAHONA CARBON': 'coal',
u'BERSAL': 'unknown',
u'BERSAL': 'oil',
u'CEPP 1': 'oil',
u'CEPP 2': 'oil',
u'CESPM 1': 'oil',
Expand All @@ -53,16 +54,16 @@
u'LOS OR\xcdGENES POWER PLANT FUEL OIL': 'oil',
u'LOS OR\xcdGENES POWER PLANT GAS NATURAL': 'gas',
u'METALDOM': 'oil',
u'MONTE PLATA SOLAR': 'solar',
u'MONTE RIO': 'oil',
u'PALAMARA': 'oil',
u'PALENQUE': 'oil',
u'PARQUE ENERGETICO LOS MINA CC PARCIAL': 'gas',
u'PARQUE ENERGETICO LOS MINA CC TOTAL': 'gas',
u'PARQUE FOTOVOLTAICO MONTECRISTI SOLAR1': 'solar',
u'PIMENTEL 1': 'oil',
u'PIMENTEL 2': 'oil',
u'PIMENTEL 3': 'oil',
u'PUNTA CATALINA 1': 'coal',
u'PUNTA CATALINA 2': 'coal',
u'QUISQUEYA 1': 'gas',
u'QUISQUEYA 2': 'gas',
u'QUISQUEYA 1 SAN PEDRO': 'oil',
Expand Down Expand Up @@ -231,6 +232,7 @@ def total_production(df):
current = df.loc[[hour]]
hydro = current.iloc[0]['Hydro']
wind = current.iloc[0]['Wind']
solar = current.iloc[0]['Solar']
if wind > -10:
wind = max(wind, 0)

Expand All @@ -241,7 +243,7 @@ def total_production(df):
if isnan(hydro):
hydro = None

prod = {'wind': wind, 'hydro': hydro, 'datetime': dt}
prod = {'wind': wind, 'hydro': hydro, 'solar': solar, 'datetime': dt}
vals.append(prod)

return vals
Expand Down