resolving merge conflicts

NREL · Sep 25, 2023 · 504e8f4 · 504e8f4
1 parent 158c9bb
commit 504e8f4
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/pvdeg/standards.py b/pvdeg/standards.py
@@ -81,7 +81,6 @@ def standoff(
     conf_inf= 'open_rack_glass_polymer',
     level=1,
     T98=None,
-    T98=None,
     x_0=6.1,
     wind_speed_factor=1):
     '''

diff --git a/pvdeg/weather.py b/pvdeg/weather.py
@@ -172,7 +172,6 @@ def read_h5(gid, file, attributes=None, **_):
         fp = os.path.join(os.path.dirname(__file__),
                           os.path.basename(file))
 
-    with Outputs(fp, mode='r') as f:
     with Outputs(fp, mode='r') as f:
         meta = f.meta.loc[gid]
         index = f.time_index
@@ -189,7 +188,6 @@ def read_h5(gid, file, attributes=None, **_):
 
     weather_df = pd.DataFrame(index=index, columns=attributes)
     for dset in attributes:
-        with Outputs(fp, mode='r') as f:
         with Outputs(fp, mode='r') as f:
             weather_df[dset] = f[dset, :, gid]