Skip to content

Commit 9aedca3

Browse files
committed
rev 547 (2018-10-22) (krueschan)
- changes to paper - enable "tax-table" output in wide data download - minor css syntax fix - enabled auto-update when changing responsibility weight
1 parent 77eaa7e commit 9aedca3

File tree

5 files changed

+12
-9
lines changed

5 files changed

+12
-9
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ nbproject/
22
/public_html/config.php
33
!/public_html/config.php.new
44
/public_html/inc/popup_notice.php
5-
private/
5+
/private/

CHANGELOG

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ rev 547 (2018-10-22) (krueschan)
22
- changes to paper
33
- enable "tax-table" output in wide data download
44
- minor css syntax fix
5+
- fix: report now updates when changing R-C weight
56

67
rev 546 (2018-10-19) (krueschan)
78
- clarifying system requirements in README.md
@@ -272,4 +273,4 @@ rev 429 (2015-05-01) (toma-ecoequity)
272273

273274

274275

275-
[...no changelog for revisions prior to 429 (which is when krueschan started to work on this)...]
276+
[...no changelog for revisions prior to 429 (which is when krueschan started to work on this)...]

paper/paper.bib

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ @article{Holz_Kartha_Athanasiou_2018
22
title={Fairly Sharing 1.5 – National Fair Shares of a 1.5°C-compliant Global Mitigation Effort},
33
volume={18}, DOI={10.1007/s10784-017-9371-z}, number={Special Issue: Achieving 1.5°C and Climate Justice},
44
journal={International Environmental Agreements: Politics, Law and Economics},
5-
author={{Holz}, Christian and {Karth}a, Sivan and {Athanasiou}, Tom},
5+
author={{Holz}, Christian and {Kartha}, Sivan and {Athanasiou}, Tom},
66
year={2018}, pages={117–134}
77
}
88

@@ -31,13 +31,13 @@ @software{EKB_Engine
3131
date = {2014}
3232
}
3333

34-
@book{Kemp-Benedict_Athanasiou_Baer_Kartha_2013,
35-
title={Calculations for the Greenhouse Development Rights Calculator},
36-
abstractNote={The Greenhouse Development Rights (GDRs) framework allocates responsibility for greenhouse gas mitigation and adaptation based on individual responsibility for historical emissions and capacity to act. The GDRs calculator is a web-based tool for exploring how specific quantitative expressions of the GDRs framework affect allocations. This paper documents the calculations that the calculator implements.},
34+
@book{EKB_Calculations,
35+
title={Calculations for the Climate Equity Reference Calculator (CERc)},
36+
abstractNote={The Climate Equity Reference Project (CERP) framework allocates responsibility for greenhouse gas mitigation and adaptation based on individual responsibility for historical emissions and capacity to act. The Climate Equity Reference Calculator (CERc) is a web-based tool for exploring how specific quantitative expressions of the CERP framework affect allocations. This paper documents the calculations that the calculator implements},
3737
institution={{Stockholm Environment Institute} and {EcoEquity}},
3838
url = {http://gdrights.org/wp-content/uploads/2013/02/SEI_TechReport_GDRsCalculations.pdf},
39-
author={{Kemp-Benedict}, Eric and {Athanasiou}, Tom and {Baer}, Paul and {Kartha}, Sivan},
40-
year={2013}, month={Feb}
39+
author={{Kemp-Benedict}, Eric and {Athanasiou}, Tom and {Baer}, Paul and {Holz}, Christian and {Kartha}, Sivan},
40+
year={2018}, month={Nov}
4141
}
4242

4343
@article{Meinshausen_et_al_2015,

public_html/index.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,9 @@ function microtime_float() {
225225
echo 'checked="checked"'; ?> />
226226
<label for="use_netexports" class="click"> <?php echo sprintf(_('Include %s'), $glossary->getLink('embodied_emissions', false, _('emissions embodied in trade'))); ?></label>
227227
</li>
228-
</li><?php echo select_num('r_wt', $fw_params, $glossary->getLink('r_weight', false, _('Responsibility weight')) . ":"); ?>
229228
<li>
229+
<?php echo select_num('r_wt', $fw_params, $glossary->getLink('r_weight', false, _('Responsibility weight')) . ":"); ?>
230+
</li>
230231
</ul>
231232
</fieldset>
232233
</li>

public_html/js/calc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ $(function() {
8686
$('#use_lulucf').change(submit);
8787
$('#use_nonco2').change(submit);
8888
$('#use_netexports').change(submit);
89+
$('#r_wt').change(submit);
8990

9091
$('#dev_thresh').change(submit);
9192
$('#lux_thresh').change(submit);

0 commit comments

Comments
 (0)