NREL · hdunham · Sep 19, 2023 · Sep 19, 2023 · Sep 19, 2023 · Sep 19, 2023
diff --git a/docs/src/mpc/inputs.md b/docs/src/mpc/inputs.md
@@ -132,7 +132,7 @@ Here is a more complex `MPCScenario`, which is used in [MPC Examples](@ref):
         "monthly_demand_rates": [10.0],
         "monthly_previous_peak_demands": [98.0],
         "tou_demand_rates": [0.0, 15.0],
-        "tou_demand_time_steps": [
+        "tou_demand_ratchet_time_steps": [
             [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15], 
             [16, 17, 18, 19, 20, 21, 22, 23, 24]
         ],
@@ -172,14 +172,75 @@ REopt.MPCFinancial
 REopt.MPCPV
 ```
 
+## MPCWind
+```@docs
+REopt.MPCWind
+```
+
 ## MPCGenerator
 ```@docs
 REopt.MPCGenerator
 ```
 
+## MPCElectrolyzer
+```@docs
+REopt.MPCElectrolyzer
+```
+
+## MPCCompressor
+```@docs
+REopt.MPCCompressor
+```
+
+## MPCHydrogenStorage
+```@docs
+REopt.MPCHydrogenStorage
+```
+
+## MPCFuelCell
+```@docs
+REopt.MPCFuelCell
+```
+
+## MPCHydrogenLoad
+```@docs
+REopt.MPCHydrogenLoad
+```
+
+## MPCProcessHeatLoad
+```@docs
+REopt.MPCProcessHeatLoad
+```
+
+## MPCElectricHeater
+```@docs
+REopt.MPCElectricHeater
+```
+
+## MPCHighTempThermalStorage
+```@docs
+REopt.MPCHighTempThermalStorage
+```
+
 ## MPCSettings
 The MPCSettings is the same as the [Settings](@ref).
 
+## ElectricUtility
+MPC uses the standard [ElectricUtility](@ref) struct.
+```@docs
+REopt.ElectricUtility
+```
+
+## Settings
+MPC uses the standard [Settings](@ref) struct.
+```@docs
+REopt.Settings
+```
+
+## Site
+```@docs
+REopt.MPCSite
+```
 
 ## MPCLimits
 ```@docs

diff --git a/docs/src/mpc/outputs.md b/docs/src/mpc/outputs.md
@@ -3,19 +3,14 @@
 REopt.mpc_results
 ```
 
-## MPC ElectricStorage outputs
-```@docs
-REopt.add_electric_storage_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict, ::String)
-```
-
-## MPC HotThermalStorage outputs
+## MPC ElectricLoad outputs
 ```@docs
-REopt.add_hot_storage_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict, ::String)
+REopt.add_electric_load_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict, ::String)
 ```
 
-## MPC ColdThermalStorage outputs
+## MPC ElectricStorage outputs
 ```@docs
-REopt.add_cold_storage_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict, ::String)
+REopt.add_electric_storage_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict, ::String)
 ```
 
 ## MPC ElectricTariff outputs
@@ -33,8 +28,52 @@ REopt.add_electric_utility_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict)
 REopt.add_pv_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict)
 ```
 
+## MPC Wind outputs
+```@docs
+REopt.add_wind_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict)
+```
+
 ## MPC Generator outputs
 ```@docs
 REopt.add_generator_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict)
 ```
 
+## MPC HydrogenLoad outputs
+```@docs
+REopt.add_hydrogen_load_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict)
+```
+
+## MPC Electrolyzer outputs
+```@docs
+REopt.add_electrolyzer_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict)
+```
+
+## MPC Compressor outputs
+```@docs
+REopt.add_compressor_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict)
+```
+
+## MPC HydrogenStorage outputs
+```@docs
+REopt.add_hydrogen_storage_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict, ::String)
+```
+
+## MPC FuelCell outputs
+```@docs
+REopt.add_fuel_cell_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict)
+```
+
+## MPC HeatingLoad outputs
+```@docs
+REopt.add_heating_load_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict)
+```
+
+## MPC ElectricHeater outputs
+```@docs
+REopt.add_electric_heater_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict)
+```
+
+## MPC HighTempThermalStorage outputs
+```@docs
+REopt.add_high_temp_storage_results(::JuMP.AbstractModel, ::MPCInputs, ::Dict, ::String)
+```
diff --git a/docs/src/reopt/inputs.md b/docs/src/reopt/inputs.md
@@ -132,6 +132,11 @@ REopt.Boiler
 REopt.HotThermalStorageDefaults
 ```
 
+## HighTempThermalStorage
+```@docs
+REopt.HighTempThermalStorageDefaults
+```
+
 ## ColdThermalStorage
 ```@docs
 REopt.ColdThermalStorageDefaults
@@ -176,3 +181,28 @@ REopt.ElectricHeater
 ```@docs
 REopt.ASHP
 ```
