New options for IPLC land conservation and minor fixes in SEALS submission#868
Open
pvjeetze wants to merge 9 commits into
Open
New options for IPLC land conservation and minor fixes in SEALS submission#868pvjeetze wants to merge 9 commits into
pvjeetze wants to merge 9 commits into
Conversation
| # * ("LandMark_IPLC_indicative") Indicative Indigenous Peoples’ and Local Community | ||
| # * Lands from LandMark | ||
| # * ("LandMark_IPLC_all) Delineated + indicative Indigenous Peoples’ and Local | ||
| # * Community Lands from LandMark |
Contributor
There was a problem hiding this comment.
Just pointing out for other reviewers (correct me if I'm wrong): only the three LandMark options are new. (It's hard to see due to added alignment spaces for other options here)
| if (!is.null(dependsID)) { | ||
| # check if job is still in SLURM memory using scontrol | ||
| scontrolCheck <- system(paste("scontrol show job", dependsID), | ||
| intern = TRUE, ignore.stderr = TRUE) |
Contributor
There was a problem hiding this comment.
Suggested change
| intern = TRUE, ignore.stderr = TRUE) | |
| intern = TRUE, ignore.stderr = TRUE) |
| submitFile <- file.path(dirProject, "run_submit", paste0("submit_seals_", title, ".sh")) | ||
|
|
||
| # Check job status if dependsID is provided | ||
| useDependency <- inputDataExists <- FALSE |
Contributor
There was a problem hiding this comment.
Suggested change
| useDependency <- inputDataExists <- FALSE | |
| useDependency <- FALSE | |
| inputDataExists <- FALSE |
| } else { | ||
| # Job purged from SLURM memory - check completion status with sacct | ||
| sacctCheck <- system(paste("sacct -j", dependsID, "-o State -n -X"), | ||
| intern = TRUE, ignore.stderr = TRUE) |
Contributor
There was a problem hiding this comment.
Suggested change
| intern = TRUE, ignore.stderr = TRUE) | |
| intern = TRUE, ignore.stderr = TRUE) |
| if (jobState == "COMPLETED") { | ||
| inputDataExists <- TRUE | ||
| } else { | ||
| stop(paste("Initial data preparation run (Job ID:", dependsID, ") did not complete successfully. Status:", jobState)) |
Contributor
There was a problem hiding this comment.
Suggested change
| stop(paste("Initial data preparation run (Job ID:", dependsID, ") did not complete successfully. Status:", jobState)) | |
| stop("Initial data preparation run (Job ID: ", | |
| dependsID, ") did not complete successfully. Status: ", jobState) |
Contributor
There was a problem hiding this comment.
stop already has paste0 built-in
| stop(paste("Initial data preparation run (Job ID:", dependsID, ") did not complete successfully. Status:", jobState)) | ||
| } | ||
| } else { | ||
| stop(paste("Could not find initial data preparation run (Job ID:", dependsID, ") in SLURM history")) |
Contributor
There was a problem hiding this comment.
Suggested change
| stop(paste("Could not find initial data preparation run (Job ID:", dependsID, ") in SLURM history")) | |
| stop("Could not find initial data preparation run (Job ID: ", dependsID, ") in SLURM history") |
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
3 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.
🐦 Description of this PR 🐦
mrlandthat add this to the preprocessing: Added functions to calculate Indigenious People and Local Community (IPLC) land based on LandMark data pik-piam/mrland#68🔧 Checklist for PR creator 🔧
If a point is not applicable, check the checkbox anyway and write "non-applicable" next to the checkbox.
Label pull request from the label list.
Self-review own code
magpie4R library has been updated accordingly and backwards compatible where necessary.scenario_config.csvhas been updated accordingly (important ifdefault.cfghas been updated)Document changes
CHANGELOG.mdgoxygen::goxygen()and verify the modified code is properly documentedPerform test runs
Rscript start.R --> "compilation check"Rscript start.R --> "default"Rscript start.R --> "test runs"Reporting produces no errors and no new warnings
Get two approving reviews (at least one from RSE)
📉 Performance 📈
🚨 Checklist for reviewer 🚨
CHANGELOGis updated correctly