Merge pull request #4 from hafs-community/feature/add_km

Correction to the GFS physics driver for the add_km feature
NCAR · Mar 9, 2020 · 4632d7c · 4632d7c
2 parents 4bc1e4d + 3690b63
commit 4632d7c
Showing 1 changed file with 1 addition and 28 deletions.
diff --git a/gfsphysics/GFS_layer/GFS_physics_driver.F90 b/gfsphysics/GFS_layer/GFS_physics_driver.F90
@@ -2388,7 +2388,6 @@ subroutine GFS_physics_driver                                 &
                            Model%xkzm_s, lprnt, ipr,                                &
                            Model%xkzminv, Model%moninq_fac)
             else
-             if (Model%moninq_fac > -2) then
               call moninedmf_hafs(ix, im, levs, nvdiff, ntcw, dvdt, dudt, dtdt, dqdt, &
                            Statein%ugrs, Statein%vgrs, Statein%tgrs, Statein%qgrs,    &
                            Radtend%htrsw, Radtend%htrlw, xmu, Statein%prsik(1,1),     &
@@ -2399,20 +2398,7 @@ subroutine GFS_physics_driver                                 &
                            Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl,  &
                            gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h,       &
                            Model%xkzm_s, lprnt, ipr,                                  & 
-                           Model%xkzminv, Model%moninq_fac,islmsk,Diag%dkudiagnostic)
-             else
-               call moninedmf_hafs_pzhu(ix, im, levs, nvdiff, ntcw, dvdt, dudt, dtdt,    &
-                           dqdt, Statein%ugrs, Statein%vgrs, Statein%tgrs, Statein%qgrs, &
-                           Radtend%htrsw, Radtend%htrlw, xmu, Statein%prsik(1,1),        &
-                           rb, Sfcprop%zorl, Diag%u10m, Diag%v10m, Sfcprop%ffmm,         &
-                           Sfcprop%ffhh, Sfcprop%tsfc, qss, hflx, evap, stress,          &
-                           wind, kpbl, Statein%prsi, del, Statein%prsl,                  &
-                           Statein%prslk, Statein%phii, Statein%phil, dtp,               &
-                           Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl,     &
-                           gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h,          &
-                           Model%xkzm_s, lprnt, ipr,                                     & 
-                           Model%xkzminv, Model%moninq_fac,islmsk,Diag%dkudiagnostic)
-             endif 
+                           Model%xkzminv, Model%moninq_fac,islmsk, Diag%dkudiagnostic)
             endif
 !     if (lprnt)  write(0,*)' dtdtm=',(dtdt(ipr,k),k=1,15)
 !     if (lprnt)  write(0,*)' dqdtm=',(dqdt(ipr,k,1),k=1,15)
@@ -2659,7 +2645,6 @@ subroutine GFS_physics_driver                                 &
 !*## CCPP ##
 !## CCPP ##* The following schemes are not in the CCPP yet.
            else
-            if ( Model%moninq_fac > -2 ) then
             call moninedmf_hafs(ix, im, levs, nvdiff, ntcw, dvdt, dudt, dtdt, dvdftra,  &
                            Statein%ugrs, Statein%vgrs, Statein%tgrs, vdftra,            &
                            Radtend%htrsw, Radtend%htrlw, xmu, Statein%prsik(1,1),       &
@@ -2671,18 +2656,6 @@ subroutine GFS_physics_driver                                 &
                            gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h,         &
                            Model%xkzm_s, lprnt, ipr,                                    &
                            Model%xkzminv, Model%moninq_fac,islmsk, Diag%dkudiagnostic)
-            call moninedmf_hafs_pzhu(ix, im, levs, nvdiff, ntcw, dvdt, dudt, dtdt,      &
-                           dvdftra, Statein%ugrs, Statein%vgrs, Statein%tgrs, vdftra,   &
-                           Radtend%htrsw, Radtend%htrlw, xmu, Statein%prsik(1,1),       &
-                           rb, Sfcprop%zorl, Diag%u10m, Diag%v10m, Sfcprop%ffmm,        &
-                           Sfcprop%ffhh, Sfcprop%tsfc, qss, hflx, evap, stress,         &
-                           wind, kpbl, Statein%prsi, del, Statein%prsl,                 &
-                           Statein%prslk, Statein%phii, Statein%phil, dtp,              &
-                           Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Diag%hpbl,    &
-                           gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h,         &
-                           Model%xkzm_s, lprnt, ipr,                                    &
-                           Model%xkzminv, Model%moninq_fac,islmsk, Diag%dkudiagnostic)
-            endif
            endif
           elseif (.not. Model%old_monin) then
             call moninq(ix, im, levs, nvdiff, ntcw, dvdt, dudt, dtdt, dvdftra,          &