Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

grassland, forest module and soil land use processes for a closed land carbon cycle #34

Merged
merged 31 commits into from
Oct 7, 2024
Merged

grassland, forest module and soil land use processes for a closed land carbon cycle #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
209ca76
merge grassland and soil land use proceses into (more) latest version
Sep 12, 2024
e9e8381
add forest module
Sep 13, 2024
ee325e4
latest changes
Sep 17, 2024
f18cd20
add more land use soil carbon feedbacks
Sep 17, 2024
65a1668
fixes, debugging and units
Sep 18, 2024
d870a27
add terrestrial carbon balance accounting
Sep 18, 2024
06cbed0
fix carbon balance accounting
Sep 18, 2024
98714a0
try fix terrestrial carbon balance
Sep 19, 2024
4e17a84
fix units
Sep 20, 2024
f1d5c73
Unit error fixes, and fixed calibration a bit
Sep 24, 2024
296b055
fix balance, add new land use type balances
Sep 25, 2024
b9fbc6c
add land use change check
Sep 26, 2024
59237e2
externalize new work from Jannes
Sep 27, 2024
c652518
Merge remote-tracking branch 'upstream/main'
Sep 27, 2024
0457566
Fixed animal grazing carbon removal, reduced cycling of land signific…
Sep 27, 2024
c707fae
fix soil carbon emissions
Sep 30, 2024
56a6857
put soil carbon emissions back
Sep 30, 2024
8979b89
Merge remote-tracking branch 'upstream/main'
Sep 30, 2024
45d8372
Merge remote-tracking branch 'upstream/main'
Sep 30, 2024
9da1d64
Add calibration data for terrestrial carbon balance from GCB
lnnrtrmm Oct 2, 2024
87edc88
Merge remote-tracking branch 'upstream/main'
Oct 2, 2024
e902653
changes to fix terrestrial carbon sink
Oct 3, 2024
877fbc8
Get terrestrial carbon to balance right
Oct 3, 2024
500ed2b
Merge remote-tracking branch 'upstream/main'
Oct 3, 2024
64160ce
Merge remote-tracking branch 'upstream/main'
Oct 3, 2024
3c40a58
removed backwards grazing land NPP effect
Oct 4, 2024
e007238
W/ changes on the phone -- behavior isn't right yet
Oct 4, 2024
0679455
More changes from the phone
Oct 4, 2024
21b6b24
calibration carbon balance
Oct 5, 2024
338d741
Merge remote-tracking branch 'upstream/main'
Oct 5, 2024
5999a43
avoid problems with demand accessibility check
Oct 5, 2024
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
261 changes: 132 additions & 129 deletions Data/Calibration Data.csv
View file
Open in desktop

Large diffs are not rendered by default.

