Merge pull request #991 from GEOS-ESM/bugfix/rreichle/conversion_of_m…

…inimal_CAPAC_to_RUNOFF Fixed conversion of minimal CAPAC to RUNOFF (catchment.F90)
GEOS-ESM · Sep 13, 2024 · 24de04c · 24de04c
2 parents ef37b0e + 6328342
commit 24de04c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...idComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90 b/...idComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatchCN_GridComp/Shared/catchmentCN.F90
@@ -1248,11 +1248,11 @@ SUBROUTINE CATCHCN (                                           &
 
       DO N=1,NCH
 
-        RUNOFF(N) = RUNSRF(N)+BFLOW(N)
         IF(CAPAC(N).LT.1.E-10) THEN
-           RUNOFF(N) = RUNOFF(N)+CAPAC(N)/DTSTEP
+           RUNSRF(N) = RUNSRF(N)+CAPAC(N)/DTSTEP
            CAPAC(N) = 0.0
            endif
+        RUNOFF(N) = RUNSRF(N)+BFLOW(N)
 
         EINT(N) = EINT(N) * ALHE
         ESOI(N) = ESOI(N) * ALHE

diff --git a/...Sphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90 b/...Sphysics_GridComp/GEOSsurface_GridComp/GEOSland_GridComp/GEOScatch_GridComp/catchment.F90
@@ -1268,11 +1268,11 @@ SUBROUTINE CATCHMENT (                                                   &
 
       DO N=1,NCH
 
-        RUNOFF(N) = RUNSRF(N)+BFLOW(N)
         IF(CAPAC(N).LT.1.E-10) THEN
-           RUNOFF(N) = RUNOFF(N)+CAPAC(N)/DTSTEP
+           RUNSRF(N) = RUNSRF(N)+CAPAC(N)/DTSTEP
            CAPAC(N) = 0.0
            endif
+        RUNOFF(N) = RUNSRF(N)+BFLOW(N)
 
         EINT(N) = EINT(N) * ALHE / DTSTEP
         ESOI(N) = ESOI(N) * ALHE / DTSTEP