Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
7a0b5c6
merge main
samgdotson Apr 18, 2025
2069ccb
Merge branch 'main' of github.com:arfc/2025-dotson-dissertation into …
samgdotson Apr 27, 2025
689463b
adds new sections to interview chapter
samgdotson Apr 27, 2025
127016b
adds detail about interview transcribing
samgdotson Apr 28, 2025
d1dea32
adds intro section to chapter
samgdotson May 7, 2025
aae4ec5
adds demographic data for interview regions
samgdotson May 8, 2025
e5ab058
adds info about uiuc
samgdotson May 10, 2025
a90d876
adds note in red about interview patterns
samgdotson Jun 16, 2025
192f3cb
merges benchmark_chapter into interview_chapter
samgdotson Jul 2, 2025
6d1d9a8
Merge branch 'benchmark_chapter' into interview_chapter
samgdotson Jul 2, 2025
5eb26ba
adds uiuc emissions plot
samgdotson Jul 2, 2025
8320601
updates emissions plot
samgdotson Jul 3, 2025
d54c960
adds plot of illinois
samgdotson Jul 3, 2025
19bf71d
adds illinois plot and minor writing changes
samgdotson Jul 8, 2025
0c3055b
adds some text
samgdotson Jul 11, 2025
79c9fac
adds table and some info to interview chapter
samgdotson Jul 15, 2025
8d7a6fa
minor update
samgdotson Jul 16, 2025
5e4b65b
Merge branch 'benchmark_chapter' into interview_chapter
samgdotson Jul 16, 2025
e0b9ff1
updates climate plan descriptions
samgdotson Jul 17, 2025
0c54656
merge conflict
samgdotson Jul 17, 2025
62b23d5
adds appendix with interview guide and expands methods
samgdotson Jul 22, 2025
e71221a
updates literature review
samgdotson Jul 24, 2025
90ff8ea
updates climate plans for chambana
samgdotson Jul 30, 2025
c0354fe
updates lit review, methods, and finishes climate plan descriptions
samgdotson Jul 31, 2025
f2b6ce6
makes latest changes to benchmark chapter from @katyhuff
samgdotson Jul 31, 2025
f981cc3
Merge branch 'benchmark_chapter' into interview_chapter
samgdotson Jul 31, 2025
06b6ab1
Merge branch 'main' of github.com:arfc/2025-dotson-dissertation into …
samgdotson Jul 31, 2025
58df44e
reorders sections, adds some thoughts, and slightly updates lit review
samgdotson Aug 1, 2025
b280244
adds themes and categories table to results section
samgdotson Aug 6, 2025
72543bb
adds positive feedback on osier
samgdotson Aug 6, 2025
27b6a3a
finishes the osier assessment section
samgdotson Aug 7, 2025
be65836
finishes part of lit review
samgdotson Aug 7, 2025
43d9c1d
updates emissions plot to include IL, adds PCAP, and starts planning …
samgdotson Aug 8, 2025
5d8aff5
updates the existing process section
samgdotson Aug 8, 2025
8a0b50c
updates energy model usage section
samgdotson Aug 8, 2025
f8e2649
organizes the interview chapter
samgdotson Aug 10, 2025
1848bc9
extends the structural barriers section
samgdotson Aug 10, 2025
4f019a2
finishes structural barriers and planning for justice sections
samgdotson Aug 10, 2025
13d2ddc
finishes discussion section
samgdotson Aug 10, 2025
4e8d6c3
first full draft of interview chapter
samgdotson Aug 10, 2025
ffb43ce
minor edit
samgdotson Aug 11, 2025
50be0c3
grammar and punctuation
samgdotson Aug 11, 2025
ea0e8de
initial commit for introduction
samgdotson Aug 12, 2025
33a221b
adds plots for introduction chapter
samgdotson Aug 13, 2025
d2db2cc
finishes a draft of the introduction section
samgdotson Aug 13, 2025
74b16bc
meager start at interview chapter edits
samgdotson Aug 18, 2025
5b3f04f
rewrites intro and reorganizes chapter
samgdotson Aug 19, 2025
09c936f
updates interview chapter based on comments from MFJ and @katyhuff
samgdotson Aug 22, 2025
4a3d6d8
adds important arrow's theorem section
samgdotson Aug 22, 2025
4536867
adds conclusion file
samgdotson Aug 25, 2025
5304544
first draft of conclusion finishe
samgdotson Aug 25, 2025
11c4b18
quick grammarly review
samgdotson Aug 25, 2025
3de5797
slightly stronger support in the discussion section
samgdotson Aug 25, 2025
8e48d64
Merge branch 'interview_chapter' into conclusion
samgdotson Aug 25, 2025
08de198
adds abstract file
samgdotson Aug 26, 2025
91bacb6
updates outline
samgdotson Aug 26, 2025
4b7d97e
merge conf
samgdotson Aug 26, 2025
89b664c
Merge branch 'conclusion' into abstract
samgdotson Aug 26, 2025
de827a9
fixes cross references
samgdotson Aug 26, 2025
7d48d39
turns on list of tables/figures
samgdotson Aug 26, 2025
4ee1da2
minor corrections based on comments from @katyhuff
samgdotson Aug 27, 2025
c8d8756
adds dedication
samgdotson Aug 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 121 additions & 5 deletions analysis/Snakefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ latexopt = """
docs_path = "../docs/"
data_path = "../data/"
osier_data = f"{data_path}2023-osier-simulation-results/"
ch7_log = "ch7.log"
ch5_log = "ch5.log"
ch4_log = "ch4.log"
ch3_log = "ch3.log"
ch2_log = "ch2.log"
ch1_log = "ch1.log"

with open(f"{docs_path}Makefile", "r") as file:
lines = file.readlines()
Expand Down Expand Up @@ -406,17 +408,130 @@ rule examples_chapter:
done
"""

