diff --git a/VERSION b/VERSION
index 5219a0df7..82f3d338c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-10.0.8
+10.0.9
diff --git a/parm/fv3lam.xml b/parm/fv3lam.xml
index 4537c8fb2..2e78a58a5 100755
--- a/parm/fv3lam.xml
+++ b/parm/fv3lam.xml
@@ -1598,14 +1598,6 @@
         <scale>5.0</scale>
        </param>
 
-       <param>
-       <shortname>TMP_ON_SIGMA_LVL_HPC</shortname>
-       <pname>TMP</pname>
-       <scale_fact_fixed_sfc1>4</scale_fact_fixed_sfc1>
-       <level>9000. 8500. 8000. 7500. 7000.</level>
-        <scale>-4.0</scale>
-       </param>
-
        <param>
        <shortname>PBLREG_ON_SURFACE</shortname>
        <pname>PBLREG</pname>
diff --git a/parm/postxconfig-NT-fv3lam.txt b/parm/postxconfig-NT-fv3lam.txt
index dc4a08b94..0e0401d86 100644
--- a/parm/postxconfig-NT-fv3lam.txt
+++ b/parm/postxconfig-NT-fv3lam.txt
@@ -1,6 +1,6 @@
 2
 219
-259
+258
 PRSLEV
 32769
 ncep_nco
@@ -8416,43 +8416,6 @@ entire_atmos_single_lyr
 ?
 ?
 ?
-296
-TMP_ON_SIGMA_LVL_HPC
-?
-1
-tmpl4_0
-TMP
-?
-?
-sigma_lvl
-1
-4
-5
-9000. 8500. 8000. 7500. 7000.
-?
-0
-?
-0
-?
-?
-?
-0
-0.0
-0
-0.0
-?
-0
-0.0
-0
-0.0
-1
--4.0
-0
-0
-0
-?
-?
-?
 344
 PBLREG_ON_SURFACE
 ?
diff --git a/sorc/ncep_post.fd/ALLOCATE_ALL.f b/sorc/ncep_post.fd/ALLOCATE_ALL.f
index f615db747..593851af4 100644
--- a/sorc/ncep_post.fd/ALLOCATE_ALL.f
+++ b/sorc/ncep_post.fd/ALLOCATE_ALL.f
@@ -46,7 +46,7 @@ SUBROUTINE ALLOCATE_ALL()
       integer ierr,jsx,jex
       integer i,j,l,k
 ! Allocate arrays
-      allocate(u(im,jsta_2l:jend_2u,lm))
+      allocate(u(im+1,jsta_2l:jend_2u,lm))
       allocate(v(im,jsta_2l:jvend_2u,lm))
       allocate(t(im,jsta_2l:jend_2u,lm))
 ! CHUANG ADD POTENTIAL TEMP BECAUSE WRF OUTPUT THETA
@@ -79,9 +79,23 @@ SUBROUTINE ALLOCATE_ALL()
 !$omp parallel do private(i,j,l)
       do l=1,lm
         do j=jsta_2l,jend_2u
-          do i=1,im
+          do i=1,im+1
             u(i,j,l)=0.
+          enddo
+        enddo
+      enddo
+!$omp parallel do private(i,j,l)
+      do l=1,lm
+        do j=jsta_2l,jvend_2u
+          do i=1,im
             v(i,j,l)=0.
+          enddo
+        enddo
+      enddo
+!$omp parallel do private(i,j,l)
+      do l=1,lm
+        do j=jsta_2l,jend_2u
+          do i=1,im
             t(i,j,l)=spval
             q(i,j,l)=spval
             uh(i,j,l)=spval
@@ -810,14 +824,14 @@ SUBROUTINE ALLOCATE_ALL()
           cldfra(i,j)=spval
           cprate(i,j)=spval
           cnvcfr(i,j)=spval
-          ivgtyp(i,j)=spval
-          isltyp(i,j)=spval
+          ivgtyp(i,j)=0
+          isltyp(i,j)=0
           hbotd(i,j)=spval
           htopd(i,j)=spval
           hbots(i,j)=spval
           htops(i,j)=spval
           cldefi(i,j)=spval
-          islope(i,j)=spval
+          islope(i,j)=0
           si(i,j)=spval
           lspa(i,j)=spval
           rswinc(i,j)=spval
diff --git a/sorc/ncep_post.fd/BNDLYR.f b/sorc/ncep_post.fd/BNDLYR.f
index f78c2f08b..0ec21e25d 100644
--- a/sorc/ncep_post.fd/BNDLYR.f
+++ b/sorc/ncep_post.fd/BNDLYR.f
@@ -31,7 +31,7 @@
 !!   00-01-04  JIM TUCCILLO - MPI VERSION 
 !!   02-01-15  MIKE BALDWIN - WRF VERSION
 !!   20-11-10  JESSE MENG   - USE UPP_PHYSICS MODULE
-!!   21-04-01  JESSE MENG   - COMPUTATION ON DEFINED POINTS ONLY
+!!   21-08-20  Wen Meng     - Retrict computation fro undefined points.
 !!     
 !!     USAGE:    CALL BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,
 !!                            WBND,OMGBND,PWTBND,QCNVBND)
@@ -208,6 +208,18 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
                 END IF 
                 QSBND(I,J,LBND) = QSBND(I,J,LBND) + QSAT*DP
               ENDIF
+              ELSE  !undeined grids
+                PBND(I,J,LBND)=SPVAL
+                TBND(I,J,LBND)=SPVAL
+                UBND(I,J,LBND)=SPVAL
+                VBND(I,J,LBND)=SPVAL
+                WBND(I,J,LBND)=SPVAL
+                OMGBND(I,J,LBND)=SPVAL
+                QCNVBND(I,J,LBND)=SPVAL
+                PWTBND(I,J,LBND)=SPVAL
+                QBND(I,J,LBND)=SPVAL
+                QSBND(I,J,LBND)=SPVAL
+                RHBND(I,J,LBND)=SPVAL
               ENDIF
             ENDDO
           ENDDO
@@ -273,9 +285,7 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
       DO LBND=1,NBND
         DO J=JSTA,JEND
           DO I=1,IM
-            IF(PSUM(I,J,LBND)/=0.)THEN
-            IF(T(I,J,LBND)<spval.and.Q(I,J,LBND)<spval.and.&
-               UH(I,J,LBND)<spval.and.VH(I,J,LBND)<spval) THEN
+            IF(PSUM(I,J,LBND)/=0..AND.TBND(I,J,LBND)<SPVAL)THEN
               RPSUM           = 1./PSUM(I,J,LBND)
               LVLBND(I,J,LBND)= LVLBND(I,J,LBND)/NSUM(I,J,LBND)
               PBND(I,J,LBND)  = (PBINT(I,J,LBND)+PBINT(I,J,LBND+1))*0.5
@@ -288,18 +298,8 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
                VBND(I,J,LBND)  = VBND(I,J,LBND)*RPSUM
               END IF 
               WBND(I,J,LBND)     = WBND(I,J,LBND)*RPSUM
+              IF(QCNVBND(I,J,LBND)<SPVAL) &
               QCNVBND(I,J,LBND)  = QCNVBND(I,J,LBND)*RPSUM
-            ELSE
-              LVLBND(I,J,LBND)= spval
-              PBND(I,J,LBND)  = spval
-              TBND(I,J,LBND)  = spval
-              QBND(I,J,LBND)  = spval
-              OMGBND(I,J,LBND)= spval
-              UBND(I,J,LBND)  = spval
-              VBND(I,J,LBND)  = spval
-              WBND(I,J,LBND)  = spval
-              QCNVBND(I,J,LBND)= spval
-            ENDIF
             ENDIF
           ENDDO
         ENDDO
