diff --git a/pvdeg/data/xeff_demo.csv b/pvdeg/data/xeff_demo.csv
index df4aae13..cb857820 100644
--- a/pvdeg/data/xeff_demo.csv
+++ b/pvdeg/data/xeff_demo.csv
@@ -1,6 +1,6 @@
-Source,Location ID,City,State,Country,Latitude,Longitude,Time Zone,Elevation,Local Time Zone,Clearsky DHI Units,Clearsky DNI Units,Clearsky GHI Units,Dew Point Units,DHI Units,DNI Units,GHI Units,Solar Zenith Angle Units,Temperature Units,Pressure Units,Relative Humidity Units,Precipitable Water Units,Wind Direction Units,Wind Speed Units,Cloud Type -15,Cloud Type 0,Cloud Type 1,Cloud Type 2,Cloud Type 3,Cloud Type 4,Cloud Type 5,Cloud Type 6,Cloud Type 7,Cloud Type 8,Cloud Type 9,Cloud Type 10,Cloud Type 11,Cloud Type 12,Fill Flag 0,Fill Flag 1,Fill Flag 2,Fill Flag 3,Fill Flag 4,Fill Flag 5,Surface Albedo Units,Version,Tilt,Azimuth,Wind_Height_m
+Source,Location ID,City,State,Country,Latitude,Longitude,Time Zone,Elevation,Local Time Zone,Clearsky DHI Units,Clearsky DNI Units,Clearsky GHI Units,Dew Point Units,DHI Units,DNI Units,GHI Units,Solar Zenith Angle Units,Temperature Units,Pressure Units,Relative Humidity Units,Precipitable Water Units,Wind Direction Units,Wind Speed Units,Cloud Type -15,Cloud Type 0,Cloud Type 1,Cloud Type 2,Cloud Type 3,Cloud Type 4,Cloud Type 5,Cloud Type 6,Cloud Type 7,Cloud Type 8,Cloud Type 9,Cloud Type 10,Cloud Type 11,Cloud Type 12,Fill Flag 0,Fill Flag 1,Fill Flag 2,Fill Flag 3,Fill Flag 4,Fill Flag 5,Surface Albedo Units,Version,tilt,azimuth,wind_height
NSRDB,145809,-,-,-,39.73,-105.18,-7,1820,-7,w/m2,w/m2,w/m2,c,w/m2,w/m2,w/m2,Degree,c,mbar,%,cm,Degrees,m/s,N/A,Clear,Probably Clear,Fog,Water,Super-Cooled Water,Mixed,Opaque Ice,Cirrus,Overlapping,Overshooting,Unknown,Dust,Smoke,N/A,Missing Image,Low Irradiance,Exceeds Clearsky,Missing CLoud Properties,Rayleigh Violation,N/A,3.0.6,39.73,180,2
-Year,Month,Day,Hour,Minute,DNI,DHI,GHI,Temperature,Dew Point,Wind Speed,Relative Humidity,Module_Temperature,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
+Year,Month,Day,Hour,Minute,DNI,DHI,GHI,Temperature,Dew Point,Wind Speed,Relative Humidity,module_temperature,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1999,1,1,0,30,0,0,0,0,-5,1.8,79.39,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1999,1,1,1,30,0,0,0,0,-4,1.7000000000000002,80.84,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
1999,1,1,2,30,0,0,0,0,-4,1.5,82.98,0,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,
diff --git a/pvdeg/degradation.py b/pvdeg/degradation.py
index 9ef54acf..2660f239 100644
--- a/pvdeg/degradation.py
+++ b/pvdeg/degradation.py
@@ -723,16 +723,12 @@ def degradation(
return degradation
+
# change it to take pd.DataFrame? instead of np.ndarray
@njit
def vecArrhenius(
- poa_global : np.ndarray,
- module_temp : np.ndarray,
- ea : float,
- x : float,
- lnr0 : float
- ) -> float:
-
+ poa_global: np.ndarray, module_temp: np.ndarray, ea: float, x: float, lnr0: float
+) -> float:
"""
Calculates degradation using :math:`R_D = R_0 * I^X * e^{\\frac{-Ea}{kT}}`
@@ -756,7 +752,7 @@ def vecArrhenius(
Returns
----------
degredation : float
- Degradation Rate [%/h]
+ Degradation Rate [%/h]
"""
@@ -764,13 +760,17 @@ def vecArrhenius(
poa_global = poa_global[mask]
module_temp = module_temp[mask]
- ea_scaled = ea / 8.31446261815324E-03
+ ea_scaled = ea / 8.31446261815324e-03
R0 = np.exp(lnr0)
poa_global_scaled = poa_global / 1000
degredation = 0
# refactor to list comprehension approach
for entry in range(len(poa_global_scaled)):
- degredation += R0 * np.exp(-ea_scaled / (273.15 + module_temp[entry])) * np.power(poa_global_scaled[entry], x)
+ degredation += (
+ R0
+ * np.exp(-ea_scaled / (273.15 + module_temp[entry]))
+ * np.power(poa_global_scaled[entry], x)
+ )
- return (degredation / len(poa_global))
+ return degredation / len(poa_global)
diff --git a/pvdeg/spectral.py b/pvdeg/spectral.py
index 3d6caacc..53b73ea1 100644
--- a/pvdeg/spectral.py
+++ b/pvdeg/spectral.py
@@ -73,12 +73,24 @@ def poa_irradiance(
# TODO: change for handling HSAT tracking passed or requested
if tilt is None:
- tilt = float(meta["latitude"])
+ try:
+ tilt = float(meta["tilt"])
+ except:
+ tilt = float(meta["latitude"])
+ print(
+ f"The array tilt angle was not provided, therefore the latitude tilt of {tilt:.1f} was used."
+ )
if azimuth is None: # Sets the default orientation to equator facing.
- if float(meta["latitude"]) < 0:
- azimuth = 0
- else:
- azimuth = 180
+ try:
+ azimuth = float(meta["azimuth"])
+ except:
+ if float(meta["latitude"]) < 0:
+ azimuth = 0
+ else:
+ azimuth = 180
+ print(
+ f"The array azimuth was not provided, therefore an azimuth of {azimuth:.1f} was used."
+ )
if sol_position is None:
sol_position = solar_position(weather_df, meta)
diff --git a/pvdeg/standards.py b/pvdeg/standards.py
index 4567ae35..f420f93b 100644
--- a/pvdeg/standards.py
+++ b/pvdeg/standards.py
@@ -20,7 +20,6 @@
def eff_gap_parameters(
weather_df=None,
meta=None,
- module_temp=None,
weather_kwarg=None,
sky_model="isotropic",
temp_model="sapm",
@@ -46,9 +45,10 @@ def eff_gap_parameters(
sky_model : str, optional
Options: 'isotropic', 'klucher', 'haydavies', 'reindl', 'king', 'perez'.
temp_model : str, optional
- Options: 'sapm'. 'pvsyst' and 'faiman' will be added later.
+ Options: 'sapm'. 'pvsyst' and 'faiman' and others from PVlib.
Performs the calculation for the cell temperature.
- conf_0 : str, optional Model for the high temperature module on the exponential decay curve.
+ conf_0 : str, optional
+ Model for the high temperature module on the exponential decay curve.
Default: 'insulated_back_glass_polymer'
conf_inf : str, optional
Model for the lowest temperature module on the exponential decay curve.
@@ -81,8 +81,6 @@ def eff_gap_parameters(
maximum achievable temperature.
T_inf : float
An array of temperature values for a module that is rack mounted, [°C].
- T_measured : float
- An array of values for the test module in the system, [°C] interest.
poa : float
An array of values for the plane of array irradiance, [W/m²]
@@ -98,17 +96,6 @@ def eff_gap_parameters(
elif weather_df is None:
weather_df, meta = weather.get(**weather_kwarg)
- # if tilt == None:
- # tilt = meta["latitude"]
-
- # if azimuth == None: # Sets the default orientation to equator facing. MSP: Defaults are already set in temperature.py
- # if float(meta["latitude"]) < 0:
- # azimuth = 0
- # else:
- # azimuth = 180
- # if "wind_height" not in meta.keys():
- # wind_factor = 1
-
solar_position = spectral.solar_position(weather_df, meta)
poa = spectral.poa_irradiance(
weather_df,
@@ -134,13 +121,11 @@ def eff_gap_parameters(
conf=conf_inf,
wind_factor=wind_factor,
)
- T_measured = module_temp
- T_ambient = weather_df["temp_air"]
- return T_0, T_inf, T_measured, T_ambient, poa
+ return T_0, T_inf, poa
-def eff_gap(T_0, T_inf, T_measured, T_ambient, poa, x_0=6.5, poa_min=100, t_amb_min=0):
+def eff_gap(T_0, T_inf, T_measured, T_ambient, poa, x_0=6.5, poa_min=400, t_amb_min=0):
"""
Calculate the effective standoff distance for rooftop mounded PV system
according to IEC TS 63126. The 98ᵗʰ percentile calculations for T_0 and T_inf are
@@ -159,10 +144,16 @@ def eff_gap(T_0, T_inf, T_measured, T_ambient, poa, x_0=6.5, poa_min=100, t_amb_
T_ambient : float
An array of values for the ambient temperature, [°C].
poa : float
- An array of values for the plane of array irradiance, [W/m²]
+ An array of values for the plane of array irradiance, [W/m²].
x_0 : float, optional
Thermal decay constant [cm], [Kempe, PVSC Proceedings 2023].
According to edition 2 of IEC TS 63126 a value of 6.5 cm is recommended.
+ poa_min : float
+ The minimum value for which the data will be used, [W/m²].
+ 400 W/m² is recommended.
+ t_amb_min : float
+ The minimum ambient temperature for which the calculation will be made, [°C].
+ A value of 0 °C is recommended to avoid data where snow might be present.
Returns
-------
@@ -186,7 +177,6 @@ def eff_gap(T_0, T_inf, T_measured, T_ambient, poa, x_0=6.5, poa_min=100, t_amb_
summ = summ + (T_0.iloc[i] - T_measured.iloc[i]) / (
T_0.iloc[i] - T_inf.iloc[i]
)
-
try:
x_eff = -x_0 * np.log(1 - summ / n)
except RuntimeWarning as e:
@@ -274,13 +264,6 @@ def standoff(
to IEC TS 63126, PVSC Proceedings 2023
"""
- # if azimuth == None: # Sets the default orientation to equator facing.
- # if float(meta["latitude"]) < 0:
- # azimuth = 0
- # else:
- # azimuth = 180
- # if "wind_height" not in meta.keys():
- # wind_factor = 1
parameters = ["temp_air", "wind_speed", "dhi", "ghi", "dni"]
if isinstance(weather_df, dd.DataFrame):
@@ -377,14 +360,14 @@ def interpret_standoff(standoff_1=None, standoff_2=None):
else:
if T98_0 is not None:
Output = (
- "The estimated temperature of an insulated-back module is "
+ "The estimated T₉₈ of an insulated-back module is "
+ "%.1f" % T98_0
+ "°C. \n"
)
if T98_inf is not None:
Output = (
Output
- + "The estimated temperature of an open-rack module is "
+ + "The estimated T₉₈ of an open-rack module is "
+ "%.1f" % T98_inf
+ "°C. \n"
)
@@ -498,16 +481,6 @@ def T98_estimate(
"""
- # if tilt == None:
- # tilt = meta["latitude"]
-
- # if azimuth == None: # Sets the default orientation to equator facing.
- # if float(meta["latitude"]) < 0:
- # azimuth = 0
- # else:
- # azimuth = 180
- # if "wind_height" not in meta.keys():
- # wind_factor = 1
parameters = ["temp_air", "wind_speed", "dhi", "ghi", "dni"]
if isinstance(weather_df, dd.DataFrame):
@@ -598,111 +571,3 @@ def standoff_x(
).x[0]
return temp_df
-
-
-# def run_calc_standoff(
-# project_points,
-# out_dir,
-# tag,
-# #weather_db,
-# #weather_satellite,
-# #weather_names,
-# max_workers=None,
-# tilt=None,
-# azimuth=180,
-# sky_model='isotropic',
-# temp_model='sapm',
-# module_type='glass_polymer',
-# level=1,
-# x_0=6.1,
-# wind_speed_factor=1
-# ):
-
-# """
-# parallelization utilizing gaps #TODO: write docstring
-# """
-
-# #inputs
-# weather_arg = {}
-# #weather_arg['satellite'] = weather_satellite
-# #weather_arg['names'] = weather_names
-# weather_arg['NREL_HPC'] = True #TODO: add argument or auto detect
-# weather_arg['attributes'] = [
-# 'air_temperature',
-# 'wind_speed',
-# 'dhi',
-# 'ghi',
-# 'dni',
-# 'relative_humidity'
-# ]
-
-# all_fields = ['x', 'T98_0', 'T98_inf']
-
-# out_fp = Path(out_dir) / f"out_standoff{tag}.h5"
-# shapes = {n : (len(project_points), ) for n in all_fields}
-# attrs = {'x' : {'units': 'cm'},
-# 'T98_0' : {'units': 'Celsius'},
-# 'T98_inf' : {'units': 'Celsius'}}
-# chunks = {n : None for n in all_fields}
-# dtypes = {n : "float32" for n in all_fields}
-
-# # #TODO: is there a better way to add the meta data?
-# # nsrdb_fnames, hsds = weather.get_NSRDB_fnames(
-# # weather_arg['satellite'],
-# # weather_arg['names'],
-# # weather_arg['NREL_HPC'])
-
-# # with NSRDBX(nsrdb_fnames[0], hsds=hsds) as f:
-# # meta = f.meta[f.meta.index.isin(project_points.gids)]
-
-# Outputs.init_h5(
-# out_fp,
-# all_fields,
-# shapes,
-# attrs,
-# chunks,
-# dtypes,
-# #meta=meta.reset_index()
-# meta=project_points.df
-# )
-
-# future_to_point = {}
-# with ProcessPoolExecutor(max_workers=max_workers) as executor:
-# for idx, point in project_points.df.iterrows():
-# database = point.weather_db
-# gid = idx #int(point.gid)
-# df_weather_kwargs = point.drop('weather_db', inplace=False).filter(like='weather_')
-# df_weather_kwargs.index = df_weather_kwargs.index.map(
-# lambda arg: arg.lstrip('weather_'))
-# weather_kwarg = weather_arg | df_weather_kwargs.to_dict()
-
-# weather_df, meta = weather.load(
-# database = database,
-# id = gid,
-# #satellite = point.satellite, #TODO: check input
-# **weather_kwarg)
-# future = executor.submit(
-# calc_standoff,
-# weather_df,
-# meta,
-# tilt,
-# azimuth,
-# sky_model,
-# temp_model,
-# module_type,
-# level,
-# x_0,
-# wind_speed_factor
-# )
-# future_to_point[future] = gid
-
-# with Outputs(out_fp, mode="a") as out:
-# for future in as_completed(future_to_point):
-# result = future.result()
-# gid = future_to_point.pop(future)
-
-# #ind = project_points.index(gid)
-# for dset, data in result.items():
-# out[dset, idx] = np.array([data])
-
-# return out_fp.as_posix()
diff --git a/pvdeg/weather.py b/pvdeg/weather.py
index 9712508d..5543cc0a 100644
--- a/pvdeg/weather.py
+++ b/pvdeg/weather.py
@@ -162,6 +162,10 @@ def read(file_in, file_type, map_variables=True, **kwargs):
map_weather(weather_df)
map_meta(meta)
+ if weather_df.index.tzinfo is None:
+ tz = "Etc/GMT%+d" % -meta["tz"]
+ weather_df = weather_df.tz_localize(tz)
+
return weather_df, meta
@@ -192,6 +196,13 @@ def csv_read(filename):
metadata_values = file1.readline().split(",")
metadata_values[-1] = metadata_values[-1].strip() # strip trailing newline
meta = dict(zip(metadata_fields, metadata_values))
+ for (
+ key
+ ) in meta: # converts everything to a float that is possible to convert to a float
+ try:
+ meta[key] = float(meta[key])
+ except:
+ pass
# get the column headers
columns = file1.readline().split(",")
columns[-1] = columns[-1].strip() # strip trailing newline
@@ -226,11 +237,7 @@ def csv_read(filename):
dtidx = print(
"Your data file should have columns for Year, Month, Day, and Hour"
)
- try:
- tz = "Etc/GMT%+d" % -meta["tz"]
- weather_df.index = pd.DatetimeIndex(dtidx.tz_localize(tz))
- except:
- weather_df.index = pd.DatetimeIndex(dtidx)
+ weather_df.index = pd.DatetimeIndex(dtidx)
file1.close()
return weather_df, meta
@@ -252,6 +259,7 @@ def map_meta(meta):
"Elevation": "altitude",
"Local Time Zone": "tz",
"Time Zone": "tz",
+ "timezone": "tz",
"Dew Point": "dew_point",
"Longitude": "longitude",
"Latitude": "latitude",
diff --git a/tests/test_letid.py b/tests/test_letid.py
index ec28d551..126eceae 100644
--- a/tests/test_letid.py
+++ b/tests/test_letid.py
@@ -1,5 +1,5 @@
import pytest
-from pvdeg import letid, utilities, collection, DATA_DIR, TEST_DATA_DIR
+from pvdeg import weather, letid, utilities, collection, DATA_DIR, TEST_DATA_DIR
import os
import pandas as pd
import numpy as np
@@ -64,7 +64,7 @@
with open(os.path.join(TEST_DATA_DIR, "meta.json"), "r") as file:
META = json.load(file)
-
+META = weather.map_meta(META)
def test_tau_now():
# from LETID - Passivated Wafer.ipynb
@@ -270,7 +270,7 @@ def test_calc_letid_outdoors():
generation_df = pd.read_excel(os.path.join(DATA_DIR, 'PVL_GenProfile.xlsx'), header = 0) # this is an optical generation profile generated by PVLighthouse's OPAL2 default model for 1-sun, normal incident AM1.5 sunlight on a 180-um thick SiNx-coated, pyramid-textured wafer.
result = letid.calc_letid_outdoors(tau_0, tau_deg, wafer_thickness, s_rear, nA_0, nB_0, nC_0, WEATHER, META, mechanism_params, generation_df)
-
+ print("here it is", META)
pd.testing.assert_frame_equal(result, LETID_OUTDOORS)
def test_calc_letid_lab():
diff --git a/tutorials_and_tools/tutorials_and_tools/2 - Degradation.ipynb b/tutorials_and_tools/tutorials_and_tools/2 - Degradation.ipynb
index 95174cf3..50cea86b 100644
--- a/tutorials_and_tools/tutorials_and_tools/2 - Degradation.ipynb
+++ b/tutorials_and_tools/tutorials_and_tools/2 - Degradation.ipynb
@@ -5,16 +5,7 @@
"metadata": {},
"source": [
"# 2 - Degradation\n",
-<<<<<<< HEAD
"Degradation and Solder Fatigue\n",
-=======
- "### Degradation and Solder Fatigue\n",
- "***\n",
- "Matthew Brown\n",
- "\n",
- "2023.06.02\n",
- "***\n",
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f
"\n",
"**Requirements**:\n",
"- compatible weather file (PSM3, TMY3, EPW)\n",
@@ -35,39 +26,30 @@
},
{
"cell_type": "code",
- "execution_count": 1,
+ "execution_count": 8,
"metadata": {},
"outputs": [],
"source": [
"# if running on google colab, uncomment the next line and execute this cell to install the dependencies and prevent \"ModuleNotFoundError\" in later cells:\n",
-<<<<<<< HEAD
"# !pip install pvdeg==0.3.1"
-=======
- "# !pip install pvdeg==0.1.1"
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f
]
},
{
"cell_type": "code",
-<<<<<<< HEAD
- "execution_count": 2,
-=======
- "execution_count": 1,
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f
+ "execution_count": 9,
"metadata": {},
"outputs": [],
"source": [
"import os\n",
"import pandas as pd\n",
"\n",
- "import pvdeg \n",
+ "import pvdeg\n",
"from pvdeg import DATA_DIR"
]
},
{
-<<<<<<< HEAD
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": 10,
"metadata": {},
"outputs": [
{
@@ -75,9 +57,9 @@
"output_type": "stream",
"text": [
"Working on a Windows 10\n",
- "Python version 3.11.4 | packaged by Anaconda, Inc. | (main, Jul 5 2023, 13:38:37) [MSC v.1916 64 bit (AMD64)]\n",
- "Pandas version 2.1.0\n",
- "pvdeg version 0.2.0+12.g277eda3.dirty\n"
+ "Python version 3.11.7 | packaged by Anaconda, Inc. | (main, Dec 15 2023, 18:05:47) [MSC v.1916 64 bit (AMD64)]\n",
+ "Pandas version 2.2.0\n",
+ "pvdeg version 0.2.4.dev83+ge2ceab9.d20240422\n"
]
}
],
@@ -91,8 +73,6 @@
]
},
{
-=======
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f
"cell_type": "markdown",
"metadata": {},
"source": [
@@ -103,7 +83,7 @@
},
{
"cell_type": "code",
- "execution_count": 2,
+ "execution_count": 11,
"metadata": {},
"outputs": [],
"source": [
@@ -122,9 +102,18 @@
},
{
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": 12,
"metadata": {},
- "outputs": [],
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "The array tilt angle was not provided, therefore the latitude tilt of 39.7 was used.\n",
+ "The array azimuth was not provided, therefore an azimuth of 180.0 was used.\n"
+ ]
+ }
+ ],
"source": [
"sol_pos = pvdeg.spectral.solar_position(weather_df=WEATHER, meta=META)\n",
"\n",
@@ -150,12 +139,12 @@
},
{
"cell_type": "code",
- "execution_count": 4,
+ "execution_count": 13,
"metadata": {},
"outputs": [],
"source": [
"# chamber irradiance (W/m^2)\n",
- "I_chamber = 1000 \n",
+ "I_chamber = 1000\n",
"# chamber temperature (C)\n",
"temp_chamber = 60\n",
"\n",
@@ -164,12 +153,12 @@
" I_chamber=I_chamber,\n",
" temp_chamber=temp_chamber,\n",
" poa=poa_df,\n",
- " temp_cell=temp_cell)\n",
+ " temp=temp_cell)\n",
"\n",
"# calculate the VantHoff weighted irradiance\n",
"irr_weighted_avg_v = pvdeg.degradation.IwaVantHoff(weather_df=WEATHER, meta=META,\n",
" poa=poa_df,\n",
- " temp_cell=temp_cell)"
+ " temp=temp_cell)"
]
},
{
@@ -192,7 +181,7 @@
},
{
"cell_type": "code",
- "execution_count": 6,
+ "execution_count": 15,
"metadata": {},
"outputs": [],
"source": [
@@ -211,13 +200,13 @@
" rh_chamber=rh_chamber,\n",
" temp_chamber=temp_chamber,\n",
" poa=poa_df,\n",
- " temp_cell=temp_cell,\n",
+ " temp=temp_cell,\n",
" Ea=Ea)\n",
"\n",
"irr_weighted_avg_a = pvdeg.degradation.IwaArrhenius(weather_df=WEATHER, meta=META,\n",
- " poa=poa_df, \n",
+ " poa=poa_df,\n",
" rh_outdoor=WEATHER['relative_humidity'],\n",
- " temp_cell=temp_cell,\n",
+ " temp=temp_cell,\n",
" Ea=Ea)"
]
},
@@ -232,9 +221,20 @@
},
{
"cell_type": "code",
- "execution_count": 7,
+ "execution_count": 16,
"metadata": {},
- "outputs": [],
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "The array tilt angle was not provided, therefore the latitude tilt of 39.7 was used.\n",
+ "The array azimuth was not provided, therefore an azimuth of 180.0 was used.\n",
+ "The array tilt angle was not provided, therefore the latitude tilt of 39.7 was used.\n",
+ "The array azimuth was not provided, therefore an azimuth of 180.0 was used.\n"
+ ]
+ }
+ ],
"source": [
"# chamber settings\n",
"I_chamber= 1000\n",
@@ -253,9 +253,20 @@
},
{
"cell_type": "code",
- "execution_count": 8,
+ "execution_count": 17,
"metadata": {},
- "outputs": [],
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "The array tilt angle was not provided, therefore the latitude tilt of 39.7 was used.\n",
+ "The array azimuth was not provided, therefore an azimuth of 180.0 was used.\n",
+ "The array tilt angle was not provided, therefore the latitude tilt of 39.7 was used.\n",
+ "The array azimuth was not provided, therefore an azimuth of 180.0 was used.\n"
+ ]
+ }
+ ],
"source": [
"rh_surface = pvdeg.humidity.surface_outside(rh_ambient=WEATHER['relative_humidity'],\n",
" temp_ambient=WEATHER['temp_air'],\n",
@@ -268,7 +279,7 @@
" temp_chamber=temp_chamber,\n",
" Ea=Ea)\n",
"\n",
- "irr_weighted_avg_a = pvdeg.degradation.IwaArrhenius(weather_df=WEATHER, meta=META, \n",
+ "irr_weighted_avg_a = pvdeg.degradation.IwaArrhenius(weather_df=WEATHER, meta=META,\n",
" rh_outdoor=WEATHER['relative_humidity'],\n",
" Ea=Ea)"
]
@@ -284,9 +295,18 @@
},
{
"cell_type": "code",
- "execution_count": 9,
+ "execution_count": 18,
"metadata": {},
- "outputs": [],
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "The array tilt angle was not provided, therefore the latitude tilt of 39.7 was used.\n",
+ "The array azimuth was not provided, therefore an azimuth of 180.0 was used.\n"
+ ]
+ }
+ ],
"source": [
"fatigue = pvdeg.fatigue.solder_fatigue(weather_df=WEATHER, meta=META)"
]
@@ -305,9 +325,18 @@
},
{
"cell_type": "code",
- "execution_count": null,
+ "execution_count": 19,
"metadata": {},
- "outputs": [],
+ "outputs": [
+ {
+ "name": "stdout",
+ "output_type": "stream",
+ "text": [
+ "The array tilt angle was not provided, therefore the latitude tilt of 39.7 was used.\n",
+ "The array azimuth was not provided, therefore an azimuth of 180.0 was used.\n"
+ ]
+ }
+ ],
"source": [
"# select the month of June\n",
"time_range = WEATHER.index[WEATHER.index.month == 6]\n",
@@ -341,11 +370,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
-<<<<<<< HEAD
- "version": "3.11.4"
-=======
- "version": "3.9.13"
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f
+ "version": "3.11.7"
}
},
"nbformat": 4,
diff --git a/tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb b/tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
index f0eee1e2..b8eacf2f 100644
--- a/tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
+++ b/tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
@@ -4,19 +4,10 @@
"cell_type": "markdown",
"metadata": {},
"source": [
-<<<<<<< HEAD:tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
"# Tools - Module Standoff for IEC TS 63126\n",
- "## Calculation of module standoff distance according to IEC TS 63126\n",
-=======
- "# 4 - Standards\n",
"\n",
"### Calculation of module standoff distance according to IEC TS 63126\n",
"\n",
- "***\n",
- "Matthew Brown, Michael Kempe\n",
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f:pvdeg_tutorials/tutorials/4 - Standards.ipynb
- "\n",
- "\n",
"**Requirements:**\n",
"- Local weather data file or site longitude and latittude\n",
"\n",
@@ -56,29 +47,17 @@
},
{
"cell_type": "code",
-<<<<<<< HEAD:tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
- "execution_count": null,
-=======
- "execution_count": 18,
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f:pvdeg_tutorials/tutorials/4 - Standards.ipynb
+ "execution_count": 1,
"metadata": {},
"outputs": [],
"source": [
"# if running on google colab, uncomment the next line and execute this cell to install the dependencies and prevent \"ModuleNotFoundError\" in later cells:\n",
-<<<<<<< HEAD:tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
"# !pip install pvdeg==0.3.1"
-=======
- "# !pip install git+https://github.com/NREL/PVDegradationTools.git@development"
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f:pvdeg_tutorials/tutorials/4 - Standards.ipynb
]
},
{
"cell_type": "code",
-<<<<<<< HEAD:tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
- "execution_count": 3,
-=======
- "execution_count": 19,
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f:pvdeg_tutorials/tutorials/4 - Standards.ipynb
+ "execution_count": 2,
"metadata": {},
"outputs": [],
"source": [
@@ -96,32 +75,19 @@
},
{
"cell_type": "code",
-<<<<<<< HEAD:tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
- "execution_count": 2,
-=======
- "execution_count": 20,
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f:pvdeg_tutorials/tutorials/4 - Standards.ipynb
+ "execution_count": 3,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
-<<<<<<< HEAD:tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
"Working on a Windows 10\n",
- "Python version 3.11.4 | packaged by Anaconda, Inc. | (main, Jul 5 2023, 13:38:37) [MSC v.1916 64 bit (AMD64)]\n",
- "Pandas version 2.1.0\n",
- "pvdeg version 0.2.0+12.g277eda3.dirty\n",
- "dask version 2023.6.0\n",
- "c:\\users\\sayala\\documents\\github\\pvdegtool\\pvdegradationtools\\pvdeg\\data\n"
-=======
- "Working on a Linux 4.18.0-477.10.1.el8_8.x86_64\n",
- "Python version 3.11.7 (main, Dec 15 2023, 18:12:31) [GCC 11.2.0]\n",
- "Pandas version 2.2.1\n",
- "pvdeg version 0.2.4.dev77+g3683457\n",
- "dask version 2024.2.1\n",
- "/kfs2/projects/pvsoiling/pvdeg/repos/PVDegradationTools/pvdeg/data\n"
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f:pvdeg_tutorials/tutorials/4 - Standards.ipynb
+ "Python version 3.11.7 | packaged by Anaconda, Inc. | (main, Dec 15 2023, 18:05:47) [MSC v.1916 64 bit (AMD64)]\n",
+ "Pandas version 2.2.0\n",
+ "pvdeg version 0.2.4.dev83+ge2ceab9.d20240422\n",
+ "dask version 2024.1.1\n",
+ "C:\\Users\\mspringe\\OneDrive - NREL\\msp\\projects\\2023_DegradationTools\\Github\\PVDegradationTools\\pvdeg\\data\n"
]
}
],
@@ -151,18 +117,14 @@
},
{
"cell_type": "code",
-<<<<<<< HEAD:tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
"execution_count": 4,
-=======
- "execution_count": 21,
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f:pvdeg_tutorials/tutorials/4 - Standards.ipynb
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
- "{'Source': 'NSRDB', 'Location ID': '145809', 'City': '-', 'State': '-', 'Country': '-', 'Clearsky DHI Units': 'w/m2', 'Clearsky DNI Units': 'w/m2', 'Clearsky GHI Units': 'w/m2', 'Dew Point Units': 'c', 'DHI Units': 'w/m2', 'DNI Units': 'w/m2', 'GHI Units': 'w/m2', 'Solar Zenith Angle Units': 'Degree', 'Temperature Units': 'c', 'Pressure Units': 'mbar', 'Relative Humidity Units': '%', 'Precipitable Water Units': 'cm', 'Wind Direction Units': 'Degrees', 'Wind Speed Units': 'm/s', 'Cloud Type -15': 'N/A', 'Cloud Type 0': 'Clear', 'Cloud Type 1': 'Probably Clear', 'Cloud Type 2': 'Fog', 'Cloud Type 3': 'Water', 'Cloud Type 4': 'Super-Cooled Water', 'Cloud Type 5': 'Mixed', 'Cloud Type 6': 'Opaque Ice', 'Cloud Type 7': 'Cirrus', 'Cloud Type 8': 'Overlapping', 'Cloud Type 9': 'Overshooting', 'Cloud Type 10': 'Unknown', 'Cloud Type 11': 'Dust', 'Cloud Type 12': 'Smoke', 'Fill Flag 0': 'N/A', 'Fill Flag 1': 'Missing Image', 'Fill Flag 2': 'Low Irradiance', 'Fill Flag 3': 'Exceeds Clearsky', 'Fill Flag 4': 'Missing CLoud Properties', 'Fill Flag 5': 'Rayleigh Violation', 'Surface Albedo Units': 'N/A', 'Version': '3.0.6', 'latitude': '39.73', 'longitude': '-105.18', 'tz': '-7', 'altitude': '1820'}\n"
+ "{'Source': 'NSRDB', 'Location ID': 145809.0, 'City': '-', 'State': '-', 'Country': '-', 'Clearsky DHI Units': 'w/m2', 'Clearsky DNI Units': 'w/m2', 'Clearsky GHI Units': 'w/m2', 'Dew Point Units': 'c', 'DHI Units': 'w/m2', 'DNI Units': 'w/m2', 'GHI Units': 'w/m2', 'Solar Zenith Angle Units': 'Degree', 'Temperature Units': 'c', 'Pressure Units': 'mbar', 'Relative Humidity Units': '%', 'Precipitable Water Units': 'cm', 'Wind Direction Units': 'Degrees', 'Wind Speed Units': 'm/s', 'Cloud Type -15': 'N/A', 'Cloud Type 0': 'Clear', 'Cloud Type 1': 'Probably Clear', 'Cloud Type 2': 'Fog', 'Cloud Type 3': 'Water', 'Cloud Type 4': 'Super-Cooled Water', 'Cloud Type 5': 'Mixed', 'Cloud Type 6': 'Opaque Ice', 'Cloud Type 7': 'Cirrus', 'Cloud Type 8': 'Overlapping', 'Cloud Type 9': 'Overshooting', 'Cloud Type 10': 'Unknown', 'Cloud Type 11': 'Dust', 'Cloud Type 12': 'Smoke', 'Fill Flag 0': 'N/A', 'Fill Flag 1': 'Missing Image', 'Fill Flag 2': 'Low Irradiance', 'Fill Flag 3': 'Exceeds Clearsky', 'Fill Flag 4': 'Missing CLoud Properties', 'Fill Flag 5': 'Rayleigh Violation', 'Surface Albedo Units': 'N/A', 'Version': '3.0.6', 'latitude': 39.73, 'longitude': -105.18, 'tz': -7.0, 'altitude': 1820.0}\n"
]
}
],
@@ -175,11 +137,7 @@
},
{
"cell_type": "code",
-<<<<<<< HEAD:tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
"execution_count": 5,
-=======
- "execution_count": 22,
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f:pvdeg_tutorials/tutorials/4 - Standards.ipynb
"metadata": {},
"outputs": [
{
@@ -187,11 +145,7 @@
"output_type": "stream",
"text": [
"Column \"relative_humidity\" not found in DataFrame. Calculating...\n",
-<<<<<<< HEAD:tutorials_and_tools/tutorials_and_tools/Tools - Module Standoff for IEC TS 63126.ipynb
- "{'Source': 'NSRDB', 'Location ID': '77855', 'City': '-', 'State': '-', 'Country': '-', 'Dew Point Units': 'c', 'DHI Units': 'w/m2', 'DNI Units': 'w/m2', 'GHI Units': 'w/m2', 'Temperature Units': 'c', 'Pressure Units': 'mbar', 'Wind Direction Units': 'Degrees', 'Wind Speed Units': 'm/s', 'Surface Albedo Units': 'N/A', 'Version': '3.2.0', 'latitude': 33.41, 'longitude': -111.82, 'altitude': 381, 'timezone': -7, 'wind_height': 2, 'tz': -7}\n"
-=======
"{'Source': 'NSRDB', 'Location ID': '77855', 'City': '-', 'State': '-', 'Country': '-', 'Dew Point Units': 'c', 'DHI Units': 'w/m2', 'DNI Units': 'w/m2', 'GHI Units': 'w/m2', 'Temperature Units': 'c', 'Pressure Units': 'mbar', 'Wind Direction Units': 'Degrees', 'Wind Speed Units': 'm/s', 'Surface Albedo Units': 'N/A', 'Version': '3.2.0', 'latitude': 33.41, 'longitude': -111.82, 'altitude': 381, 'tz': -7, 'wind_height': 2}\n"
->>>>>>> 7e6c16e81df3f9f88dd0b11c44620f1df3ceea0f:pvdeg_tutorials/tutorials/4 - Standards.ipynb
]
}
],
@@ -216,304 +170,7 @@
},
{
"cell_type": "code",
- "execution_count": 23,
- "metadata": {},
- "outputs": [],
- "source": [
- "import pvlib\n",
- "weather_df, meta = pvlib.iotools.get_psm3(latitude=33.4, longitude=-111.8315, **weather_arg)"
- ]
- },
- {
- "cell_type": "code",
- "execution_count": 24,
- "metadata": {},
- "outputs": [
- {
- "data": {
- "text/html": [
- "\n",
- "\n",
- "
\n",
- " \n",
- " \n",
- " | \n",
- " Year | \n",
- " Month | \n",
- " Day | \n",
- " Hour | \n",
- " Minute | \n",
- " temp_dew | \n",
- " dhi | \n",
- " dni | \n",
- " ghi | \n",
- " albedo | \n",
- " pressure | \n",
- " temp_air | \n",
- " wind_direction | \n",
- " wind_speed | \n",
- "
\n",
- " \n",
- " \n",
- " \n",
- " | 2012-01-01 00:30:00-07:00 | \n",
- " 2012 | \n",
- " 1 | \n",
- " 1 | \n",
- " 0 | \n",
- " 30 | \n",
- " -2.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.16 | \n",
- " 970.0 | \n",
- " 7.0 | \n",
- " 47.0 | \n",
- " 4.4 | \n",
- "
\n",
- " \n",
- " | 2012-01-01 01:30:00-07:00 | \n",
- " 2012 | \n",
- " 1 | \n",
- " 1 | \n",
- " 1 | \n",
- " 30 | \n",
- " -2.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.16 | \n",
- " 970.0 | \n",
- " 7.0 | \n",
- " 46.0 | \n",
- " 4.2 | \n",
- "
\n",
- " \n",
- " | 2012-01-01 02:30:00-07:00 | \n",
- " 2012 | \n",
- " 1 | \n",
- " 1 | \n",
- " 2 | \n",
- " 30 | \n",
- " -3.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.16 | \n",
- " 970.0 | \n",
- " 6.0 | \n",
- " 45.0 | \n",
- " 4.1 | \n",
- "
\n",
- " \n",
- " | 2012-01-01 03:30:00-07:00 | \n",
- " 2012 | \n",
- " 1 | \n",
- " 1 | \n",
- " 3 | \n",
- " 30 | \n",
- " -3.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.16 | \n",
- " 970.0 | \n",
- " 6.0 | \n",
- " 48.0 | \n",
- " 4.0 | \n",
- "
\n",
- " \n",
- " | 2012-01-01 04:30:00-07:00 | \n",
- " 2012 | \n",
- " 1 | \n",
- " 1 | \n",
- " 4 | \n",
- " 30 | \n",
- " -4.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.16 | \n",
- " 970.0 | \n",
- " 6.0 | \n",
- " 50.0 | \n",
- " 3.8 | \n",
- "
\n",
- " \n",
- " | ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- " ... | \n",
- "
\n",
- " \n",
- " | 1998-12-31 19:30:00-07:00 | \n",
- " 1998 | \n",
- " 12 | \n",
- " 31 | \n",
- " 19 | \n",
- " 30 | \n",
- " 1.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.16 | \n",
- " 970.0 | \n",
- " 13.0 | \n",
- " 34.0 | \n",
- " 1.5 | \n",
- "
\n",
- " \n",
- " | 1998-12-31 20:30:00-07:00 | \n",
- " 1998 | \n",
- " 12 | \n",
- " 31 | \n",
- " 20 | \n",
- " 30 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.16 | \n",
- " 970.0 | \n",
- " 11.0 | \n",
- " 41.0 | \n",
- " 2.2 | \n",
- "
\n",
- " \n",
- " | 1998-12-31 21:30:00-07:00 | \n",
- " 1998 | \n",
- " 12 | \n",
- " 31 | \n",
- " 21 | \n",
- " 30 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.16 | \n",
- " 970.0 | \n",
- " 10.0 | \n",
- " 45.0 | \n",
- " 3.3 | \n",
- "
\n",
- " \n",
- " | 1998-12-31 22:30:00-07:00 | \n",
- " 1998 | \n",
- " 12 | \n",
- " 31 | \n",
- " 22 | \n",
- " 30 | \n",
- " -1.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.16 | \n",
- " 970.0 | \n",
- " 9.0 | \n",
- " 46.0 | \n",
- " 4.1 | \n",
- "
\n",
- " \n",
- " | 1998-12-31 23:30:00-07:00 | \n",
- " 1998 | \n",
- " 12 | \n",
- " 31 | \n",
- " 23 | \n",
- " 30 | \n",
- " -2.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.0 | \n",
- " 0.16 | \n",
- " 970.0 | \n",
- " 8.0 | \n",
- " 46.0 | \n",
- " 4.5 | \n",
- "
\n",
- " \n",
- "
\n",
- "
8760 rows × 14 columns
\n",
- "