Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
R
remind
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jerome Hilaire
remind
Commits
913bc2a8
Commit
913bc2a8
authored
5 years ago
by
Nicolas Bauer
Browse files
Options
Downloads
Patches
Plain Diff
*NB* added constraints for historic oil imports (2010, 2015). In addition to the last commit.
parent
9b3ca836
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!110
*NB* added constraints for historic oil imports (2010, 2015). In addi…
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main.gms
+1
-1
1 addition, 1 deletion
main.gms
modules/24_trade/standard/bounds.gms
+6
-0
6 additions, 0 deletions
modules/24_trade/standard/bounds.gms
with
7 additions
and
1 deletion
main.gms
+
1
−
1
View file @
913bc2a8
...
...
@@ -84,7 +84,7 @@
*
* Input data revision: 5.94
*
* Last modification (input data): Tu
e
Mar 1
0 09:56:11
2020
* Last modification (input data): T
h
u Mar 1
9 16:15:13
2020
*
*###################### R SECTION END (VERSION INFO) ###########################
...
...
This diff is collapsed.
Click to expand it.
modules/24_trade/standard/bounds.gms
+
6
−
0
View file @
913bc2a8
...
...
@@ -92,6 +92,12 @@ vm_Xport.up("2010",regi,"peoil") = 1.05 * pm_IO_trade("2010",regi,"peoil","Xport
vm_Xport.lo("2015",regi,"peoil") = 0.95 * pm_IO_trade("2015",regi,"peoil","Xport");
vm_Xport.up("2015",regi,"peoil") = 1.05 * pm_IO_trade("2015",regi,"peoil","Xport");
*** bounds on oil imports in 2010 and 2015
vm_Mport.lo("2010",regi,"peoil") = 0.95 * pm_IO_trade("2010",regi,"peoil","Mport");
vm_Mport.up("2010",regi,"peoil") = 1.05 * pm_IO_trade("2010",regi,"peoil","Mport");
vm_Mport.lo("2015",regi,"peoil") = 0.95 * pm_IO_trade("2015",regi,"peoil","Mport");
vm_Mport.up("2015",regi,"peoil") = 1.05 * pm_IO_trade("2015",regi,"peoil","Mport");
*** bounds on gas exports in 2010 and 2015
vm_Xport.lo("2010",regi,"pegas") = 0.95 * pm_IO_trade("2010",regi,"pegas","Xport");
vm_Xport.up("2010",regi,"pegas") = 1.05 * pm_IO_trade("2010",regi,"pegas","Xport");
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment