Skip to content

Commit

Permalink
Merge remote-tracking branch 'jmccreight/bug_mass_errors' into bug_ma…
Browse files Browse the repository at this point in the history
…ss_errors
  • Loading branch information
jmccreight committed Sep 22, 2023
2 parents 044949e + e1cdec9 commit d5ae798
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion prms_src/prms5.2.1/prms/snowcomp.f90
Original file line number Diff line number Diff line change
Expand Up @@ -2601,7 +2601,7 @@ SUBROUTINE snowevap(Potet_sublim, Potet, Snowcov_area, Snow_evap, &
! heat deficit
! JLM mass balance fix, if we take pkwater_equiv - ez below
! JLM we need to take ez from both pk_ice and freeh2o here
freeh2o = freeh2o - pk_ice
freeh2o = freeh2o + pk_ice
Pk_ice = 0.0
Pk_def = 0.0
Pk_temp = 0.0
Expand Down
4 changes: 2 additions & 2 deletions pywatershed/hydrology/prms_runoff.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
from ..base.control import Control
from ..constants import (
HruType,
epsilon32,
epsilon64,
nan,
numba_num_threads,
zero,
epsilon32,
epsilon64,
)
from ..parameters import Parameters

Expand Down

0 comments on commit d5ae798

Please sign in to comment.