From decb0b9baa89e30885d00be208aa476667fe9922 Mon Sep 17 00:00:00 2001
From: lisa-bengtsson <54411948+lisa-bengtsson@users.noreply.github.com>
Date: Thu, 6 Apr 2023 12:35:27 -0600
Subject: [PATCH 1/2] Correction of convective cloud condensate in prog closure
 for HR2 (#639)

* Make passing of PBL q tendency more general (not dependent on specific PBL scheme) for prog closure
* Bugfix for convection (prog closure) and gravity wave drag (for stochastic perturbations) needed for GFS/GEFS prototypes
---
 ccpp/data/GFS_typedefs.F90  | 3 ---
 ccpp/data/GFS_typedefs.meta | 8 --------
 ccpp/physics                | 2 +-
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/ccpp/data/GFS_typedefs.F90 b/ccpp/data/GFS_typedefs.F90
index 56b01aa12..1b35c8e5c 100644
--- a/ccpp/data/GFS_typedefs.F90
+++ b/ccpp/data/GFS_typedefs.F90
@@ -590,7 +590,6 @@ module GFS_typedefs
     real (kind=kind_phys), pointer :: pfl_lsan(:,:)   => null()  !< instantaneous 3D flux of liquid nonconvective precipitation (kg m-2 s-1)
 
     !-- prognostic updraft area fraction coupling in convection
-    real (kind=kind_phys), pointer :: tmf (:,:) => null()         !< tmf to be passed from turublence scheme to convection
     real (kind=kind_phys), pointer :: dqdt_qmicro(:,:) => null()  !< instantanious microphysics tendency to be passed from MP to convection
 
     contains
@@ -2889,8 +2888,6 @@ subroutine coupling_create (Coupling, IM, Model)
     !--prognostic closure - moisture coupling
     if(Model%progsigma)then
        allocate(Coupling%dqdt_qmicro (IM,Model%levs))
-       allocate(Coupling%tmf (IM,Model%levs))
-       Coupling%tmf = clear_val
        Coupling%dqdt_qmicro = clear_val
     endif
 
diff --git a/ccpp/data/GFS_typedefs.meta b/ccpp/data/GFS_typedefs.meta
index cdca4cacf..7978333bd 100644
--- a/ccpp/data/GFS_typedefs.meta
+++ b/ccpp/data/GFS_typedefs.meta
@@ -2493,14 +2493,6 @@
   type = real
   kind = kind_phys
   active = (flag_for_surface_flux_coupling)
-[tmf]
-  standard_name = instantaneous_tendency_of_specific_humidity_due_to_PBL
-  long_name = instantaneous_tendency_of_specific_humidity_due_to_PBL
-  units = kg kg-1 s-1
-  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
-  type = real
-  kind = kind_phys
-  active = (do_prognostic_updraft_area_fraction)
 [dqdt_qmicro]
   standard_name = instantaneous_tendency_of_specific_humidity_due_to_microphysics
   long_name = instantaneous_tendency_of_specific_humidity_due_to_microphysics
diff --git a/ccpp/physics b/ccpp/physics
index a11db782d..57c444f65 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit a11db782ddc8ee2264c054dc904d8c7acc0ecaad
+Subproject commit 57c444f6535bf34cbe8e75a52a74ea3bec2f8f50

From 9ee48d0fccfc79a1e93ee763dd1622da2b7cd2b0 Mon Sep 17 00:00:00 2001
From: Grant Firl <grant.firl@noaa.gov>
Date: Thu, 20 Apr 2023 15:31:17 -0400
Subject: [PATCH 2/2] update ccpp/physics pointer and .gitmodules

---
 .gitmodules  | 6 ++----
 ccpp/physics | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index f9c5f09ac..6bb663df1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,10 +8,8 @@
   branch = main
 [submodule "ccpp/physics"]
   path = ccpp/physics
-  #url = https://github.com/NCAR/ccpp-physics
-  #branch = main
-  url = https://github.com/grantfirl/ccpp-physics
-  branch = ufs-dev-PR57
+  url = https://github.com/NCAR/ccpp-physics
+  branch = main
 [submodule "upp"]
   path = upp
   url = https://github.com/NOAA-EMC/UPP
diff --git a/ccpp/physics b/ccpp/physics
index 42509d01b..ae12bd549 160000
--- a/ccpp/physics
+++ b/ccpp/physics
@@ -1 +1 @@
-Subproject commit 42509d01b8f05fb03a019b882646d53ddbe37d90
+Subproject commit ae12bd549d951ebaf45cbe07dc14033cea46ca1c