Merge pull request #143 from Breakthrough-Energy/lane/fix_read

Refactor read_demand_flexibility to include duration parameter check
Breakthrough-Energy · Jul 9, 2021 · f38cb6e · f38cb6e
2 parents 2d610ca + 83283b5
commit f38cb6e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 14 deletions.
diff --git a/src/REISE.jl b/src/REISE.jl
@@ -61,7 +61,7 @@ function run_scenario(;
     stderr_filepath = joinpath(outputfolder, "stderr.err")
     case = read_case(inputfolder)
     storage = read_storage(inputfolder)
-    demand_flexibility = read_demand_flexibility(inputfolder)
+    demand_flexibility = read_demand_flexibility(inputfolder, interval)
     println("All scenario files loaded!")
     case = reise_data_mods(case, num_segments=num_segments)
     save_input_mat(case, storage, inputfolder, outputfolder)

diff --git a/src/model.jl b/src/model.jl
@@ -261,18 +261,6 @@ function _build_model(
         bus_demand_flex_amt = _make_bus_demand_flexibility_amount(
             case, demand_flexibility, start_index, end_index
         )
-        if (
-            demand_flexibility.duration == nothing 
-            || demand_flexibility.duration > interval_length
-        )
-            if demand_flexibility.duration > interval_length
-                @warn (
-                    "Demand flexibility durations greater than the interval length are "
-                    * "set equal to the interval length."
-                )
-            end
-            demand_flexibility.duration = interval_length
-        end
     end
 
     println("variables: ", Dates.now())

diff --git a/src/read.jl b/src/read.jl
@@ -102,7 +102,7 @@ end
 
 
 """Load demand flexibility profile from .csv files into DataFrame(s)."""
-function read_demand_flexibility(filepath)::DemandFlexibility
+function read_demand_flexibility(filepath, interval)::DemandFlexibility
     # Initialize demand flexibility
     demand_flexibility = Dict()
 
@@ -165,13 +165,30 @@ function read_demand_flexibility(filepath)::DemandFlexibility
                     println(demand_flexibility_params_errs[k])
                 end
             end
+
+            # Set the demand flexibility constraints to false if enabled is false
+            if !demand_flexibility["enabled"]
+                demand_flexibility["interval_balance"] = false
+                demand_flexibility["rolling_balance"] = false
+            end
         catch e
             println("Demand flexibility parameters not found in " * filepath)
             println(
                 "Demand flexibility parameters will default to allowing demand "
                 * "flexibility to occur."
             )
         end
+
+        # Check the feasibility of the duration parameter
+        if demand_flexibility["duration"] == nothing
+            demand_flexibility["duration"] = interval
+        elseif demand_flexibility["duration"] > interval
+            @warn (
+                "Demand flexibility durations greater than the interval length are "
+                * "set equal to the interval length."
+            )
+            demand_flexibility["duration"] = interval
+        end
     end
 
     # Convert Dict to NamedTuple