Skip to content

Commit

Permalink
Fixed compat file for auto-merging Julia registrator (#75)
Browse files Browse the repository at this point in the history
* Increase cost exponent to 3

Increased to cost exponent from 2 to 3, which brings MARGO's cost
functions more in line with other models.

Also renamed the units file.

* Improved adaptation model and costs

**Adaptation model**
Following Reviewer #1's suggestion, we improve the adaptation model somewhat following DeBruin et al's AD-DICE implementation. In particular, we assume that adaptation reduces damages proportionally, such that the damages used to compute benefits are the *residual damages*. The marginal costs of these adaptive measures increase super-linearly proportionally with the GWP. Based on suggestions from a different anonymous reviewer (from a previous submission at a different journal), we also make the cost proportional to the controlled gross damages. We tune the proportionality constant to match DeBruin's estimate for the damages that correspond to a warming of 3ºC (this reference temperature comes in as an additional input parameter in the economic submodule, Tb=3.0).

These changes are implemented in both the Diagnostic and Optimization modules.

We remove the constraint that forces adaptation to be constant in time, also following DeBruin's implementation.

**Misc**
Also fixed some bugs with the expenditure and budget objective functions (although these are not used in the paper at all).

Also improved the interface for the standard plots of the model state.

* Increment version number to reflect major (breaking) changes

* Updates tests with new results

* Updated default parameter values based on referrees

- Updated total remove costs in line with new cost function.

- Increased mitigation costs to match other estimates in 2100, rather than in 2020

- Increased climate damages according to Frankhauser review

- Increased geoengineering costs following costs of climate damages

* Fixed bugs in economic submodel and optimization

- Forgot to add Tb as paramter in some sub-module constructor methods

- Forgot to index background damages Db[i] in some places of optimization

* Increased default adaptation limit

* Bugfixes

* Back to de Bruin adaptation module

* Slightly thinner lines

* Fixed one-two dim example

* Removed legacy Tb changes

* Fixed default configuration

* Minor update

* Updated hard-coded correct results for tests

* Added compatible Revise version
  • Loading branch information
hdrake authored Sep 13, 2021
1 parent e10b857 commit 2febc9a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ JSON2 = "0.3.2"
JuMP = "= 0.21.5"
PyPlot = "2.9.0"
julia = "^1.5"
Revise = "3.1.17"

[extras]
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
Expand Down

2 comments on commit 2febc9a

@hdrake
Copy link
Collaborator Author

@hdrake hdrake commented on 2febc9a Sep 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request updated: JuliaRegistries/General/44786

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v0.3.0 -m "<description of version>" 2febc9aa00b8a3c1486952431273ea57558ec969
git push origin v0.3.0

Please sign in to comment.