Merge pull request #56 from NREL-Sienna/jd/change_storage

Jd/change storage
NREL-Sienna · May 16, 2024 · 814286e · 814286e
2 parents b528649 + 887d007
commit 814286e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/5-Bus/generator_mapping.yaml b/5-Bus/generator_mapping.yaml
@@ -34,5 +34,5 @@ ThermalStandard:
 - {fuel: SYNC_COND, type: SYNC_COND}
 - {fuel: OTHER, type: OT}
 
-GenericBattery:
+EnergyReservoirStorage:
 - {fuel: STORAGE, type: null}
diff --git a/RTS_GMLC/generator_mapping.yaml b/RTS_GMLC/generator_mapping.yaml
@@ -30,5 +30,5 @@ ThermalStandard:
 - {fuel: SYNC_COND, type: SYNC_COND}
 - {fuel: OTHER, type: OT}
 
-GenericBattery:
+EnergyReservoirStorage:
 - {fuel: STORAGE, type: null}
diff --git a/RTS_GMLC/generator_mapping_multi_start.yaml b/RTS_GMLC/generator_mapping_multi_start.yaml
@@ -30,5 +30,5 @@ ThermalMultiStart:
 - {fuel: SYNC_COND, type: SYNC_COND}
 - {fuel: OTHER, type: OT}
 
-GenericBattery:
+EnergyReservoirStorage:
 - {fuel: STORAGE, type: null}
diff --git a/psy_data/data_14bus_pu.jl b/psy_data/data_14bus_pu.jl
@@ -837,9 +837,10 @@ timeseries_DA14 = [
 ];
 
 battery14(nodes14) = [
-    GenericBattery(
+    EnergyReservoirStorage(
         name = "Bat",
         prime_mover_type = PrimeMovers.BA,
+        storage_technology_type = StorageTech.OTHER_CHEM,
         available = true,
         bus = nodes14[1],
         initial_energy = 5.0,

diff --git a/psy_data/data_5bus_pu.jl b/psy_data/data_5bus_pu.jl
@@ -761,9 +761,10 @@ phes5(nodes5) = [
     ),
 ];
 
-battery5(nodes5) = [GenericBattery(
+battery5(nodes5) = [EnergyReservoirStorage(
     name = "Bat",
     prime_mover_type = PrimeMovers.BA,
+    storage_technology_type = StorageTech.OTHER_CHEM,
     available = true,
     bus = nodes5[1],
     initial_energy = 2.0,
@@ -779,9 +780,10 @@ battery5(nodes5) = [GenericBattery(
 )];
 
 batteryems5(nodes5) = [
-     PSY.BatteryEMS(;
+     PSY.EnergyReservoirStorage(;
          name = "Bat2",
          prime_mover_type = PrimeMovers.BA,
+         storage_technology_type = StorageTech.OTHER_CHEM,
          available = true,
          bus = nodes5[1],
          initial_energy = 5.0,