-
Notifications
You must be signed in to change notification settings - Fork 169
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
labour productivity module + new sticky factor cost realization + bugfixes #332
Conversation
…e into f_labourprod
…e into f_labourprod
…e into f_labourprod # Conflicts: # CHANGELOG.md
…e into f_labourprod
…e into f_labourprod
…e into f_labourprod # Conflicts: # modules/14_yields/managementcalib_aug19/preloop.gms
…e into f_labourprod
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please check whether it could be sufficient to only copy one of the avl_land files to the output folder as duplication of these large files leads to serious memory consumption
@@ -1385,6 +1420,7 @@ cfg$files2export <- list() | |||
# Files that should be copied before MAgPIE is started | |||
cfg$files2export$start <- c("input/info.txt", | |||
"modules/10_land/input/avl_land_t_0.5.mz", | |||
"input/avl_land_full_t_0.5.mz", |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is it necessary to copy both avl_land files to the output folders? I guess both are quite similar and big. If possible, reduce it to one file
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see your point. But this file is needed for scripts/output/extra/disaggregation_LUH2.R. I think we should switch soon to using avl_land_full_t
in MAgPIE. The only difference is that pasture is split into rangeland and pasture, and that other land is split into primary and secondary other land. As soon as we switch, only avl_land_full_t
will be needed. In this concrete case, the file is 5 MB, which is small compared to other files we copy by default such as f50_AtmosphericDepositionRates_0.5.mz : 32 MB
. Anyways, I could imagine a more space-efficent approch for files needed in post-processing. Instead of copying these files into each output folder, these files could be copied once to scripts/output/data/[name_of_celluar_input]
. E.g. scripts/output/data/rev4.64_h12_477f2095_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-4b917a03
. The output scripts know which celluar input was used (cfg object) and can take the needed data from the respective folder in scripts/output/data/
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so, if avl_land_full_t_0.5.mz
is just a more detailed version of avl_land_t_0.5.mz
, why does the latter still have to be copied to the output folder?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because both disaggregation.R
and disaggregation_LUH2.R
use avl_land_t_0.5.mz
. In disaggregation_LUH2.R
, avl_land_full_t_0.5.mz
is just used in an additional step.
As an alternative to exporting avl_land_full_t_0.5.mz
by default, I can include the export of avl_land_full_t_0.5.mz
just in my start script.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
my comments in demand module and factor cost module seem to have been considered.
My review only concerns labout productivity module and demand bugfixes. They seem alright!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good
🐦 Purpose of this PR 🐦
Added
Fixed
Removed
Changed
🔧 Checklist for PR creator 🔧
CHANGELOG.md
gams main.gms action=c
in model folder for testing).goxygen
is okay (usegoxygen::goxygen()
for testing).magpie4
R library for post processing of model output (ideally backward compatible).NA
🚨 Checklist for RSE reviewer 🚨
CHANGELOG
is updated correctly🚨 Checklist for MAgPIE reviewer 🚨
CHANGELOG
is updated correctly