Skip to content

Commit

Permalink
fix: imports from powersimdata
Browse files Browse the repository at this point in the history
  • Loading branch information
Jon Hagg committed Oct 1, 2020
1 parent 003d381 commit 3bf4026
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions prereise/gather/solardata/nsrdb/sam.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import numpy as np
import pandas as pd
from powersimdata.network.usa_tamu.constants.zones import (
id2state,
id2abv,
interconnect2state,
state2interconnect,
)
Expand Down Expand Up @@ -69,7 +69,7 @@ def retrieve_data(solar_plant, email, api_key, ssc_lib, year="2016"):
zone_id = solar_plant.zone_id.unique()
frac = {}
for i in zone_id:
state = id2state[i]
state = id2abv[i]
frac[i] = get_pv_tracking_ratio_state(pv_info, [state])
if frac[i] is None:
frac[i] = get_pv_tracking_ratio_state(
Expand Down
4 changes: 2 additions & 2 deletions prereise/gather/solardata/pv_tracking.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import os

import pandas as pd
from powersimdata.network.usa_tamu.constants.zones import id2state
from powersimdata.network.usa_tamu.constants.zones import id2abv


def get_pv_tracking_data():
Expand Down Expand Up @@ -46,7 +46,7 @@ def get_pv_tracking_ratio_state(pv_info, state):
raise TypeError("state must be a list")

for s in state:
if s not in set(id2state.values()):
if s not in set(id2abv.values()):
raise ValueError("Invalid State: %s" % s)

pv_info_state = pv_info[pv_info["State"].isin(state)].copy()
Expand Down

0 comments on commit 3bf4026

Please sign in to comment.