Skip to content

Commit ce10f94

Browse files
Merge pull request #29 from NREL/development
geospatial analysis via dask
2 parents 401dceb + 16f454a commit ce10f94

22 files changed

+10361
-1112
lines changed

.gitignore

+4-1
Original file line numberDiff line numberDiff line change
@@ -101,4 +101,7 @@ demo/chunk_files/
101101
demo/logs/
102102
demo/old
103103

104-
TEMP/
104+
TEMP/
105+
106+
# Slurm log files
107+
slurm-*.out

pvdeg/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from . import degradation
88
from . import design
99
from . import fatigue
10+
from . import geospatial
1011
from . import humidity
1112
from . import letid
1213
from .scenario import Scenario

pvdeg/fatigue.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ def _avg_daily_temp_change(time_range, temp_cell):
2727
Average of Daily Maximum Temperature for 1-year (Celsius)
2828
2929
"""
30-
30+
3131
if time_range.dtype == 'object':
3232
time_range = pd.to_datetime(time_range)
33-
33+
3434
# Setup frame for vector processing
3535
timeAndTemp_df = pd.DataFrame(columns=['Cell Temperature'])
3636
timeAndTemp_df['Cell Temperature'] = temp_cell
@@ -111,7 +111,7 @@ def solder_fatigue(weather_df, meta,
111111
This function uses the default values for 60-min input intervals from Table 4 of the above
112112
paper. For other use cases, please refer to the paper for recommended values of C1 and
113113
the reversal temperature.
114-
114+
115115
Parameters
116116
------------
117117
weather_df : pd.dataframe
@@ -143,9 +143,9 @@ def solder_fatigue(weather_df, meta,
143143
144144
"""
145145

146-
# TODO this, and many other functions with temp_cell or temp_module would benefit from an
146+
# TODO this, and many other functions with temp_cell or temp_module would benefit from an
147147
# optional parameter "conf = 'open_rack_glass_glass' or equivalent"
148-
148+
149149
# TODO Make this function have more utility.
150150
# People want to run all the scenarios from the bosco paper.
151151
# Currently have everything hard coded for hourly calculation
@@ -158,10 +158,10 @@ def solder_fatigue(weather_df, meta,
158158

159159
if time_range is None:
160160
time_range = weather_df.index
161-
161+
162162
if temp_cell is None:
163163
temp_cell = temperature.cell(weather_df, meta)
164-
164+
165165
temp_amplitude, temp_max_avg = _avg_daily_temp_change(time_range, temp_cell)
166166

167167
temp_max_avg = convert_temperature(temp_max_avg, 'Celsius', 'Kelvin')

0 commit comments

Comments
 (0)