-
Notifications
You must be signed in to change notification settings - Fork 149
Feature/custom grid litpop #1022
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
Conversation
| reference_year=DEF_REF_YEAR, | ||
| gpw_version=GPW_VERSION, | ||
| data_dir=SYSTEM_DIR, | ||
| target_grid=None |
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 add the docstring for this new variable?
| res_arcsec=15, | ||
| reference_year=DEF_REF_YEAR, | ||
| data_dir=SYSTEM_DIR, | ||
| target_grid=None |
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.
idem, can you please add the docstring?
| reference_year=DEF_REF_YEAR, | ||
| gpw_version=GPW_VERSION, | ||
| data_dir=SYSTEM_DIR, | ||
| target_grid=None |
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.
idem, can you please add the docstring?
| reference_year=DEF_REF_YEAR, | ||
| gpw_version=GPW_VERSION, | ||
| data_dir=SYSTEM_DIR, | ||
| target_grid=None |
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.
idem, can you please add the docstring?
chahank
left a comment
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.
Great addition! I have noted quickly some small elements to improve the code itself. I will do a review of the desired result of the new feature soon. I am currently wondering how the resampling of the original data (black marble and gpw) is done, how this affects the output results, and whether this is clear to the user at the moment.
|
So, the data is regridded using the method |
climada/test/test_litpop_integr.py
Outdated
| # TESTS = unittest.TestLoader().loadTestsFromTestCase(TestLitPopExposure) | ||
| # TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestAdmin1)) | ||
| # unittest.TextTestRunner(verbosity=2).run(TESTS) | ||
|
|
||
| TESTS = unittest.TestLoader().loadTestsFromTestCase(TestLitPopGridAlignment) |
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.
| # TESTS = unittest.TestLoader().loadTestsFromTestCase(TestLitPopExposure) | |
| # TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestAdmin1)) | |
| # unittest.TextTestRunner(verbosity=2).run(TESTS) | |
| TESTS = unittest.TestLoader().loadTestsFromTestCase(TestLitPopGridAlignment) | |
| TESTS = unittest.TestLoader().loadTestsFromTestCase(TestLitPopExposure) | |
| TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestAdmin1)) | |
| TESTS.addTests(unittest.TestLoader().loadTestsFromTestCase(TestLitPopGridAlignment)) |
|
The tests are currently failing due to a too-low test coverage. It means that many of the added lines of code are never tested for. This suggests that additional unit tests are required. Also, there are small linter errors that are easy to correct (trailing white spaces for instance). |
|
I think the test coverage is failing because the main methods to setup litpop are only tested in the integration test. @emanuel-schmid if you confirm, I would merge. |
That may be the reason. It fails if the reference job, which is a particular commit from develop, has a better (lines of code)/(tested lines of code) ratio. That's all. If only this fails, we don't mind. 🤷 |
Changes proposed in this PR:
Added a target_grid option for creating LitPop exposures. If the argument is not provided, the grid is automatically defined based on the population dataset (GPW) or nightlight dataset (NASA Black Marble), depending on the resolution.
Removed outdated test case (test_reproject_input_data_odd_downsample), as it was no longer relevant with the new grid alignment method.
Added a new test (test_target_grid_alignment) to verify that the reprojection correctly aligns with the target grid.
Why this is needed:
PR Author Checklist
develop)PR Reviewer Checklist