diff --git a/example_systems/1_three_zones/settings/genx_settings.yml b/example_systems/1_three_zones/settings/genx_settings.yml index 7480c0516a..7b0fb2e8b9 100644 --- a/example_systems/1_three_zones/settings/genx_settings.yml +++ b/example_systems/1_three_zones/settings/genx_settings.yml @@ -2,7 +2,6 @@ OverwriteResults: 0 # Overwrite existing results in output folder or create a ne PrintModel: 0 # Write the model formulation as an output; 0 = active; 1 = not active NetworkExpansion: 1 # Transmission network expansionl; 0 = not active; 1 = active systemwide Trans_Loss_Segments: 1 # Number of segments used in piecewise linear approximation of transmission losses; 1 = linear, >2 = piecewise quadratic -Reserves: 0 # Regulation (primary) and operating (secondary) reserves; 0 = not active, 1 = active systemwide EnergyShareRequirement: 0 # Minimum qualifying renewables penetration; 0 = not active; 1 = active systemwide CapacityReserveMargin: 0 # Number of capacity reserve margin constraints; 0 = not active; 1 = active systemwide CO2Cap: 2 # CO2 emissions cap; 0 = not active (no CO2 emission limit); 1 = mass-based emission limit constraint; 2 = demand + rate-based emission limit constraint; 3 = generation + rate-based emission limit constraint diff --git a/test/VREStor/highs_settings.yml b/test/VRE_storage/highs_settings.yml similarity index 100% rename from test/VREStor/highs_settings.yml rename to test/VRE_storage/highs_settings.yml diff --git a/test/LoadResourceData/test_gen_vre_stor/Policies/CO2_cap.csv b/test/VRE_storage/policies/CO2_cap.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Policies/CO2_cap.csv rename to test/VRE_storage/policies/CO2_cap.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Policies/Capacity_reserve_margin.csv b/test/VRE_storage/policies/Capacity_reserve_margin.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Policies/Capacity_reserve_margin.csv rename to test/VRE_storage/policies/Capacity_reserve_margin.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Policies/Maximum_capacity_requirement.csv b/test/VRE_storage/policies/Maximum_capacity_requirement.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Policies/Maximum_capacity_requirement.csv rename to test/VRE_storage/policies/Maximum_capacity_requirement.csv diff --git a/test/VREStor/Policies/Minimum_capacity_requirement.csv b/test/VRE_storage/policies/Minimum_capacity_requirement.csv similarity index 100% rename from test/VREStor/Policies/Minimum_capacity_requirement.csv rename to test/VRE_storage/policies/Minimum_capacity_requirement.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Resources/Flex_demand.csv b/test/VRE_storage/resources/Flex_demand.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Resources/Flex_demand.csv rename to test/VRE_storage/resources/Flex_demand.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Resources/Hydro.csv b/test/VRE_storage/resources/Hydro.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Resources/Hydro.csv rename to test/VRE_storage/resources/Hydro.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Resources/Must_run.csv b/test/VRE_storage/resources/Must_run.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Resources/Must_run.csv rename to test/VRE_storage/resources/Must_run.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Resources/Storage.csv b/test/VRE_storage/resources/Storage.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Resources/Storage.csv rename to test/VRE_storage/resources/Storage.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Resources/Thermal.csv b/test/VRE_storage/resources/Thermal.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Resources/Thermal.csv rename to test/VRE_storage/resources/Thermal.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Resources/Vre.csv b/test/VRE_storage/resources/Vre.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Resources/Vre.csv rename to test/VRE_storage/resources/Vre.csv diff --git a/test/VREStor/Resources/Vre_stor.csv b/test/VRE_storage/resources/Vre_stor.csv similarity index 100% rename from test/VREStor/Resources/Vre_stor.csv rename to test/VRE_storage/resources/Vre_stor.csv diff --git a/test/VREStor/Resources/Policy_assignments/Resource_capacity_reserve_margin.csv b/test/VRE_storage/resources/policy_assignments/Resource_capacity_reserve_margin.csv similarity index 100% rename from test/VREStor/Resources/Policy_assignments/Resource_capacity_reserve_margin.csv rename to test/VRE_storage/resources/policy_assignments/Resource_capacity_reserve_margin.csv diff --git a/test/VREStor/Resources/Policy_assignments/Resource_maximum_capacity_requirement.csv b/test/VRE_storage/resources/policy_assignments/Resource_maximum_capacity_requirement.csv similarity index 100% rename from test/VREStor/Resources/Policy_assignments/Resource_maximum_capacity_requirement.csv rename to test/VRE_storage/resources/policy_assignments/Resource_maximum_capacity_requirement.csv diff --git a/test/VREStor/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv b/test/VRE_storage/resources/policy_assignments/Resource_minimum_capacity_requirement.csv similarity index 100% rename from test/VREStor/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv rename to test/VRE_storage/resources/policy_assignments/Resource_minimum_capacity_requirement.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/System/Demand_data.csv b/test/VRE_storage/system/Demand_data.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/System/Demand_data.csv rename to test/VRE_storage/system/Demand_data.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/System/Fuels_data.csv b/test/VRE_storage/system/Fuels_data.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/System/Fuels_data.csv rename to test/VRE_storage/system/Fuels_data.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/System/Generators_variability.csv b/test/VRE_storage/system/Generators_variability.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/System/Generators_variability.csv rename to test/VRE_storage/system/Generators_variability.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/System/Network.csv b/test/VRE_storage/system/Network.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/System/Network.csv rename to test/VRE_storage/system/Network.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/System/Vre_and_stor_solar_variability.csv b/test/VRE_storage/system/Vre_and_stor_solar_variability.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/System/Vre_and_stor_solar_variability.csv rename to test/VRE_storage/system/Vre_and_stor_solar_variability.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/System/Vre_and_stor_wind_variability.csv b/test/VRE_storage/system/Vre_and_stor_wind_variability.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/System/Vre_and_stor_wind_variability.csv rename to test/VRE_storage/system/Vre_and_stor_wind_variability.csv diff --git a/test/ComputeConflicts/highs_settings.yml b/test/compute_conflicts/highs_settings.yml similarity index 100% rename from test/ComputeConflicts/highs_settings.yml rename to test/compute_conflicts/highs_settings.yml diff --git a/test/ComputeConflicts/Policies/CO2_cap.csv b/test/compute_conflicts/policies/CO2_cap.csv similarity index 100% rename from test/ComputeConflicts/Policies/CO2_cap.csv rename to test/compute_conflicts/policies/CO2_cap.csv diff --git a/test/ComputeConflicts/Policies/Capacity_reserve_margin.csv b/test/compute_conflicts/policies/Capacity_reserve_margin.csv similarity index 100% rename from test/ComputeConflicts/Policies/Capacity_reserve_margin.csv rename to test/compute_conflicts/policies/Capacity_reserve_margin.csv diff --git a/test/ComputeConflicts/Policies/Maximum_capacity_requirement.csv b/test/compute_conflicts/policies/Maximum_capacity_requirement.csv similarity index 100% rename from test/ComputeConflicts/Policies/Maximum_capacity_requirement.csv rename to test/compute_conflicts/policies/Maximum_capacity_requirement.csv diff --git a/test/ComputeConflicts/Resources/Storage.csv b/test/compute_conflicts/resources/Storage.csv similarity index 100% rename from test/ComputeConflicts/Resources/Storage.csv rename to test/compute_conflicts/resources/Storage.csv diff --git a/test/ComputeConflicts/Resources/Thermal.csv b/test/compute_conflicts/resources/Thermal.csv similarity index 100% rename from test/ComputeConflicts/Resources/Thermal.csv rename to test/compute_conflicts/resources/Thermal.csv diff --git a/test/ComputeConflicts/Resources/Vre.csv b/test/compute_conflicts/resources/Vre.csv similarity index 100% rename from test/ComputeConflicts/Resources/Vre.csv rename to test/compute_conflicts/resources/Vre.csv diff --git a/test/ComputeConflicts/System/Demand_data.csv b/test/compute_conflicts/system/Demand_data.csv similarity index 100% rename from test/ComputeConflicts/System/Demand_data.csv rename to test/compute_conflicts/system/Demand_data.csv diff --git a/test/ComputeConflicts/System/Fuels_data.csv b/test/compute_conflicts/system/Fuels_data.csv similarity index 100% rename from test/ComputeConflicts/System/Fuels_data.csv rename to test/compute_conflicts/system/Fuels_data.csv diff --git a/test/ComputeConflicts/System/Generators_variability.csv b/test/compute_conflicts/system/Generators_variability.csv similarity index 100% rename from test/ComputeConflicts/System/Generators_variability.csv rename to test/compute_conflicts/system/Generators_variability.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/generators_data.csv b/test/load_resources/test_gen_non_colocated/generators_data.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/generators_data.csv rename to test/load_resources/test_gen_non_colocated/generators_data.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/inputs_after_loadgen.jld2 b/test/load_resources/test_gen_non_colocated/inputs_after_loadgen.jld2 similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/inputs_after_loadgen.jld2 rename to test/load_resources/test_gen_non_colocated/inputs_after_loadgen.jld2 diff --git a/test/LoadResourceData/test_gen_non_colocated/inputs_before_loadgen.jld2 b/test/load_resources/test_gen_non_colocated/inputs_before_loadgen.jld2 similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/inputs_before_loadgen.jld2 rename to test/load_resources/test_gen_non_colocated/inputs_before_loadgen.jld2 diff --git a/test/LoadResourceData/test_gen_non_colocated/Policies/CO2_cap.csv b/test/load_resources/test_gen_non_colocated/policies/CO2_cap.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Policies/CO2_cap.csv rename to test/load_resources/test_gen_non_colocated/policies/CO2_cap.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Policies/Capacity_reserve_margin.csv b/test/load_resources/test_gen_non_colocated/policies/Capacity_reserve_margin.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Policies/Capacity_reserve_margin.csv rename to test/load_resources/test_gen_non_colocated/policies/Capacity_reserve_margin.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Policies/Energy_share_requirement.csv b/test/load_resources/test_gen_non_colocated/policies/Energy_share_requirement.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Policies/Energy_share_requirement.csv rename to test/load_resources/test_gen_non_colocated/policies/Energy_share_requirement.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Policies/Minimum_capacity_requirement.csv b/test/load_resources/test_gen_non_colocated/policies/Minimum_capacity_requirement.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Policies/Minimum_capacity_requirement.csv rename to test/load_resources/test_gen_non_colocated/policies/Minimum_capacity_requirement.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Resources/Electrolyzer.csv b/test/load_resources/test_gen_non_colocated/resources/Electrolyzer.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Resources/Electrolyzer.csv rename to test/load_resources/test_gen_non_colocated/resources/Electrolyzer.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Resources/Flex_demand.csv b/test/load_resources/test_gen_non_colocated/resources/Flex_demand.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Resources/Flex_demand.csv rename to test/load_resources/test_gen_non_colocated/resources/Flex_demand.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Resources/Hydro.csv b/test/load_resources/test_gen_non_colocated/resources/Hydro.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Resources/Hydro.csv rename to test/load_resources/test_gen_non_colocated/resources/Hydro.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Resources/Must_run.csv b/test/load_resources/test_gen_non_colocated/resources/Must_run.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Resources/Must_run.csv rename to test/load_resources/test_gen_non_colocated/resources/Must_run.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Resources/Resource_multistage_data.csv b/test/load_resources/test_gen_non_colocated/resources/Resource_multistage_data.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Resources/Resource_multistage_data.csv rename to test/load_resources/test_gen_non_colocated/resources/Resource_multistage_data.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Resources/Storage.csv b/test/load_resources/test_gen_non_colocated/resources/Storage.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Resources/Storage.csv rename to test/load_resources/test_gen_non_colocated/resources/Storage.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Resources/Thermal.csv b/test/load_resources/test_gen_non_colocated/resources/Thermal.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Resources/Thermal.csv rename to test/load_resources/test_gen_non_colocated/resources/Thermal.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Resources/Vre.csv b/test/load_resources/test_gen_non_colocated/resources/Vre.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Resources/Vre.csv rename to test/load_resources/test_gen_non_colocated/resources/Vre.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Resources/Policy_assignments/Resource_capacity_reserve_margin.csv b/test/load_resources/test_gen_non_colocated/resources/policy_assignments/Resource_capacity_reserve_margin.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Resources/Policy_assignments/Resource_capacity_reserve_margin.csv rename to test/load_resources/test_gen_non_colocated/resources/policy_assignments/Resource_capacity_reserve_margin.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Resources/Policy_assignments/Resource_energy_share_requirement.csv b/test/load_resources/test_gen_non_colocated/resources/policy_assignments/Resource_energy_share_requirement.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Resources/Policy_assignments/Resource_energy_share_requirement.csv rename to test/load_resources/test_gen_non_colocated/resources/policy_assignments/Resource_energy_share_requirement.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv b/test/load_resources/test_gen_non_colocated/resources/policy_assignments/Resource_minimum_capacity_requirement.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv rename to test/load_resources/test_gen_non_colocated/resources/policy_assignments/Resource_minimum_capacity_requirement.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/Settings/genx_settings.yml b/test/load_resources/test_gen_non_colocated/settings/genx_settings.yml similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Settings/genx_settings.yml rename to test/load_resources/test_gen_non_colocated/settings/genx_settings.yml diff --git a/test/LoadResourceData/test_gen_non_colocated/Settings/highs_settings.yml b/test/load_resources/test_gen_non_colocated/settings/highs_settings.yml similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Settings/highs_settings.yml rename to test/load_resources/test_gen_non_colocated/settings/highs_settings.yml diff --git a/test/LoadResourceData/test_gen_non_colocated/Settings/time_domain_reduction_settings.yml b/test/load_resources/test_gen_non_colocated/settings/time_domain_reduction_settings.yml similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/Settings/time_domain_reduction_settings.yml rename to test/load_resources/test_gen_non_colocated/settings/time_domain_reduction_settings.yml diff --git a/test/LoadResourceData/test_gen_non_colocated/System/Demand_data.csv b/test/load_resources/test_gen_non_colocated/system/Demand_data.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/System/Demand_data.csv rename to test/load_resources/test_gen_non_colocated/system/Demand_data.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/System/Fuels_data.csv b/test/load_resources/test_gen_non_colocated/system/Fuels_data.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/System/Fuels_data.csv rename to test/load_resources/test_gen_non_colocated/system/Fuels_data.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/System/Generators_variability.csv b/test/load_resources/test_gen_non_colocated/system/Generators_variability.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/System/Generators_variability.csv rename to test/load_resources/test_gen_non_colocated/system/Generators_variability.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/System/Network.csv b/test/load_resources/test_gen_non_colocated/system/Network.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/System/Network.csv rename to test/load_resources/test_gen_non_colocated/system/Network.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/System/Operational_reserves.csv b/test/load_resources/test_gen_non_colocated/system/Operational_reserves.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/System/Operational_reserves.csv rename to test/load_resources/test_gen_non_colocated/system/Operational_reserves.csv diff --git a/test/LoadResourceData/test_gen_non_colocated/System/Period_map.csv b/test/load_resources/test_gen_non_colocated/system/Period_map.csv similarity index 100% rename from test/LoadResourceData/test_gen_non_colocated/System/Period_map.csv rename to test/load_resources/test_gen_non_colocated/system/Period_map.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Vre_and_stor_data.csv b/test/load_resources/test_gen_vre_stor/Vre_and_stor_data.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Vre_and_stor_data.csv rename to test/load_resources/test_gen_vre_stor/Vre_and_stor_data.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/generators_data.csv b/test/load_resources/test_gen_vre_stor/generators_data.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/generators_data.csv rename to test/load_resources/test_gen_vre_stor/generators_data.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/inputs_after_loadgen.jld2 b/test/load_resources/test_gen_vre_stor/inputs_after_loadgen.jld2 similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/inputs_after_loadgen.jld2 rename to test/load_resources/test_gen_vre_stor/inputs_after_loadgen.jld2 diff --git a/test/LoadResourceData/test_gen_vre_stor/inputs_before_loadgen.jld2 b/test/load_resources/test_gen_vre_stor/inputs_before_loadgen.jld2 similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/inputs_before_loadgen.jld2 rename to test/load_resources/test_gen_vre_stor/inputs_before_loadgen.jld2 diff --git a/test/VREStor/Policies/CO2_cap.csv b/test/load_resources/test_gen_vre_stor/policies/CO2_cap.csv similarity index 100% rename from test/VREStor/Policies/CO2_cap.csv rename to test/load_resources/test_gen_vre_stor/policies/CO2_cap.csv diff --git a/test/VREStor/Policies/Capacity_reserve_margin.csv b/test/load_resources/test_gen_vre_stor/policies/Capacity_reserve_margin.csv similarity index 100% rename from test/VREStor/Policies/Capacity_reserve_margin.csv rename to test/load_resources/test_gen_vre_stor/policies/Capacity_reserve_margin.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Policies/Energy_share_requirement.csv b/test/load_resources/test_gen_vre_stor/policies/Energy_share_requirement.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Policies/Energy_share_requirement.csv rename to test/load_resources/test_gen_vre_stor/policies/Energy_share_requirement.csv diff --git a/test/VREStor/Policies/Maximum_capacity_requirement.csv b/test/load_resources/test_gen_vre_stor/policies/Maximum_capacity_requirement.csv similarity index 100% rename from test/VREStor/Policies/Maximum_capacity_requirement.csv rename to test/load_resources/test_gen_vre_stor/policies/Maximum_capacity_requirement.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Policies/Minimum_capacity_requirement.csv b/test/load_resources/test_gen_vre_stor/policies/Minimum_capacity_requirement.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Policies/Minimum_capacity_requirement.csv rename to test/load_resources/test_gen_vre_stor/policies/Minimum_capacity_requirement.csv diff --git a/test/VREStor/Resources/Flex_demand.csv b/test/load_resources/test_gen_vre_stor/resources/Flex_demand.csv similarity index 100% rename from test/VREStor/Resources/Flex_demand.csv rename to test/load_resources/test_gen_vre_stor/resources/Flex_demand.csv diff --git a/test/VREStor/Resources/Hydro.csv b/test/load_resources/test_gen_vre_stor/resources/Hydro.csv similarity index 100% rename from test/VREStor/Resources/Hydro.csv rename to test/load_resources/test_gen_vre_stor/resources/Hydro.csv diff --git a/test/VREStor/Resources/Must_run.csv b/test/load_resources/test_gen_vre_stor/resources/Must_run.csv similarity index 100% rename from test/VREStor/Resources/Must_run.csv rename to test/load_resources/test_gen_vre_stor/resources/Must_run.csv diff --git a/test/VREStor/Resources/Storage.csv b/test/load_resources/test_gen_vre_stor/resources/Storage.csv similarity index 100% rename from test/VREStor/Resources/Storage.csv rename to test/load_resources/test_gen_vre_stor/resources/Storage.csv diff --git a/test/VREStor/Resources/Thermal.csv b/test/load_resources/test_gen_vre_stor/resources/Thermal.csv similarity index 100% rename from test/VREStor/Resources/Thermal.csv rename to test/load_resources/test_gen_vre_stor/resources/Thermal.csv diff --git a/test/VREStor/Resources/Vre.csv b/test/load_resources/test_gen_vre_stor/resources/Vre.csv similarity index 100% rename from test/VREStor/Resources/Vre.csv rename to test/load_resources/test_gen_vre_stor/resources/Vre.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Resources/Vre_stor.csv b/test/load_resources/test_gen_vre_stor/resources/Vre_stor.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Resources/Vre_stor.csv rename to test/load_resources/test_gen_vre_stor/resources/Vre_stor.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Resources/Policy_assignments/Resource_capacity_reserve_margin.csv b/test/load_resources/test_gen_vre_stor/resources/policy_assignments/Resource_capacity_reserve_margin.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Resources/Policy_assignments/Resource_capacity_reserve_margin.csv rename to test/load_resources/test_gen_vre_stor/resources/policy_assignments/Resource_capacity_reserve_margin.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Resources/Policy_assignments/Resource_energy_share_requirement.csv b/test/load_resources/test_gen_vre_stor/resources/policy_assignments/Resource_energy_share_requirement.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Resources/Policy_assignments/Resource_energy_share_requirement.csv rename to test/load_resources/test_gen_vre_stor/resources/policy_assignments/Resource_energy_share_requirement.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Resources/Policy_assignments/Resource_maximum_capacity_requirement.csv b/test/load_resources/test_gen_vre_stor/resources/policy_assignments/Resource_maximum_capacity_requirement.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Resources/Policy_assignments/Resource_maximum_capacity_requirement.csv rename to test/load_resources/test_gen_vre_stor/resources/policy_assignments/Resource_maximum_capacity_requirement.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv b/test/load_resources/test_gen_vre_stor/resources/policy_assignments/Resource_minimum_capacity_requirement.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv rename to test/load_resources/test_gen_vre_stor/resources/policy_assignments/Resource_minimum_capacity_requirement.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/Settings/genx_settings.yml b/test/load_resources/test_gen_vre_stor/settings/genx_settings.yml similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Settings/genx_settings.yml rename to test/load_resources/test_gen_vre_stor/settings/genx_settings.yml diff --git a/test/LoadResourceData/test_gen_vre_stor/Settings/highs_settings.yml b/test/load_resources/test_gen_vre_stor/settings/highs_settings.yml similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Settings/highs_settings.yml rename to test/load_resources/test_gen_vre_stor/settings/highs_settings.yml diff --git a/test/LoadResourceData/test_gen_vre_stor/Settings/time_domain_reduction_settings.yml b/test/load_resources/test_gen_vre_stor/settings/time_domain_reduction_settings.yml similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/Settings/time_domain_reduction_settings.yml rename to test/load_resources/test_gen_vre_stor/settings/time_domain_reduction_settings.yml diff --git a/test/VREStor/System/Demand_data.csv b/test/load_resources/test_gen_vre_stor/system/Demand_data.csv similarity index 100% rename from test/VREStor/System/Demand_data.csv rename to test/load_resources/test_gen_vre_stor/system/Demand_data.csv diff --git a/test/VREStor/System/Fuels_data.csv b/test/load_resources/test_gen_vre_stor/system/Fuels_data.csv similarity index 100% rename from test/VREStor/System/Fuels_data.csv rename to test/load_resources/test_gen_vre_stor/system/Fuels_data.csv diff --git a/test/VREStor/System/Generators_variability.csv b/test/load_resources/test_gen_vre_stor/system/Generators_variability.csv similarity index 100% rename from test/VREStor/System/Generators_variability.csv rename to test/load_resources/test_gen_vre_stor/system/Generators_variability.csv diff --git a/test/VREStor/System/Network.csv b/test/load_resources/test_gen_vre_stor/system/Network.csv similarity index 100% rename from test/VREStor/System/Network.csv rename to test/load_resources/test_gen_vre_stor/system/Network.csv diff --git a/test/LoadResourceData/test_gen_vre_stor/System/Reserves.csv b/test/load_resources/test_gen_vre_stor/system/Reserves.csv similarity index 100% rename from test/LoadResourceData/test_gen_vre_stor/System/Reserves.csv rename to test/load_resources/test_gen_vre_stor/system/Reserves.csv diff --git a/test/VREStor/System/Vre_and_stor_solar_variability.csv b/test/load_resources/test_gen_vre_stor/system/Vre_and_stor_solar_variability.csv similarity index 100% rename from test/VREStor/System/Vre_and_stor_solar_variability.csv rename to test/load_resources/test_gen_vre_stor/system/Vre_and_stor_solar_variability.csv diff --git a/test/VREStor/System/Vre_and_stor_wind_variability.csv b/test/load_resources/test_gen_vre_stor/system/Vre_and_stor_wind_variability.csv similarity index 100% rename from test/VREStor/System/Vre_and_stor_wind_variability.csv rename to test/load_resources/test_gen_vre_stor/system/Vre_and_stor_wind_variability.csv diff --git a/test/MultiStage/Can_Retire/highs_settings.yml b/test/multi_stage/can_retire/highs_settings.yml similarity index 100% rename from test/MultiStage/Can_Retire/highs_settings.yml rename to test/multi_stage/can_retire/highs_settings.yml diff --git a/test/MultiStage/Can_Retire/Inputs_p1/Policies/CO2_cap.csv b/test/multi_stage/can_retire/inputs_p1/policies/CO2_cap.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p1/Policies/CO2_cap.csv rename to test/multi_stage/can_retire/inputs_p1/policies/CO2_cap.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p1/Resources/Resource_multistage_data.csv b/test/multi_stage/can_retire/inputs_p1/resources/Resource_multistage_data.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p1/Resources/Resource_multistage_data.csv rename to test/multi_stage/can_retire/inputs_p1/resources/Resource_multistage_data.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p1/Resources/Storage.csv b/test/multi_stage/can_retire/inputs_p1/resources/Storage.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p1/Resources/Storage.csv rename to test/multi_stage/can_retire/inputs_p1/resources/Storage.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p1/Resources/Thermal.csv b/test/multi_stage/can_retire/inputs_p1/resources/Thermal.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p1/Resources/Thermal.csv rename to test/multi_stage/can_retire/inputs_p1/resources/Thermal.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p1/Resources/Vre.csv b/test/multi_stage/can_retire/inputs_p1/resources/Vre.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p1/Resources/Vre.csv rename to test/multi_stage/can_retire/inputs_p1/resources/Vre.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p1/System/Demand_data.csv b/test/multi_stage/can_retire/inputs_p1/system/Demand_data.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p1/System/Demand_data.csv rename to test/multi_stage/can_retire/inputs_p1/system/Demand_data.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p1/System/Fuels_data.csv b/test/multi_stage/can_retire/inputs_p1/system/Fuels_data.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p1/System/Fuels_data.csv rename to test/multi_stage/can_retire/inputs_p1/system/Fuels_data.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p1/System/Generators_variability.csv b/test/multi_stage/can_retire/inputs_p1/system/Generators_variability.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p1/System/Generators_variability.csv rename to test/multi_stage/can_retire/inputs_p1/system/Generators_variability.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p1/System/Period_map.csv b/test/multi_stage/can_retire/inputs_p1/system/Period_map.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p1/System/Period_map.csv rename to test/multi_stage/can_retire/inputs_p1/system/Period_map.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p1/System/Reserves.csv b/test/multi_stage/can_retire/inputs_p1/system/Reserves.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p1/System/Reserves.csv rename to test/multi_stage/can_retire/inputs_p1/system/Reserves.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p2/Policies/CO2_cap.csv b/test/multi_stage/can_retire/inputs_p2/policies/CO2_cap.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p2/Policies/CO2_cap.csv rename to test/multi_stage/can_retire/inputs_p2/policies/CO2_cap.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p2/Resources/Resource_multistage_data.csv b/test/multi_stage/can_retire/inputs_p2/resources/Resource_multistage_data.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p2/Resources/Resource_multistage_data.csv rename to test/multi_stage/can_retire/inputs_p2/resources/Resource_multistage_data.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p2/Resources/Storage.csv b/test/multi_stage/can_retire/inputs_p2/resources/Storage.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p2/Resources/Storage.csv rename to test/multi_stage/can_retire/inputs_p2/resources/Storage.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p2/Resources/Thermal.csv b/test/multi_stage/can_retire/inputs_p2/resources/Thermal.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p2/Resources/Thermal.csv rename to test/multi_stage/can_retire/inputs_p2/resources/Thermal.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p2/Resources/Vre.csv b/test/multi_stage/can_retire/inputs_p2/resources/Vre.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p2/Resources/Vre.csv rename to test/multi_stage/can_retire/inputs_p2/resources/Vre.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p2/System/Demand_data.csv b/test/multi_stage/can_retire/inputs_p2/system/Demand_data.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p2/System/Demand_data.csv rename to test/multi_stage/can_retire/inputs_p2/system/Demand_data.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p2/System/Fuels_data.csv b/test/multi_stage/can_retire/inputs_p2/system/Fuels_data.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p2/System/Fuels_data.csv rename to test/multi_stage/can_retire/inputs_p2/system/Fuels_data.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p2/System/Generators_variability.csv b/test/multi_stage/can_retire/inputs_p2/system/Generators_variability.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p2/System/Generators_variability.csv rename to test/multi_stage/can_retire/inputs_p2/system/Generators_variability.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p2/System/Operational_reserves.csv b/test/multi_stage/can_retire/inputs_p2/system/Operational_reserves.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p2/System/Operational_reserves.csv rename to test/multi_stage/can_retire/inputs_p2/system/Operational_reserves.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p2/System/Period_map.csv b/test/multi_stage/can_retire/inputs_p2/system/Period_map.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p2/System/Period_map.csv rename to test/multi_stage/can_retire/inputs_p2/system/Period_map.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p3/Policies/CO2_cap.csv b/test/multi_stage/can_retire/inputs_p3/policies/CO2_cap.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p3/Policies/CO2_cap.csv rename to test/multi_stage/can_retire/inputs_p3/policies/CO2_cap.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p3/Resources/Resource_multistage_data.csv b/test/multi_stage/can_retire/inputs_p3/resources/Resource_multistage_data.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p3/Resources/Resource_multistage_data.csv rename to test/multi_stage/can_retire/inputs_p3/resources/Resource_multistage_data.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p3/Resources/Storage.csv b/test/multi_stage/can_retire/inputs_p3/resources/Storage.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p3/Resources/Storage.csv rename to test/multi_stage/can_retire/inputs_p3/resources/Storage.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p3/Resources/Thermal.csv b/test/multi_stage/can_retire/inputs_p3/resources/Thermal.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p3/Resources/Thermal.csv rename to test/multi_stage/can_retire/inputs_p3/resources/Thermal.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p3/Resources/Vre.csv b/test/multi_stage/can_retire/inputs_p3/resources/Vre.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p3/Resources/Vre.csv rename to test/multi_stage/can_retire/inputs_p3/resources/Vre.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p3/System/Demand_data.csv b/test/multi_stage/can_retire/inputs_p3/system/Demand_data.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p3/System/Demand_data.csv rename to test/multi_stage/can_retire/inputs_p3/system/Demand_data.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p3/System/Fuels_data.csv b/test/multi_stage/can_retire/inputs_p3/system/Fuels_data.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p3/System/Fuels_data.csv rename to test/multi_stage/can_retire/inputs_p3/system/Fuels_data.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p3/System/Generators_variability.csv b/test/multi_stage/can_retire/inputs_p3/system/Generators_variability.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p3/System/Generators_variability.csv rename to test/multi_stage/can_retire/inputs_p3/system/Generators_variability.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p3/System/Period_map.csv b/test/multi_stage/can_retire/inputs_p3/system/Period_map.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p3/System/Period_map.csv rename to test/multi_stage/can_retire/inputs_p3/system/Period_map.csv diff --git a/test/MultiStage/Can_Retire/Inputs_p3/System/Reserves.csv b/test/multi_stage/can_retire/inputs_p3/system/Reserves.csv similarity index 100% rename from test/MultiStage/Can_Retire/Inputs_p3/System/Reserves.csv rename to test/multi_stage/can_retire/inputs_p3/system/Reserves.csv diff --git a/test/MultiStage/New_Build/highs_settings.yml b/test/multi_stage/highs_settings.yml similarity index 100% rename from test/MultiStage/New_Build/highs_settings.yml rename to test/multi_stage/highs_settings.yml diff --git a/test/MultiStage/Inputs_p1/Policies/CO2_cap.csv b/test/multi_stage/inputs_p1/policies/CO2_cap.csv similarity index 100% rename from test/MultiStage/Inputs_p1/Policies/CO2_cap.csv rename to test/multi_stage/inputs_p1/policies/CO2_cap.csv diff --git a/test/MultiStage/Inputs_p1/Resources/Resource_multistage_data.csv b/test/multi_stage/inputs_p1/resources/Resource_multistage_data.csv similarity index 100% rename from test/MultiStage/Inputs_p1/Resources/Resource_multistage_data.csv rename to test/multi_stage/inputs_p1/resources/Resource_multistage_data.csv diff --git a/test/MultiStage/Inputs_p1/Resources/Storage.csv b/test/multi_stage/inputs_p1/resources/Storage.csv similarity index 100% rename from test/MultiStage/Inputs_p1/Resources/Storage.csv rename to test/multi_stage/inputs_p1/resources/Storage.csv diff --git a/test/MultiStage/Inputs_p1/Resources/Thermal.csv b/test/multi_stage/inputs_p1/resources/Thermal.csv similarity index 100% rename from test/MultiStage/Inputs_p1/Resources/Thermal.csv rename to test/multi_stage/inputs_p1/resources/Thermal.csv diff --git a/test/MultiStage/Inputs_p1/Resources/Vre.csv b/test/multi_stage/inputs_p1/resources/Vre.csv similarity index 100% rename from test/MultiStage/Inputs_p1/Resources/Vre.csv rename to test/multi_stage/inputs_p1/resources/Vre.csv diff --git a/test/MultiStage/Inputs_p1/System/Demand_data.csv b/test/multi_stage/inputs_p1/system/Demand_data.csv similarity index 100% rename from test/MultiStage/Inputs_p1/System/Demand_data.csv rename to test/multi_stage/inputs_p1/system/Demand_data.csv diff --git a/test/MultiStage/Inputs_p1/System/Fuels_data.csv b/test/multi_stage/inputs_p1/system/Fuels_data.csv similarity index 100% rename from test/MultiStage/Inputs_p1/System/Fuels_data.csv rename to test/multi_stage/inputs_p1/system/Fuels_data.csv diff --git a/test/MultiStage/Inputs_p1/System/Generators_variability.csv b/test/multi_stage/inputs_p1/system/Generators_variability.csv similarity index 100% rename from test/MultiStage/Inputs_p1/System/Generators_variability.csv rename to test/multi_stage/inputs_p1/system/Generators_variability.csv diff --git a/test/MultiStage/Inputs_p1/System/Operational_reserves.csv b/test/multi_stage/inputs_p1/system/Operational_reserves.csv similarity index 100% rename from test/MultiStage/Inputs_p1/System/Operational_reserves.csv rename to test/multi_stage/inputs_p1/system/Operational_reserves.csv diff --git a/test/MultiStage/Inputs_p1/System/Period_map.csv b/test/multi_stage/inputs_p1/system/Period_map.csv similarity index 100% rename from test/MultiStage/Inputs_p1/System/Period_map.csv rename to test/multi_stage/inputs_p1/system/Period_map.csv diff --git a/test/MultiStage/Inputs_p2/Policies/CO2_cap.csv b/test/multi_stage/inputs_p2/policies/CO2_cap.csv similarity index 100% rename from test/MultiStage/Inputs_p2/Policies/CO2_cap.csv rename to test/multi_stage/inputs_p2/policies/CO2_cap.csv diff --git a/test/MultiStage/Inputs_p2/Resources/Resource_multistage_data.csv b/test/multi_stage/inputs_p2/resources/Resource_multistage_data.csv similarity index 100% rename from test/MultiStage/Inputs_p2/Resources/Resource_multistage_data.csv rename to test/multi_stage/inputs_p2/resources/Resource_multistage_data.csv diff --git a/test/MultiStage/Inputs_p2/Resources/Storage.csv b/test/multi_stage/inputs_p2/resources/Storage.csv similarity index 100% rename from test/MultiStage/Inputs_p2/Resources/Storage.csv rename to test/multi_stage/inputs_p2/resources/Storage.csv diff --git a/test/MultiStage/Inputs_p2/Resources/Thermal.csv b/test/multi_stage/inputs_p2/resources/Thermal.csv similarity index 100% rename from test/MultiStage/Inputs_p2/Resources/Thermal.csv rename to test/multi_stage/inputs_p2/resources/Thermal.csv diff --git a/test/MultiStage/Inputs_p2/Resources/Vre.csv b/test/multi_stage/inputs_p2/resources/Vre.csv similarity index 100% rename from test/MultiStage/Inputs_p2/Resources/Vre.csv rename to test/multi_stage/inputs_p2/resources/Vre.csv diff --git a/test/MultiStage/Inputs_p2/System/Demand_data.csv b/test/multi_stage/inputs_p2/system/Demand_data.csv similarity index 100% rename from test/MultiStage/Inputs_p2/System/Demand_data.csv rename to test/multi_stage/inputs_p2/system/Demand_data.csv diff --git a/test/MultiStage/Inputs_p2/System/Fuels_data.csv b/test/multi_stage/inputs_p2/system/Fuels_data.csv similarity index 100% rename from test/MultiStage/Inputs_p2/System/Fuels_data.csv rename to test/multi_stage/inputs_p2/system/Fuels_data.csv diff --git a/test/MultiStage/Inputs_p2/System/Generators_variability.csv b/test/multi_stage/inputs_p2/system/Generators_variability.csv similarity index 100% rename from test/MultiStage/Inputs_p2/System/Generators_variability.csv rename to test/multi_stage/inputs_p2/system/Generators_variability.csv diff --git a/test/MultiStage/Inputs_p2/System/Operational_reserves.csv b/test/multi_stage/inputs_p2/system/Operational_reserves.csv similarity index 100% rename from test/MultiStage/Inputs_p2/System/Operational_reserves.csv rename to test/multi_stage/inputs_p2/system/Operational_reserves.csv diff --git a/test/MultiStage/Inputs_p2/System/Period_map.csv b/test/multi_stage/inputs_p2/system/Period_map.csv similarity index 100% rename from test/MultiStage/Inputs_p2/System/Period_map.csv rename to test/multi_stage/inputs_p2/system/Period_map.csv diff --git a/test/MultiStage/Inputs_p3/Policies/CO2_cap.csv b/test/multi_stage/inputs_p3/policies/CO2_cap.csv similarity index 100% rename from test/MultiStage/Inputs_p3/Policies/CO2_cap.csv rename to test/multi_stage/inputs_p3/policies/CO2_cap.csv diff --git a/test/MultiStage/Inputs_p3/Resources/Resource_multistage_data.csv b/test/multi_stage/inputs_p3/resources/Resource_multistage_data.csv similarity index 100% rename from test/MultiStage/Inputs_p3/Resources/Resource_multistage_data.csv rename to test/multi_stage/inputs_p3/resources/Resource_multistage_data.csv diff --git a/test/MultiStage/Inputs_p3/Resources/Storage.csv b/test/multi_stage/inputs_p3/resources/Storage.csv similarity index 100% rename from test/MultiStage/Inputs_p3/Resources/Storage.csv rename to test/multi_stage/inputs_p3/resources/Storage.csv diff --git a/test/MultiStage/Inputs_p3/Resources/Thermal.csv b/test/multi_stage/inputs_p3/resources/Thermal.csv similarity index 100% rename from test/MultiStage/Inputs_p3/Resources/Thermal.csv rename to test/multi_stage/inputs_p3/resources/Thermal.csv diff --git a/test/MultiStage/Inputs_p3/Resources/Vre.csv b/test/multi_stage/inputs_p3/resources/Vre.csv similarity index 100% rename from test/MultiStage/Inputs_p3/Resources/Vre.csv rename to test/multi_stage/inputs_p3/resources/Vre.csv diff --git a/test/MultiStage/Inputs_p3/System/Demand_data.csv b/test/multi_stage/inputs_p3/system/Demand_data.csv similarity index 100% rename from test/MultiStage/Inputs_p3/System/Demand_data.csv rename to test/multi_stage/inputs_p3/system/Demand_data.csv diff --git a/test/MultiStage/Inputs_p3/System/Fuels_data.csv b/test/multi_stage/inputs_p3/system/Fuels_data.csv similarity index 100% rename from test/MultiStage/Inputs_p3/System/Fuels_data.csv rename to test/multi_stage/inputs_p3/system/Fuels_data.csv diff --git a/test/MultiStage/Inputs_p3/System/Generators_variability.csv b/test/multi_stage/inputs_p3/system/Generators_variability.csv similarity index 100% rename from test/MultiStage/Inputs_p3/System/Generators_variability.csv rename to test/multi_stage/inputs_p3/system/Generators_variability.csv diff --git a/test/MultiStage/Inputs_p3/System/Operational_reserves.csv b/test/multi_stage/inputs_p3/system/Operational_reserves.csv similarity index 100% rename from test/MultiStage/Inputs_p3/System/Operational_reserves.csv rename to test/multi_stage/inputs_p3/system/Operational_reserves.csv diff --git a/test/MultiStage/Inputs_p3/System/Period_map.csv b/test/multi_stage/inputs_p3/system/Period_map.csv similarity index 100% rename from test/MultiStage/Inputs_p3/System/Period_map.csv rename to test/multi_stage/inputs_p3/system/Period_map.csv diff --git a/test/MultiStage/highs_settings.yml b/test/multi_stage/new_build/highs_settings.yml similarity index 100% rename from test/MultiStage/highs_settings.yml rename to test/multi_stage/new_build/highs_settings.yml diff --git a/test/MultiStage/New_Build/Inputs_p1/Policies/CO2_cap.csv b/test/multi_stage/new_build/inputs_p1/policies/CO2_cap.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p1/Policies/CO2_cap.csv rename to test/multi_stage/new_build/inputs_p1/policies/CO2_cap.csv diff --git a/test/MultiStage/New_Build/Inputs_p1/Resources/Resource_multistage_data.csv b/test/multi_stage/new_build/inputs_p1/resources/Resource_multistage_data.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p1/Resources/Resource_multistage_data.csv rename to test/multi_stage/new_build/inputs_p1/resources/Resource_multistage_data.csv diff --git a/test/MultiStage/New_Build/Inputs_p1/Resources/Storage.csv b/test/multi_stage/new_build/inputs_p1/resources/Storage.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p1/Resources/Storage.csv rename to test/multi_stage/new_build/inputs_p1/resources/Storage.csv diff --git a/test/MultiStage/New_Build/Inputs_p1/Resources/Thermal.csv b/test/multi_stage/new_build/inputs_p1/resources/Thermal.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p1/Resources/Thermal.csv rename to test/multi_stage/new_build/inputs_p1/resources/Thermal.csv diff --git a/test/MultiStage/New_Build/Inputs_p1/Resources/Vre.csv b/test/multi_stage/new_build/inputs_p1/resources/Vre.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p1/Resources/Vre.csv rename to test/multi_stage/new_build/inputs_p1/resources/Vre.csv diff --git a/test/MultiStage/New_Build/Inputs_p1/System/Demand_data.csv b/test/multi_stage/new_build/inputs_p1/system/Demand_data.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p1/System/Demand_data.csv rename to test/multi_stage/new_build/inputs_p1/system/Demand_data.csv diff --git a/test/MultiStage/New_Build/Inputs_p1/System/Fuels_data.csv b/test/multi_stage/new_build/inputs_p1/system/Fuels_data.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p1/System/Fuels_data.csv rename to test/multi_stage/new_build/inputs_p1/system/Fuels_data.csv diff --git a/test/MultiStage/New_Build/Inputs_p1/System/Generators_variability.csv b/test/multi_stage/new_build/inputs_p1/system/Generators_variability.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p1/System/Generators_variability.csv rename to test/multi_stage/new_build/inputs_p1/system/Generators_variability.csv diff --git a/test/MultiStage/New_Build/Inputs_p1/System/Period_map.csv b/test/multi_stage/new_build/inputs_p1/system/Period_map.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p1/System/Period_map.csv rename to test/multi_stage/new_build/inputs_p1/system/Period_map.csv diff --git a/test/MultiStage/New_Build/Inputs_p1/System/Reserves.csv b/test/multi_stage/new_build/inputs_p1/system/Reserves.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p1/System/Reserves.csv rename to test/multi_stage/new_build/inputs_p1/system/Reserves.csv diff --git a/test/MultiStage/New_Build/Inputs_p2/Policies/CO2_cap.csv b/test/multi_stage/new_build/inputs_p2/policies/CO2_cap.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p2/Policies/CO2_cap.csv rename to test/multi_stage/new_build/inputs_p2/policies/CO2_cap.csv diff --git a/test/MultiStage/New_Build/Inputs_p2/Resources/Resource_multistage_data.csv b/test/multi_stage/new_build/inputs_p2/resources/Resource_multistage_data.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p2/Resources/Resource_multistage_data.csv rename to test/multi_stage/new_build/inputs_p2/resources/Resource_multistage_data.csv diff --git a/test/MultiStage/New_Build/Inputs_p2/Resources/Storage.csv b/test/multi_stage/new_build/inputs_p2/resources/Storage.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p2/Resources/Storage.csv rename to test/multi_stage/new_build/inputs_p2/resources/Storage.csv diff --git a/test/MultiStage/New_Build/Inputs_p2/Resources/Thermal.csv b/test/multi_stage/new_build/inputs_p2/resources/Thermal.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p2/Resources/Thermal.csv rename to test/multi_stage/new_build/inputs_p2/resources/Thermal.csv diff --git a/test/MultiStage/New_Build/Inputs_p2/Resources/Vre.csv b/test/multi_stage/new_build/inputs_p2/resources/Vre.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p2/Resources/Vre.csv rename to test/multi_stage/new_build/inputs_p2/resources/Vre.csv diff --git a/test/MultiStage/New_Build/Inputs_p2/System/Demand_data.csv b/test/multi_stage/new_build/inputs_p2/system/Demand_data.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p2/System/Demand_data.csv rename to test/multi_stage/new_build/inputs_p2/system/Demand_data.csv diff --git a/test/MultiStage/New_Build/Inputs_p2/System/Fuels_data.csv b/test/multi_stage/new_build/inputs_p2/system/Fuels_data.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p2/System/Fuels_data.csv rename to test/multi_stage/new_build/inputs_p2/system/Fuels_data.csv diff --git a/test/MultiStage/New_Build/Inputs_p2/System/Generators_variability.csv b/test/multi_stage/new_build/inputs_p2/system/Generators_variability.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p2/System/Generators_variability.csv rename to test/multi_stage/new_build/inputs_p2/system/Generators_variability.csv diff --git a/test/MultiStage/New_Build/Inputs_p2/System/Period_map.csv b/test/multi_stage/new_build/inputs_p2/system/Period_map.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p2/System/Period_map.csv rename to test/multi_stage/new_build/inputs_p2/system/Period_map.csv diff --git a/test/MultiStage/New_Build/Inputs_p2/System/Reserves.csv b/test/multi_stage/new_build/inputs_p2/system/Reserves.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p2/System/Reserves.csv rename to test/multi_stage/new_build/inputs_p2/system/Reserves.csv diff --git a/test/MultiStage/New_Build/Inputs_p3/Policies/CO2_cap.csv b/test/multi_stage/new_build/inputs_p3/policies/CO2_cap.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p3/Policies/CO2_cap.csv rename to test/multi_stage/new_build/inputs_p3/policies/CO2_cap.csv diff --git a/test/MultiStage/New_Build/Inputs_p3/Resources/Resource_multistage_data.csv b/test/multi_stage/new_build/inputs_p3/resources/Resource_multistage_data.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p3/Resources/Resource_multistage_data.csv rename to test/multi_stage/new_build/inputs_p3/resources/Resource_multistage_data.csv diff --git a/test/MultiStage/New_Build/Inputs_p3/Resources/Storage.csv b/test/multi_stage/new_build/inputs_p3/resources/Storage.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p3/Resources/Storage.csv rename to test/multi_stage/new_build/inputs_p3/resources/Storage.csv diff --git a/test/MultiStage/New_Build/Inputs_p3/Resources/Thermal.csv b/test/multi_stage/new_build/inputs_p3/resources/Thermal.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p3/Resources/Thermal.csv rename to test/multi_stage/new_build/inputs_p3/resources/Thermal.csv diff --git a/test/MultiStage/New_Build/Inputs_p3/Resources/Vre.csv b/test/multi_stage/new_build/inputs_p3/resources/Vre.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p3/Resources/Vre.csv rename to test/multi_stage/new_build/inputs_p3/resources/Vre.csv diff --git a/test/MultiStage/New_Build/Inputs_p3/System/Demand_data.csv b/test/multi_stage/new_build/inputs_p3/system/Demand_data.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p3/System/Demand_data.csv rename to test/multi_stage/new_build/inputs_p3/system/Demand_data.csv diff --git a/test/MultiStage/New_Build/Inputs_p3/System/Fuels_data.csv b/test/multi_stage/new_build/inputs_p3/system/Fuels_data.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p3/System/Fuels_data.csv rename to test/multi_stage/new_build/inputs_p3/system/Fuels_data.csv diff --git a/test/MultiStage/New_Build/Inputs_p3/System/Generators_variability.csv b/test/multi_stage/new_build/inputs_p3/system/Generators_variability.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p3/System/Generators_variability.csv rename to test/multi_stage/new_build/inputs_p3/system/Generators_variability.csv diff --git a/test/MultiStage/New_Build/Inputs_p3/System/Period_map.csv b/test/multi_stage/new_build/inputs_p3/system/Period_map.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p3/System/Period_map.csv rename to test/multi_stage/new_build/inputs_p3/system/Period_map.csv diff --git a/test/MultiStage/New_Build/Inputs_p3/System/Reserves.csv b/test/multi_stage/new_build/inputs_p3/system/Reserves.csv similarity index 100% rename from test/MultiStage/New_Build/Inputs_p3/System/Reserves.csv rename to test/multi_stage/new_build/inputs_p3/system/Reserves.csv diff --git a/test/PiecewiseFuel_CO2/highs_settings.yml b/test/piecewise_fuel/highs_settings.yml similarity index 100% rename from test/PiecewiseFuel_CO2/highs_settings.yml rename to test/piecewise_fuel/highs_settings.yml diff --git a/test/PiecewiseFuel_CO2/Policies/CO2_cap.csv b/test/piecewise_fuel/policies/CO2_cap.csv similarity index 100% rename from test/PiecewiseFuel_CO2/Policies/CO2_cap.csv rename to test/piecewise_fuel/policies/CO2_cap.csv diff --git a/test/PiecewiseFuel_CO2/Resources/Thermal.csv b/test/piecewise_fuel/resources/Thermal.csv similarity index 100% rename from test/PiecewiseFuel_CO2/Resources/Thermal.csv rename to test/piecewise_fuel/resources/Thermal.csv diff --git a/test/PiecewiseFuel_CO2/Resources/Vre.csv b/test/piecewise_fuel/resources/Vre.csv similarity index 100% rename from test/PiecewiseFuel_CO2/Resources/Vre.csv rename to test/piecewise_fuel/resources/Vre.csv diff --git a/test/PiecewiseFuel_CO2/System/Demand_data.csv b/test/piecewise_fuel/system/Demand_data.csv similarity index 100% rename from test/PiecewiseFuel_CO2/System/Demand_data.csv rename to test/piecewise_fuel/system/Demand_data.csv diff --git a/test/PiecewiseFuel_CO2/System/Fuels_data.csv b/test/piecewise_fuel/system/Fuels_data.csv similarity index 100% rename from test/PiecewiseFuel_CO2/System/Fuels_data.csv rename to test/piecewise_fuel/system/Fuels_data.csv diff --git a/test/PiecewiseFuel_CO2/System/Generators_variability.csv b/test/piecewise_fuel/system/Generators_variability.csv similarity index 100% rename from test/PiecewiseFuel_CO2/System/Generators_variability.csv rename to test/piecewise_fuel/system/Generators_variability.csv diff --git a/test/runtests.jl b/test/runtests.jl index 33c5b5969e..fd1f4bffdf 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -30,11 +30,11 @@ end end @testset "Piecewise Fuel" begin - include("test_piecewisefuel_CO2.jl") + include("test_piecewisefuel.jl") end @testset "VRE_STOR" begin - include("test_VREStor.jl") + include("test_VRE_storage.jl") end @testset "Electrolyzer" begin diff --git a/test/test_VREStor.jl b/test/test_VRE_storage.jl similarity index 97% rename from test/test_VREStor.jl rename to test/test_VRE_storage.jl index 1e9f62583a..10ce1b9d31 100644 --- a/test/test_VREStor.jl +++ b/test/test_VRE_storage.jl @@ -4,7 +4,7 @@ using Test include(joinpath(@__DIR__, "utilities.jl")) obj_true = 92376.060123 -test_path = "VREStor" +test_path = "VRE_storage" # Define test inputs genx_setup = Dict( diff --git a/test/test_compute_conflicts.jl b/test/test_compute_conflicts.jl index c42b113c47..c8c4c88f72 100644 --- a/test/test_compute_conflicts.jl +++ b/test/test_compute_conflicts.jl @@ -3,7 +3,7 @@ module TestConflicts using Test include(joinpath(@__DIR__, "utilities.jl")) -test_path = joinpath(@__DIR__,"ComputeConflicts"); +test_path = joinpath(@__DIR__,"compute_conflicts"); # Define test inputs genx_setup = Dict{Any,Any}( diff --git a/test/test_electrolyzer.jl b/test/test_electrolyzer.jl index 6472cbf96e..426540eef1 100644 --- a/test/test_electrolyzer.jl +++ b/test/test_electrolyzer.jl @@ -5,7 +5,7 @@ using Test include(joinpath(@__DIR__, "utilities.jl")) obj_true = 6946.9618 -test_path = "Electrolyzer" +test_path = "electrolyzer" # Define test inputs genx_setup = Dict( diff --git a/test/test_load_resource_data.jl b/test/test_load_resource_data.jl index 6873d8aacb..3dca1876df 100644 --- a/test/test_load_resource_data.jl +++ b/test/test_load_resource_data.jl @@ -206,7 +206,7 @@ function test_load_resources_data() settings = GenX.default_settings() merge!(settings, setup) - test_path = joinpath("LoadResourceData", "test_gen_non_colocated") + test_path = joinpath("load_resources", "test_gen_non_colocated") # load dfGen and inputs_true to compare against input_true_filenames = InputsTrue("generators_data.csv", "inputs_after_loadgen.jld2") @@ -259,7 +259,7 @@ function test_load_VRE_STOR_data() settings = GenX.default_settings() merge!(settings, setup) - test_path = joinpath("LoadResourceData","test_gen_vre_stor") + test_path = joinpath("load_resources","test_gen_vre_stor") input_true_filenames = InputsTrue("generators_data.csv", "inputs_after_loadgen.jld2") dfGen, inputs_true = prepare_inputs_true(test_path, input_true_filenames, settings) diff --git a/test/test_multistage.jl b/test/test_multistage.jl index e9c46ca751..ddb3ab1859 100644 --- a/test/test_multistage.jl +++ b/test/test_multistage.jl @@ -5,7 +5,7 @@ using Test include(joinpath(@__DIR__, "utilities.jl")) obj_true = [79734.80032, 41630.03494, 27855.20631] -test_path = joinpath(@__DIR__, "MultiStage"); +test_path = joinpath(@__DIR__, "multi_stage"); # Define test inputs multistage_setup = Dict( diff --git a/test/test_piecewisefuel_CO2.jl b/test/test_piecewisefuel.jl similarity index 96% rename from test/test_piecewisefuel_CO2.jl rename to test/test_piecewisefuel.jl index d7d0e8e2c8..a9630ce320 100644 --- a/test/test_piecewisefuel_CO2.jl +++ b/test/test_piecewisefuel.jl @@ -4,7 +4,7 @@ using Test include(joinpath(@__DIR__, "utilities.jl")) obj_true = 2341.82308 -test_path = "PiecewiseFuel_CO2" +test_path = "piecewise_fuel" # Define test inputs genx_setup = Dict( diff --git a/test/test_threezones.jl b/test/test_threezones.jl index 4489d4487b..c533da8770 100644 --- a/test/test_threezones.jl +++ b/test/test_threezones.jl @@ -5,7 +5,7 @@ using Test include(joinpath(@__DIR__, "utilities.jl")) obj_true = 6960.20855 -test_path = "ThreeZones" +test_path = "three_zones" # Define test inputs genx_setup = Dict( diff --git a/test/test_time_domain_reduction.jl b/test/test_time_domain_reduction.jl index b17761ee9c..90dedfc17f 100644 --- a/test/test_time_domain_reduction.jl +++ b/test/test_time_domain_reduction.jl @@ -12,13 +12,13 @@ console_out = stdout redirect_stdout(devnull) test_folder = settings_path = "TDR" -TDR_Results_test = joinpath(test_folder, "TDR_Results_test") +TDR_Results_test = joinpath(test_folder, "TDR_results_test") # Folder with true clustering results for LTS and non-LTS versions TDR_Results_true = if VERSION == v"1.6.7" - joinpath(test_folder, "TDR_Results_true_LTS") + joinpath(test_folder, "TDR_results_true_LTS") else - joinpath(test_folder, "TDR_Results_true") + joinpath(test_folder, "TDR_results_true") end # Remove test folder if it exists @@ -29,7 +29,7 @@ end # Inputs for cluster_inputs function genx_setup = Dict( "TimeDomainReduction" => 1, - "TimeDomainReductionFolder" => "TDR_Results_test", + "TimeDomainReductionFolder" => "TDR_results_test", "UCommit" => 2, "CapacityReserveMargin" => 1, "MinCapReq" => 1, diff --git a/test/ThreeZones/highs_settings.yml b/test/three_zones/highs_settings.yml similarity index 100% rename from test/ThreeZones/highs_settings.yml rename to test/three_zones/highs_settings.yml diff --git a/test/ThreeZones/Policies/CO2_cap.csv b/test/three_zones/policies/CO2_cap.csv similarity index 100% rename from test/ThreeZones/Policies/CO2_cap.csv rename to test/three_zones/policies/CO2_cap.csv diff --git a/test/ThreeZones/Policies/Minimum_capacity_requirement.csv b/test/three_zones/policies/Minimum_capacity_requirement.csv similarity index 100% rename from test/ThreeZones/Policies/Minimum_capacity_requirement.csv rename to test/three_zones/policies/Minimum_capacity_requirement.csv diff --git a/test/ThreeZones/Resources/Storage.csv b/test/three_zones/resources/Storage.csv similarity index 100% rename from test/ThreeZones/Resources/Storage.csv rename to test/three_zones/resources/Storage.csv diff --git a/test/ThreeZones/Resources/Thermal.csv b/test/three_zones/resources/Thermal.csv similarity index 100% rename from test/ThreeZones/Resources/Thermal.csv rename to test/three_zones/resources/Thermal.csv diff --git a/test/ThreeZones/Resources/Vre.csv b/test/three_zones/resources/Vre.csv similarity index 100% rename from test/ThreeZones/Resources/Vre.csv rename to test/three_zones/resources/Vre.csv diff --git a/test/ThreeZones/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv b/test/three_zones/resources/policy_assignments/Resource_minimum_capacity_requirement.csv similarity index 100% rename from test/ThreeZones/Resources/Policy_assignments/Resource_minimum_capacity_requirement.csv rename to test/three_zones/resources/policy_assignments/Resource_minimum_capacity_requirement.csv diff --git a/test/ThreeZones/System/Demand_data.csv b/test/three_zones/system/Demand_data.csv similarity index 100% rename from test/ThreeZones/System/Demand_data.csv rename to test/three_zones/system/Demand_data.csv diff --git a/test/ThreeZones/System/Fuels_data.csv b/test/three_zones/system/Fuels_data.csv similarity index 100% rename from test/ThreeZones/System/Fuels_data.csv rename to test/three_zones/system/Fuels_data.csv diff --git a/test/ThreeZones/System/Generators_variability.csv b/test/three_zones/system/Generators_variability.csv similarity index 100% rename from test/ThreeZones/System/Generators_variability.csv rename to test/three_zones/system/Generators_variability.csv diff --git a/test/ThreeZones/System/Network.csv b/test/three_zones/system/Network.csv similarity index 100% rename from test/ThreeZones/System/Network.csv rename to test/three_zones/system/Network.csv diff --git a/test/ThreeZones/System/Period_map.csv b/test/three_zones/system/Period_map.csv similarity index 100% rename from test/ThreeZones/System/Period_map.csv rename to test/three_zones/system/Period_map.csv diff --git a/test/ThreeZones/System/Reserves.csv b/test/three_zones/system/Reserves.csv similarity index 100% rename from test/ThreeZones/System/Reserves.csv rename to test/three_zones/system/Reserves.csv