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.

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

prc: updates to include separate explosive and degassing volcanic emissions for SO2 #261

Merged
merged 3 commits into from
Aug 15, 2024

Conversation

pcolarco
Copy link
Contributor

@pcolarco pcolarco commented Jan 8, 2024

Modification to SU2G_instance_SU.rc to now provide two input files for volcanic SO2 emissions, one for explosive and one for degassing. Moved existing volcanic emissions to one or the other. Updated Fortran code in SU and Process_Library to accommodate this change. Verified zero-diff result for tracer and restart against v11.3.3 release of GEOSgcm. This is not presently zero-diff in volcanic emission diagnostics, as presently they are assigned to whichever of the channels I put the emissions to. This will be corrected when we update the emissions next go round.

@pcolarco pcolarco added the 0 diff The changes in this pull request have verified to be zero-diff with the target branch. label Jan 8, 2024
@pcolarco pcolarco requested a review from a team as a code owner January 8, 2024 20:32
@jrjoshi1
Copy link

@pcolarco Please update PR to develop instead to main, and resolve any conflict that may arise.

@pcolarco
Copy link
Contributor Author

Joshi, can you show me how to do this? I do this so infrequently (this was 8 months ago...) and clearly I don't remember to do it the right way.

@jrjoshi1
Copy link

Joshi, can you show me how to do this? I do this so infrequently (this was 8 months ago...) and clearly I don't remember to do it the right way.

@jrjoshi1 jrjoshi1 closed this Aug 15, 2024
@jrjoshi1
Copy link

Joshi, can you show me how to do this? I do this so infrequently (this was 8 months ago...) and clearly I don't remember to do it the right way.

@pcolarco I am not sure but will keep you updated.

@jrjoshi1 jrjoshi1 reopened this Aug 15, 2024
@mathomp4
Copy link
Member

The first thing to do is go to the top of the PR where there is an "Edit" button. When you click that, under the title bar, you'll see a new dropdown for "base". Change that to develop and click Save and see what happens. You'll probably get an "Update branch" button at the bottom to click.

Once you press that, it might merge in clean, or you might have to fix up some conflicts.

@mathomp4
Copy link
Member

I can work with either of you on this if you like :)

@vbuchard vbuchard changed the base branch from main to develop August 15, 2024 15:09
@vbuchard vbuchard merged commit e407b24 into develop Aug 15, 2024
5 of 11 checks passed
@vbuchard vbuchard deleted the feature/pcolarco/Update_Volcanic_SO2_Emissions branch August 15, 2024 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants