From 43ba912e3a5ce21016b7762fb82fd29ce85ce1c8 Mon Sep 17 00:00:00 2001
From: WenMeng-NOAA <48260754+WenMeng-NOAA@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:27:40 -0500
Subject: [PATCH] 1)Sync the fix of scattering calculation from GEFS V12
 implementation; 2)Update CMakeLists.txt for removing GRIBIT.F since grib1
 output was removed from the UPP. (#217)

---
 sorc/ncep_post.fd/CALPW.f        | 2 +-
 sorc/ncep_post.fd/CMakeLists.txt | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/sorc/ncep_post.fd/CALPW.f b/sorc/ncep_post.fd/CALPW.f
index 5c18874ac..2ed406358 100644
--- a/sorc/ncep_post.fd/CALPW.f
+++ b/sorc/ncep_post.fd/CALPW.f
@@ -290,7 +290,7 @@ SUBROUTINE CALPW(PW,IDECID)
           DO I=1,IM
              DP      = PINT(I,J,L+1) - PINT(I,J,L)
              PW(I,J) = PW(I,J) + Qdum(I,J)*DP*GI*HTM(I,J,L)
-            IF (IDECID == 17) THEN
+            IF (IDECID == 17 .or. IDECID == 20 .or. IDECID == 21) THEN
              PW(I,J) = PW(I,J) + Qdum(I,J)*MAX(DP,0.)*GI*HTM(I,J,L)
             ENDIF
             IF (IDECID == 19) THEN
diff --git a/sorc/ncep_post.fd/CMakeLists.txt b/sorc/ncep_post.fd/CMakeLists.txt
index ecd1793db..058d95b48 100644
--- a/sorc/ncep_post.fd/CMakeLists.txt
+++ b/sorc/ncep_post.fd/CMakeLists.txt
@@ -67,7 +67,6 @@ list(APPEND LIB_SRC
     GFSPOST.F
     GPVS.f
     grib2_module.f
-    GRIBIT.F
     GRIDAVG.f
     GRIDSPEC.f
     gtg_algo.f90