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

Changed a solver for a soil moisture reservoir to prevent over-extraction of water by primary fluxes #66

Closed
wants to merge 6 commits into from
Closed

Changed a solver for a soil moisture reservoir to prevent over-extraction of water by primary fluxes #66

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c0a813a
debugged. '_m' were missing on primary&secondaryflux
RY4GIT Apr 12, 2022
ef03a5e
debugged. '_m' was missing in primary&secondary fluxes
RY4GIT Apr 12, 2022
9fe18c9
an additioanl fix on secondary_flux
RY4GIT Apr 12, 2022
4579f27
an additioal fix on secondary_flux
RY4GIT Apr 12, 2022
d25cc5f
Added ODE solver for the soil reservoir calculation
RY4GIT Sep 21, 2022
e9923cd
Fixed the water balance
RY4GIT Sep 23, 2022
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
33 changes: 24 additions & 9 deletions bmi_cfe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,16 @@ def initialize(self, current_time_step=0):
self.primary_flux = 0 # temporary vars.
self.secondary_flux = 0 # temporary vars.
self.total_discharge = 0
self.diff_infilt = 0
self.diff_perc = 0

# ________________________________________________
# Evapotranspiration
self.potential_et_m_per_timestep = 0
self.actual_et_m_per_timestep = 0
self.reduced_potential_et_m_per_timestep = 0
self.actual_et_from_rain_m_per_timestep = 0
self.actual_et_from_soil_m_per_timestep = 0

# ________________________________________________________
# Set these values now that we have the information from the configuration file.
Expand Down Expand Up @@ -283,9 +288,13 @@ def reset_volume_tracking(self):
self.vol_soil_to_lat_flow = 0
self.vol_soil_to_gw = 0
self.vol_soil_end = 0
self.vol_et_to_atm = 0
self.vol_et_from_soil = 0
self.vol_et_from_rain = 0
self.volin = 0
self.volout = 0
self.volend = 0
self.vol_PET = 0
return

#________________________________________________________
Expand Down Expand Up @@ -351,38 +360,45 @@ def finalize_mass_balance(self, verbose=True):
self.vol_soil_end = self.soil_reservoir['storage_m']

self.global_residual = self.volstart + self.volin - self.volout - self.volend -self.vol_end_giuh
self.schaake_residual = self.volin - self.vol_sch_runoff - self.vol_sch_infilt
self.schaake_residual = self.volin - self.vol_et_from_rain - self.vol_sch_runoff - self.vol_sch_infilt
self.giuh_residual = self.vol_sch_runoff - self.vol_out_giuh - self.vol_end_giuh
self.soil_residual = self.vol_soil_start + self.vol_sch_infilt - \
self.vol_soil_to_lat_flow - self.vol_soil_end - self.vol_to_gw
self.soil_residual = self.vol_soil_start - self.vol_soil_end + self.vol_sch_infilt - \
self.vol_soil_to_lat_flow - self.vol_soil_to_gw - self.vol_et_from_soil
self.nash_residual = self.vol_in_nash - self.vol_out_nash - self.vol_in_nash_end
self.gw_residual = self.vol_in_gw_start + self.vol_to_gw - self.vol_from_gw - self.vol_in_gw_end
if verbose:

if verbose:
print("\nGLOBAL MASS BALANCE")
print(" initial volume: {:8.4f}".format(self.volstart))
print(" volume input: {:8.4f}".format(self.volin))
print(" volume output: {:8.4f}".format(self.volout))
print(" final volume: {:8.4f}".format(self.volend))
print(" residual: {:6.4e}".format(self.global_residual))

print("\n AET & PET")
print(" volume PET: {:8.4f}".format(self.vol_PET))
print(" volume AET: {:8.4f}".format(self.vol_et_to_atm))

print("\nSCHAAKE MASS BALANCE")
print(" volume input: {:8.4f}".format(self.volin))
print("ET from rainfall: {:8.4f}".format(self.vol_et_from_rain))
print(" surface runoff: {:8.4f}".format(self.vol_sch_runoff))
print(" infiltration: {:8.4f}".format(self.vol_sch_infilt))
print("schaake residual: {:6.4e}".format(self.schaake_residual))
print("schaake residual: {:6.4e}".format(self.schaake_residual))

print("\nGIUH MASS BALANCE");
print("\nGIUH MASS BALANCE")
print(" vol. into giuh: {:8.4f}".format(self.vol_sch_runoff))
print(" vol. out giuh: {:8.4f}".format(self.vol_out_giuh))
print(" vol. end giuh q: {:8.4f}".format(self.vol_end_giuh))
print(" giuh residual: {:6.4e}".format(self.giuh_residual))

print("\nSOIL WATER CONCEPTUAL RESERVOIR MASS BALANCE")
print(" init soil vol: {:8.4f}".format(self.vol_soil_start))
print(" init soil vol: {:8.4f}".format(self.vol_soil_start))
print(" vol. into soil: {:8.4f}".format(self.vol_sch_infilt))
print("vol.soil2latflow: {:8.4f}".format(self.vol_soil_to_lat_flow))
print(" vol. soil to gw: {:8.4f}".format(self.vol_soil_to_gw))
print(" final vol. soil: {:8.4f}".format(self.vol_soil_end))
print(" vol. soil to ET: {:8.4f}".format(self.vol_et_from_soil))
print(" final vol. soil: {:8.4f}".format(self.vol_soil_end))
print("vol. soil resid.: {:6.4e}".format(self.soil_residual))


Expand All @@ -399,7 +415,6 @@ def finalize_mass_balance(self, verbose=True):
print(" vol from gw: {:8.4f}".format(self.vol_from_gw))
print("final gw.storage: {:8.4f}".format(self.vol_in_gw_end))
print(" gw. residual: {:6.4e}".format(self.gw_residual))


return

Expand Down
Loading