ComDef: fix land cover

bc3LC · Nov 27, 2024 · 11667d3 · 11667d3
1 parent 72c8be0
commit 11667d3
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 56 deletions.
diff --git a/R/functions.R b/R/functions.R
@@ -2056,14 +2056,15 @@ get_land <- function(GCAM_version = "v7.1") {
 
   land_clean <-
     rgcam::getQuery(prj, "land allocation by crop and water source") %>%
-    dplyr::filter(grepl('^[a-z]',crop)) %>%
     left_join_strict(get(paste('land_use_map',GCAM_version,sep='_'), envir = asNamespace("gcamreport")),
                      by = c("crop","water"), mapping = paste('land_use_map',GCAM_version,sep='_'), multiple = "all", relationship = "many-to-many") %>%
     dplyr::filter(var != 'NoReported', !is.na(var)) %>%
+    # thous km2 to million ha
     dplyr::mutate(value = value * unit_conv) %>%
     dplyr::group_by(scenario, region, year, var) %>%
     dplyr::summarise(value = sum(value, na.rm = T)) %>%
-    dplyr::ungroup()
+    dplyr::ungroup() %>%
+    dplyr::select(dplyr::all_of(gcamreport::long_columns))
 
   land_clean <<- land_clean
 }

diff --git a/data/convert_v7.0.rda b/data/convert_v7.0.rda
diff --git a/data/convert_v7.1.rda b/data/convert_v7.1.rda
diff --git a/data/convert_v7.2.rda b/data/convert_v7.2.rda
diff --git a/data/land_use_map_v7.0.rda b/data/land_use_map_v7.0.rda
diff --git a/data/land_use_map_v7.1.rda b/data/land_use_map_v7.1.rda
diff --git a/data/land_use_map_v7.2.rda b/data/land_use_map_v7.2.rda
diff --git a/inst/extdata/mappings/GCAM7.0/land_use_map.csv b/inst/extdata/mappings/GCAM7.0/land_use_map.csv
@@ -14,8 +14,8 @@ Fruits,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cov
 Fruits,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 FruitsTree,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 FruitsTree,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
-Grassland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-Hardwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
+Grassland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+Hardwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
 Legumes,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 Legumes,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 MiscCrop,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
@@ -32,35 +32,35 @@ OilCropTree,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Lan
 OilCropTree,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Oil Crops,Land Cover|Cropland|Oil Crops|Rainfed,,,,0.1
 OilPalmTree,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Oil Crops,Land Cover|Cropland|Oil Crops|Irrigated,,,,0.1
 OilPalmTree,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Oil Crops,Land Cover|Cropland|Oil Crops|Rainfed,,,,0.1
-OtherArableLand,,Land Cover,Land Cover|Other Natural,,,,,,,0.1
+OtherArableLand,NA,Land Cover,Land Cover|Other Natural,,,,,,,0.1
 OtherGrain,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1
 OtherGrain,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Rainfed,,,,0.1
 OtherGrainC4,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1
 OtherGrainC4,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Rainfed,,,,0.1
-Pasture,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedGrassland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedShrubland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedUnmanagedHardwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
-ProtectedUnmanagedPasture,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedUnmanagedSoftwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
+Pasture,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedGrassland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedShrubland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedUnmanagedHardwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
+ProtectedUnmanagedPasture,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedUnmanagedSoftwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
 Rice,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1
 Rice,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Rainfed,,,,0.1
-RockIceDesert,,Land Cover,Land Cover|Other Natural,,,,,,,0.1
+RockIceDesert,NA,Land Cover,Land Cover|Other Natural,,,,,,,0.1
 RootTuber,IRR,Land Cover,Land Cover|Other Natural,,,,,,,0.1
 RootTuber,RFD,Land Cover,Land Cover|Other Natural,,,,,,,0.1
-Shrubland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-Softwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
+Shrubland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+Softwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
 Soybean,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 Soybean,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 SugarCrop,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Irrigated,,,,0.1
 SugarCrop,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Rainfed,,,,0.1
 SugarCropC4,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Irrigated,,,,0.1
 SugarCropC4,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Rainfed,,,,0.1