@@ -308,14 +308,9 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
           DO J=JSTA_M,JEND_M
             DO I=2,IM-1
               IF(PVSUM(I,J,LBND)/=0.)THEN
-              IF(UBND(I,J,LBND)<spval.and.VBND(I,J,LBND)<spval.and.PVSUM(I,J,LBND)<spval)THEN
                 RPVSUM         = 1./PVSUM(I,J,LBND)
                 UBND(I,J,LBND) = UBND(I,J,LBND)*RPVSUM
                 VBND(I,J,LBND) = VBND(I,J,LBND)*RPVSUM
-              ELSE
-                UBND(I,J,LBND) = spval
-                VBND(I,J,LBND) = spval
-              ENDIF
               ENDIF
             ENDDO
           ENDDO
@@ -331,7 +326,7 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
       DO LBND=1,NBND
         DO J=JSTA,JEND
           DO I=1,IM
-            IF(PSUM(I,J,LBND)==0.)THEN
+            IF(PSUM(I,J,LBND)==0..AND.PBND(I,J,LBND)<SPVAL)THEN
               L    = LM
               PMIN = 9999999.
               PBND(I,J,LBND) = (PBINT(I,J,LBND)+PBINT(I,J,LBND+1))*0.5
@@ -355,7 +350,6 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
                 VBND(I,J,LBND) = VH(I,J,L)
               END IF 
               WBND(I,J,LBND)    = WH(I,J,L)
-            IF(T(I,J,LBND)<spval.and.Q(I,J,LBND)<spval)THEN
               QCNVBND(I,J,LBND) = QCNVG(I,J,L)
               IF(MODELNAME == 'GFS' .OR. MODELNAME == 'FV3R')THEN
                 ES   = FPVSNEW(T(I,J,L))
@@ -367,17 +361,11 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
               QSBND(I,J,LBND)  = QSAT
               OMGBND(I,J,LBND) = OMGA(I,J,L)
               PWTBND(I,J,LBND) = (Q(I,J,L)+CWM(I,J,L))*DP*GI
-            ELSE
-              QCNVBND(I,J,LBND)= spval
-              QSBND(I,J,LBND)  = spval
-              OMGBND(I,J,LBND) = spval
-              PWTBND(I,J,LBND) = spval
-            ENDIF
             ENDIF
 !
 !   RH, BOUNDS CHECK
 !
-          IF(T(I,J,LBND)<spval.and.Q(I,J,LBND)<spval)THEN            
+            IF(QSBND(I,J,LBND)/=0..AND.QBND(I,J,LBND)<SPVAL)THEN
             RHBND(I,J,LBND) = QBND(I,J,LBND)/QSBND(I,J,LBND)
             IF (RHBND(I,J,LBND)>1.0) THEN
               RHBND(I,J,LBND) = 1.0
@@ -387,10 +375,7 @@ SUBROUTINE BNDLYR(PBND,TBND,QBND,RHBND,UBND,VBND,       &
               RHBND(I,J,LBND) = 0.01
               QBND(I,J,LBND)  = RHBND(I,J,LBND)*QSBND(I,J,LBND)
             ENDIF
-          ELSE
-              RHBND(I,J,LBND) = spval
-              QBND(I,J,LBND)  = spval
-          ENDIF
+            ENDIF
           ENDDO
         ENDDO
 !
diff --git a/sorc/ncep_post.fd/CALDWP.f b/sorc/ncep_post.fd/CALDWP.f
index 9d7d62068..aa2405e05 100644
--- a/sorc/ncep_post.fd/CALDWP.f
+++ b/sorc/ncep_post.fd/CALDWP.f
@@ -12,6 +12,7 @@
 !!                            AMBIENT TEMPERATURE.
 !!   98-06-08  T BLACK      - CONVERSION FROM 1-D TO 2-D
 !!   00-01-04  JIM TUCCILLO - MPI VERSION                
+!!   21-07-23  Wen Meng     - Retrict computation from undefined points
 !!     
 !! USAGE:    CALL CALDWP(P1D,Q1D,TDWP,T1D)
 !!   INPUT ARGUMENT LIST:
@@ -42,7 +43,7 @@ SUBROUTINE CALDWP(P1D,Q1D,TDWP,T1D)
 !
 !     SET PARAMETERS.
      use params_mod, only: eps, oneps, d001, h1m12
-     use ctlblk_mod, only: jsta, jend, im
+     use ctlblk_mod, only: jsta, jend, im, spval
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       implicit none
 !     
@@ -62,8 +63,12 @@ SUBROUTINE CALDWP(P1D,Q1D,TDWP,T1D)
 !$omp parallel do private(i,j)
       DO J=JSTA,JEND
         DO I=1,IM
+          IF(P1D(I,j)<spval .and. Q1D(I,J)<spval) THEN
           EVP(I,J) = P1D(I,J)*Q1D(I,J)/(EPS+ONEPS*Q1D(I,J))
           EVP(I,J) = MAX(H1M12,EVP(I,J)*D001)
+          ELSE
+          EVP(I,J) = spval
+          ENDIF
         ENDDO
       ENDDO
 !     
diff --git a/sorc/ncep_post.fd/CALLCL.f b/sorc/ncep_post.fd/CALLCL.f
index 1f65cf9bb..4b029b758 100644
--- a/sorc/ncep_post.fd/CALLCL.f
+++ b/sorc/ncep_post.fd/CALLCL.f
@@ -19,6 +19,7 @@
 !!   00-01-04  JIM TUCCILLO - MPI VERSION            
 !!   02-04-24  MIKE BALDWIN - WRF VERSION            
 !!   19-10-30  Bo CUI - REMOVE "GOTO" STATEMENT
+!!   21-07-28  W Meng - Restriction compuatation from undefined grids
 !!     
 !! USAGE:    CALL CALLCL(P1D,T1D,Q1D,PLCL,ZLCL)
 !!   INPUT ARGUMENT LIST:
@@ -88,6 +89,7 @@ SUBROUTINE CALLCL(P1D,T1D,Q1D,PLCL,ZLCL)
       DO 30 J=JSTA_M,JEND_M
       DO 30 I=2,IM-1
 !     DO 30 I=1,IM
+      IF(P1D(I,J)<spval.and.Q1D(I,J)<spval)THEN
       EVP       = P1D(I,J)*Q1D(I,J)/(EPS+ONEPS*Q1D(I,J))
       RMX       = EPS*EVP/(P1D(I,J)-EVP)
       RKAPA     = 1.0 / (D2845*(1.0-D28*RMX))
@@ -107,6 +109,7 @@ SUBROUTINE CALLCL(P1D,T1D,Q1D,PLCL,ZLCL)
         EXIT
       ENDIF
  20   CONTINUE
+      ENDIF
  30   CONTINUE
 !     
 !     END OF ROUTINE.
diff --git a/sorc/ncep_post.fd/CALMCVG.f b/sorc/ncep_post.fd/CALMCVG.f
index 9edfcdc13..488fe8033 100644
--- a/sorc/ncep_post.fd/CALMCVG.f
+++ b/sorc/ncep_post.fd/CALMCVG.f
@@ -81,7 +81,11 @@ SUBROUTINE CALMCVG(Q1D,U1D,V1D,QCNVG)
 !$omp  parallel do private(i,j)
       DO J=JSTA_2L,JEND_2U
         DO I=1,IM
+          IF(U1D(I,J)<SPVAL)THEN
           QCNVG(I,J) = 0.
+          ELSE
+          QCNVG(I,J) = SPVAL
+          ENDIF
           UWND(I,J)  = U1D(I,J)
           VWND(I,J)  = V1D(I,J)
           IF (UWND(I,J) == SPVAL) UWND(I,J) = D00
@@ -97,7 +101,8 @@ SUBROUTINE CALMCVG(Q1D,U1D,V1D,QCNVG)
        DO J=JSTA_M,JEND_M
          DO I=2,IM-1
            IF(Q1D(I,J+1)<SPVAL.AND.Q1D(I,J-1)<SPVAL.AND.          &
-              Q1D(I+1,J)<SPVAL.AND.Q1D(I-1,J)<SPVAL) THEN
+              Q1D(I+1,J)<SPVAL.AND.Q1D(I-1,J)<SPVAL.AND. &
+              Q1D(I,J)<SPVAL) THEN
              R2DX   = 1./(2.*DX(I,J))   !MEB DX?
              R2DY   = 1./(2.*DY(I,J))   !MEB DY?  
              QUDX   = (Q1D(I+1,J)*UWND(I+1,J)-Q1D(I-1,J)*UWND(I-1,J))*R2DX
