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

Fix to calculation of OUT_PREC for output files when LAKES=TRUE. #310

Closed
wants to merge 3 commits into from
Closed

Fix to calculation of OUT_PREC for output files when LAKES=TRUE. #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36d5bd3
Fix to calculation of OUT_PREC for output files when LAKES=TRUE.
tbohn Nov 17, 2015
34bcfde
Added validation for lake depth-area relationship.
tbohn Nov 17, 2015
3125695
Updated validation of lake depth-area in read_lakeparam.c. This ensu…
tbohn Nov 19, 2015
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
8 changes: 5 additions & 3 deletions src/full_energy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,9 +543,11 @@ int full_energy(int gridcell,
oldsnow = lake_var->snow.swq;
snowprec = gauge_correction[SNOW] * (atmos->prec[NR] - rainonly);
rainprec = gauge_correction[SNOW] * rainonly;
atmos->out_prec += (snowprec + rainprec) * lake_con->Cl[0] * lakefrac;
atmos->out_rain += rainprec * lake_con->Cl[0] * lakefrac;
atmos->out_snow += snowprec * lake_con->Cl[0] * lakefrac;
Cv = veg_con[iveg].Cv;
Cv *= lakefrac;
atmos->out_prec += (snowprec + rainprec) * Cv;
atmos->out_rain += rainprec * Cv;
atmos->out_snow += snowprec * Cv;

ErrorFlag = solve_lake(snowprec, rainprec, atmos->air_temp[NR],
atmos->wind[NR], atmos->vp[NR] / 1000.,
Expand Down
18 changes: 16 additions & 2 deletions src/read_lakeparam.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,13 @@ lake_con_struct read_lakeparam(FILE *lakeparam,
sprintf(tmpstr, "Lake area fraction (%f) for cell (%d) specified in the lake parameter file must be a fraction between 0 and 1.", temp.Cl[0], soil_con.gridcel);
nrerror(tmpstr);
}
if(fabs(1-temp.Cl[0]/veg_con[temp.lake_idx].Cv) > 0.01) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you run this through uncrustify first? The whitespace is inconsistent with what we use in the updated code. See here for info. Use the uncrustify_VIC_c.cfg as the confit file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually hold off on that - since 4.2 has not been reformatted anyway. @jhamman : Should this go on a hit fix branch first or can this go directly into master?

sprintf(tmpstr, "Lake area fraction at top of lake basin (%f) for cell (%d) specified in the lake parameter file must equal the area fraction of the veg tile containing it (%f).", temp.Cl[0], soil_con.gridcel,veg_con[temp.lake_idx].Cv);
nrerror(tmpstr);
}
else {
temp.Cl[0] = veg_con[temp.lake_idx].Cv;
}

fgets(tmpstr, MAXSTRING, lakeparam);

Expand Down Expand Up @@ -204,10 +211,17 @@ lake_con_struct read_lakeparam(FILE *lakeparam,
if(i==0) {
temp.maxdepth = temp.z[i];
tempdz = (temp.maxdepth) / ((float) temp.numnod);
if(fabs(1-temp.Cl[0]/veg_con[temp.lake_idx].Cv) > 0.01) {
sprintf(tmpstr, "Lake area fraction at top of lake basin (%f) for cell (%d) specified in the lake parameter file must equal the area fraction of the veg tile containing it (%f).", temp.Cl[0], soil_con.gridcel,veg_con[temp.lake_idx].Cv);
nrerror(tmpstr);
}
else {
temp.Cl[0] = veg_con[temp.lake_idx].Cv;
}
}

if(temp.Cl[0] < 0.0 || temp.Cl[0] > 1.0) {
sprintf(tmpstr, "Lake area fraction (%f) for cell (%d) specified in the lake parameter file must be a fraction between 0 and 1.", temp.Cl[0], soil_con.gridcel);
if(temp.Cl[i] < 0.0 || temp.Cl[i] > 1.0) {
sprintf(tmpstr, "Lake layer %d area fraction (%f) for cell (%d) specified in the lake parameter file must be a fraction between 0 and 1.", i, temp.Cl[i], soil_con.gridcel);
nrerror(tmpstr);
}
}
Expand Down