-Tundra,,Land Cover,Land Cover|Other Natural,,,,,,,0.1
-UnmanagedHardwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
-UnmanagedPasture,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-UnmanagedSoftwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
-UrbanLand,,Land Cover,Land Cover|Built-Up Area,,,,,,,0.1
+Tundra,NA,Land Cover,Land Cover|Other Natural,,,,,,,0.1
+UnmanagedHardwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
+UnmanagedPasture,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+UnmanagedSoftwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
+UrbanLand,NA,Land Cover,Land Cover|Built-Up Area,,,,,,,0.1
 Vegetables,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 Vegetables,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 Wheat,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1

diff --git a/inst/extdata/mappings/GCAM7.1/land_use_map.csv b/inst/extdata/mappings/GCAM7.1/land_use_map.csv
@@ -14,8 +14,8 @@ Fruits,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cov
 Fruits,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 FruitsTree,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 FruitsTree,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
-Grassland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-Hardwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
+Grassland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+Hardwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
 Legumes,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 Legumes,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 MiscCrop,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
@@ -32,35 +32,35 @@ OilCropTree,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Lan
 OilCropTree,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Oil Crops,Land Cover|Cropland|Oil Crops|Rainfed,,,,0.1
 OilPalmTree,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Oil Crops,Land Cover|Cropland|Oil Crops|Irrigated,,,,0.1
 OilPalmTree,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Oil Crops,Land Cover|Cropland|Oil Crops|Rainfed,,,,0.1
-OtherArableLand,,Land Cover,Land Cover|Other Natural,,,,,,,0.1
+OtherArableLand,NA,Land Cover,Land Cover|Other Natural,,,,,,,0.1
 OtherGrain,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1
 OtherGrain,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Rainfed,,,,0.1
 OtherGrainC4,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1
 OtherGrainC4,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Rainfed,,,,0.1
-Pasture,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedGrassland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedShrubland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedUnmanagedHardwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
-ProtectedUnmanagedPasture,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedUnmanagedSoftwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
+Pasture,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedGrassland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedShrubland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedUnmanagedHardwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
+ProtectedUnmanagedPasture,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedUnmanagedSoftwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
 Rice,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1
 Rice,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Rainfed,,,,0.1
-RockIceDesert,,Land Cover,Land Cover|Other Natural,,,,,,,0.1
+RockIceDesert,NA,Land Cover,Land Cover|Other Natural,,,,,,,0.1
 RootTuber,IRR,Land Cover,Land Cover|Other Natural,,,,,,,0.1
 RootTuber,RFD,Land Cover,Land Cover|Other Natural,,,,,,,0.1
-Shrubland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-Softwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
+Shrubland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+Softwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
 Soybean,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 Soybean,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 SugarCrop,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Irrigated,,,,0.1
 SugarCrop,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Rainfed,,,,0.1
 SugarCropC4,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Irrigated,,,,0.1
 SugarCropC4,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Rainfed,,,,0.1
-Tundra,,Land Cover,Land Cover|Other Natural,,,,,,,0.1
-UnmanagedHardwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
-UnmanagedPasture,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-UnmanagedSoftwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
-UrbanLand,,Land Cover,Land Cover|Built-Up Area,,,,,,,0.1
+Tundra,NA,Land Cover,Land Cover|Other Natural,,,,,,,0.1
+UnmanagedHardwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
+UnmanagedPasture,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+UnmanagedSoftwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
+UrbanLand,NA,Land Cover,Land Cover|Built-Up Area,,,,,,,0.1
 Vegetables,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 Vegetables,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 Wheat,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1

diff --git a/inst/extdata/mappings/GCAM7.2/land_use_map.csv b/inst/extdata/mappings/GCAM7.2/land_use_map.csv
@@ -14,8 +14,8 @@ Fruits,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cov
 Fruits,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 FruitsTree,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 FruitsTree,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
-Grassland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-Hardwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
+Grassland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+Hardwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
 Legumes,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 Legumes,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 MiscCrop,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
@@ -32,35 +32,35 @@ OilCropTree,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Lan
 OilCropTree,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Oil Crops,Land Cover|Cropland|Oil Crops|Rainfed,,,,0.1
 OilPalmTree,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Oil Crops,Land Cover|Cropland|Oil Crops|Irrigated,,,,0.1
 OilPalmTree,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Oil Crops,Land Cover|Cropland|Oil Crops|Rainfed,,,,0.1
-OtherArableLand,,Land Cover,Land Cover|Other Natural,,,,,,,0.1
+OtherArableLand,NA,Land Cover,Land Cover|Other Natural,,,,,,,0.1
 OtherGrain,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1
 OtherGrain,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Rainfed,,,,0.1
 OtherGrainC4,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1
 OtherGrainC4,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Rainfed,,,,0.1
