Added primary and secondary other land adjustment to BII disaggregattion

[pvjeetze]

🐦 Purpose of this PR 🐦

• New BII disaggregation with primary and secondary other land specification.
• Also includes changes/rewrite of magpie4::PrimSecdOtherLand

🔧 Checklist for PR creator 🔧

• Labeling pull request correctly from the label list.

• Low risk : Simple bugfixes (missing files, updated documentation, typos) or Start/output scripts
• Medium risk : New realization / Changes to existing realization / Other changes which don't modify default.cfg
• High risk : New input files (if cfg$input is changed in default.cfg) / Modification to core model (eg. changes in equations, calculations, introduction of new sets etc.) / Other changes in default.cfg

• Providing additional information based on PR label

• Low risk : No new model run needed.
• Medium risk : Default run based on the current version of the fork from which PR is made
• High risk
  • Default run from the current develop branch
  • Default run based on the current version of the fork from which PR is made

• 📉 Performance loss/gain from current default behavior 📈

  • Current develop branch default : ** mins
  • This PR's default : ** mins

• Added changes to CHANGELOG.md

• Compilation check (model starts without compilation errors - use gams main.gms action=c in model folder for testing).

• No hard coded numbers and cluster/country/region names.

• The new code doesn't contain declared but unused parameters or variables.

• Where relevant, In-code comments added including documentation comments.

• Made sure that documentation created with goxygen is okay (use goxygen::goxygen() for testing).

• Changes to magpie4 R library for post processing of model output (ideally backward compatible).

• Self-review of my own code.

• In case of updated cellular input tgz file in default.cfg: scenario_config.csv has been updated accordingly (rcp1p9, rcp2p6 etc)

⚠️ Additional notes or warnings ⚠️

NA

🚨 Checklist for RSE reviewer 🚨

• PR is labeled correctly.
• CHANGELOG is updated correctly
• No hard coded numbers and cluster/country/region names.
• No unnecessary increase in module interfaces
• All required updates in interfaces (if any) have been properly adressed in the module contracts
• In-code comments and documentation comments are satisfactory.
• model behavior/performance is satisfactory.
• Requested changes (if any) were applied correctly

🚨 Checklist for MAgPIE reviewer 🚨

• PR is labeled correctly.
• CHANGELOG is updated correctly
• No hard coded numbers and cluster/country/region names.
• Changes to the model are scientifically sound
• In-code comments and documentation comments are satisfactory.
• model behavior/performance is satisfactory.
• Requested changes (if any) were applied correctly

[tscheypidi]

can you check whether the dependency on mrcommons is really needed?

[tscheypidi]

what is madrat and mrcommons being used for here? Output scripts should not use any mr-packages as this would limit their use to machines with a full madrat installation including all relevant sources, which is currently only available on the PIK cluster.

[tscheypidi]

(toolAggregate can be used, but no calc-, read- or download- functions)

[pvjeetze]

This was inherited from the original script. It also e.g. occurs in the LUH disaggregation script. While this is, of course, not a justification, maybe we can fix this in a different PR? It might require some rework of the package structure. In this particular case mrcommons::toolCell2isoCell is used in line 64

[tscheypidi]

ok, we can fix this later as the use of a tool-function (while not optimal) is not that of an issue like the use of a read- or calc- function would be

[flohump]

Looks good

[FelicitasBeier]

Since this is an improvement of the existing BII script, why don't you replace the old script but introduce a new one?
I would suggest to replace the existing one rather than introducing a parallel BII_adjusted.