From f13771d09d25ed56e2f6fb4f3f27560401e83560 Mon Sep 17 00:00:00 2001
From: Peter Alexander <peter@blackhillock.co.uk>
Date: Sat, 15 Apr 2017 21:48:02 +0100
Subject: [PATCH] Sim param changes
---
data/sims/ssp_params.csv | 40 ++++++++++++++++-----------------
src/ac/ed/lurg/ModelConfig.java | 4 ++--
2 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/data/sims/ssp_params.csv b/data/sims/ssp_params.csv
index 6aab8dda..a6bbabf3 100644
--- a/data/sims/ssp_params.csv
+++ b/data/sims/ssp_params.csv
@@ -39,11 +39,11 @@ SSP2,YIELD_DIR_TOP,rcp,,,,,,ssp2
SSP3,YIELD_DIR_TOP,rcp,,,,,,ssp3
SSP4,YIELD_DIR_TOP,rcp,,,,,,ssp4
SSP5,YIELD_DIR_TOP,rcp,,,,,,ssp5
-SSP1,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.02,0.18,0.12,0.14,0.16,
-SSP2,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.02,0.18,0.08,0.1,0.12,
-SSP3,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.02,0.18,0.06,0.08,0.1,
-SSP4,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.02,0.18,0.06,0.1,0.14,
-SSP5,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.02,0.18,0.04,0.06,0.08,
+SSP1,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.03,0.27,0.18,0.21,0.24,
+SSP2,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.03,0.27,0.12,0.15,0.18,
+SSP3,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.03,0.27,0.09,0.12,0.15,
+SSP4,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.03,0.27,0.09,0.15,0.21,
+SSP5,BIOENERGY_CHANGE_ANNUAL_RATE,beta,0.03,0.27,0.06,0.09,0.12,
SSP1,FERTILISER_COST_PER_T,beta,1.5,3.9,2.7,3.3,3.6,
SSP2,FERTILISER_COST_PER_T,beta,1.5,3.9,2.4,2.7,3,
SSP3,FERTILISER_COST_PER_T,beta,1.5,3.9,1.8,2.4,3,
@@ -69,23 +69,23 @@ SSP2,DIETARY_CLOSURE,beta,0,0.16,0.02,0.08,0.12,
SSP3,DIETARY_CLOSURE,beta,0,0.16,0.01,0.02,0.04,
SSP4,DIETARY_CLOSURE,beta,0,0.16,0.01,0.02,0.04,
SSP5,DIETARY_CLOSURE,beta,0,0.16,0.04,0.08,0.12,
-SSP1,LAND_CHANGE_COST,beta,0.7,1.1,0.8,0.9,0.85,
-SSP2,LAND_CHANGE_COST,beta,0.7,1.1,0.85,0.9,0.95,
-SSP3,LAND_CHANGE_COST,beta,0.7,1.1,0.95,1,1.05,
-SSP4,LAND_CHANGE_COST,beta,0.7,1.1,0.9,0.95,1,
-SSP5,LAND_CHANGE_COST,beta,0.7,1.1,0.75,0.8,0.85,
+SSP1,LAND_CHANGE_COST,beta,0.6,1,0.7,0.8,0.85,
+SSP2,LAND_CHANGE_COST,beta,0.6,1,0.75,0.8,0.85,
+SSP3,LAND_CHANGE_COST,beta,0.6,1,0.85,0.9,0.95,
+SSP4,LAND_CHANGE_COST,beta,0.6,1,0.8,0.85,0.9,
+SSP5,LAND_CHANGE_COST,beta,0.6,1,0.65,0.7,0.75,
SSP1,AGRI_LAND_ABANDONMENT_COST_FACTOR,beta,0.8,1.2,0.85,0.9,0.95,
SSP2,AGRI_LAND_ABANDONMENT_COST_FACTOR,beta,0.8,1.2,0.95,1,1.05,
SSP3,AGRI_LAND_ABANDONMENT_COST_FACTOR,beta,0.8,1.2,1.05,1.1,1.15,
SSP4,AGRI_LAND_ABANDONMENT_COST_FACTOR,beta,0.8,1.2,0.95,1,1.05,
SSP5,AGRI_LAND_ABANDONMENT_COST_FACTOR,beta,0.8,1.2,1.05,1.1,1.15,
-SSP1,CROP_TO_PASTURE_COST_FACTOR,beta,0.8,1.2,1.05,1.1,1.15,
-SSP2,CROP_TO_PASTURE_COST_FACTOR,beta,0.8,1.2,0.95,1,1.05,
-SSP3,CROP_TO_PASTURE_COST_FACTOR,beta,0.8,1.2,0.85,0.9,0.95,
-SSP4,CROP_TO_PASTURE_COST_FACTOR,beta,0.8,1.2,0.9,0.95,1,
-SSP5,CROP_TO_PASTURE_COST_FACTOR,beta,0.8,1.2,0.9,0.95,1,
-SSP1,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
-SSP2,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
-SSP3,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
-SSP4,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
-SSP5,PASTURE_HARVEST_FRACTION,unif,0.4,0.6,,,,
\ No newline at end of file
+SSP1,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
+SSP2,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
+SSP3,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
+SSP4,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
+SSP5,CROP_TO_PASTURE_COST_FACTOR,unif,0.8,1.2,,,,
+SSP1,PASTURE_HARVEST_FRACTION,unif,0.45,0.55,,,,
+SSP2,PASTURE_HARVEST_FRACTION,unif,0.45,0.55,,,,
+SSP3,PASTURE_HARVEST_FRACTION,unif,0.45,0.55,,,,
+SSP4,PASTURE_HARVEST_FRACTION,unif,0.45,0.55,,,,
+SSP5,PASTURE_HARVEST_FRACTION,unif,0.45,0.55,,,,
\ No newline at end of file
diff --git a/src/ac/ed/lurg/ModelConfig.java b/src/ac/ed/lurg/ModelConfig.java
index 524d6e57..8e0ea214 100644
--- a/src/ac/ed/lurg/ModelConfig.java
+++ b/src/ac/ed/lurg/ModelConfig.java
@@ -186,12 +186,12 @@ public class ModelConfig {
public static final double MEAT_EFFICIENCY = getDoubleProperty("MEAT_EFFICIENCY", 1.0); // 'meat' is includes feed conversion ratio already, this is tech. change or similar
public static final double IRRIGIATION_EFFICIENCY = getDoubleProperty("IRRIGIATION_EFFICIENCY", 0.5);
- public static final double LAND_CHANGE_COST = getDoubleProperty("LAND_CHANGE_COST", 0.9);
+ public static final double LAND_CHANGE_COST = getDoubleProperty("LAND_CHANGE_COST", 0.8);
public static final double CROP_TO_PASTURE_COST_FACTOR = getDoubleProperty("CROP_TO_PASTURE_COST_FACTOR", 1.0);
public static final double AGRI_LAND_ABANDONMENT_COST_FACTOR = getDoubleProperty("AGRI_LAND_ABANDONMENT_COST_FACTOR", 1.0);
public static final double CROP_INCREASE_COST = getDoubleProperty("CROP_INCREASE_COST", 1.0 * LAND_CHANGE_COST);
- public static final double CROP_OR_PASTURE_DECREASE_COST = getDoubleProperty("CROP_OR_PASTURE_DECREASE_COST", 0.5 * LAND_CHANGE_COST * AGRI_LAND_ABANDONMENT_COST_FACTOR);
+ public static final double CROP_OR_PASTURE_DECREASE_COST = getDoubleProperty("CROP_OR_PASTURE_DECREASE_COST", 0.8 * LAND_CHANGE_COST * AGRI_LAND_ABANDONMENT_COST_FACTOR);
public static final double PASTURE_INCREASE_COST = getDoubleProperty("PASTURE_INCREASE_COST", 0.2 * LAND_CHANGE_COST * CROP_TO_PASTURE_COST_FACTOR);
public static final double AGRI_EXPANSION_COST_BASE = getDoubleProperty("AGRI_EXPANSION_COST_BASE", 0.1 * LAND_CHANGE_COST);
public static final double AGRI_EXPANSION_COST_BASE_MANAGED_FOREST = getDoubleProperty("AGRI_EXPANSION_COST_BASE_MANAGED_FOREST", 0.3 * LAND_CHANGE_COST);
--
GitLab