-Pasture,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedGrassland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedShrubland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedUnmanagedHardwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
-ProtectedUnmanagedPasture,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-ProtectedUnmanagedSoftwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
+Pasture,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedGrassland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedShrubland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedUnmanagedHardwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
+ProtectedUnmanagedPasture,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+ProtectedUnmanagedSoftwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
 Rice,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1
 Rice,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Rainfed,,,,0.1
-RockIceDesert,,Land Cover,Land Cover|Other Natural,,,,,,,0.1
+RockIceDesert,NA,Land Cover,Land Cover|Other Natural,,,,,,,0.1
 RootTuber,IRR,Land Cover,Land Cover|Other Natural,,,,,,,0.1
 RootTuber,RFD,Land Cover,Land Cover|Other Natural,,,,,,,0.1
-Shrubland,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-Softwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
+Shrubland,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+Softwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
 Soybean,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 Soybean,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 SugarCrop,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Irrigated,,,,0.1
 SugarCrop,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Rainfed,,,,0.1
 SugarCropC4,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Irrigated,,,,0.1
 SugarCropC4,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Sugar Crops,Land Cover|Cropland|Sugar Crops|Rainfed,,,,0.1
-Tundra,,Land Cover,Land Cover|Other Natural,,,,,,,0.1
-UnmanagedHardwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
-UnmanagedPasture,,Land Cover,Land Cover|Pasture,,,,,,,0.1
-UnmanagedSoftwood_Forest,,Land Cover,Land Cover|Forest,,,,,,,0.1
-UrbanLand,,Land Cover,Land Cover|Built-Up Area,,,,,,,0.1
+Tundra,NA,Land Cover,Land Cover|Other Natural,,,,,,,0.1
+UnmanagedHardwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
+UnmanagedPasture,NA,Land Cover,Land Cover|Pasture,,,,,,,0.1
+UnmanagedSoftwood_Forest,NA,Land Cover,Land Cover|Forest,,,,,,,0.1
+UrbanLand,NA,Land Cover,Land Cover|Built-Up Area,,,,,,,0.1
 Vegetables,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Irrigated,,,,0.1
 Vegetables,RFD,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Rainfed,Land Cover|Cropland|Other Crops,Land Cover|Cropland|Other Crops|Rainfed,,,,0.1
 Wheat,IRR,Land Cover,Land Cover|Cropland,Land Cover|Cropland|Irrigated,Land Cover|Cropland|Cereals,Land Cover|Cropland|Cereals|Irrigated,,,,0.1

diff --git a/inst/extdata/saveDataFiles_GCAM7.0.R b/inst/extdata/saveDataFiles_GCAM7.0.R
@@ -308,6 +308,8 @@ convert_v7.0 <- list(
   aglu.BIO_ENERGY_CONTENT_GJT = 17.5,
   # 1Mt = 1e3kg
   kg_to_Mt = 1e3,
+  # land units
+  km2_to_ha = 100,
   # ghg * CO2_equivalent gives CO2 units
   CO2_equivalent = 3.666667
 )

diff --git a/inst/extdata/saveDataFiles_GCAM7.1.R b/inst/extdata/saveDataFiles_GCAM7.1.R
@@ -308,6 +308,8 @@ convert_v7.1 <- list(
   aglu.BIO_ENERGY_CONTENT_GJT = 17.5,
   # 1Mt = 1e3kg
   kg_to_Mt = 1e3,
+  # land units
+  km2_to_ha = 100,
   # ghg * CO2_equivalent gives CO2 units
   CO2_equivalent = 3.666667
 )

diff --git a/inst/extdata/saveDataFiles_GCAM7.2.R b/inst/extdata/saveDataFiles_GCAM7.2.R
@@ -308,6 +308,8 @@ convert_v7.2 <- list(
   aglu.BIO_ENERGY_CONTENT_GJT = 17.5,
   # 1Mt = 1e3kg
   kg_to_Mt = 1e3,
+  # land units
+  km2_to_ha = 100,
   # ghg * CO2_equivalent gives CO2 units
   CO2_equivalent = 3.666667
 )

diff --git a/man/convert_v7.0.Rd b/man/convert_v7.0.Rd
diff --git a/man/convert_v7.1.Rd b/man/convert_v7.1.Rd
diff --git a/man/convert_v7.2.Rd b/man/convert_v7.2.Rd