Merge branch 'hybrids' of https://github.com/NREL/SAM into hybrids

NREL · Aug 18, 2023 · 4065155 · 4065155
2 parents a3a1b97 + 8a9d81d
commit 4065155
Show file tree

Hide file tree

Showing 9 changed files with 59,427 additions and 19 deletions.
diff --git a/deploy/runtime/defaults/Generic PVWatts Wind FuelCell Battery Hybrid_Single Owner.json b/deploy/runtime/defaults/Generic PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
diff --git a/.../runtime/defaults/Generic System PVWatts Wind FuelCell Battery Hybrid_Host Developer.json b/.../runtime/defaults/Generic System PVWatts Wind FuelCell Battery Hybrid_Host Developer.json
@@ -0,0 +1,9 @@
+{
+    "Generic": {},
+    "System": {},
+    "PVWatts": {},
+    "Wind": {},
+    "FuelCell": {},
+    "Battery": {},
+    "Hybrid": {}
+}
diff --git a/...oy/runtime/defaults/Generic System PVWatts Wind FuelCell Battery Hybrid_Single Owner.json b/...oy/runtime/defaults/Generic System PVWatts Wind FuelCell Battery Hybrid_Single Owner.json
@@ -0,0 +1,9 @@
+{
+    "Generic": {},
+    "System": {},
+    "PVWatts": {},
+    "Wind": {},
+    "FuelCell": {},
+    "Battery": {},
+    "Hybrid": {}
+}