From e162bd2c34d05cca5a8a2aee61d35c2fd92457bc Mon Sep 17 00:00:00 2001 From: mmowers Date: Tue, 10 Dec 2024 12:03:14 -0500 Subject: [PATCH 1/2] Fix bug on Linux: Convert inputs/dGen_Model_Inputs to lowercase --- .../{dGen_Model_Inputs => dgen_model_inputs}/distpvcf_hourly.csv | 0 .../distpvcap_stscen2023_electrification.csv | 0 .../stscen2023_highng/distpvcap_stscen2023_highng.csv | 0 .../stscen2023_highre/distpvcap_stscen2023_highre.csv | 0 .../stscen2023_lowng/distpvcap_stscen2023_lowng.csv | 0 .../stscen2023_lowre/distpvcap_stscen2023_lowre.csv | 0 .../stscen2023_mid_case/distpvcap_stscen2023_mid_case.csv | 0 .../distpvcap_stscen2023_mid_case_95_by_2035.csv | 0 .../distpvcap_stscen2023_mid_case_95_by_2050.csv | 0 .../distpvcap_stscen2023_taxcredit_extended2050.csv | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename inputs/{dGen_Model_Inputs => dgen_model_inputs}/distpvcf_hourly.csv (100%) rename inputs/{dGen_Model_Inputs => dgen_model_inputs}/stscen2023_electrification/distpvcap_stscen2023_electrification.csv (100%) rename inputs/{dGen_Model_Inputs => dgen_model_inputs}/stscen2023_highng/distpvcap_stscen2023_highng.csv (100%) rename inputs/{dGen_Model_Inputs => dgen_model_inputs}/stscen2023_highre/distpvcap_stscen2023_highre.csv (100%) rename inputs/{dGen_Model_Inputs => dgen_model_inputs}/stscen2023_lowng/distpvcap_stscen2023_lowng.csv (100%) rename inputs/{dGen_Model_Inputs => dgen_model_inputs}/stscen2023_lowre/distpvcap_stscen2023_lowre.csv (100%) rename inputs/{dGen_Model_Inputs => dgen_model_inputs}/stscen2023_mid_case/distpvcap_stscen2023_mid_case.csv (100%) rename inputs/{dGen_Model_Inputs => dgen_model_inputs}/stscen2023_mid_case_95_by_2035/distpvcap_stscen2023_mid_case_95_by_2035.csv (100%) rename inputs/{dGen_Model_Inputs => dgen_model_inputs}/stscen2023_mid_case_95_by_2050/distpvcap_stscen2023_mid_case_95_by_2050.csv (100%) rename inputs/{dGen_Model_Inputs => dgen_model_inputs}/stscen2023_taxcredit_extended2050/distpvcap_stscen2023_taxcredit_extended2050.csv (100%) diff --git a/inputs/dGen_Model_Inputs/distpvcf_hourly.csv b/inputs/dgen_model_inputs/distpvcf_hourly.csv similarity index 100% rename from inputs/dGen_Model_Inputs/distpvcf_hourly.csv rename to inputs/dgen_model_inputs/distpvcf_hourly.csv diff --git a/inputs/dGen_Model_Inputs/stscen2023_electrification/distpvcap_stscen2023_electrification.csv b/inputs/dgen_model_inputs/stscen2023_electrification/distpvcap_stscen2023_electrification.csv similarity index 100% rename from inputs/dGen_Model_Inputs/stscen2023_electrification/distpvcap_stscen2023_electrification.csv rename to inputs/dgen_model_inputs/stscen2023_electrification/distpvcap_stscen2023_electrification.csv diff --git a/inputs/dGen_Model_Inputs/stscen2023_highng/distpvcap_stscen2023_highng.csv b/inputs/dgen_model_inputs/stscen2023_highng/distpvcap_stscen2023_highng.csv similarity index 100% rename from inputs/dGen_Model_Inputs/stscen2023_highng/distpvcap_stscen2023_highng.csv rename to inputs/dgen_model_inputs/stscen2023_highng/distpvcap_stscen2023_highng.csv diff --git a/inputs/dGen_Model_Inputs/stscen2023_highre/distpvcap_stscen2023_highre.csv b/inputs/dgen_model_inputs/stscen2023_highre/distpvcap_stscen2023_highre.csv similarity index 100% rename from inputs/dGen_Model_Inputs/stscen2023_highre/distpvcap_stscen2023_highre.csv rename to inputs/dgen_model_inputs/stscen2023_highre/distpvcap_stscen2023_highre.csv diff --git a/inputs/dGen_Model_Inputs/stscen2023_lowng/distpvcap_stscen2023_lowng.csv b/inputs/dgen_model_inputs/stscen2023_lowng/distpvcap_stscen2023_lowng.csv similarity index 100% rename from inputs/dGen_Model_Inputs/stscen2023_lowng/distpvcap_stscen2023_lowng.csv rename to inputs/dgen_model_inputs/stscen2023_lowng/distpvcap_stscen2023_lowng.csv diff --git a/inputs/dGen_Model_Inputs/stscen2023_lowre/distpvcap_stscen2023_lowre.csv b/inputs/dgen_model_inputs/stscen2023_lowre/distpvcap_stscen2023_lowre.csv similarity index 100% rename from inputs/dGen_Model_Inputs/stscen2023_lowre/distpvcap_stscen2023_lowre.csv rename to inputs/dgen_model_inputs/stscen2023_lowre/distpvcap_stscen2023_lowre.csv diff --git a/inputs/dGen_Model_Inputs/stscen2023_mid_case/distpvcap_stscen2023_mid_case.csv b/inputs/dgen_model_inputs/stscen2023_mid_case/distpvcap_stscen2023_mid_case.csv similarity index 100% rename from inputs/dGen_Model_Inputs/stscen2023_mid_case/distpvcap_stscen2023_mid_case.csv rename to inputs/dgen_model_inputs/stscen2023_mid_case/distpvcap_stscen2023_mid_case.csv diff --git a/inputs/dGen_Model_Inputs/stscen2023_mid_case_95_by_2035/distpvcap_stscen2023_mid_case_95_by_2035.csv b/inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2035/distpvcap_stscen2023_mid_case_95_by_2035.csv similarity index 100% rename from inputs/dGen_Model_Inputs/stscen2023_mid_case_95_by_2035/distpvcap_stscen2023_mid_case_95_by_2035.csv rename to inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2035/distpvcap_stscen2023_mid_case_95_by_2035.csv diff --git a/inputs/dGen_Model_Inputs/stscen2023_mid_case_95_by_2050/distpvcap_stscen2023_mid_case_95_by_2050.csv b/inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2050/distpvcap_stscen2023_mid_case_95_by_2050.csv similarity index 100% rename from inputs/dGen_Model_Inputs/stscen2023_mid_case_95_by_2050/distpvcap_stscen2023_mid_case_95_by_2050.csv rename to inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2050/distpvcap_stscen2023_mid_case_95_by_2050.csv diff --git a/inputs/dGen_Model_Inputs/stscen2023_taxcredit_extended2050/distpvcap_stscen2023_taxcredit_extended2050.csv b/inputs/dgen_model_inputs/stscen2023_taxcredit_extended2050/distpvcap_stscen2023_taxcredit_extended2050.csv similarity index 100% rename from inputs/dGen_Model_Inputs/stscen2023_taxcredit_extended2050/distpvcap_stscen2023_taxcredit_extended2050.csv rename to inputs/dgen_model_inputs/stscen2023_taxcredit_extended2050/distpvcap_stscen2023_taxcredit_extended2050.csv From 3e402fde318cc9c3f5dedd697032c453475f087d Mon Sep 17 00:00:00 2001 From: mmowers Date: Tue, 10 Dec 2024 12:47:09 -0500 Subject: [PATCH 2/2] Lowercase all references to dgen_model_inputs --- cases.csv | 2 +- sources.csv | 20 ++++++++--------- sources_documentation.md | 46 ++++++++++++++++++++-------------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/cases.csv b/cases.csv index 94ebeefe..d5f8191a 100644 --- a/cases.csv +++ b/cases.csv @@ -6,7 +6,7 @@ yearset_suffix,Set of years that are modeled,default; 1yr_2yr; 1yr_5yr; 2yr_1yr2 endyear,Last year to be modeled,N/A,2050, windows_suffix,Set of windows that are modeled,default; step5; step10; 2100,default, solver,Solver for GAMS to use,CPLEX; gurobi,CPLEX, -distpvscen,Setting for distpv scenario (see inputs\dGen_model_inputs),N/A,stscen2023_mid_case, +distpvscen,Setting for distpv scenario (see inputs\dgen_model_inputs),N/A,stscen2023_mid_case, calc_csp_cc,Switch to turn on CSP capacity credit calculations,0; 1,0, batteryscen,Battery cost and performance inputs (inputs\plant_characteristics\{batteryscen}.csv). The options for batteryscen start with 'battery_' and the switch should be set to the entire file name (ex: battery_ATB_2024_advanced),battery_ATB_(2023|2024)_(conservative|moderate|advanced),battery_ATB_2024_moderate, beccsscen,BECCS cost and performance inputs (inputs\plant_characteristics\{beccsscen}.csv) The options for beccsscen start with 'beccs_' and the switch should be set to the entire file name (ex: beccs_reference),(beccs_BVRE_2021_(high|mid|low)|beccs_(reference|lowcost)),beccs_reference, diff --git a/sources.csv b/sources.csv index b85a0c62..82242819 100644 --- a/sources.csv +++ b/sources.csv @@ -203,16 +203,16 @@ RelativeFilePath,RelativeFolderPath,FileName_new,FileExtension,Description_new,I /inputs/demand_response/evmc_storage_decrease_profile_Baseline.h5,/inputs/demand_response,evmc_storage_decrease_profile_Baseline,.h5,,,,,, /inputs/demand_response/evmc_storage_energy_Baseline.h5,/inputs/demand_response,evmc_storage_energy_Baseline,.h5,,,,,, /inputs/demand_response/evmc_storage_increase_profile_Baseline.h5,/inputs/demand_response,evmc_storage_increase_profile_Baseline,.h5,,,,,, -/inputs/dGen_model_inputs/distpvcf_hourly.csv,/inputs/dGen_model_inputs,distPVCF_hourly,.csv,Setting for distpv scenario hourly cf,,,,distribution PV inputs ,fraction -/inputs/dGen_Model_Inputs/stscen2023_electrification/distpv_stscen2023_electrification.csv,/inputs/dGen_Model_Inputs/stscen2023_electrification,distpv_stscen2023_electrification.csv,.csv,,,,,distribution PV inputs , -/inputs/dGen_model_inputs/stscen2023_highng/distpvcap_stscen2023_highng.csv,/inputs/dGen_model_inputs/stscen2023_highng,distpvcap_stscen2023_highng.csv,.csv,Setting for distpv scenario capacity - from standard scenarios 2023 with high NG (including distpv) costs,,,,distribution PV inputs , -/inputs/dGen_model_inputs/stscen2023_highre/distpvcap_stscen2023_highre.csv,/inputs/dGen_model_inputs/stscen2023_highre,distpvcap_stscen2023_highre.csv,.csv,Setting for distpv scenario capacity - from standard scenarios 2023 with high RE (including distpv) costs,,,,distribution PV inputs , -/inputs/dGen_model_inputs/stscen2023_lowng/distpvcap_stscen2023_lowng.csv,/inputs/dGen_model_inputs/stscen2023_lowng,distpvcap_stscen2023_lowng.csv,.csv,Setting for distpv scenario capacity - from standard scenarios 2023 with low NG (including distpv) costs,,,,distribution PV inputs , -/inputs/dGen_model_inputs/stscen2023_lowre/distpvcap_stscen2023_lowre.csv,/inputs/dGen_model_inputs/stscen2023_lowre,distpvcap_stscen2023_lowre.csv,.csv,Setting for distpv scenario capacity - from standard scenarios 2023 with low RE (including distpv) costs,,,,distribution PV inputs , -/inputs/dGen_model_inputs/stscen2023_mid_case/distpvcap_stscen2023_mid_case.csv,/inputs/dGen_model_inputs/stscen2023_mid_case,distpvcap_stscen2023_mid_case.csv,.csv,,,,,distribution PV inputs , -/inputs/dGen_model_inputs/stscen2023_mid_case_95_by_2035/distpvcap_stscen2023_mid_case_95_by_2035.csv,/inputs/dGen_model_inputs/stscen2023_mid_case_95_by_2035,distpvcap_stscen2023_mid_case_95_by_2035.csv,.csv,,,,,distribution PV inputs , -/inputs/dGen_model_inputs/stscen2023_mid_case_95_by_2050/distpvcap_stscen2023_mid_case_95_by_2050.csv,/inputs/dGen_model_inputs/stscen2023_mid_case_95_by_2050,distpvcap_stscen2023_mid_case_95_by_2050.csv,.csv,,,,,distribution PV inputs , -/inputs/dGen_model_inputs/stscen2023_taxcredit_extended2050/distpvcap_stscen2023_taxcredit_extended2050.csv,/inputs/dGen_model_inputs/stscen2023_taxcredit_extended2050,distpvcap_stscen2023_taxcredit_extended2050.csv,.csv,,,,,distribution PV inputs , +/inputs/dgen_model_inputs/distpvcf_hourly.csv,/inputs/dgen_model_inputs,distPVCF_hourly,.csv,Setting for distpv scenario hourly cf,,,,distribution PV inputs ,fraction +/inputs/dgen_model_inputs/stscen2023_electrification/distpv_stscen2023_electrification.csv,/inputs/dgen_model_inputs/stscen2023_electrification,distpv_stscen2023_electrification.csv,.csv,,,,,distribution PV inputs , +/inputs/dgen_model_inputs/stscen2023_highng/distpvcap_stscen2023_highng.csv,/inputs/dgen_model_inputs/stscen2023_highng,distpvcap_stscen2023_highng.csv,.csv,Setting for distpv scenario capacity - from standard scenarios 2023 with high NG (including distpv) costs,,,,distribution PV inputs , +/inputs/dgen_model_inputs/stscen2023_highre/distpvcap_stscen2023_highre.csv,/inputs/dgen_model_inputs/stscen2023_highre,distpvcap_stscen2023_highre.csv,.csv,Setting for distpv scenario capacity - from standard scenarios 2023 with high RE (including distpv) costs,,,,distribution PV inputs , +/inputs/dgen_model_inputs/stscen2023_lowng/distpvcap_stscen2023_lowng.csv,/inputs/dgen_model_inputs/stscen2023_lowng,distpvcap_stscen2023_lowng.csv,.csv,Setting for distpv scenario capacity - from standard scenarios 2023 with low NG (including distpv) costs,,,,distribution PV inputs , +/inputs/dgen_model_inputs/stscen2023_lowre/distpvcap_stscen2023_lowre.csv,/inputs/dgen_model_inputs/stscen2023_lowre,distpvcap_stscen2023_lowre.csv,.csv,Setting for distpv scenario capacity - from standard scenarios 2023 with low RE (including distpv) costs,,,,distribution PV inputs , +/inputs/dgen_model_inputs/stscen2023_mid_case/distpvcap_stscen2023_mid_case.csv,/inputs/dgen_model_inputs/stscen2023_mid_case,distpvcap_stscen2023_mid_case.csv,.csv,,,,,distribution PV inputs , +/inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2035/distpvcap_stscen2023_mid_case_95_by_2035.csv,/inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2035,distpvcap_stscen2023_mid_case_95_by_2035.csv,.csv,,,,,distribution PV inputs , +/inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2050/distpvcap_stscen2023_mid_case_95_by_2050.csv,/inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2050,distpvcap_stscen2023_mid_case_95_by_2050.csv,.csv,,,,,distribution PV inputs , +/inputs/dgen_model_inputs/stscen2023_taxcredit_extended2050/distpvcap_stscen2023_taxcredit_extended2050.csv,/inputs/dgen_model_inputs/stscen2023_taxcredit_extended2050,distpvcap_stscen2023_taxcredit_extended2050.csv,.csv,,,,,distribution PV inputs , /inputs/disaggregation/disagg_geosize.csv,/inputs/disaggregation,disagg_geosize,.csv,"The geographic area fraction of each county within a given ReEDS BA, used as multipliers for disaggregating spatial data",r,,,, /inputs/disaggregation/disagg_hydroexist.csv,/inputs/disaggregation,disagg_hydroexist,.csv,"The hydropower capacity fraction of each county within a given ReEDS BA, used as multipliers for downselecting data",r,,,, /inputs/disaggregation/disagg_population.csv,/inputs/disaggregation,disagg_population,.csv,"The population fraction of each county within a given ReEDS BA, used as multipliers for downselecting data",r,,,, diff --git a/sources_documentation.md b/sources_documentation.md index d7ad0da5..66f45a3f 100644 --- a/sources_documentation.md +++ b/sources_documentation.md @@ -16,8 +16,8 @@ - ##### [ctus](#inputs/ctus) - ##### [degradation](#inputs/degradation) - ##### [demand_response](#inputs/demand_response) - - ##### [dGen_model_inputs](#inputs/dGen_model_inputs) - - ##### [dGen_Model_Inputs](#inputs/dGen_Model_Inputs) + - ##### [dgen_model_inputs](#inputs/dgen_model_inputs) + - ##### [dgen_model_inputs](#inputs/dgen_model_inputs) - ##### [disaggregation](#inputs/disaggregation) - ##### [emission_constraints](#inputs/emission_constraints) - ##### [financials](#inputs/financials) @@ -1101,8 +1101,8 @@ Note: If you see a '#' before a header it means there may be further subdirector --- -#### [dGen_model_inputs](inputs/dGen_model_inputs) - - [distPVCF_hourly.csv](/inputs/dGen_model_inputs/distpvcf_hourly.csv) +#### [dgen_model_inputs](inputs/dgen_model_inputs) + - [distPVCF_hourly.csv](/inputs/dgen_model_inputs/distpvcf_hourly.csv) - **File Type:** distribution PV inputs - **Description:** Setting for distpv scenario hourly cf - **Units:** fraction @@ -1110,62 +1110,62 @@ Note: If you see a '#' before a header it means there may be further subdirector --- -##### [stscen2023_highng](inputs/dGen_model_inputs/stscen2023_highng) - - [distpvcap_stscen2023_highng.csv.csv](/inputs/dGen_model_inputs/stscen2023_highng/distpvcap_stscen2023_highng.csv) +##### [stscen2023_highng](inputs/dgen_model_inputs/stscen2023_highng) + - [distpvcap_stscen2023_highng.csv.csv](/inputs/dgen_model_inputs/stscen2023_highng/distpvcap_stscen2023_highng.csv) - **File Type:** distribution PV inputs - **Description:** Setting for distpv scenario capacity - from standard scenarios 2023 with high NG (including distpv) costs --- -##### [stscen2023_highre](inputs/dGen_model_inputs/stscen2023_highre) - - [distpvcap_stscen2023_highre.csv.csv](/inputs/dGen_model_inputs/stscen2023_highre/distpvcap_stscen2023_highre.csv) +##### [stscen2023_highre](inputs/dgen_model_inputs/stscen2023_highre) + - [distpvcap_stscen2023_highre.csv.csv](/inputs/dgen_model_inputs/stscen2023_highre/distpvcap_stscen2023_highre.csv) - **File Type:** distribution PV inputs - **Description:** Setting for distpv scenario capacity - from standard scenarios 2023 with high RE (including distpv) costs --- -##### [stscen2023_lowng](inputs/dGen_model_inputs/stscen2023_lowng) - - [distpvcap_stscen2023_lowng.csv.csv](/inputs/dGen_model_inputs/stscen2023_lowng/distpvcap_stscen2023_lowng.csv) +##### [stscen2023_lowng](inputs/dgen_model_inputs/stscen2023_lowng) + - [distpvcap_stscen2023_lowng.csv.csv](/inputs/dgen_model_inputs/stscen2023_lowng/distpvcap_stscen2023_lowng.csv) - **File Type:** distribution PV inputs - **Description:** Setting for distpv scenario capacity - from standard scenarios 2023 with low NG (including distpv) costs --- -##### [stscen2023_lowre](inputs/dGen_model_inputs/stscen2023_lowre) - - [distpvcap_stscen2023_lowre.csv.csv](/inputs/dGen_model_inputs/stscen2023_lowre/distpvcap_stscen2023_lowre.csv) +##### [stscen2023_lowre](inputs/dgen_model_inputs/stscen2023_lowre) + - [distpvcap_stscen2023_lowre.csv.csv](/inputs/dgen_model_inputs/stscen2023_lowre/distpvcap_stscen2023_lowre.csv) - **File Type:** distribution PV inputs - **Description:** Setting for distpv scenario capacity - from standard scenarios 2023 with low RE (including distpv) costs --- -##### [stscen2023_mid_case](inputs/dGen_model_inputs/stscen2023_mid_case) - - [distpvcap_stscen2023_mid_case.csv.csv](/inputs/dGen_model_inputs/stscen2023_mid_case/distpvcap_stscen2023_mid_case.csv) +##### [stscen2023_mid_case](inputs/dgen_model_inputs/stscen2023_mid_case) + - [distpvcap_stscen2023_mid_case.csv.csv](/inputs/dgen_model_inputs/stscen2023_mid_case/distpvcap_stscen2023_mid_case.csv) - **File Type:** distribution PV inputs --- -##### [stscen2023_mid_case_95_by_2035](inputs/dGen_model_inputs/stscen2023_mid_case_95_by_2035) - - [distpvcap_stscen2023_mid_case_95_by_2035.csv.csv](/inputs/dGen_model_inputs/stscen2023_mid_case_95_by_2035/distpvcap_stscen2023_mid_case_95_by_2035.csv) +##### [stscen2023_mid_case_95_by_2035](inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2035) + - [distpvcap_stscen2023_mid_case_95_by_2035.csv.csv](/inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2035/distpvcap_stscen2023_mid_case_95_by_2035.csv) - **File Type:** distribution PV inputs --- -##### [stscen2023_mid_case_95_by_2050](inputs/dGen_model_inputs/stscen2023_mid_case_95_by_2050) - - [distpvcap_stscen2023_mid_case_95_by_2050.csv.csv](/inputs/dGen_model_inputs/stscen2023_mid_case_95_by_2050/distpvcap_stscen2023_mid_case_95_by_2050.csv) +##### [stscen2023_mid_case_95_by_2050](inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2050) + - [distpvcap_stscen2023_mid_case_95_by_2050.csv.csv](/inputs/dgen_model_inputs/stscen2023_mid_case_95_by_2050/distpvcap_stscen2023_mid_case_95_by_2050.csv) - **File Type:** distribution PV inputs --- -##### [stscen2023_taxcredit_extended2050](inputs/dGen_model_inputs/stscen2023_taxcredit_extended2050) - - [distpvcap_stscen2023_taxcredit_extended2050.csv.csv](/inputs/dGen_model_inputs/stscen2023_taxcredit_extended2050/distpvcap_stscen2023_taxcredit_extended2050.csv) +##### [stscen2023_taxcredit_extended2050](inputs/dgen_model_inputs/stscen2023_taxcredit_extended2050) + - [distpvcap_stscen2023_taxcredit_extended2050.csv.csv](/inputs/dgen_model_inputs/stscen2023_taxcredit_extended2050/distpvcap_stscen2023_taxcredit_extended2050.csv) - **File Type:** distribution PV inputs --- -#### [dGen_Model_Inputs](inputs/dGen_Model_Inputs) +#### [dgen_model_inputs](inputs/dgen_model_inputs) -##### [stscen2023_electrification](inputs/dGen_Model_Inputs/stscen2023_electrification) - - [distpv_stscen2023_electrification.csv.csv](/inputs/dGen_Model_Inputs/stscen2023_electrification/distpv_stscen2023_electrification.csv) +##### [stscen2023_electrification](inputs/dgen_model_inputs/stscen2023_electrification) + - [distpv_stscen2023_electrification.csv.csv](/inputs/dgen_model_inputs/stscen2023_electrification/distpv_stscen2023_electrification.csv) - **File Type:** distribution PV inputs ---