#============================INTERVIEW CHAPTER================================
rule plot_uiuc_emissions:
output:
uiuc_emissions_plot = f"{docs_path}figures/07_interview_chapter/uiuc_emissions_plot.pgf"
script:
"scripts/07-interview-scripts/plot_uiuc_emissions.py"

rule retrieve_illinois_data:
output:
illinois_data = f"{data_path}cb_2024_us_county_500k.zip"
shell: f"""
(cd {data_path} && \
curl -O \
"https://www2.census.gov/geo/tiger/GENZ2024/shp/cb_2024_us_county_500k.zip")
"""

rule plot_illinois_regions:
input:
illinois_data = f"{data_path}cb_2024_us_county_500k.zip"
output:
illinois_plot = f"{docs_path}figures/07_interview_chapter/illinois_plot.pgf"
script:
"scripts/07-interview-scripts/plot_illinois_regions.py"


rule plot_ares_ptc:
input:
ptc_data = f"{data_path}icc-ares-report-data.csv"
output:
ptc_plot = f"{docs_path}figures/07_interview_chapter/ptc_plot.pgf"
script:
"scripts/07-interview-scripts/plot_ptc_comparison.py"

rule interview_chapter:
input:
uiuc_emissions_plot = f"{docs_path}figures/07_interview_chapter/uiuc_emissions_plot.pgf",
illinois_plot = f"{docs_path}figures/07_interview_chapter/illinois_plot.pgf",
ptc_plot = f"{docs_path}figures/07_interview_chapter/ptc_plot.pgf",
output:
ch7_log
shell:
"""
for file in {input}; do
echo $file >> {output}
done
"""
#============================INTRODUCTION================================

rule retrieve_mauna_loa_data:
output:
mauna_loa_data = f"{data_path}co2_mlo_surface-insitu_1_ccgg_DailyData.txt"
shell: f"""
(cd {data_path} && curl -O https://gml.noaa.gov/aftp/data/trace_gases/co2/in-situ/surface/txt/co2_mlo_surface-insitu_1_ccgg_DailyData.txt)
"""

rule retrieve_epa_inventory:
output:
epa_inventory = f"{data_path}us-ghg-inventory-2024-chapter-executive-summary_04-16-2024.pdf"
shell:
f"""
(cd {data_path} && curl -O https://www.epa.gov/system/files/documents/2024-04/us-ghg-inventory-2024-chapter-executive-summary_04-16-2024.pdf)
"""

rule plot_mauna_loa:
input:
mauna_loa_data = f"{data_path}co2_mlo_surface-insitu_1_ccgg_DailyData.txt"
output:
mauna_loa_plot = f"{docs_path}figures/01_introduction/mauna-loa-co2.pgf"
script:
"scripts/01-introduction-scripts/plot_mauna_loa.py"

rule plot_source_emissions:
output:
source_emissions_plot = f"{docs_path}figures/01_introduction/emissions-by-source.pgf"
script:
"scripts/01-introduction-scripts/plot_source_emissions.py"

rule plot_sector_emissions:
input:
epa_inventory = f"{data_path}us-ghg-inventory-2024-chapter-executive-summary_04-16-2024.pdf"
output:
sector_emissions_plot = f"{docs_path}figures/01_introduction/emissions-by-sector.pgf"
script:
"scripts/01-introduction-scripts/plot_sector_emissions.py"


rule build_example_dag:
params:
chapter = "introduction_chapter"
input: "Snakefile"
output: "introduction_chapter_dag.png"
shell:
"snakemake {params.chapter} --dag | dot -Tpng > {output}"


rule introduction_chapter:
input:
dag = "dag.png",
example_dag = "introduction_chapter_dag.png",
mauna_loa_plot = f"{docs_path}figures/01_introduction/mauna-loa-co2.pgf",
source_emissions_plot = f"{docs_path}figures/01_introduction/emissions-by-source.pgf",
sector_emissions_plot = f"{docs_path}figures/01_introduction/emissions-by-sector.pgf"
output:
ch1_log
shell:
"""
for file in {input}; do
echo $file >> {output}
done
"""


#============================BUILD RULE================================

if sys.platform == 'Windows':
rule build_thesis:
input:
main_tex = f"{docs_path}{output_name}.tex",
ch7_log=ch7_log,
ch5_log=ch5_log,
ch4_log=ch4_log,
ch3_log=ch3_log,
ch2_log=ch2_log,
dag = "dag.png"
ch1_log=ch1_log,
output: f"{docs_path}{output_name}.pdf"
shell:
f"""
Expand All @@ -430,11 +545,12 @@ elif sys.platform in ['darwin', 'linux']:
rule build_thesis:
input:
main_tex = f"{docs_path}{output_name}.tex",
ch5_log = ch5_log,
ch4_log = ch4_log,
ch7_log=ch7_log,
ch5_log=ch5_log,
ch4_log=ch4_log,
ch3_log=ch3_log,
ch2_log=ch2_log,
dag = "dag.png"
ch1_log=ch1_log,
output: f"{docs_path}{output_name}.pdf"
shell:
f"""
Expand All @@ -446,4 +562,4 @@ rule build_dag:
output:
"dag.png"
shell:
"snakemake --dag | dot -Tpng > {output}"
"snakemake --rulegraph | dot -Tpng > {output}"
Binary file modified analysis/dag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added analysis/introduction_chapter_dag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
127 changes: 84 additions & 43 deletions analysis/pres-plots/emissions-by-sector.ipynb

Large diffs are not rendered by default.

Loading
Loading