include TRANSPORT_COST in imported price

data/sims/hind_params_old.csv

-Ensemble,pname,dist,xmin,xmax
-hb,BIOENERGY_CHANGE_ANNUAL_RATE,unif,0,0.8
-hb,FERTILISER_COST_PER_T,unif,0.4,3.2
-hb,IRRIG_COST_SCALE_FACTOR,unif,0.0001,0.0011
-hb,IRRIGIATION_EFFICIENCY,unif,0.2,0.8
-hb,MEAT_EFFICIENCY,unif,0.8,1.2
-hb,OTHER_INTENSITY_COST,unif,0.2,1
-hb,PASTURE_HARVEST_FRACTION,unif,0.4,0.6
-hb,MIN_NATURAL_RATE,unif,0.05,0.15
-hb,TRADE_BARRIER_ADJ,unif,0.5,1.5
-hb,TRANSPORT_COST,unif,0.1,0.5
-hb,ANNUAL_MAX_IMPORT_CHANGE,unif,0.01,0.09
-hb,LAND_CHANGE_COST,unif,0.1,0.3
-hb,CROP_DECREASE_COST,unif,0.2,1
-hb,AGRI_LAND_EXPANSION_COST_FACTOR,unif,0.5,1.5
-hb,CROP_TO_PASTURE_COST_FACTOR,unif,0.5,1.5
-hb,TECHNOLOGY_CHANGE_ANNUAL_RATE,unif,0,0.01
-hb,INITIAL_PRICE_SHIFT,unif,0.5,1.5
\ No newline at end of file

data/sims/rcp_params.csv

@@ -104,13 +104,13 @@ rcp/85,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
 rcp/constCO2_constClim,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
 rcp/85_constCO2,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
 rcp/85_constClim,TRADE_BARRIER_FACTOR_DEFAULT,unif,0.15,0.45,
-rcp/26,TRANSPORT_COST,unif,0.15,0.45,
-rcp/45,TRANSPORT_COST,unif,0.15,0.45,
-rcp/60,TRANSPORT_COST,unif,0.15,0.45,
-rcp/85,TRANSPORT_COST,unif,0.15,0.45,
-rcp/constCO2_constClim,TRANSPORT_COST,unif,0.15,0.45,
-rcp/85_constCO2,TRANSPORT_COST,unif,0.15,0.45,
-rcp/85_constClim,TRANSPORT_COST,unif,0.15,0.45,
+rcp/26,TRANSPORT_COST,unif,0.05,0.15,
+rcp/45,TRANSPORT_COST,unif,0.05,0.15,
+rcp/60,TRANSPORT_COST,unif,0.05,0.15,
+rcp/85,TRANSPORT_COST,unif,0.05,0.15,
+rcp/constCO2_constClim,TRANSPORT_COST,unif,0.05,0.15,
+rcp/85_constCO2,TRANSPORT_COST,unif,0.05,0.15,
+rcp/85_constClim,TRANSPORT_COST,unif,0.05,0.15,
 rcp/26,TRANSPORT_LOSSES,unif,0.025,0.075,
 rcp/45,TRANSPORT_LOSSES,unif,0.025,0.075,
 rcp/60,TRANSPORT_LOSSES,unif,0.025,0.075,
@@ -122,6 +122,6 @@ rcp/26,YIELD_DIR_TOP,value,,,runs_20170925/LPJG_PLUM_expt1.2_rcp26_ipsl_irrV7104
 rcp/45,YIELD_DIR_TOP,value,,,runs_20170925/LPJG_PLUM_expt1.2_rcp45_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170925151730
 rcp/60,YIELD_DIR_TOP,value,,,runs_20170925/LPJG_PLUM_expt1.2_rcp60_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170925151858
 rcp/85,YIELD_DIR_TOP,value,,,runs_20170925/LPJG_PLUM_expt1.2_rcp85_ipsl_irrV7104_b20170728_bothDS_irrWaits_forED_20170925151957
-rcp/constCO2_constClim,YIELD_DIR_TOP,value,,,runs_20170925_constCO2_constClim/LPJG_PLUM_expt1.2_rcp85_ipsl_irrV7104_b20170728_bothDS_irrWaits_constCO2_constClim_forED_20170925154536
+rcp/constCO2_constClim,YIELD_DIR_TOP,value,,,runs_20171008_constCO2_constClim/LPJG_PLUM_expt1.2_rcp85_ipsl_irrV7104_b20170728_bothDS_irrWaits_constCO2_constClim_forED_20171008124330
 rcp/85_constCO2,YIELD_DIR_TOP,value,,,runs_20170925_constCO2/LPJG_PLUM_expt1.2_rcp85_ipsl_irrV7104_b20170728_bothDS_irrWaits_constCO2_forED_20170925152021
-rcp/85_constClim,YIELD_DIR_TOP,value,,,runs_20170925_constClim/LPJG_PLUM_expt1.2_rcp85_ipsl_irrV7104_b20170728_bothDS_irrWaits_constClim_forED_20170925152008
\ No newline at end of file
+rcp/85_constClim,YIELD_DIR_TOP,value,,,runs_20171008_constClim/LPJG_PLUM_expt1.2_rcp85_ipsl_irrV7104_b20170728_bothDS_irrWaits_constClim_forED_20171008124324
\ No newline at end of file

src/ac/ed/lurg/ModelConfig.java

@@ -255,7 +255,7 @@ public class ModelConfig {
 	
 	public static final double DOMESTIC_PRICE_MARKUP = getDoubleProperty("DOMESTIC_PRICE_MARKUP", 1.0);
 	public static final double TRANSPORT_LOSSES = getDoubleProperty("TRANSPORT_LOSSES", 0.05);  // in international trade
-	public static final double TRANSPORT_COST = getDoubleProperty("TRANSPORT_COST", 0.3);  // 100 $/t  see Wheat Transportation Profile - USDA
+	public static final double TRANSPORT_COST = getDoubleProperty("TRANSPORT_COST", 0.1);  // 100 $/t  see Wheat Transportation Profile - USDA
 	public static final double TRADE_BARRIER_FACTOR_DEFAULT = getDoubleProperty("TRADE_BARRIER_FACTOR_DEFAULT", 0.3);  // price factor in international trade, transport cost and real trade barriers
 	public static final double TRADE_BARRIER_ADJ = getDoubleProperty("TRADE_BARRIER_ADJ", 1.0);
 	public static final boolean ACTIVE_TRADE_BARRIERS = getBooleanProperty("ACTIVE_TRADE_BARRIERS", false);  // if set to true read in barrier information from file, otherwise use default as above

src/ac/ed/lurg/country/GlobalPrice.java

@@ -23,7 +23,7 @@ public class GlobalPrice {
 	}
 	
 	public double getCountryImportPrice(double countryTradeBarrier) {
-		double importPrice = exportPrice * (1.0 + countryTradeBarrier*ModelConfig.TRADE_BARRIER_ADJ) / (1.0 - ModelConfig.TRANSPORT_LOSSES);
+		double importPrice = (exportPrice * (1.0 + countryTradeBarrier*ModelConfig.TRADE_BARRIER_ADJ) / (1.0 - ModelConfig.TRANSPORT_LOSSES)) + ModelConfig.TRANSPORT_COST;
 		return importPrice;
 	}