From eb97de166d4f21e40dff571112edee18144d06ae Mon Sep 17 00:00:00 2001
From: Bart Arendarczyk <s1924442@ed.ac.uk>
Date: Wed, 19 Mar 2025 15:30:25 +0000
Subject: [PATCH] Fixed setaside bug in formatForLPJG.R
---
scripts/formatForLPJG.R | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/formatForLPJG.R b/scripts/formatForLPJG.R
index ef512e8..76acee3 100644
--- a/scripts/formatForLPJG.R
+++ b/scripts/formatForLPJG.R
@@ -87,14 +87,14 @@ reformat_gridded <- function(data_dir) {
fert_df <- lu_df %>%
select(Lon, Lat, "CerealsC3"=wheat_FQ, "OilcropsNFix"=oilcropsNFix_FQ, "OilcropsOther"=oilcropsOther_FQ,
"StarchyRoots"=starchyRoots_FQ, "Pulses"=pulses_FQ, "Maize"=maize_FQ, "Miscanthus"=energycrops_FQ,
- "Rice"=rice_FQ, "FruitVeg"=fruitveg_FQ, "Sugar"=sugar_FQ, "Setaside"=setaside_A, "Pasture"=pasture_FQ)
+ "Rice"=rice_FQ, "FruitVeg"=fruitveg_FQ, "Sugar"=sugar_FQ, "Setaside"=setaside_FQ, "Pasture"=pasture_FQ)
write.table(fert_df, file = file.path(data_dir, "Fert.txt"), quote = F, row.names = F)
irrig_df <- lu_df %>%
select(Lon, Lat, "CerealsC3"=wheat_II, "OilcropsNFix"=oilcropsNFix_II, "OilcropsOther"=oilcropsOther_II,
"StarchyRoots"=starchyRoots_II, "Pulses"=pulses_II, "Maize"=maize_II, "Miscanthus"=energycrops_II,
- "Rice"=rice_II, "FruitVeg"=fruitveg_II, "Sugar"=sugar_II, "Setaside"=setaside_A, "Pasture"=pasture_II)
+ "Rice"=rice_II, "FruitVeg"=fruitveg_II, "Sugar"=sugar_II, "Setaside"=setaside_II, "Pasture"=pasture_II)
write.table(irrig_df, file = file.path(data_dir, "Irrig.txt"), quote = F, row.names = F)
--
GitLab