Binary file modified FRIDA.isdb
View file
Open in desktop
Binary file not shown.
182 changes: 123 additions & 59 deletions FRIDA.stmx
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion FRIDA_Modules/Behavioral Change.itmx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@
<units>years</units>
</aux>
<aux name="average daily demand\nper capita in 1980">
<eqn>378</eqn>
<eqn>371</eqn>
<units>kcal/person/day</units>
</aux>
<aux name="total yearly\nconsumption">
Expand Down
16 changes: 14 additions & 2 deletions FRIDA_Modules/Behavioral Choices.itmx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<name>Behavioral Choices</name>
<uuid>a98fb344-3c49-4486-a2ca-cfd7fbdac9bc</uuid>
<vendor>isee systems, inc.</vendor>
<product version="3.7.1" isee:build_number="3377" isee:saved_by_v1="true" lang="en">Stella_Architect</product>
<product version="3.7.1" isee:build_number="3377" isee:saved_by_v1="true" lang="en">Stella Architect</product>
</header>
<sim_specs isee:sim_duration="0" isee:run_prefix="Run" isee:simulation_delay="0" isee:restore_on_start="false" isee:save_interval="1" method="RK4" time_units="Year" isee:instantaneous_flows="false" isee:ignore_module_errors="false" isee:strict_units="false" isee:loop_scores="false" isee:loop_exhaustive_allowed="1000">
<start>1980</start>
Expand Down Expand Up @@ -185,6 +185,18 @@
<unit name="TW">
<eqn>Million*MW</eqn>
</unit>
<unit name="G">
<eqn>Giga</eqn>
</unit>
<unit name="GtCO2">
<eqn>Giga*tCO2</eqn>
</unit>
<unit name="GtCH4">
<eqn>Giga*tCH4</eqn>
</unit>
<unit name="GtN2O">
<eqn>Giga*tN2O</eqn>
</unit>
</model_units>
<model name="Behavioral_Choices">
<variables>
Expand Down Expand Up @@ -286,7 +298,7 @@
<isee:iframe color="black" background="white" text_align="left" vertical_text_align="top" font_size="12pt" border_width="thin" border_style="solid"/>
<isee:financial_table color="black" background="#E0E0E0" text_align="right" font_size="12pt" hide_border="false" auto_fit="true" first_column_width="250" other_column_width="100" header_font_style="normal" header_font_weight="bold" header_text_decoration="none" header_text_align="center" header_vertical_text_align="center" header_font_color="black" header_font_family="Arial" header_font_size="14pt" header_text_padding="2" header_text_border_color="black" header_text_border_width="thin" header_text_border_style="none"/>
</style>
<view isee:show_pages="false" background="white" page_width="1091" page_height="761" zoom="160" isee:popup_graphs_are_comparative="true" isee:enable_non_negative_highlights="false" type="stock_flow">
<view isee:show_pages="false" background="white" page_width="1091" page_height="761" zoom="160" isee:popup_graphs_are_comparative="false" isee:enable_non_negative_highlights="false" type="stock_flow">
<style color="black" background="white" font_style="normal" font_weight="normal" text_decoration="none" text_align="center" vertical_text_align="center" font_color="black" font_family="Arial" font_size="10pt" padding="2" border_color="black" border_width="thin" border_style="none">
<stock color="blue" background="white" font_color="blue" font_size="11pt" label_side="top">
<shape type="rectangle" width="45" height="35"/>
Expand Down
2 changes: 1 addition & 1 deletion FRIDA_Modules/Demographics.itmx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1628,7 +1628,7 @@ Miladinov, G. 2020. Socioeconomic development and life expectancy relationship:
<isee:iframe color="black" background="white" text_align="left" vertical_text_align="top" font_size="12pt" border_width="thin" border_style="solid"/>
<isee:financial_table color="black" background="#E0E0E0" text_align="right" font_size="12pt" hide_border="false" auto_fit="true" first_column_width="250" other_column_width="100" header_font_style="normal" header_font_weight="bold" header_text_decoration="none" header_text_align="center" header_vertical_text_align="center" header_font_color="black" header_font_family="Arial" header_font_size="14pt" header_text_padding="2" header_text_border_color="black" header_text_border_width="thin" header_text_border_style="none"/>
</style>
<view isee:show_pages="false" background="white" page_width="768" page_height="588" isee:page_cols="4" isee:page_rows="5" isee:scroll_x="1311.25" isee:scroll_y="1921.25" zoom="160" isee:popup_graphs_are_comparative="true" isee:enable_non_negative_highlights="false" type="stock_flow">
<view isee:show_pages="false" background="white" page_width="1369" page_height="956" isee:page_cols="4" isee:page_rows="5" isee:scroll_x="713.333" isee:scroll_y="638.333" zoom="60" isee:popup_graphs_are_comparative="false" isee:enable_non_negative_highlights="false" type="stock_flow">
<style color="black" background="white" font_style="normal" font_weight="normal" text_decoration="none" text_align="center" vertical_text_align="center" font_color="black" font_family="Arial" font_size="10pt" padding="2" border_color="black" border_width="thin" border_style="none">
<stock color="blue" background="white" font_color="blue" font_size="12.51pt" label_side="top">
<shape type="rectangle" width="45" height="35"/>
Expand Down
Loading