Sync the RUC LSM code with the version in RAPv5/HRRRv4.

Some clean-up in sfc_drv_ruc.F90.
NCAR · Oct 24, 2019 · db9742d · db9742d
1 parent 27eb089
commit db9742d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/physics/module_sf_ruclsm.F90 b/physics/module_sf_ruclsm.F90
@@ -431,8 +431,8 @@ SUBROUTINE LSMRUC(                                           &
 !!    or ~100 mm of snow height
 !
 !           snowc(i,j) = min(1.,snow(i,j)/32.)
-           soilt1(i,j)=soilt(i,j)
-          if(snow(i,j).le.32.) soilt1(i,j)=tso(i,1,j)
+!           soilt1(i,j)=soilt(i,j)
+!          if(snow(i,j).le.32.) soilt1(i,j)=tso(i,1,j)
 !>  - Initializing inside snow temp if it is not defined
         IF((soilt1(i,j) .LT. 170.) .or. (soilt1(i,j) .GT.400.)) THEN
             IF(snow(i,j).gt.32.) THEN
@@ -450,7 +450,9 @@ SUBROUTINE LSMRUC(                                           &
            patmb=P8w(i,kms,j)*1.e-2
            QSG  (i,j) = QSN(SOILT(i,j),TBQ)/PATMB
         IF((qvg(i,j) .LE. 0.) .or. (qvg(i,j) .GT.0.1)) THEN
-           qvg  (i,j) = QSG(i,j)*mavail(i,j)
+           !17sept19 - bad approximation with very low mavail.
+           !qvg(i,j) = QSG(i,j)*mavail(i,j)
+           qvg  (i,j) = qv3d(i,1,j)
           IF (debug_print ) THEN
            print *, &
           'QVG is initialized in RUCLSM ', qvg(i,j),mavail(i,j),qsg(i,j),i,j
@@ -751,7 +753,7 @@ SUBROUTINE LSMRUC(                                           &
          meltfactor = 0.85
 
          do k=2,nzs
-         if(zsmain(k).ge.1.0) then
+         if(zsmain(k).ge.1.1) then
             NROOT=K
             goto  111
          endif

diff --git a/physics/sfc_drv_ruc.F90 b/physics/sfc_drv_ruc.F90
@@ -560,17 +560,15 @@ subroutine lsm_ruc_run                                            & ! inputs
         !prcp(i,j)       = rhoh2o * tprcp(i)                   ! tprcp in [m] - convective plus explicit
         !raincv(i,j)     = rhoh2o * rainc(i)                   ! total time-step convective precip
         !rainncv(i,j)    = rhoh2o * max(rain(i)-rainc(i),0.0)  ! total time-step explicit precip 
-        !graupelncv(i,j) = rhoh2o * graupel(i)
-        !snowncv(i,j)    = rhoh2o * snow(i)
         prcp(i,j)       = rhoh2o * (rainc(i)+rainnc(i))        ! [mm] - convective plus explicit
         raincv(i,j)     = rhoh2o * rainc(i)                    ! [mm] - total time-step convective precip
         rainncv(i,j)    = rhoh2o * rainnc(i)                   ! [mm] - total time-step explicit precip 
         graupelncv(i,j) = rhoh2o * graupel(i)
         snowncv(i,j)    = rhoh2o * snow(i)
-    if(ffrozp(i,j) > 0.) then
-    print *,'prcp(i,j),raincv(i,j),rainncv(i,j),graupelncv(i,j),snowncv(i,j),ffrozp(i,j)',i,j, &
-        prcp(i,j),raincv(i,j),rainncv(i,j),graupelncv(i,j),snowncv(i,j),ffrozp(i,j)
-    endif
+    !if(prcp(i,j) > 0. .and. i==21) then
+    !print *,'prcp(i,j),rainncv(i,j),graupelncv(i,j),snowncv(i,j),ffrozp(i,j)',i,j, &
+    !    prcp(i,j),rainncv(i,j),graupelncv(i,j),snowncv(i,j),ffrozp(i,j)
+    !endif
         ! ice not used
         ! precipfr(i,j)   = rainncv(i,j) * ffrozp(i,j)