Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fixing projection and land maskingLocation fix #42

Open
wants to merge 32 commits into
base: main
Choose a base branch
from
Open

fixing projection and land maskingLocation fix #42

wants to merge 32 commits into from

Conversation

prayner
Copy link
Contributor

@prayner prayner commented Aug 6, 2024

Description

The previous code was making some wrong assumptions about the domain projection so various emissions were displaced, especially in smaller domains. These changes fix this and remove some of the intermediate reprojections. Also applies land masking to all fields except fugitives to remove offshore emissions arising from coarse grids

responds to issues #17 #24 and #31

Checklist

Please confirm that this pull request has done the following:

  • Tests added
  • there is now a reprojection test which picks a single raster point and tests it projects to one point and that its location is approximately unchanged
  • Documentation added (where applicable)

Notes

there is still one landuse intermediate projection which we should also remove

prayner added 13 commits July 22, 2024 10:26
@prayner
WIP, cutting out two reprojections and setting origin internally
bc8d8fd 
Responds to #17 and #24
@prayner
Adding lower-left-corner method (llc) to guarantee fixed origin
ccd750f 
responds to #17 #24 and #31
@prayner
propagating new reprojection code throughout omIndustrialStationaryTr…
a89a82a 
…ansportEmis

responds to #17, #24 and #31
@prayner
Merge branch 'main' into location-fix
3e1711b
@prayner
Remove shape-based clipping of nightlights and reprojecting directly …
24f8034 
…from input not intermediate file

responds to #17, #24 and #31
@prayner
adding raster reprojection test
bae1c5a
@prayner
Refactoring reprojection into single routine and propagating through …
a1fd0a5 
…layers

passes reprojection test
@prayner
Moving electricity layer to new reprojection code
6ac3680
@prayner
WIP, converting ag and landuse sectors to new projection code
5501f2d
@prayner
extending new projection code to other layers
a755c13
@prayner
fixing new projection code in fugitives layer
b547399
@prayner
adding optional land masking
37499ee
@prayner
propagating land masking through layers. Turned on except for fugitiv…
63cec95 
…es to account for offshore oil&gas emissions
@prayner prayner requested a review from a team August 6, 2024 06:55
@lewisjared lewisjared self-assigned this Aug 12, 2024
@lewisjared lewisjared mentioned this pull request Aug 13, 2024
Merged
2 tasks
@lewisjared
Copy link
Collaborator

@prayner I've disabled the land masking for stationary, transport and industrial emissions due to discrepancies in the total emissions. We should address this in #44

@lewisjared
Copy link
Collaborator

This is still failing now with waste. I think this needs a bit more investigation

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@lewisjared lewisjared

@prayner prayner

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@prayner @lewisjared