Remove unnecessary suite definition files and revert changes to GFS_p…

…hysics_driver.F90
NOAA-EMC · Oct 17, 2020 · 55bf7f4 · 55bf7f4
1 parent 002f58d
commit 55bf7f4
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 266 deletions.
diff --git a/ccpp/suites/suite_FV3_GFS_2017_stretched_FA.xml b/ccpp/suites/suite_FV3_GFS_2017_stretched_FA.xml
diff --git a/ccpp/suites/suite_FV3_GFS_v15p2_FA.xml b/ccpp/suites/suite_FV3_GFS_v15p2_FA.xml
diff --git a/ccpp/suites/suite_FV3_HAFS_FA_HWRF_RRTMG.xml b/ccpp/suites/suite_FV3_HAFS_FA_HWRF_RRTMG.xml
diff --git a/ccpp/suites/suite_HAFS_v0_hwrf.xml b/ccpp/suites/suite_HAFS_v0_hwrf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<suite name="HAFS_v0_hwrf" lib="ccppphys" ver="4">
+<suite name="HAFS_v0_hwrf" version="1">
   <!-- <init></init> -->
   <group name="time_vary">
     <subcycle loop="1">

diff --git a/gfsphysics/GFS_layer/GFS_physics_driver.F90 b/gfsphysics/GFS_layer/GFS_physics_driver.F90
@@ -2535,7 +2535,7 @@ subroutine GFS_physics_driver                                 &
                        Statein%prslk, Statein%phii, Statein%phil, dtp,              &
                        Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl,    &
                        kinver, Model%xkzm_m, Model%xkzm_h, Model%xkzm_s,            &
-                       Model%dspfac, Model%bl_upfr, Model%bl_dnfr, Diag%dkudiagnostic)
+                       Model%dspfac, Model%bl_upfr, Model%bl_dnfr)
 !*## CCPP ##
              endif
           elseif (Model%hybedmf) then
@@ -2562,7 +2562,7 @@ subroutine GFS_physics_driver                                 &
                            Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl,&
                            gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h,     &
                            Model%xkzm_s, lprnt, ipr,                                &
-                           Model%xkzminv, Model%moninq_fac,islmsk, Diag%dkudiagnostic)
+                           Model%xkzminv, Model%moninq_fac,islmsk)
             endif
 !     if (lprnt)  write(0,*)' dtdtm=',(dtdt(ipr,k),k=1,15)
 !     if (lprnt)  write(0,*)' dqdtm=',(dqdt(ipr,k,1),k=1,15)
@@ -2788,7 +2788,7 @@ subroutine GFS_physics_driver                                 &
                          Statein%prslk, Statein%phii, Statein%phil, dtp,              &
                          Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl,    &
                          kinver, Model%xkzm_m, Model%xkzm_h, Model%xkzm_s,            &
-                         Model%dspfac, Model%bl_upfr, Model%bl_dnfr, Diag%dkudiagnostic)
+                         Model%dspfac, Model%bl_upfr, Model%bl_dnfr)
 !*## CCPP ##
              endif
           elseif (Model%hybedmf) then
@@ -2819,7 +2819,7 @@ subroutine GFS_physics_driver                                 &
                            Model%dspheat, dusfc1, dvsfc1, dtsfc1, dqsfc1, Tbd%hpbl,    &
                            gamt, gamq, dkt, kinver, Model%xkzm_m, Model%xkzm_h,         &
                            Model%xkzm_s, lprnt, ipr,                                    &
-                           Model%xkzminv, Model%moninq_fac,islmsk, Diag%dkudiagnostic)
+                           Model%xkzminv, Model%moninq_fac,islmsk)
            endif
           elseif (.not. Model%old_monin) then
             call moninq(ix, im, levs, nvdiff, ntcw, dvdt, dudt, dtdt, dvdftra,          &