Merge pull request #163 from e4st-dev/feat-102-3busupdate

testing updates

benchmark/benchmark_helper.jl

@@ -14,7 +14,7 @@ function make_random_inputs(;n_bus = 100, n_gen = 100, n_branch=100, n_af=100, n
     bus = DataFrame(
         ref_bus = fill(false, n_bus),
         plnom = rand(n_bus),
-        country = rand(countries(), n_bus),
+        nation = rand(nations(), n_bus),
         reg_factor = rand(n_bus),
     )
     ref_bus_idx = rand(1:n_bus)
@@ -153,7 +153,7 @@ end
 function load_types()
     ("ev", "residential", "commercial", "industrial", "transportation")
 end
-function countries()
+function nations()
     ("narnia", "calormen", "archenland", "telmar")
 end
 
@@ -203,11 +203,11 @@ function rand_af(;n_hours, n_af)
     gt = gentypes()
     yrs = year_strs()
     while nrow(af) < n_af
-        for country in countries()
+        for nation in nations()
             joint += 1
             for genfuel in genfuels(), gentype in gt[genfuel]
                 year = rand(yrs)
-                push!(af, ("country", country, genfuel, gentype, year, joint, true, rand(n_hours)...))
+                push!(af, ("nation", nation, genfuel, gentype, year, joint, true, rand(n_hours)...))
                 if nrow(af) == n_af
                     break
                 end
@@ -236,11 +236,11 @@ function rand_load_shape(;n_hours, n_load_shape)
     yrs = year_strs()
     lts = load_types()
     while nrow(load_shape) < n_load_shape
-        for country in countries()
+        for nation in nations()
             joint += 1
             for lt in lts
                 year = rand(yrs)
-                push!(load_shape, ("country", country, lt, year, joint, true, rand(n_hours)...))
+                push!(load_shape, ("nation", nation, lt, year, joint, true, rand(n_hours)...))
                 if nrow(load_shape) == n_load_shape
                     break
                 end
@@ -267,10 +267,10 @@ function rand_load_match(;n_years, n_load_match)
     gt = gentypes()
     lts = load_types()
     while nrow(load_match) < n_load_match
-        for country in countries()
+        for nation in nations()
             joint += 1
             for lt in lts
-                push!(load_match, ("country", country, lt, joint, true, rand(n_years)...))
+                push!(load_match, ("nation", nation, lt, joint, true, rand(n_years)...))
                 if nrow(load_match) == n_load_match
                     break
                 end
@@ -299,11 +299,11 @@ function rand_load_add(;n_hours, n_load_add)
     yrs = year_strs()
     lts = load_types()
     while nrow(load_add) < n_load_add
-        for country in countries()
+        for nation in nations()
             joint += 1
             for lt in lts
                 year = rand(yrs)
-                push!(load_add, ("country", country, lt, year, joint, true, rand(n_hours)...))
+                push!(load_add, ("nation", nation, lt, year, joint, true, rand(n_hours)...))
                 if nrow(load_add) == n_load_add
                     break
                 end

src/io/data.jl

@@ -1194,7 +1194,7 @@ end
 
 Return the energy load by load elements corresponding to `load_idx` or `load_idxs`, for `year_idx` and `hour_idx`.  Note `year_idx` can be the index or the year string (i.e. "y2030").
 
-If pair(s) are given, filters the load elements by pair.  i.e. pairs = ("country"=>"narnia", "read_type"=>"residential").
+If pair(s) are given, filters the load elements by pair.  i.e. pairs = ("nation"=>"narnia", "read_type"=>"residential").
 """
 function get_elnom_load(data, load_idxs::AbstractVector{Int64}, year_idx::Int64, hour_idxs)
     load_arr = get_load_array(data)

src/io/util.jl

@@ -181,7 +181,7 @@ Returns row indices of the passed-in table that correspond to `conditions`, wher
 * `pairs`, an iterator of `Pair`s - returns a Vector containing the indices which satisfy all the pairs as above.
 
 Some possible pairs to filter by:
-* `:country => "narnia"`: checks if the `country` column is equal to the string "narnia"
+* `:nation => "narnia"`: checks if the `nation` column is equal to the string "narnia"
 * `:emis_co2 => >=(0.1)`: checks if the `emis_co2` column is greater than or equal to 0.1
 * `:age => (2,10)`: checks if the `age` column is between 2, and 10, inclusive.  To be exclusive, use different values like (2.0001, 9.99999) for clarity
 * `:state => in(("alabama", "arkansas"))`: checks if the `state` column is either "alabama" or "arkansas"
@@ -290,7 +290,7 @@ end
 Parses the string, `s` for a comparison with which to filter `table`.
 
 Possible examples of strings `s` to parse:
-* `"country=>narnia"` - All rows for which row.country=="narnia"
+* `"nation=>narnia"` - All rows for which row.nation=="narnia"
 * `"bus_idx=>5"` - All rows for which row.bus_idx==5
 * `"year_on=>(y2002,y2030)"` - All rows for which `row.year_on` is between 2002 and 2030, inclusive.
 * `"emis_co2=>(0.0,4.99)"` - All rows for which `row.emis_co2` is between 0.0 and 4.99, inclusive. (Works for integers and negatives too)
@@ -337,7 +337,7 @@ function parse_comparison(s::AbstractString)
         return strip(m.captures[1])=>ar
     end
 
-    # In the form "country=>narnia" or "bus_idx=>5"
+    # In the form "nation=>narnia" or "bus_idx=>5"
     if (m = match(r"([\w\s]+)=>([\w\s]+)", s)) !== nothing
         return strip(m.captures[1])=>strip(m.captures[2])
     end

src/types/modifications/FuelPrice.jl

@@ -24,7 +24,7 @@ function summarize_table(::Val{:fuel_price})
     df = TableSummary()
     push!(df, 
         (:genfuel, String, NA, true, "The type of fuel that the price applies for. i.e. `ng` or `coal`"),
-        (:area, String, NA, true, "The area that the price applies for i.e. `country`.  Leave blank if grid-wide"),
+        (:area, String, NA, true, "The area that the price applies for i.e. `nation`.  Leave blank if grid-wide"),
         (:subarea, String, NA, true, "The subarea that the price applies for i.e. `narnia`.  Leave blank if grid-wide"),
         (:filter_, String, NA, false, "I.e. `filter1`, `filter2`, etc. Other filter conditions that the price applies for, see [`parse_comparison`](@ref) for ideas"),
         (:price, Float64, DollarsPerMMBtu, true, "The price of 1 MMBtu of fuel"),

src/types/modifications/InterfaceLimit.jl

@@ -29,7 +29,7 @@ function summarize_table(::Val{:interface_limit})
     push!(df, 
         (:name, String, NA, false, "Name of the interface limit, not used"),
         (:description, String, NA, false, "Description of the interface limit, not used."),
-        (:f_filter, String, NA, true, "The filter for the bus table specifiying the region the power is flowing **f**rom.  I.e. `country=>narnia`, or `state=>[angard, stormness]`"),
+        (:f_filter, String, NA, true, "The filter for the bus table specifiying the region the power is flowing **f**rom.  I.e. `nation=>narnia`, or `state=>[angard, stormness]`"),
         (:t_filter, String, NA, true, "The filter for the bus table specifiying the region the power is flowing **t**o."),
         (:pflow_max, Float64, MWFlow, false, "The maximum allowable power flow in the direction of `f` to `t`. If left as ±Inf, no constraint made."),
         (:pflow_min, Float64, MWFlow, false, "The minimum allowable power flow in the direction of `f` to `t`.  Can be positive or negative.  If left as ±Inf, no constraint made."),

src/types/modifications/YearlyTable.jl

@@ -9,7 +9,7 @@ This modification creates an agregated table for each year in the simulation.  I
 # Fields:
 * `name` - the name of the Modification, (don't need to specify this field in config file).  The outputed table will be saved to [`get_out_path(config, "<name>_<year>.csv")`](@ref)
 * `table_name` - the name of the table to export.  I.e. `gen`, `bus`, or `branch`
-* `groupby = Symbol[]` - the name(s) of the columns of the table specified by `table_name` to group by. I.e. `state`, `country`, `genfuel`, `gentype`, etc.  Leave blank to group the whole table together into a single row.  To prevent any grouping and show every row, give a `:`
+* `groupby = Symbol[]` - the name(s) of the columns of the table specified by `table_name` to group by. I.e. `state`, `nation`, `genfuel`, `gentype`, etc.  Leave blank to group the whole table together into a single row.  To prevent any grouping and show every row, give a `:`
 * `group_hours_by = Symbol[]` - the name(s) of the columns of the hours table to group by.  I.e. `season`.  Leave blank to group the whole table together. To prevent any grouping and show every hour, give a `:`
 """
 struct YearlyTable{G,H} <: Modification

test/config/config_3bus_ces.yml

@@ -7,7 +7,7 @@ mods:
       type: "CreditByBenchmark"
       benchmark: 0.5
     gen_filters:
-      country: "archenland"
+      nation: "archenland"
     load_targets:
       anvard_ces:
         targets:

test/config/config_3bus_emiscap.yml

@@ -7,6 +7,6 @@ mods:
       y2035: 4000
       y2040: 3000
     gen_filters:
-      country: "[narnia, archenland]"
+      nation: "[narnia, archenland]"
 
 

test/config/config_3bus_emisprc.yml

@@ -10,6 +10,6 @@ mods:
     years_after_ref_max: 10
     ref_year_col: "year_on"
     gen_filters:
-      country: "narnia"
+      nation: "narnia"
 
 

test/config/config_3bus_ptc.yml

@@ -9,11 +9,11 @@ mods:
     years_after_ref_max: 10
     gen_filters:
       emis_co2: "<= 0.1"
-      country: "narnia"
+      nation: "narnia"
   example_ptc_no_age_filter:
     type: "PTC"
     values: 
       y2035: 1
       y2040: 1
     gen_filters:
-      country: "archenland"
+      nation: "archenland"

test/config/config_3bus_rps.yml

@@ -5,7 +5,7 @@ mods:
     crediting: 
       type: "StandardRPSCrediting"
     gen_filters:
-      country: "archenland"
+      nation: "archenland"
     load_targets:
       stormness_rps:
         filters:
@@ -22,15 +22,15 @@ mods:
         wind: 1.0
         oswind: 1.0
     gen_filters:
-      country: "narnia"
+      nation: "narnia"
     load_targets:
       narnia_rps:
         targets:
           y2030: 0.7
           y2035: 0.8
           y2040: 0.9
         filters:  
-          country: "narnia"
+          nation: "narnia"
   stor:
     type: Storage
     file: "../data/3bus/storage.csv"

test/config/config_ccus.yml

@@ -1,5 +1,5 @@
 mods:
   ccus:
     type: CCUS
-    file: "../data/3bus/ccus_paths_by_country.csv"
-    groupby: "country"
+    file: "../data/3bus/ccus_paths_by_nation.csv"
+    groupby: "nation"

test/config/config_res.yml

@@ -2,16 +2,16 @@ mods:
   agg_res:
     type: AggregationTemplate
     file: ../data/3bus/aggregate_template.csv
-  gen_res_genfuel_country:
+  gen_res_genfuel_nation:
     type: YearlyTable
     table_name: gen
     groupby: 
-      - country
+      - nation
       - genfuel
   bus_res_season_time_of_day:
     type: YearlyTable
     table_name: bus
-    groupby: country
+    groupby: nation
     group_hours_by:
       - season
       - time_of_day

test/data/3bus/adjust_hourly.csv

@@ -1,7 +1,7 @@
 description,table_name,variable_name,operation,filter1,filter2,year,status,h1,h2,h3,h4,h5,h6,h7,h8
-Scale the vom of narnian solar generators to be higher in some hours,gen,vom,scale,country=>narnia,genfuel=>solar,,1,1.0,1.05,1.1,1.15,1.1,1.05,1.0,1.0
+Scale the vom of narnian solar generators to be higher in some hours,gen,vom,scale,nation=>narnia,genfuel=>solar,,1,1.0,1.05,1.1,1.15,1.1,1.05,1.0,1.0
 Add 0.1 to the CO2 emissions rate for winter hours for all ng plants,gen,emis_co2,add,genfuel=>ng,,,1,0,0,0,0,0.1,0.1,0.1,0.1
-Scale the vom of narnian solar generators to be even higher in some hours for 2030 only,gen,vom,scale,country=>narnia,genfuel=>solar,y2030,1,1.0,1.05,1.1,1.15,1.1,1.05,1.0,1.0
+Scale the vom of narnian solar generators to be even higher in some hours for 2030 only,gen,vom,scale,nation=>narnia,genfuel=>solar,y2030,1,1.0,1.05,1.1,1.15,1.1,1.05,1.0,1.0
 Add additional 0.2 to the CO2 emissions rate for winter hours for all ng plants in 2030 only,gen,emis_co2,add,genfuel=>ng,,y2030,1,0,0,0,0,0.2,0.2,0.2,0.2
 Set availability factors for wind turbines (here rather than in af table),gen,af,set,genfuel=>wind,,,1,0.9,0.8,0.7,0.9,0.9,0.8,0.7,0.9
 Scale NOX damages to be zero for winter hours,,r_dam_nox,scale,,,,1,1,1,1,1,0,0,0,0

test/data/3bus/adjust_yearly.csv

@@ -1,5 +1,5 @@
 description,table_name,variable_name,operation,filter1,filter2,status,y2020,y2025,y2030,y2035,y2040,y2050,y2060,y2070
-Reduce the FOM in narnia for solar generators,gen,fom,add,country=>narnia,gentype=>solar,1,0.0,-0.1,-0.2,-0.3,-0.4,-0.5,-0.6,-0.6
+Reduce the FOM in narnia for solar generators,gen,fom,add,nation=>narnia,gentype=>solar,1,0.0,-0.1,-0.2,-0.3,-0.4,-0.5,-0.6,-0.6
 Scale the branch max power flow to match a 5% annual growth rate starting in 2020,branch,pflow_max,scale,,,1,1.0,1.276,1.629,2.079,2.653,4.322,7.040,11.467
 "Set the yearly value of damage rate of CO2, using values from Rennert et. al. (constant after 2040)",,r_dam_co2,set,,,1,150.26,166.91,183.56,198.59,213.61,213.61,213.61,213.61
 "Set the yearly value of damage rate of NOx emissions, in dollars per pound  (constant after 2040)",,r_dam_nox,set,,,1,24.18,27.11,30.05,33.00,35.60,35.60,35.60,35.60

test/data/3bus/af.csv

@@ -1,4 +1,4 @@
 area,subarea,genfuel,gentype,year,status,h1,h2,h3,h4,h5,h6,h7,h8
-country,narnia,solar,,,1,0.5,0.5,0.5,0.0,0.5,0.5,0.5,0.0
-country,narnia,solar,,y2040,1,0.5,0.6,0.6,0.0,0.5,0.6,0.6,0.0
-country,archenland,solar,,,1,0.4,0.4,0.4,0.0,0.4,0.4,0.4,0.0
+nation,narnia,solar,,,1,0.5,0.5,0.5,0.0,0.5,0.5,0.5,0.0
+nation,narnia,solar,,y2040,1,0.5,0.6,0.6,0.0,0.5,0.6,0.6,0.0
+nation,archenland,solar,,,1,0.4,0.4,0.4,0.0,0.4,0.4,0.4,0.0

test/data/3bus/aggregate_template.csv

@@ -14,12 +14,12 @@ gen,cf_avg,genfuel=>solar,,,
 gen,cf_avg,genfuel=>wind,,,
 gen,cf_avg,genfuel=>coal,,,
 gen,cf_avg,genfuel=>nuclear,,,
-bus,electricity_price,country=>narnia,y2030,season=>summer,
-bus,electricity_price,country=>narnia,y2030,season=>winter,
-bus,electricity_price,country=>narnia,y2035,season=>summer,
-bus,electricity_price,country=>narnia,y2035,season=>winter,
-bus,electricity_price,country=>narnia,y2040,season=>summer,
-bus,electricity_price,country=>narnia,y2040,season=>winter,
+bus,electricity_price,nation=>narnia,y2030,season=>summer,
+bus,electricity_price,nation=>narnia,y2030,season=>winter,
+bus,electricity_price,nation=>narnia,y2035,season=>summer,
+bus,electricity_price,nation=>narnia,y2035,season=>winter,
+bus,electricity_price,nation=>narnia,y2040,season=>summer,
+bus,electricity_price,nation=>narnia,y2040,season=>winter,
 gen,vom_cost,genfuel=>ng,,,
 gen,vom_cost,genfuel=>solar,,,
 gen,vom_cost,genfuel=>wind,,,

test/data/3bus/build_gen.csv

@@ -1,8 +1,8 @@
 source,area,subarea,status,build_status,build_type,build_id,genfuel,gentype,pcap0,pcap_min,pcap_max,cf_min,cf_hist,vom,fuel_price,fom,capex,transmission_capex,routine_capex,year_on,econ_life,year_on_min,year_on_max,age_shutdown,emis_co2,capt_co2_percent,heat_rate,chp_co2_multi
-none,country,narnia,1,unbuilt,endog,test_solar_build,solar,solar,0,0,0.5,0,0.25,2,0,1.5,6,0.1,0,,35,y2015,,30,0,0,0,1
-none,country,archenland,1,unbuilt,endog,test_wind_build,wind,wind,0,0,0.5,0,0.4,2,0,6,6,0.1,0,,35,y2015,,30,0,0,0,1
-none,country,archenland,1,unbuilt,endog,test_oswind_build,wind,oswind,0,0,0.5,0,0.4,5,0,6,6,0.3,0,,35,y2035,,30,0,0,0,1
-none,country,narnia,1,unbuilt,endog,test_coal_build,coal,coal,0,0,1,0.6,0.68,2,0.5555555555555556,6,7,0.1,0,,35,,y2030,30,1,0,9,1
+none,nation,narnia,1,unbuilt,endog,test_solar_build,solar,solar,0,0,0.5,0,0.25,2,0,1.5,6,0.1,0,,35,y2015,,30,0,0,0,1
+none,nation,archenland,1,unbuilt,endog,test_wind_build,wind,wind,0,0,0.5,0,0.4,2,0,6,6,0.1,0,,35,y2015,,30,0,0,0,1
+none,nation,archenland,1,unbuilt,endog,test_oswind_build,wind,oswind,0,0,0.5,0,0.4,5,0,6,6,0.3,0,,35,y2035,,30,0,0,0,1
+none,nation,narnia,1,unbuilt,endog,test_coal_build,coal,coal,0,0,1,0.6,0.68,2,0.5555555555555556,6,7,0.1,0,,35,,y2030,30,1,0,9,1
 none,buildngcc,1,1,unbuilt,endog,test_ngcc_build,ng,ngcc,0,0,1.5,0,0.58,1,0.21428571428571427,5,5,0.1,0,,35,y2015,,30,0.6,0,7,1
 none,bus_idx,1,1,unbuilt,exog,test_exog_nuc_build,nuclear,nuclear,0.5,0,0.5,0.6,0.92,2,5,5,10,0.1,0,y2021,35,,,30,0,0,1,1
 none,bus_idx,2,1,unbuilt,exog,test_exog_solar_build,solar,solar,0.5,0,1,0,0.25,2,0,2.5,5,0.1,0,y2060,35,,,30,0,0,0,1

test/data/3bus/build_storage.csv

@@ -1,2 +1,2 @@
 area,subarea,status,build_status,build_type,build_id,year_on,econ_life,year_on_min,year_on_max,age_shutdown,pcap0,pcap_min,pcap_max,vom,fom,capex,transmission_capex,routine_capex,duration_discharge,duration_charge,storage_efficiency,side,hour_groupby,hour_duration,hour_order
-country,narnia,1,unbuilt,endog,test_battery_build,,30,y2020,y2050,30,0.0,0.0,0.05,0.1,0.2,1,0.1,0,4,8,0.8,load,day,day_duration,day_order
+nation,narnia,1,unbuilt,endog,test_battery_build,,30,y2020,y2050,30,0.0,0.0,0.05,0.1,0.2,1,0.1,0,4,8,0.8,load,day,day_duration,day_order

test/data/3bus/bus.csv

@@ -1,4 +1,4 @@
-ref_bus,reg_factor,plnom,country,buildngcc,buildsolar,state
+ref_bus,reg_factor,plnom,nation,buildngcc,buildsolar,state
 0,0,0.2,narnia,1,1,beaverdam
 1,1,1.6,archenland,1,0,stormness
 0,1,0.2,archenland,1,1,anvard

test/data/3bus/fuel_price.csv

@@ -1,10 +1,10 @@
 genfuel,area,subarea,price,quantity
 coal,,,0.1,Inf
-ng,country,narnia,1.5,5000
-ng,country,narnia,1.75,5000
-ng,country,narnia,2.0,5000
-ng,country,narnia,2.25,Inf
-ng,country,archenland,0.1,50000
-ng,country,archenland,0.2,50000
-ng,country,archenland,0.3,50000
-ng,country,archenland,0.4,Inf
+ng,nation,narnia,1.5,5000
+ng,nation,narnia,1.75,5000
+ng,nation,narnia,2.0,5000
+ng,nation,narnia,2.25,Inf
+ng,nation,archenland,0.1,50000
+ng,nation,archenland,0.2,50000
+ng,nation,archenland,0.3,50000
+ng,nation,archenland,0.4,Inf

test/data/3bus/load_add.csv

@@ -1,2 +1,2 @@
 area,subarea,load_type,year,status,h1,h2,h3,h4,h5,h6,h7,h8
-country,archenland,,y2040,1,0.00001,0.00001,0.00001,0.00001,0.00001,0.00001,0.00001,0.00001
+nation,archenland,,y2040,1,0.00001,0.00001,0.00001,0.00001,0.00001,0.00001,0.00001,0.00001

test/data/3bus/load_match.csv

@@ -1,4 +1,4 @@
 area,subarea,load_type,status,y2020,y2025,y2030,y2035,y2040,y2050,y2060,y2070
-country,narnia,,1,1000,1200,1400,1600,1800,2000,2200,2400
-country,archenland,,1,10000,12000,14000,16000,18000,20000,22000,24000
+nation,narnia,,1,1000,1200,1400,1600,1800,2000,2200,2400
+nation,archenland,,1,10000,12000,14000,16000,18000,20000,22000,24000
 ,,,1,14000,15000,16000,18000,19800,22000,24000,28000

test/data/3bus/load_shape.csv

@@ -1,7 +1,7 @@
 area,subarea,load_type,year,status,h1,h2,h3,h4,h5,h6,h7,h8
-country,narnia,,y2030,1,0.5,1.0,1.0,0.5,0.5,0.7,0.8,0.5
-country,narnia,,y2035,1,0.55,0.95,0.95,0.55,0.5,0.7,0.8,0.5
-country,narnia,,y2040,1,0.6,0.9,0.9,0.6,0.5,0.7,0.8,0.5
-country,archenland,residential,,1,0.6,1.0,1.0,0.6,0.5,0.7,0.8,0.5
-country,archenland,industrial,,1,0.9,1.0,1.0,0.9,0.8,0.9,0.9,0.8
-country,archenland,commercial,,1,1.0,0.9,0.9,1.0,0.9,0.8,0.8,0.9
+nation,narnia,,y2030,1,0.5,1.0,1.0,0.5,0.5,0.7,0.8,0.5
+nation,narnia,,y2035,1,0.55,0.95,0.95,0.55,0.5,0.7,0.8,0.5
+nation,narnia,,y2040,1,0.6,0.9,0.9,0.6,0.5,0.7,0.8,0.5
+nation,archenland,residential,,1,0.6,1.0,1.0,0.6,0.5,0.7,0.8,0.5
+nation,archenland,industrial,,1,0.9,1.0,1.0,0.9,0.8,0.9,0.9,0.8
+nation,archenland,commercial,,1,1.0,0.9,0.9,1.0,0.9,0.8,0.8,0.9

test/data/3bus/summary_table.csv

@@ -1,7 +1,7 @@
 table_name,column_name,data_type,unit,required,description
 build_gen,source,AbstractString,NA,0,"Source file of the generator, if applicable"
 build_gen,emis_co2,Float64,ShortTonsPerMWhGenerated,0,"Emission rate of the generator, in short tons per MWh generated"
-bus,country,AbstractString,NA,0,Country that the bus is in
+bus,nation,AbstractString,NA,0,nation that the bus is in
 bus,buildngcc,Bool,NA,0,Whether or not ngcc can be built in the bus
 bus,buildsolar,Bool,NA,0,Whether or not solar units can be built in the bus
 hours,day,Int64,NA,0,Which representative day the hour is in