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

Feature/refactor cesm put data #710

Merged
merged 20 commits into from Jun 7, 2017

Conversation

Projects
None yet
2 participants
@dgergel
Contributor

dgergel commented Mar 30, 2017

  • closes #709
  • tests passed
  • new tests added
  • science test figures
  • ran uncrustify prior to final commit
  • ReleaseNotes entry

This PR refactors the cesm_put_data routine in the CESM driver so that the same output data is being written to the coupler fields and the history files, barring a few sign convention differences. It also sets the dust l2x fluxes, dry deposition velocity and MEGAN fluxes to 0, as I don't think we should be passing these with fill values to the coupler (previously in RASM we populated unused fields with zeros).

A few remaining to-dos (which we may want to put in a separate PR):

  • updating calculation of aerodynamical resistances
  • updating roughness and wind stresses (which depend on the aerodynamical resistances)

@dgergel dgergel self-assigned this Mar 30, 2017

@dgergel dgergel requested review from bartnijssen and jhamman Mar 30, 2017

@jhamman

This looks pretty good. Please run uncrustify. There are all sorts of formatting issues. Let me know once you've sorted out the final aero-resistance issues and I'll give it a complete/final review.

Show outdated Hide outdated vic/drivers/cesm/src/cesm_put_data.c Outdated
Show outdated Hide outdated vic/drivers/cesm/src/cesm_put_data.c Outdated
Show outdated Hide outdated vic/drivers/cesm/src/cesm_put_data.c Outdated
Show outdated Hide outdated vic/drivers/cesm/src/cesm_put_data.c Outdated
Show outdated Hide outdated vic/drivers/cesm/src/cesm_put_data.c Outdated
Show outdated Hide outdated vic/drivers/cesm/src/cesm_put_data.c Outdated
Show outdated Hide outdated vic/drivers/cesm/src/cesm_put_data.c Outdated
@dgergel

This comment has been minimized.

Show comment
Hide comment
@dgergel

dgergel May 2, 2017

Contributor

@jhamman and @bartnijssen, this is ready for a full review. I'm holding off on making corresponding changes for PR #712 since they'll break the Travis tests, so I'll make those in a quick follow up PR after this and #712 have been merged.

Contributor

dgergel commented May 2, 2017

@jhamman and @bartnijssen, this is ready for a full review. I'm holding off on making corresponding changes for PR #712 since they'll break the Travis tests, so I'll make those in a quick follow up PR after this and #712 have been merged.

@jhamman

This looks nice and clean. 1 small comment. We also should note this change in the change-log.

// adjust sign for CESM sign convention
l2x_vic[i].l2x_Fall_lwup = -1 *
(out_data[i][OUT_LWDOWN][0] -
out_data[i][OUT_LWNET][0]);

This comment has been minimized.

@jhamman

jhamman May 19, 2017

Member

Do we have a longwave up variable in out_data?

@jhamman

jhamman May 19, 2017

Member

Do we have a longwave up variable in out_data?

This comment has been minimized.

@dgergel

dgergel May 19, 2017

Contributor

Nope - we have LWDOWN, LWNET and the band-specific version of LWNET in out_data.

@dgergel

dgergel May 19, 2017

Contributor

Nope - we have LWDOWN, LWNET and the band-specific version of LWNET in out_data.

@dgergel

This comment has been minimized.

Show comment
Hide comment
@dgergel

dgergel May 19, 2017

Contributor

@jhamman thanks. Just added a release notes entry.

Contributor

dgergel commented May 19, 2017

@jhamman thanks. Just added a release notes entry.

@dgergel

This comment has been minimized.

Show comment
Hide comment
@dgergel

dgergel Jun 5, 2017

Contributor

@bartnijssen @jhamman this should be ready to merge.

Contributor

dgergel commented Jun 5, 2017

@bartnijssen @jhamman this should be ready to merge.

@jhamman jhamman merged commit 6728d96 into UW-Hydro:develop Jun 7, 2017

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment