update to v2024.3.0

NREL · May 2, 2024 · 2099735 · 2099735
1 parent 5fb5690
commit 2099735
Show file tree

Hide file tree

Showing 66 changed files with 7,465 additions and 4,612 deletions.
diff --git a/ReEDS_Augur/A_prep_data.py b/ReEDS_Augur/A_prep_data.py
@@ -328,7 +328,14 @@ def intify(v):
         gdxreeds['h_szn'].drop('Value', axis=1)
         .merge(gdxreeds['hours'], on='allh').groupby('allszn').Value.sum())
     ## Make sure the number of hours makes sense
-    assert int(np.around(sznhours.sum(), 0)) % 8760 == 0
+    if (
+        ((int(np.around(sznhours.sum(), 0)) % 8760) and int(sw.GSw_PRM_CapCredit))
+        or ((int(np.around(sznhours.sum(), 0)) % 8766) and not int(sw.GSw_PRM_CapCredit))
+    ):
+        raise ValueError(
+            f"sznhours.sum() = {sznhours.sum()} but should be divisible by 8760 "
+            "when using capacity credit and by 8766 when using stress periods"
+        )
     ## [MWh] / [h] = [MW] (average)
     can_imports_avemw_rszn = (
         gdxreeds['can_imports_szn_filt'].pivot(index='allszn',columns='r',values='Value')