Skip to content

Changed warning msg per OWP request #6

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

Merged
Parent: Merge updated warning per OWP to the development branch
merged 1 commit into from
Sep 12, 2025
Merged

Changed warning msg per OWP request #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/cfe.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,12 @@ extern void cfe(
if(flux_from_deep_gw_to_chan_m > gw_reservoir_struct->storage_m) {
flux_from_deep_gw_to_chan_m=gw_reservoir_struct->storage_m;
// TODO: set a flag when flux larger than storage
Log(WARNING, "Groundwater flux larger than storage \n");
// Adding specific warning message requested by OWP (9/11/2025)
Log(WARNING,
"Groundwater flux larger than storage. "
"While this will not cause a run failure, "
"parameter combinations may not be realistic "
"and a mass balance error will occur.\n");
}

massbal_struct->vol_from_gw+=flux_from_deep_gw_to_chan_m;
Expand Down
8 changes: 4 additions & 4 deletions src/conceptual_reservoir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ extern void conceptual_reservoir_flux_calc(struct conceptual_reservoir *da_reser
*primary_flux_m = da_reservoir->coeff_primary * (exp_term - 1.0);
*secondary_flux_m = 0.0;

// cap so flux never exceeds storage
if (*primary_flux_m > da_reservoir->storage_m) {
*primary_flux_m = da_reservoir->storage_m;
}
// cap so flux never exceeds storage, but commented out here per OWP request (9/11/2025)
//if (*primary_flux_m > da_reservoir->storage_m) {
// *primary_flux_m = da_reservoir->storage_m;
//}

return;
}
Expand Down
Loading