Fix and align FRA2025 forest-type and LUC-CO2 validation series - #40
Merged
Conversation
The FRA2025 growing-stock source labels the primary/introduced totals with an inconsistent 'gs_total_' prefix (all other categories use 'gs_tot_'), which made the absolute branch leak 'introduced' and render garbled names ('GS Total Primary Forest'). Normalise the prefix, then drop 'introduced' and the broken FRA primary-forest GS (~18 m3/ha area-weighted, too sparsely reported) from both indicators. Total Forest and Natural Forest GS are retained.
After reverting the other-planted->secondary fold, keep FRA's planted forest split as its own categories matching the model forestry pools: rename the plantation series to Planted Forest|+|Timber and other planted forest to Planted Forest|+|Other Planted (was mislabeled NPI_NDC AR).
… RAW Harmonise the LUC-CO2 validation cloud so it can be compared like-for-like with MAgPIE, and remove the orphaned "Land RAW" duplicate series. - readGlobalCarbonBudget: select each GCB component by its row-38 sub-label instead of a fixed column offset. The bookkeeping models do not share a column layout - GCB uniquely carries a peat drainage/fire column - so the old offset silently mis-read GCB's peat as its wood harvest (Timber) and dropped GCB's actual wood harvest. - calcValidGlobalCarbonBudget: document the two comparison axes (peat, indirect/Grassi) in @details; expose Land-use Change also under MAgPIE's peat-excluded memo name (Emissions|CO2|Land|Land-use Change|Excl Peatland) since these bookkeeping sources are ex-peat; drop the Land RAW duplicates. - calcValidEmisLucGasser: ex-peat alias + note that Gasser = OSCAR bookkeeping (ex-peat, direct); drop RAW. - calcValidEmissions, calcValidAnnualCarbonLTS: drop the orphaned Land RAW series. - calcValidEmissionsAFOLU: note that FAO_EmisLUC/EDGAR_LU are inventory sources (incl-peat, embed the managed-land indirect sink), so their like-for-like counterpart is net Emissions|CO2|Land, not the bookkeeping Land-use Change flux.
codeZeilen
approved these changes
Jul 27, 2026
Member
|
Only comment: Maybe this could be 2.70 instead of 2.69.4 as the renaming/removal of variables is quite significant. |
- lucode2::buildLibrary: 2.69.3 -> 2.70.0 minor bump (the variable renames and removals are output-level changes): ValidationKey, CITATION.cff, README, pkgdown CI template refresh - lint fixes on the changed files: native |> pipe in readGlobalCarbonBudget, wrap two long lines in calcValidGS
flohump
force-pushed
the
forest-luc-emissions
branch
from
July 27, 2026 14:02
c7af604 to
f9cc5ef
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
Corrects and harmonises the FRA2025 forest-type and LUC-CO2 validation series so they
overlay MAgPIE like-for-like. Three self-contained commits, plus the version bump.
The
calcValidLandrenames anticipate a forthcoming MAgPIE development in whichother-planted forest becomes its own harvestable forestry pool.
Changes
calcValidGS— drop broken FRA primary GS + fix naming (be88ce8)FRA2025 labels the primary/introduced GS totals with an inconsistent
gs_total_prefix(all others use
gs_tot_); normalise it so the absolute branch stops leakingintroducedand garbling names. Drop the FRA primary-forest GS (~18 m³/haarea-weighted → implausible, too sparsely reported); keep Total and Natural Forest GS.
calcValidLand— planted-forest split to match model pools (0800025)Keep FRA's planted split as its own categories —
Planted Forest|+|TimberandPlanted Forest|+|Other Planted(was mislabeledNatural|+|NPI_NDC AR, a policycategory with no FRA observation).
calcValidGlobalCarbonBudget+readGlobalCarbonBudget— LUC-CO2 scope + GCB read fix (3ef7ddc)readGlobalCarbonBudget: pick each GCB component by its row-38 sub-label, not a fixedcolumn offset. GCB uniquely carries a peat drainage/fire column, so the old offset
mis-read GCB's peat as its wood harvest (Timber) and dropped GCB's real wood harvest.
stop()-guarded.calcValidGlobalCarbonBudget: document the peat and indirect/Grassi comparison axesin
@details; add a peat-excluded alias (…|Land-use Change|Excl Peatland), sincethese bookkeeping sources are ex-peat.
Land RAWduplicate series (calcValidEmisLucGasser,calcValidEmissions,calcValidAnnualCarbonLTS); add the ex-peat alias to Gasser;note in
calcValidEmissionsAFOLUthat FAO/EDGAR inventory series compare to netEmissions|CO2|Land, not the bookkeeping flux.Note
Changes what the validation output contains — renamed forest categories and a few
dropped series — so comparison scripts referring to the old names must be updated.