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

dos2unix update and kforestry set moved to trade from no_trade #98

Closed
wants to merge 720 commits into from
Closed

dos2unix update and kforestry set moved to trade from no_trade #98

wants to merge 720 commits into from

Conversation

abhimishr
Copy link
Member

No description provided.

k4rst3ns
k4rst3ns requested changes Aug 15, 2019
View reviewed changes
Copy link
Member

@k4rst3ns k4rst3ns left a comment

Choose a reason for hiding this comment

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

Leave core/sets.gms unchanged

@abhimishr
Standaone test and establishment based on current demand or production
6138bf1
@abhimishr
Merge branch 'sep19' of gitlab.pik-potsdam.de:mishra/private_forestry…
28921fd 
…_dynamic into sep19
@abhimishr
No future trade calculations
f3e42e3
@abhimishr
fix kforestry set domain error
db855fa
@abhimishr
only current trade
db0d81d
@abhimishr
no future trade
df8af56
@abhimishr
Forestr future trade. Lower woodfuel demand in India
79ca727
@abhimishr
boundfix for v32_land and higher Tol_feas_min
19eb20e
@abhimishr
Getting rid of unnecessary equations
1b7442b
@abhimishr
1995 demand dest (suppressed t0 75pc)
64f478d
@abhimishr
Establish more than 0 plantations in each region
d1308b2
@abhimishr
Updated Tol_Feas_Min
ec358de
@abhimishr
Added free variable to overcome infeasibility
c6cc166
@abhimishr
Test with regional demand
80d4a89
@abhimishr
Updated run flag
3c7e000
@abhimishr
typo fix
be92c21
@abhimishr
Introduced new timber module
432a4e3
@abhimishr
Removed additional conopt setting
a898a5c
@abhimishr
Removed boundfix for v32_land for plantations
ae78a38
@abhimishr
main file changes
8ed4e0f
@abhimishr
Merge branch 'sep19' of gitlab.pik-potsdam.de:mishra/private_forestry…
e9abb26 
…_dynamic into sep19
@abhimishr
Declaration as positive vars for prodn from heaven
e762823
@abhimishr
changes in opt file usage setting
51f2dbb
@abhimishr
Merge branch 'sep19' of gitlab.pik-potsdam.de:mishra/private_forestry…
e900657 
…_dynamic into sep19
@abhimishr
Estb according to current demand. Activate default trade
993a059
@abhimishr
trade margin for timber added. Re-activate separete pro eqn in natveg
84247a8
@abhimishr
Establishment of plantations to meet more than 66% of demand.
2d8afa6
@abhimishr
Added rand number generator for distingushing between similar runs
3fba1d3
abhimishr and others added 26 commits November 11, 2019 17:23
@abhimishr
Estb more than harvest
a505357
@abhimishr
Bugfix for incorrect establishment equation
dd773e3
@abhimishr
Poulter distribution for secdf and harvested secdf comes from other land
8e4e433
@abhimishr
Run flag changed
f4c54d7
@abhimishr
Removed poulter distibution. Assumuing equally distributed secdf
963619f
@abhimishr
secdf remains secdf
741db7b
@abhimishr
Secdf remain secdf. All secdf is acx for initialization
e69b2db
@abhimishr
Poulter distribution. Secdf to other. NPIs in one eqn
ef582b4
@abhimishr
Secdf to other. No poulter. Default npis
2bf205a
@abhimishr
Merge pull request #3 from abhimishr/develop_forestry
54bb7dd 
Develop forestry merged to default develop of fork
@abhimishr
bugfix in missing time set during yield calculation
ee6d27e
@abhimishr
Title change
ee2f0a7
@abhimishr
No dampening. Secdf goes to other
4abcf82
@abhimishr
Secdf stays secdf. No dampeingn factors
77ad9ad
@abhimishr
Secdf stays secdf. Dampening reactivated
eaf7bca
@abhimishr
OAS and LAM manual fix for testing
2e4bd8c
@abhimishr
Further bugfix for LAM and OAS
1dc4e7c
@abhimishr
Run flag changed
6a19a6e
@abhimishr
Additional data added. Recalculated management factors for plantations
130860d
@abhimishr
Bugfix for lower value of management factor. Activated all run combos
a6060c3
@abhimishr
main file changes
edc1bb1
@abhimishr
Harvesting and establshment same
b6c38a8
@abhimishr
Same harvesting and estb
0c2943b
@abhimishr
Merge pull request #4 from abhimishr/develop_forestry
86b1b93 
develop branch updated with testing version of dynamic forestry.
@abhimishr
changes from magpiemodel develop
4b07ea8
@abhimishr
Merge pull request #5 from magpiemodel/develop
d48d5b8 
Develop from magpiemodel merged into develop from personal fork
@tscheypidi
Copy link
Member

This pr is now pending for quite a while. Can it be closed without being merged or should we wait for the required changes?

@abhimishr abhimishr closed this Dec 19, 2019
@abhimishr abhimishr deleted the develop branch March 18, 2020 16:18
flohump pushed a commit to flohump/magpie that referenced this pull request Mar 17, 2023
@weindl
Merge pull request magpiemodel#98 from pik-piam/weindl-patch-1
2a34c7f 
Bugfix for reporting of natural forest cover
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@k4rst3ns k4rst3ns Awaiting requested review from k4rst3ns

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@abhimishr @tscheypidi @k4rst3ns