Merge pull request #129 from jinyun1tang/jytang/taproots

bug fix for water balance

Author: jinyuntang

f90src/HydroTherm/SnowPhys/SnowBalanceMod.F90

@@ -119,26 +119,6 @@ subroutine SnowMassUpdate(I,J,NY,NX,QWatinfl2Mic,QHeatInfl2Soil)
 !
 ! IF SNOWPACK DISAPPEARS
 
-! intermediate disappearance
-  IF(SoilBulkDensity_vr(NUM_col(NY,NX),NY,NX).LE.ZERO .or. SoilOrgM_vr(ielmc,0,NY,NX)<=1.e-2_r8)THEN
-    VLWatMicP_vr(NUM_col(NY,NX),NY,NX) = VLWatMicP_vr(NUM_col(NY,NX),NY,NX)+QSnoWatXfer2Soil_col(NY,NX)
-    VLiceMicP_vr(NUM_col(NY,NX),NY,NX) = VLiceMicP_vr(NUM_col(NY,NX),NY,NX)+QSnoIceXfer2Soil_col(NY,NX)
-
-    TKSX = TKS_vr(NUM_col(NY,NX),NY,NX)
-    ENGY = VHeatCapacity_vr(NUM_col(NY,NX),NY,NX)*TKSX
-
-    VHeatCapacity_vr(NUM_col(NY,NX),NY,NX) = VHeatCapacitySoilM_vr(NUM_col(NY,NX),NY,NX) &
-      +cpw*(VLWatMicP_vr(NUM_col(NY,NX),NY,NX)+VLWatMacP_vr(NUM_col(NY,NX),NY,NX)) &
-      +cpi*(VLiceMicP_vr(NUM_col(NY,NX),NY,NX)+VLiceMacP_vr(NUM_col(NY,NX),NY,NX))
-
-    IF(VHeatCapacity_vr(NUM_col(NY,NX),NY,NX).GT.ZEROS(NY,NX) .and. abs(QSnoHeatXfer2Soil_col(NY,NX))>ZEROS(NY,NX))THEN
-      TKS_vr(NUM_col(NY,NX),NY,NX) = (ENGY+QSnoHeatXfer2Soil_col(NY,NX))/VHeatCapacity_vr(NUM_col(NY,NX),NY,NX)
-    ELSEIF(VHeatCapacity_vr(NUM_col(NY,NX),NY,NX).LE.ZEROS(NY,NX))then
-      TKS_vr(NUM_col(NY,NX),NY,NX)=TairK_col(NY,NX)
-    ENDIF
-
-  endif
-
   call SnowpackDisapper(I,J,NY,NX,test_exist,QWatinfl2Mic_loc,QHeatInfl2Soil_loc)
 
   if(test_exist)then

f90src/ModelDiags/BalancesMod.F90

@@ -234,7 +234,7 @@ subroutine EndCheckBalances(I,J,NHW,NHE,NVN,NVS)
         -HeatDrain_col(NY,NX)-HeatDischar_col(NY,NX)-HeatCanopy2Dist_col(NY,NX)
 
       if(abs(WaterErr_test)>err_h2o .and. etimer%get_nstep()>1)then
-        if(iVerbLevel==1)then
+        if(iVerbLevel==1 .or. abs(SoilWatErr_test)>err_h2o)then
           write(110,*)('=',ii=1,50)
           write(110,*)I*1000+J,'NY,NX ',NY,NX
           write(110,*)'init H2O         =',WaterErr_col(NY,NX)
@@ -273,7 +273,7 @@ subroutine EndCheckBalances(I,J,NHW,NHE,NVN,NVS)
           write(110,*)'SoilWatErr_test  =',SoilWatErr_test
           write(110,*)'col WaterErr_test=',WaterErr_test
         endif
-        if(abs(SoilWatErr_test)>1.e-4_r8 ) & ! .or. abs(SnowMassErr_test)>1.e-3_r8*SnowMassBeg_col(NY,NX)) &
+        if(abs(SoilWatErr_test)>err_h2o ) & ! .or. abs(SnowMassErr_test)>1.e-3_r8*SnowMassBeg_col(NY,NX)) &
           call endrun('H2O error test failure in '//trim(mod_filename)//' at line',__LINE__)
 
       endif