+
+## HydrogenLoad
+```@docs
+REopt.## HydrogenLoad
+```
+
+## Electrolyzer
+```@docs
+REopt.Electrolyzer
+```
+
+## Compressor
+```@docs
+REopt.Compressor
+```
+
+## HydrogenStorage
+```@docs
+REopt.HydrogenStorage
+```
+
+## FuelCell
+```@docs
+REopt.FuelCell
+```
diff --git a/docs/src/reopt/outputs.md b/docs/src/reopt/outputs.md
@@ -45,6 +45,11 @@ REopt.add_electric_storage_results(::JuMP.AbstractModel, ::REoptInputs, ::Dict,
 REopt.add_hot_storage_results(::JuMP.AbstractModel, ::REoptInputs, ::Dict, ::String)
 ```
 
+## HighTempThermalStorage outputs
+```@docs
+REopt.add_high_temp_storage_results(::JuMP.AbstractModel, ::REoptInputs, ::Dict, ::String)
+```
+
 ## ColdThermalStorage outputs
 ```@docs
 REopt.add_cold_storage_results(::JuMP.AbstractModel, ::REoptInputs, ::Dict, ::String)
@@ -98,4 +103,29 @@ REopt.add_flexible_hvac_results
 ## SteamTurbine outputs
 ```@docs
 REopt.add_steam_turbine_results
+```
+
+## HydrogenLoad outputs
+```@docs
+REopt.add_hydrogen_load_results
+```
+
+## Electrolyzer outputs
+```@docs
+REopt.add_electrolyzer_results
+```
+
+## Compressor outputs
+```@docs
+REopt.add_compressor_results
+```
+
+## HydrogenStorage outputs
+```@docs
+REopt.add_hydrogen_storage_results
+```
+
+## FuelCell outputs
+```@docs
+REopt.add_fuel_cell_results
 ```
diff --git a/src/REopt.jl b/src/REopt.jl
@@ -17,6 +17,10 @@ export
     run_mpc,
     build_mpc!, 
     backup_reliability,
+    shift_gen_storage_prob_matrix!,
+    backup_reliability_reopt_inputs,
+    get_maximum_generation,
+    storage_leakage!,
     get_chp_defaults_prime_mover_size_class,
     get_steam_turbine_defaults_size_class,
     simulated_load,
@@ -121,9 +125,14 @@ include("core/wind.jl")
 include("core/energy_storage/storage.jl")
 include("core/energy_storage/electric_storage.jl")
 include("core/energy_storage/thermal_storage.jl")
+include("core/energy_storage/hydrogen_storage.jl")
+include("core/electrolyzer.jl")
+include("core/compressor.jl")
+include("core/fuel_cell.jl")
 include("core/generator.jl")
 include("core/doe_commercial_reference_building_loads.jl")
 include("core/electric_load.jl")
+include("core/hydrogen_load.jl")
 include("core/existing_boiler.jl")
 include("core/boiler.jl")
 include("core/existing_chiller.jl")
@@ -163,6 +172,7 @@ include("constraints/ghp_constraints.jl")
 include("constraints/steam_turbine_constraints.jl")
 include("constraints/renewable_energy_constraints.jl")
 include("constraints/emissions_constraints.jl")
+include("constraints/hydrogen_constraints.jl")
 
 include("mpc/structs.jl")
 include("mpc/scenario.jl")
@@ -193,6 +203,11 @@ include("results/flexible_hvac.jl")
 include("results/ghp.jl")
 include("results/steam_turbine.jl")
 include("results/electric_heater.jl")
+include("results/hydrogen_load.jl")
+include("results/hydrogen_storage.jl")
+include("results/electrolyzer.jl")
+include("results/compressor.jl")
+include("results/fuel_cell.jl")
 include("results/ashp.jl")
 
 include("core/reopt.jl")

diff --git a/src/constraints/electric_utility_constraints.jl b/src/constraints/electric_utility_constraints.jl
@@ -270,7 +270,9 @@ function add_simultaneous_export_import_constraint(m, p; _n="")
         @constraint(m, NoGridPurchasesBinary[ts in p.time_steps],
             m[Symbol("binNoGridPurchases"*_n)][ts] => {
                 sum(m[Symbol("dvGridPurchase"*_n)][ts, tier] for tier in 1:p.s.electric_tariff.n_energy_tiers) +
-                sum(m[Symbol("dvGridToStorage"*_n)][b, ts] for b in p.s.storage.types.elec) <= 0
+                sum(m[Symbol("dvGridToStorage"*_n)][b, ts] for b in p.s.storage.types.elec) +
+                m[Symbol("dvGridToElectrolyzer"*_n)][ts] +
+                m[Symbol("dvGridToCompressor"*_n)][ts] <= 0
             }
         )
         @constraint(m, ExportOnlyAfterSiteLoadMetCon[ts in p.time_steps],
@@ -282,7 +284,9 @@ function add_simultaneous_export_import_constraint(m, p; _n="")
         bigM_hourly_load = maximum(p.s.electric_load.loads_kw)+maximum(p.s.space_heating_load.loads_kw)+maximum(p.s.process_heat_load.loads_kw)+maximum(p.s.dhw_load.loads_kw)+maximum(p.s.cooling_load.loads_kw_thermal)
         @constraint(m, NoGridPurchasesBinary[ts in p.time_steps],
             sum(m[Symbol("dvGridPurchase"*_n)][ts, tier] for tier in 1:p.s.electric_tariff.n_energy_tiers) +
-            sum(m[Symbol("dvGridToStorage"*_n)][b, ts] for b in p.s.storage.types.elec) <= bigM_hourly_load*(1-m[Symbol("binNoGridPurchases"*_n)][ts])
+            sum(m[Symbol("dvGridToStorage"*_n)][b, ts] for b in p.s.storage.types.elec) + 
+            m[Symbol("dvGridToElectrolyzer"*_n)][ts] +
+            m[Symbol("dvGridToCompressor"*_n)][ts] <= bigM_hourly_load*(1-m[Symbol("binNoGridPurchases"*_n)][ts])
         )
         @constraint(m, ExportOnlyAfterSiteLoadMetCon[ts in p.time_steps],
             sum(m[Symbol("dvProductionToGrid"*_n)][t,u,ts] for t in p.techs.elec, u in p.export_bins_by_tech[t]) <= bigM_hourly_load * m[Symbol("binNoGridPurchases"*_n)][ts]