@@ -141,7 +146,8 @@ SUBROUTINE CALMCVG(Q1D,U1D,V1D,QCNVG)
          IEND = IM-1-MOD(J,2)
          DO I=2,IEND
           IF(QV(I+IHE(J),J)<SPVAL.AND.UWND(I+IHE(J),J)<SPVAL.AND.&
-             QV(I+IHW(J),J)<SPVAL.AND.UWND(I+IHW(J),J)<SPVAL) THEN
+             QV(I+IHW(J),J)<SPVAL.AND.UWND(I+IHW(J),J)<SPVAL.AND.&
+             QV(I,J)<SPVAL.AND.QV(I,J-1)<SPVAL.AND.QV(I,J+1)<SPVAL) THEN
            R2DX   = 1./(2.*DX(I,J))
            R2DY   = 1./(2.*DY(I,J))
            QUDX   = (QV(I+IHE(J),J)*UWND(I+IHE(J),J)                   &
diff --git a/sorc/ncep_post.fd/CALTAU.f b/sorc/ncep_post.fd/CALTAU.f
index e90a1394b..79bae45d3 100644
--- a/sorc/ncep_post.fd/CALTAU.f
+++ b/sorc/ncep_post.fd/CALTAU.f
@@ -17,6 +17,7 @@
 !!   02-01-15  MIKE BALDWIN - WRF VERSION, OUTPUT IS ON MASS-POINTS
 !!   05-02-23  H CHUANG - COMPUTE STRESS FOR NMM ON WIND POINTS
 !!   05-07-07  BINBIN ZHOU - ADD RSM STRESS for A GRID     
+!!   21-07-26  W Meng - Restrict computation from undefined grids
 !! USAGE:    CALL CALTAU(TAUX,TAUY)
 !!   INPUT ARGUMENT LIST:
 !!     NONE     
@@ -99,6 +100,8 @@ SUBROUTINE CALTAU(TAUX,TAUY)
        DO I=1,IM
 !
         LMHK = NINT(LMH(I,J))
+        IF(EL(I,J,LMHK-1)<spval.and.Z0(I,J)<spval.and. &
+           UZ0(I,J)<spval.and.VZ0(I,J)<spval)THEN
 !
 !       COMPUTE THICKNESS OF LAYER AT MASS POINT.
 !
@@ -128,6 +131,10 @@ SUBROUTINE CALTAU(TAUX,TAUY)
         ELSQR     = EL(I,J,LMHK-1)*EL(I,J,LMHK-1)
         TAUX(I,J) = RHO*ELSQR*DELUDZ*DELUDZ
         TAUY(I,J) = RHO*ELSQR*DELVDZ*DELVDZ
+        ELSE
+        TAUX(I,J) = spval
+        TAUY(I,J) = spval
+        ENDIF
 
 !
        END DO
diff --git a/sorc/ncep_post.fd/CALTHTE.f b/sorc/ncep_post.fd/CALTHTE.f
index 2d619c5b2..c59cd08dd 100644
--- a/sorc/ncep_post.fd/CALTHTE.f
+++ b/sorc/ncep_post.fd/CALTHTE.f
@@ -12,6 +12,7 @@
 !!   93-06-18  RUSS TREADON
 !!   98-06-16  T BLACK - CONVERSION FROM 1-D TO 2-D
 !!   00-01-04  JIM TUCCILLO - MPI VERSION
+!!   21-07-28  W Meng - Restrict computation from undefined grids
 !!     
 !! USAGE:    CALL CALTHTE(P1D,T1D,Q1D,THTE)
 !!   INPUT ARGUMENT LIST:
@@ -40,7 +41,7 @@ SUBROUTINE CALTHTE(P1D,T1D,Q1D,THTE)
 !
 !     
       use params_mod, only: d00, eps, oneps, d01, h1m12, p1000, h1
-      use ctlblk_mod, only: jsta, jend, im
+      use ctlblk_mod, only: jsta, jend, im, spval
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       implicit none
 !
@@ -77,6 +78,7 @@ SUBROUTINE CALTHTE(P1D,T1D,Q1D,THTE)
 !$omp parallel do private(i,j,p,t,q,evp,rmx,ckapa,rkapa,arg,denom,tlcl,plcl,fac,eterm,thetae)
       DO J=JSTA,JEND
         DO I=1,IM
+          IF(P1D(I,J)<spval.and.T1D(I,J)<spval.and.Q1D(I,J)<spval)THEN
           P        = P1D(I,J)
           T        = T1D(I,J)
           Q        = Q1D(I,J)
@@ -92,6 +94,7 @@ SUBROUTINE CALTHTE(P1D,T1D,Q1D,THTE)
           ETERM    = (D3376/TLCL-D00254)*(RMX*KG2G*(H1+D81*RMX))
           THETAE   = T*FAC*EXP(ETERM)
           THTE(I,J)= THETAE
+          ENDIF
         ENDDO
       ENDDO
 !     
diff --git a/sorc/ncep_post.fd/CALVIS_GSD.f b/sorc/ncep_post.fd/CALVIS_GSD.f
index d67ed6547..ecd5d36b4 100644
--- a/sorc/ncep_post.fd/CALVIS_GSD.f
+++ b/sorc/ncep_post.fd/CALVIS_GSD.f
@@ -89,6 +89,7 @@ SUBROUTINE CALVIS_GSD(CZEN,VIS)
 !                              (not related to water vapor or RH at this point)
 !   2021-05        Wen Meng        Unify CONST1 and VISRH. 
 !   2021-05        Wen Meng  - Add checking for undefined points invloved in computation
+!   2021-08        Wen Meng  - Restrict divided by 0.
 !                           
 !------------------------------------------------------------------
 !
@@ -223,16 +224,19 @@ SUBROUTINE CALVIS_GSD(CZEN,VIS)
             if(QQG(I,J,ll)<spval)qgraupel  = max(qgraupel, QQG(I,J,ll) )
 ! - compute relative humidity
         Tx=T(I,J,LL)-273.15
+        RHB(I,J,LL)=0.
         POL = 0.99999683       + TX*(-0.90826951E-02 +    &
            TX*(0.78736169E-04   + TX*(-0.61117958E-06 +   &
            TX*(0.43884187E-08   + TX*(-0.29883885E-10 +   &
            TX*(0.21874425E-12   + TX*(-0.17892321E-14 +   &
            TX*(0.11112018E-16   + TX*(-0.30994571E-19)))))))))
+        if(abs(POL) > 0.) THEN
         esx = 6.1078/POL**8
 
           ES = esx
           E = PMID(I,J,LL)/100.*Q(I,J,LL)/(0.62197+Q(I,J,LL)*0.37803)
           RHB(I,J,LL) = 100.*AMIN1(1.,E/ES)
+       ENDIF
 
           enddo
 
diff --git a/sorc/ncep_post.fd/CALWXT.f b/sorc/ncep_post.fd/CALWXT.f
index 2afc51bca..a50a6065c 100644
--- a/sorc/ncep_post.fd/CALWXT.f
+++ b/sorc/ncep_post.fd/CALWXT.f
@@ -9,6 +9,7 @@ SUBROUTINE CALWXT_POST(T,Q,PMID,PINT,HTM,LMH,PREC,ZINT,IWX,ZWET)
 !     02-01-15  MIKE BALDWIN - WRF VERSION
 !     05-07-07  BINBIN ZHOU  - ADD PREC FOR RSM
 !     19-10-30  Bo CUI - REMOVE "GOTO" STATEMENT
+!     21-07-26  Wen Meng - Restrict computation from undefined grids
 !                              
 !
 !     ROUTINE TO COMPUTE PRECIPITATION TYPE USING A DECISION TREE
@@ -130,12 +131,14 @@ SUBROUTINE CALWXT_POST(T,Q,PMID,PINT,HTM,LMH,PREC,ZINT,IWX,ZWET)
 !       AND 500 MB
 !
       IF (PKL<50000.0.OR.PKL>PSFCK-7000.0) CYCLE    
+      IF(QKL<spval)THEN
       A=ALOG(QKL*PKL/(610.78*(0.378*QKL+0.622)))
       TDKL=(237.3*A)/(17.269-A)+273.15
       TDPRE=TKL-TDKL
       IF (TDPRE<TDCHK.AND.TKL<TCOLD(I,J)) TCOLD(I,J)=TKL
       IF (TDPRE<TDCHK.AND.TKL>TWARM(I,J)) TWARM(I,J)=TKL
       IF (TDPRE<TDCHK.AND.L<LICEE(I,J)) LICEE(I,J)=L
+      ENDIF
   775 CONTINUE
 !
 !    IF NO SAT LAYER AT DEW POINT DEP=TDCHK, INCREASE TDCHK
diff --git a/sorc/ncep_post.fd/CALWXT_REVISED.f b/sorc/ncep_post.fd/CALWXT_REVISED.f
index 5f72611d6..c19134def 100644
--- a/sorc/ncep_post.fd/CALWXT_REVISED.f
+++ b/sorc/ncep_post.fd/CALWXT_REVISED.f
@@ -27,7 +27,7 @@ SUBROUTINE CALWXT_REVISED_POST(T,Q,PMID,PINT,HTM,LMH,PREC,ZINT,IWX)
 !
      use params_mod, only: h1m12, d00, d608, h1, rog
      use ctlblk_mod, only: jsta, jend, modelname, pthresh, im, jsta_2l, jend_2u, lm,&
-              lp1
+              lp1, spval
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       implicit none
 !
@@ -121,12 +121,14 @@ SUBROUTINE CALWXT_REVISED_POST(T,Q,PMID,PINT,HTM,LMH,PREC,ZINT,IWX)
 !       AND 500 MB
 !
       IF (PKL<50000.0.OR.PKL>PSFCK-7000.0) cycle   
+      IF(QKL<spval)THEN
       A=ALOG(QKL*PKL/(610.78*(0.378*QKL+0.622)))
       TDKL=(237.3*A)/(17.269-A)+273.15
       TDPRE=TKL-TDKL
       IF (TDPRE<TDCHK.AND.TKL<TCOLD(I,J)) TCOLD(I,J)=TKL
       IF (TDPRE<TDCHK.AND.TKL>TWARM(I,J)) TWARM(I,J)=TKL
       IF (TDPRE<TDCHK.AND.L<LICEE(I,J)) LICEE(I,J)=L
+      ENDIF
   775 CONTINUE
 !
 !    IF NO SAT LAYER AT DEW POINT DEP=TDCHK, INCREASE TDCHK
diff --git a/sorc/ncep_post.fd/CLDRAD.f b/sorc/ncep_post.fd/CLDRAD.f
index b76625746..d8c1eb143 100644
--- a/sorc/ncep_post.fd/CLDRAD.f
+++ b/sorc/ncep_post.fd/CLDRAD.f
@@ -2732,10 +2732,13 @@ SUBROUTINE CLDRAD
 !		  qqi(i,j,k)=qqw(i,j,k) ! because GFS only uses cloud water
 !		  qqw(i,j,k)=0.
 !		 end if 
+                 if(pint(i,j,k)<spval.and.qqw(i,j,k)<spval.and. &
+                  qqi(i,j,k)<spval.and.qqs(i,j,k)<spval)then
                  dp=pint(i,j,k+1)-pint(i,j,k)
                  opdepth=opdepth+( CU_ir(k) + abscoef*qqw(i,j,k)+            &
 !bsf - end
      &                   abscoefi*( qqi(i,j,k)+qqs(i,j,k) ) )*dp
+                 endif
                  if (opdepth > 1.) exit
                enddo
                if (opdepth > 1.) num_thick=num_thick+1   ! for debug
diff --git a/sorc/ncep_post.fd/CLMAX.f b/sorc/ncep_post.fd/CLMAX.f
index 1a87ba4b2..dcc72512b 100644
--- a/sorc/ncep_post.fd/CLMAX.f
+++ b/sorc/ncep_post.fd/CLMAX.f
@@ -7,6 +7,7 @@ SUBROUTINE CLMAX(EL0,SQZ,SQ,RQ2L,RQ2H)
 !     EXTRACTED FROM EXISTING CODE BY L. LOBOCKI, JULY 28, 1992
 !   01-10-22  H CHUANG - MODIFIED TO PROCESS HYBRID MODEL OUTPUT
 !   02-06-19  MIKE BALDWIN - WRF VERSION
+!   21-07-26  W Meng - Restrict computation from undefined grids
 !
 !     INPUT:
 !     ------
@@ -41,7 +42,7 @@ SUBROUTINE CLMAX(EL0,SQZ,SQ,RQ2L,RQ2H)
 !      use vrbls2d, only:
       use masks, only: lmh, sm
       use params_mod, only: EPSQ2
-      use ctlblk_mod, only: jsta, jend, lm, im
+      use ctlblk_mod, only: jsta, jend, lm, im, spval
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       implicit none
 !
@@ -121,9 +122,13 @@ SUBROUTINE CLMAX(EL0,SQZ,SQ,RQ2L,RQ2H)
 !$omp  parallel do
       DO J=JSTA,JEND
         DO I=1,IM
+          IF(HGT(I,J)<spval)THEN
           EL0(I,J)= MAX(MIN(                                           &
      &       ((SM(I,J)*ALPHAS+(1.0-SM(I,J))*ALPHAL)*SQZ(I,J)           &
      &       /(SQ(I,J)+EPSQ2)),EL0M),ELMIN)
+          ELSE
+          EL0(I,J)= spval
+          ENDIF
         ENDDO
       ENDDO
 !
diff --git a/sorc/ncep_post.fd/DEWPOINT.f b/sorc/ncep_post.fd/DEWPOINT.f
index 676f81438..e310dd778 100644
--- a/sorc/ncep_post.fd/DEWPOINT.f
+++ b/sorc/ncep_post.fd/DEWPOINT.f
@@ -36,6 +36,7 @@
 !!                         TABLE.
 !! -  98-06-12  T BLACK   - CONVERSION FROM 1-D TO 2-D
 !! -  00-01-04  JIM TUCCILLO - MPI VERSION
+!! -  21-07-26  W Meng  - Restrict computation from undefined grids
 !!
 !! USAGE:  CALL DEWPOINT( VP, TD)
 !!   INPUT ARGUMENT LIST:
@@ -46,7 +47,7 @@
 !!
       SUBROUTINE DEWPOINT( VP, TD)
 
-       use ctlblk_mod, only: jsta, jend, im
+       use ctlblk_mod, only: jsta, jend, im, spval
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       implicit none
 !
@@ -132,10 +133,14 @@ SUBROUTINE DEWPOINT( VP, TD)
 !$omp parallel do private(i,j,w1,w2,jnt)
       DO J=JSTA,JEND
         DO I=1,IM
+          IF(VP(I,J)<spval)THEN
           W1  = MIN(MAX((A*VP(I,J)+B),1.0),DNTM1)
           W2  = AINT(W1)
           JNT = INT(W2)
           TD(I,J) = TDP(JNT) + (W1-W2)*(TDP(JNT+1)-TDP(JNT))
+          ELSE
+          TD(I,J) = spval
+          ENDIF
         ENDDO
       ENDDO
 !
diff --git a/sorc/ncep_post.fd/FRZLVL2.f b/sorc/ncep_post.fd/FRZLVL2.f
index ff1d3ccd7..a8f934ea7 100644
--- a/sorc/ncep_post.fd/FRZLVL2.f
+++ b/sorc/ncep_post.fd/FRZLVL2.f
@@ -37,6 +37,7 @@
 !!   10-08-27  T. Smirnova  - added PFRZL to the output
 !!   16-01-21  C. Alexander - Generalized function for any isotherm
 !!   20-11-10  JESSE MENG   - USE UPP_PHYSICS MODULE
+!!   21-07-28  W. Meng      - Restrict compuatation from undefined grids
 !!
 !! USAGE:    CALL FRZLVL2(ISOTHERM,ZFRZ,RHFRZ,PFRZL)
 !!   INPUT ARGUMENT LIST:
@@ -95,6 +96,7 @@ SUBROUTINE FRZLVL2(ISOTHERM,ZFRZ,RHFRZ,PFRZL)
 
       DO 20 J=JSTA,JEND
       DO 20 I=1,IM
+         IF(FIS(I,J)<spval)THEN
          HTSFC    = FIS(I,J)*GI
          LLMH     = NINT(LMH(I,J))
          RHFRZ(I,J) = D00
@@ -238,6 +240,10 @@ SUBROUTINE FRZLVL2(ISOTHERM,ZFRZ,RHFRZ,PFRZL)
                RHFRZ(I,J) = AMAX1(0.01,RHFRZ(I,J))
                RHFRZ(I,J) = AMIN1(RHFRZ(I,J),1.00)
                ZFRZ(I,J)  = AMAX1(0.0,ZFRZ(I,J))
+         ELSE
+               RHFRZ(I,J) = spval
+               ZFRZ(I,J)  = spval
+         ENDIF
  20   CONTINUE
 !     
 !     END OF ROUTINE.
diff --git a/sorc/ncep_post.fd/MDL2AGL.f b/sorc/ncep_post.fd/MDL2AGL.f
index 8847fc148..b1f5254fa 100644
--- a/sorc/ncep_post.fd/MDL2AGL.f
+++ b/sorc/ncep_post.fd/MDL2AGL.f
@@ -15,6 +15,7 @@
 !!   20-03-25  J MENG - remove grib1 
 !!   21-03-11  B Cui - change local arrays to dimension (im,jsta:jend)
 !!   21-04-01  J MENG - computation on defined points only
+!!   21-07-26  W Meng - Restrict computation from undefined grids
 !!     
 !! USAGE:    CALL MDL2P
 !!   INPUT ARGUMENT LIST:
@@ -204,6 +205,7 @@ SUBROUTINE MDL2AGL
 !HC          IF(NL1X(I,J)<=LM)THEN
              LLMH = NINT(LMH(I,J))
              IF(NL1X(I,J)<=LLMH)THEN
+               IF(ZMID(I,J,LL)<spval.and.ZMID(I,J,LL-1)<spval)THEN
 !
 !---------------------------------------------------------------------
 !          INTERPOLATE LINEARLY IN LOG(P)
@@ -212,6 +214,7 @@ SUBROUTINE MDL2AGL
 !***  EXTRAPOLATE BELOW LOWEST MODEL MIDLAYER (BUT STILL ABOVE GROUND)
 !---------------------------------------------------------------------
 !
+               
 !              FACT=(ALSL(LP)-ALOG(PMID(I,J,LL)))/
 !     &             (ALOG(PMID(I,J,LL))-ALOG(PMID(I,J,LL-1)))
                ZDUM=ZAGL(LP)+ZINT(I,J,NINT(LMH(I,J))+1)
@@ -249,6 +252,7 @@ SUBROUTINE MDL2AGL
 	       DBZR1(I,J) = MAX(DBZR1(I,J),DBZmin)
 	       DBZI1(I,J) = MAX(DBZI1(I,J),DBZmin)
 	       DBZC1(I,J) = MAX(DBZC1(I,J),DBZmin)
+             ENDIF !end ZMID(I,J,LL)<spval 
 !
 ! FOR UNDERGROUND AGL LEVELS, ASSUME TEMPERATURE TO CHANGE 
 ! ADIABATICLY, RH TO BE THE SAME AS THE AVERAGE OF THE 2ND AND 3RD
diff --git a/sorc/ncep_post.fd/MDL2SIGMA2.f b/sorc/ncep_post.fd/MDL2SIGMA2.f
index aea8c2e4b..1efa8da73 100644
--- a/sorc/ncep_post.fd/MDL2SIGMA2.f
+++ b/sorc/ncep_post.fd/MDL2SIGMA2.f
@@ -19,6 +19,7 @@
 !!   04-11-24  H CHUANG - ADD FERRIER'S HYDROMETEOR FIELD
 !!   20-03-25  J MENG   - remove grib1
 !!   21-03-11  B Cui - change local arrays to dimension (im,jsta:jend)
+!!   21-07-26  W Meng - Restrict compuatation from undefined grids
 !!  
 !! USAGE:    CALL MDL2P
 !!   INPUT ARGUMENT LIST:
@@ -185,7 +186,8 @@ SUBROUTINE MDL2SIGMA2
               LLMH = NINT(LMH(I,J))
               PSIGO=PTSIGO+ASIGO(LP)*(PINT(I,J,LLMH+1)-PTSIGO) 
               APSIGO=LOG(PSIGO)
-              IF(NL1X(I,J)<=LLMH)THEN
+              IF(NL1X(I,J)<=LLMH.and. &
+               (PMID(I,J,LL)-PMID(I,J,LL-1))/=0.)THEN
 !
 !---------------------------------------------------------------------
 !          INTERPOLATE LINEARLY IN LOG(P)
diff --git a/sorc/ncep_post.fd/MDLFLD.f b/sorc/ncep_post.fd/MDLFLD.f
index fba6eb383..b86e9131a 100644
--- a/sorc/ncep_post.fd/MDLFLD.f
+++ b/sorc/ncep_post.fd/MDLFLD.f
@@ -3275,7 +3275,7 @@ SUBROUTINE MDLFLD
 
 	 DO J=JSTA,JEND
 	 DO I=1,IM
-	  IF(abs(vis(i,j))>24135.1)print*,'bad visbility'     &
+	  IF(vis(i,j)/=spval.and.abs(vis(i,j))>24135.1)print*,'bad visbility'     &
        , i,j,Q1D(i,j),QW1(i,j),QR1(i,j),QI1(i,j)                 &
        , QS1(i,j),T1D(i,j),P1D(i,j),vis(i,j)
 
@@ -3706,10 +3706,10 @@ SUBROUTINE MDLFLD
 
 ! EGRID1 is transport wind speed
                      ! prevent floating overflow if either component is undefined
-                     IF (EGRID1(I,J)==SPVAL .or. EGRID2(I,J)==SPVAL) THEN
-                       EGRID3(I,J) = SPVAL
-                     ELSe
+                     IF (EGRID1(I,J)<SPVAL .and. EGRID2(I,J)<SPVAL) THEN
                        EGRID3(I,J) = sqrt((EGRID1(I,J)*EGRID1(I,J)+EGRID2(I,J)*EGRID2(I,J)))
+                     ELSe
+                       EGRID3(I,J) = SPVAL
                      END IF
 
 !         if (mod(I,20) == 0 .and. mod(J,20) == 0) then
diff --git a/sorc/ncep_post.fd/MIXLEN.f b/sorc/ncep_post.fd/MIXLEN.f
index 513cf6901..33c02dd7e 100644
--- a/sorc/ncep_post.fd/MIXLEN.f
+++ b/sorc/ncep_post.fd/MIXLEN.f
@@ -42,7 +42,7 @@ SUBROUTINE MIXLEN(EL0,EL)
       use masks, only: lmh, htm
       use params_mod, only: EPSQ2, CAPA
       use ctlblk_mod, only: jsta, jend, jsta_m, jend_m, im, jm, jsta_2l, jend_2u,&
-              lm, lm1
+              lm, lm1, spval
 
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        implicit none
@@ -84,9 +84,13 @@ SUBROUTINE MIXLEN(EL0,EL)
       DO L=1,LM
         DO J=JSTA,JEND
           DO I=1,IM
+            IF(HGT(I,J)<spval)THEN
             ZL        = 0.5*(ZINT(I,J,L)+ZINT(I,J,L+1))
             VKRMZ     = (ZL-HGT(I,J))*VKRM
             EL(I,J,L) = EL0(I,J)*VKRMZ/(EL0(I,J)+VKRMZ)
+            ELSE
+            EL(I,J,L) = spval
+            ENDIF
           ENDDO
         ENDDO
       ENDDO
@@ -97,7 +101,11 @@ SUBROUTINE MIXLEN(EL0,EL)
 !$omp  parallel do private(i,j)
         DO J=JSTA,JEND
           DO I=1,IM
+            IF(HGT(I,J)<spval)THEN
             EL(I,J,L) = 0.5*(EL(I,J,L)+EL(I,J,L+1))*HTM(I,J,L+1)
+            ELSE
+            EL(I,J,L) = spval
+            ENDIF
           ENDDO
         ENDDO
       ENDDO
@@ -105,7 +113,11 @@ SUBROUTINE MIXLEN(EL0,EL)
 !$omp  parallel do private(i,j)
       DO J=JSTA,JEND
         DO I=1,IM
+          IF(HGT(I,J)<spval)THEN
           EL(I,J,LM) = 0.0
+          ELSE
+          EL(I,J,LM) = spval
+          ENDIF
         ENDDO
       ENDDO
 !---STABILITY, PBL TOP, AND VERTICAL GRID DISTANCE RESTRICTIONS:--------
@@ -124,6 +136,7 @@ SUBROUTINE MIXLEN(EL0,EL)
 !$omp  parallel do private(i,j,elst,elvgd,ensq,q2kl,ziag)
         DO J=JSTA_M,JEND_M
           DO I=2,IM-1
+            IF(T(I,J,L)<spval)THEN
             APE(I,J,2) = (1.E5/PMID(I,J,L+1))**CAPA
             ENSQ = HTM(I,J,L+1)*                                     &
                    FRG*(T(I,J,L)*APE(I,J,1)-T(I,J,L+1)*APE(I,J,2))/  &
@@ -142,6 +155,9 @@ SUBROUTINE MIXLEN(EL0,EL)
               EL(I,J,L) = AMIN1(ELST,ELVGD,VKRM*ZIAG)
             ENDIF
             APE(I,J,1) = APE(I,J,2)
+            ELSE
+            EL(I,J,L) = spval
+            ENDIF
           ENDDO
         ENDDO
       ENDDO
diff --git a/sorc/ncep_post.fd/SLP_new.f b/sorc/ncep_post.fd/SLP_new.f
index 0ad9fc847..7815e81aa 100644
--- a/sorc/ncep_post.fd/SLP_new.f
+++ b/sorc/ncep_post.fd/SLP_new.f
@@ -26,6 +26,7 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
 !                        CHANGES TO AVOID RELAXATION FOR ABOVE G GIBSING
 !                        ARE COMMENTED OUT FOR NOW
 !   19-10-30  Bo CUI - REMOVE "GOTO" STATEMENT
+!   21-07-26  W  Meng - Restrict computation from undefined grids
 !
 ! USAGE:  CALL SLPSIG FROM SUBROUITNE ETA2P
 !
@@ -258,7 +259,12 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
         DO J=JSTA_M,JEND_M
           DO I=2,IM-1
 
-           if(PSLP(I,J)<spval) then
+           !if(PSLP(I,J)<spval) then
+           if(HTM2D(I-1,J)<spval.and.HTM2D(I+1,J)<spval.and. &
+              HTM2D(I,J-1)<spval.and.HTM2D(I,J+1)<spval.and. &
+              HTM2D(I-1,J-1)<spval.and.HTM2D(I+1,J-1)<spval.and. &
+              HTM2D(I-1,J+1)<spval.and.HTM2D(I+1,J+1)<spval.and. &
+              TPRES(I,J,L)<spval.and.QPRES(I,J,L)<spval)then
 
 !HC        IF(HTM2D(I,J,L)>0.5.AND.
 !HC     1     HTM2D(I+IHW(J),J-1,L)*HTM2D(I+IHE(J),J-1,L)
@@ -272,6 +278,8 @@ SUBROUTINE MEMSLP(TPRES,QPRES,FIPRES)
             IF(HTM2D(I,J) > 0.5 .AND. tem < 0.5) then
               TTV(I,J) = TPRES(I,J,L)*(1.+0.608*QPRES(I,J,L))
             ENDIF
+            else
+              TTV(I,J) = spval
 !           if(i==ii.and.j==jj)print*,'Debug:L,TTV B SMOO= ',l,TTV(I,J) 
            end if ! spval
           ENDDO
diff --git a/sorc/ncep_post.fd/SURFCE.f b/sorc/ncep_post.fd/SURFCE.f
index 3af081583..749e5cdd0 100644
--- a/sorc/ncep_post.fd/SURFCE.f
+++ b/sorc/ncep_post.fd/SURFCE.f
@@ -38,6 +38,7 @@
 !! -  20-11-10  J MENG    - USE UPP_PHYSICS MODULE
 !! -  21-03-11  B Cui - change local arrays to dimension (im,jsta:jend)
 !! -  21-04-01  J MENG    - COMPUTATION ON DEFINED POINTS ONLY
+!! -  21-07-26  W Meng  - Restrict computation from undefined grids
 !!     
 !! USAGE:    CALL SURFCE
 !!   INPUT ARGUMENT LIST:
@@ -188,7 +189,7 @@ SUBROUTINE SURFCE
 !           SURFACE (SKIN) POTENTIAL TEMPERATURE AND TEMPERATURE.
              THSFC(I,J) = THS(I,J)
              TSFC(I,J)  = spval
-             IF(THSFC(i,j) /= spval)                                   &
+             IF(THSFC(i,j) /= spval .and. PSFC(I,J) /= spval)   &
              TSFC(I,J) = THSFC(I,J)*(PSFC(I,J)/P1000)**CAPA 
 !     
 !       SURFACE SPECIFIC HUMIDITY, RELATIVE HUMIDITY, AND DEWPOINT.
@@ -198,8 +199,8 @@ SUBROUTINE SURFCE
              QSFC(I,J) = spval
              RHSFC(I,J) = spval
              EVP(I,J) = spval
-             IF(TSFC(I,J) /= spval) then
-             QSFC(I,J)  = MAX(H1M12,QS(I,J))
+             IF(TSFC(I,J) < spval) then
+             IF(QS(I,J)<spval) QSFC(I,J)  = MAX(H1M12,QS(I,J))
              TSFCK      = TSFC(I,J)
      
              IF(MODELNAME == 'RAPR') THEN
@@ -215,7 +216,7 @@ SUBROUTINE SURFCE
              QSFC(I,J)  = RHSFC(I,J)*QSAT
              RHSFC(I,J) = RHSFC(I,J) * 100.0
              EVP(I,J)   = D001*PSFC(I,J)*QSFC(I,J)/(EPS+ONEPS*QSFC(I,J))
-             END IF
+             END IF !end TSFC
 !     
 !mp           ACCUMULATED NON-CONVECTIVE PRECIP.
 !mp            IF(IGET(034)>0)THEN
@@ -302,7 +303,7 @@ SUBROUTINE SURFCE
 !     
 !        SURFACE SPECIFIC HUMIDITY.
          IF (IGET(028)>0) THEN
-            CALL BOUND(GRID1,H1M12,H99999)
+            !CALL BOUND(GRID1,H1M12,H99999)
             if(grib=='grib2') then
              cfld=cfld+1
              fld_info(cfld)%ifld=IAVBLFLD(IGET(028))
@@ -1302,7 +1303,7 @@ SUBROUTINE SURFCE
              datapd(1:im,1:jend-jsta+1,cfld) = GRID1(1:im,jsta:jend)
            endif
         ENDIF
-!     
+!     GRID1
 !        SHELTER MIXING RATIO.
         IF (IGET(414)>0) THEN
            DO J=JSTA,JEND
@@ -1336,8 +1337,12 @@ SUBROUTINE SURFCE
 
 !              EGRID1(I,J) = DWPT
 
+               IF(QSHLTR(I,J)<spval.and.PSHLTR(I,J)<spval)THEN
                EVP(I,J) = PSHLTR(I,J)*QSHLTR(I,J)/(EPS+ONEPS*QSHLTR(I,J))
                EVP(I,J) = EVP(I,J)*D001
+               ELSE
+               EVP(I,J) = spval
+               ENDIF
              ENDDO
            ENDDO
            CALL DEWPOINT(EVP,EGRID1(1,jsta))
@@ -3845,11 +3850,18 @@ SUBROUTINE SURFCE
 !$omp parallel do private(i,j,iwx)
              DO J=JSTA,JEND
                DO I=1,IM
+                 IF(ZWET(I,J)<spval)THEN
                  IWX   = IWX1(I,J)
                  SNOW(I,J,1)   = MOD(IWX,2)
                  SLEET(I,J,1)  = MOD(IWX,4)/2
                  FREEZR(I,J,1) = MOD(IWX,8)/4
                  RAIN(I,J,1)   = IWX/8
+                 ELSE
+                 SNOW(I,J,1) = spval
+                 SLEET(I,J,1) = spval
+                 FREEZR(I,J,1) = spval
+                 RAIN(I,J,1) = spval
+                 ENDIF
                ENDDO
              ENDDO
            ENDIF
@@ -4062,19 +4074,26 @@ SUBROUTINE SURFCE
            if (.not. allocated(zwet))   allocate(zwet(im,jsta:jend))
            CALL CALWXT_POST(T,Q,PMID,PINT,HTM,LMH,AVGPREC,ZINT,IWX1,ZWET)
 
-           if (allocated(zwet)) deallocate(zwet)
-!          write(0,*)' after second CALWXT_POST me=',me
-!          print *,'in SURFCE,me=',me,'IWX1=',IWX1(1:30,JSTA)
 !$omp parallel do private(i,j,iwx)
            DO J=JSTA,JEND
              DO I=1,IM
+               IF(ZWET(I,J)<spval)THEN
                IWX   = IWX1(I,J)
                SNOW(I,J,1)   = MOD(IWX,2)
                SLEET(I,J,1)  = MOD(IWX,4)/2
                FREEZR(I,J,1) = MOD(IWX,8)/4
                RAIN(I,J,1)   = IWX/8
+               ELSE
+               SNOW(I,J,1)   = spval
+               SLEET(I,J,1)  = spval
+               FREEZR(I,J,1) = spval
+               RAIN(I,J,1)   = spval
+               ENDIF
              ENDDO
            ENDDO
+           if (allocated(zwet)) deallocate(zwet)
+!          write(0,*)' after second CALWXT_POST me=',me
+!          print *,'in SURFCE,me=',me,'IWX1=',IWX1(1:30,JSTA)
 
 !     DOMINANT PRECIPITATION TYPE
 !GSM  IF DOMINANT PRECIP TYPE IS REQUESTED, 4 MORE ALGORITHMS
@@ -5195,6 +5214,7 @@ SUBROUTINE SURFCE
       IF ( (IGET(133)>0) .OR. (IGET(134)>0) ) THEN
 ! dong add missing value
         GRID1 = spval
+         IF(MODELNAME /= 'FV3R') &
          CALL CALTAU(EGRID1(1,jsta),EGRID2(1,jsta))
 !     
 !        SURFACE U COMPONENT WIND STRESS.
@@ -5202,10 +5222,11 @@ SUBROUTINE SURFCE
          IF (IGET(133)>0) THEN
             DO J=JSTA,JEND
               DO I=1,IM
-              GRID1(I,J)=EGRID1(I,J)
-         IF(MODELNAME == 'FV3R') THEN
-              GRID1(I,J)=SFCUXI(I,J)
-         END IF
+                IF(MODELNAME == 'FV3R') THEN
+                  GRID1(I,J)=SFCUXI(I,J)
+                ELSE
+                  GRID1(I,J)=EGRID1(I,J)
+                ENDIF
               ENDDO
             ENDDO
 !     
@@ -5220,10 +5241,11 @@ SUBROUTINE SURFCE
          IF (IGET(134)>0) THEN
             DO J=JSTA,JEND
             DO I=1,IM
-             GRID1(I,J)=EGRID2(I,J)
-         IF(MODELNAME == 'FV3R') THEN
-              GRID1(I,J)=SFCVXI(I,J)
-         END IF
+              IF(MODELNAME == 'FV3R') THEN
+                GRID1(I,J)=SFCVXI(I,J)
+              ELSE
+                GRID1(I,J)=EGRID2(I,J)
+              END IF
             ENDDO
             ENDDO
            if(grib=='grib2') then
diff --git a/sorc/ncep_post.fd/UPP_PHYSICS.f b/sorc/ncep_post.fd/UPP_PHYSICS.f
index b9ca9995d..3f44dd0c0 100644
--- a/sorc/ncep_post.fd/UPP_PHYSICS.f
+++ b/sorc/ncep_post.fd/UPP_PHYSICS.f
@@ -574,6 +574,7 @@ SUBROUTINE CALCAPE(ITYPE,DPBND,P1D,T1D,Q1D,L1D,CAPE,    &
 !   10-09-09  G MANIKIN    - CHANGED COMPUTATION TO USE VIRTUAL TEMP
 !                          - ADDED EQ LVL HGHT AND THUNDER PARAMETER    
 !   15-xx-xx  S MOORTHI    - optimization and threading
+!   21-07-28  W Meng       - Restrict computation from undefined grids.
 !
 ! USAGE:    CALL CALCAPE(ITYPE,DPBND,P1D,T1D,Q1D,L1D,CAPE,
 !                                CINS,PPARC)
@@ -616,7 +617,7 @@ SUBROUTINE CALCAPE(ITYPE,DPBND,P1D,T1D,Q1D,L1D,CAPE,    &
       use lookup_mod, only: thl, rdth, jtb, qs0, sqs, rdq, itb, ptbl,     &
                             plq, ttbl, pl, rdp, the0, sthe, rdthe, ttblq, &
                             itbq, jtbq, rdpq, the0q, stheq, rdtheq
-      use ctlblk_mod, only: jsta_2l, jend_2u, lm, jsta, jend, im, me
+      use ctlblk_mod, only: jsta_2l, jend_2u, lm, jsta, jend, im, me, spval
 !     
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       implicit none
@@ -723,6 +724,7 @@ SUBROUTINE CALCAPE(ITYPE,DPBND,P1D,T1D,Q1D,L1D,CAPE,    &
             DO I=1,IM
               PSFCK  = PMID(I,J,NINT(LMH(I,J)))
               PKL    = PMID(I,J,KB)
+              IF(PSFCK<spval.and.PKL<spval)THEN
 
 !hc           IF (ITYPE==1.AND.(PKL<PSFCK-DPBND.OR.PKL>PSFCK)) cycle
               IF (ITYPE ==2 .OR.                                                &
@@ -802,6 +804,7 @@ SUBROUTINE CALCAPE(ITYPE,DPBND,P1D,T1D,Q1D,L1D,CAPE,    &
                   PARCEL(I,J) = KB
                 ENDIF
               END IF 
+              ENDIF !end PSFCK<spval.and.PKL<spval
             ENDDO  ! I  loop
           ENDDO    ! J  loop
         END IF
diff --git a/sorc/ncep_post.fd/WETBULB.f b/sorc/ncep_post.fd/WETBULB.f
index feab60343..f22ba0368 100644
--- a/sorc/ncep_post.fd/WETBULB.f
+++ b/sorc/ncep_post.fd/WETBULB.f
@@ -7,6 +7,7 @@ SUBROUTINE WETBULB(T,Q,PMID,HTM,KARR,TWET)
 !     MPI VERSION: 04 Jan 2000 ( JIM TUCCILLO )
 !     MODIFIED FOR HYBRID: OCT 2001, H CHUANG
 !     02-01-15  MIKE BALDWIN - WRF VERSION
+!     21-07-26  Wen Meng  - Restrict compuation from undefined grids
 !
 !-----------------------------------------------------------------------
 !     ROUTINE TO COMPUTE WET BULB TEMPERATURES USING THE LOOK UP TABLE
@@ -22,7 +23,7 @@ SUBROUTINE WETBULB(T,Q,PMID,HTM,KARR,TWET)
       use lookup_mod, only: thl, rdth, jtb, qs0, sqs, rdq, itb, ptbl, plq, ttbl,&
               pl, rdp, the0, sthe, rdthe, ttblq, itbq, jtbq, rdpq, the0q, stheq,&
               rdtheq
-      use ctlblk_mod, only: jsta, jend, im, jsta_2l, jend_2u, lm
+      use ctlblk_mod, only: jsta, jend, im, jsta_2l, jend_2u, lm, spval
       use cuparm_mod, only: h10e5, capa, epsq, d00, elocp
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       implicit none
@@ -59,13 +60,14 @@ SUBROUTINE WETBULB(T,Q,PMID,HTM,KARR,TWET)
 !!$omp&         presk,qbtk,qqk,sqk,sqs00k,sqs10k,tbtk,thesp,tpspk,
 !!$omp&         tqk,tthbtk,tthk)
 !-----------------------------------------------------------------------
-                             DO 300 L=1,LM
+      DO 300 L=1,LM
       DO 125 J=JSTA,JEND
       DO 125 I=1,IM
         IF (HTM(I,J,L)<1.0) THEN
           THESP(I,J)=273.15
           cycle    
         ENDIF
+        IF(T(I,J,L)<spval)THEN
         TBTK  =T(I,J,L)
         QBTK  =Q(I,J,L)
         PRESK =PMID(I,J,L)
@@ -120,6 +122,9 @@ SUBROUTINE WETBULB(T,Q,PMID,HTM,KARR,TWET)
                 +(P00K-P10K-P01K+P11K)*PPK*QQK
         APESPK=(H10E5/TPSPK)**CAPA
         THESP(I,J)=TTHBTK*EXP(ELOCP*QBTK*APESPK/TTHBTK)
+        ELSE
+        THESP(I,J)=spval
+        ENDIF !end t(i,j,l)<spval
 !      ENDIF
   125 CONTINUE
 !--------------SCALING PRESSURE & TT TABLE INDEX------------------------
@@ -132,6 +137,7 @@ SUBROUTINE WETBULB(T,Q,PMID,HTM,KARR,TWET)
       KHRES(I,J)=0
 !
 !      IF(KARR(I,J)>0)THEN
+        IF(PMID(I,J,L)==spval)CYCLE
         PRESK=PMID(I,J,L)
 !
         IF(PRESK<PLQ)THEN
diff --git a/sorc/ncep_post.fd/WETFRZLVL.f b/sorc/ncep_post.fd/WETFRZLVL.f
index d44d7c8dc..a3aeeede5 100644
--- a/sorc/ncep_post.fd/WETFRZLVL.f
+++ b/sorc/ncep_post.fd/WETFRZLVL.f
@@ -20,6 +20,7 @@
 !!   03-11-14 GEOFF MANIKIN - NEW PROGRAM 
 !!   04-12-06  G MANIKIN    - CORRECTED COMPUTATION OF SFC TEMPERATURE
 !!   05-03-11  H CHUANG     - WRF VERSION
+!!   21-07-26  W Meng       - Restrict computation from undefined grids
 !!     
 !! USAGE:   CALL WETFRZLVL(TWET,ZWET) 
 !!   INPUT ARGUMENT LIST:
@@ -54,7 +55,7 @@ SUBROUTINE WETFRZLVL(TWET,ZWET)
       use vrbls2d, only:  fis, thz0, ths
       use masks, only: lmh, sm
       use params_mod, only: gi, p1000, capa, tfrz, d0065, d50
-      use ctlblk_mod, only: jsta, jend, im, jsta_2l, jend_2u, lm
+      use ctlblk_mod, only: jsta, jend, im, jsta_2l, jend_2u, lm, spval
 !- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       implicit none
 !
@@ -75,6 +76,10 @@ SUBROUTINE WETFRZLVL(TWET,ZWET)
 !!$omp&         tsfc,zl,zu)
       DO J=JSTA,JEND
       DO I=1,IM
+         IF(FIS(I,J)==spval)THEN
+           ZWET(I,J)=spval
+           CYCLE
+         ENDIF
          HTSFC     = FIS(I,J)*GI
          LLMH      = NINT(LMH(I,J))
          ZWET(I,J) = HTSFC