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

Feature/fix remaining coupler fields #734

Merged
merged 7 commits into from
Aug 18, 2017
Merged

Feature/fix remaining coupler fields #734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3cb1f45
fix signs and leave ram1 field empty in accordance with VIC 4 impleme…
dgergel Aug 18, 2017
30cb623
add comment to clarify signs
dgergel Aug 18, 2017
00d99cb
ran uncrustify
dgergel Aug 18, 2017
2da9e57
Revert "ran uncrustify"
dgergel Aug 18, 2017
49c5621
fix accidental deletion
dgergel Aug 18, 2017
c9987a5
ran uncrustify
dgergel Aug 18, 2017
3e34852
add release notes entry
dgergel Aug 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion docs/Development/ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ To check which release of VIC you are running:

[GH#732] (https://github.com/UW-Hydro/VIC/pull/732)

Updates the cesm_put_data.c routine in the CESM driver to include the correct units for sensible heat flux and updates the rofliq calculation to be correct (previously only OUT_BASEFLOW was being divided by global_param.dt).
Updates the cesm_put_data.c routine in the CESM driver to include the correct units for sensible heat flux and updates the rofliq calculation to be correct (previously only OUT_BASEFLOW was being divided by global_param.dt).

[GH#734] (https://github.com/UW-Hydro/VIC/pull/734)

Updates the cesm_put_data.c routine in the CESM driver to include the correct signs for turbulent heat fluxes and evaporation. Previously we had switched the signs to agree with the image driver and they should instead be in accordance with the sign conventions for coupled models, which differ from those of land surface models. Also, eliminate populating the `l2x_Sl_ram1` field with aero_resist to agree with the VIC 4 implementation in RASM.

3. Speed up NetCDF operations in the image/CESM drivers ([GH#684](https://github.com/UW-Hydro/VIC/pull/684))

Expand Down
10 changes: 5 additions & 5 deletions vic/drivers/cesm/src/cesm_put_data.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,16 @@ vic_cesm_put_data()
out_data[i][OUT_LWNET][0]);

// turbulent heat fluxes
// Note: both are the opposite sign from image driver
// in accordance with the sign convention for coupled models
// latent heat, VIC: W/m2, CESM: W/m2
l2x_vic[i].l2x_Fall_lat = out_data[i][OUT_LATENT][0];
l2x_vic[i].l2x_Fall_lat = -1 * out_data[i][OUT_LATENT][0];

// sensible heat, VIC: W/m2, CESM: W/m2
l2x_vic[i].l2x_Fall_sen += out_data[i][OUT_SENSIBLE][0];
l2x_vic[i].l2x_Fall_sen += -1 * out_data[i][OUT_SENSIBLE][0];

// evaporation, VIC: mm, CESM: kg m-2 s-1
l2x_vic[i].l2x_Fall_evap += out_data[i][OUT_EVAP][0] /
l2x_vic[i].l2x_Fall_evap += -1 * out_data[i][OUT_EVAP][0] /
global_param.dt;

// lnd->rtm input fluxes
Expand Down Expand Up @@ -210,8 +212,6 @@ vic_cesm_put_data()
aero_resist = param.HUGE_RESIST;
}

l2x_vic[i].l2x_Sl_ram1 += AreaFactor * aero_resist;

// log z0
// CESM units: m
if (snow.snow) {
Expand Down