Skip to content

Commit

Permalink
Merge pull request #1 from magpiemodel/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
caviddhen committed Sep 9, 2019
2 parents aa388b6 + 38b12b7 commit 481d0a6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions config/scenario_config.csv
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,4 @@ c14_yields_scenario;cc;nocc;;;;;;;;;;;;cc;cc;cc;cc;cc
c42_watdem_scenario;cc;nocc;;;;;;;;;;;;cc;cc;cc;cc;cc
c43_watavail_scenario;cc;nocc;;;;;;;;;;;;cc;cc;cc;cc;cc
c52_carbon_scenario;cc;nocc;;;;;;;;;;;;cc;cc;cc;cc;cc
c59_som_scenario;cc;nocc;;;;;;;;;;;;cc;cc;cc;cc;cc
2 changes: 1 addition & 1 deletion scripts/start/coacch.R
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ buildInputVector <- function(regionmapping = "H12",
additional_data = "additional_data_rev3.67.tgz") {
mappings <- c(H11="8a828c6ed5004e77d1ba2025e8ea2261",
H12="690d3718e151be1b450b394c1064b1c5",
coacch="",
coacch="c2a48c5eae535d4b8fe9c953d9986f1b",
mag="c30c1c580039c2b300d86cc46ff4036a",
agmip="c77f075908c3bc29bdbe1976165eccaf",
sim4nexus="25dd7264e8e145385b3bd0b89ec5f3fc",
Expand Down

0 comments on commit 481d0a6

Please sign in to comment.