|
7 | 7 | import functools |
8 | 8 | import io |
9 | 9 | import itertools |
10 | | -import os |
11 | 10 | from urllib.request import urlopen |
12 | 11 | import numpy as np |
13 | 12 | from scipy import constants |
|
20 | 19 |
|
21 | 20 | from pvlib import (atmosphere, iam, inverter, irradiance, |
22 | 21 | singlediode as _singlediode, temperature) |
23 | | -from pvlib.tools import _build_kwargs, _build_args |
| 22 | +from pvlib.tools import _build_kwargs, _build_args, get_test_dataset_path |
24 | 23 |
|
25 | 24 |
|
26 | 25 | # a dict of required parameter names for each DC power model |
@@ -2371,24 +2370,19 @@ def retrieve_sam(name=None, path=None): |
2371 | 2370 |
|
2372 | 2371 | if name is not None: |
2373 | 2372 | name = name.lower() |
2374 | | - data_path = os.path.join( |
2375 | | - os.path.dirname(os.path.abspath(__file__)), 'data') |
2376 | 2373 | if name == 'cecmod': |
2377 | | - csvdata = os.path.join( |
2378 | | - data_path, 'sam-library-cec-modules-2019-03-05.csv') |
| 2374 | + csvdata = 'sam-library-cec-modules-2019-03-05.csv' |
2379 | 2375 | elif name == 'sandiamod': |
2380 | | - csvdata = os.path.join( |
2381 | | - data_path, 'sam-library-sandia-modules-2015-6-30.csv') |
| 2376 | + csvdata = 'sam-library-sandia-modules-2015-6-30.csv' |
2382 | 2377 | elif name == 'adrinverter': |
2383 | | - csvdata = os.path.join( |
2384 | | - data_path, 'adr-library-cec-inverters-2019-03-05.csv') |
| 2378 | + csvdata = 'adr-library-cec-inverters-2019-03-05.csv' |
2385 | 2379 | elif name in ['cecinverter', 'sandiainverter']: |
2386 | 2380 | # Allowing either, to provide for old code, |
2387 | 2381 | # while aligning with current expectations |
2388 | | - csvdata = os.path.join( |
2389 | | - data_path, 'sam-library-cec-inverters-2019-03-05.csv') |
| 2382 | + csvdata = 'sam-library-cec-inverters-2019-03-05.csv' |
2390 | 2383 | else: |
2391 | 2384 | raise ValueError(f'invalid name {name}') |
| 2385 | + csvdata = get_test_dataset_path(csvdata) |
2392 | 2386 | elif path is not None: |
2393 | 2387 | if path.startswith('http'): |
2394 | 2388 | response = urlopen(path) |
|
0 commit comments