Merge pull request ESCOMP#841 from ekluzek/relanswerchangesfor5029

Some answer changes for release branch
HPSCTerrSys · Nov 19, 2019 · 5bc07ac · 5bc07ac
2 parents eb94339 + f7c13c0
commit 5bc07ac
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/biogeophys/SoilMoistureStreamMod.F90 b/src/biogeophys/SoilMoistureStreamMod.F90
@@ -344,9 +344,9 @@ subroutine PrescribedSoilMoistureInterp(bounds, soilstate_inst, &
 
              ! If soil moiture is being interpolated in time and the result is
              ! large that probably means one of the two data points is missing (set to spval)
-             !if ( h2osoi_vol_prs(g,j) > 10.0_r8 .and. (h2osoi_vol_prs(g,j) /= spval) )then
-                !h2osoi_vol_prs(g,j) = spval
-             !end if
+             if ( h2osoi_vol_prs(g,j) > 10.0_r8 .and. (h2osoi_vol_prs(g,j) /= spval) )then
+                h2osoi_vol_prs(g,j) = spval
+             end if
 
          end do
       end do
@@ -358,8 +358,7 @@ subroutine PrescribedSoilMoistureInterp(bounds, soilstate_inst, &
          g = col%gridcell(c)
          ig = g_to_ig(g)
 
-         if (lun%itype(col%landunit(c)) == istsoil ) then
-         !if ( (lun%itype(col%landunit(c)) == istsoil) .or. (lun%itype(col%landunit(c)) == istcrop) ) then
+         if ( (lun%itype(col%landunit(c)) == istsoil) .or. (lun%itype(col%landunit(c)) == istcrop) ) then
             !       this is a 2d field (gridcell/nlevsoi) !
             do j = 1, nlevsoi
 
@@ -375,7 +374,7 @@ subroutine PrescribedSoilMoistureInterp(bounds, soilstate_inst, &
                   ! file is different
                   if ( (h2osoi_vol_prs(g,j) == spval) .and. (h2osoi_vol_initial /= spval) )then
                      if ( soilm_ignore_data_if_missing )then
-                        !cycle
+                        cycle
                      else
                         write(iulog,*) 'Input soil moisture dataset is not vegetated as expected: gridcell=', &
                                         g, ' active = ', col%active(c)