From cc1d5bdaea82a880e695f19205a2203ac2eb751d Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Wed, 2 Sep 2020 13:35:58 -0600
Subject: [PATCH 1/2] Revert change to rte-rrtmgp submodule pointer

---
 physics/rte-rrtmgp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/physics/rte-rrtmgp b/physics/rte-rrtmgp
index 7dfff2025..6ee0b62c1 160000
--- a/physics/rte-rrtmgp
+++ b/physics/rte-rrtmgp
@@ -1 +1 @@
-Subproject commit 7dfff2025cae02c84b12df2402a39d77065f0e62
+Subproject commit 6ee0b62c1ac6204a89a4e922382b611c16dd5fa7

From 922c05f452ee3f8c58410672002d371fd1eb0838 Mon Sep 17 00:00:00 2001
From: Dom Heinzeller <climbfuji@ymail.com>
Date: Wed, 2 Sep 2020 13:36:20 -0600
Subject: [PATCH 2/2] physics/sfcsub.F: move message into sfccyc_module

---
 physics/sfcsub.F | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/physics/sfcsub.F b/physics/sfcsub.F
index a9328f9bf..30f663ec5 100644
--- a/physics/sfcsub.F
+++ b/physics/sfcsub.F
@@ -36,6 +36,20 @@ module sfccyc_module
       integer            :: veg_type_landice
       integer            :: soil_type_landice
 !
+!
+      contains
+
+      function message(prefix,index)
+      implicit none
+      character(len=*), intent(in) :: prefix
+      integer, intent(in) :: index
+      character(len=10) :: message
+      !
+      ! probably need to implement a check that len(prefix) + '-' + length of
+      ! string representation of index <= len(message)
+      write(message,fmt='(a,a,i0)') trim(prefix), '-', index
+      end function message
+
       end module sfccyc_module
 
 !>\ingroup mod_GFS_phys_time_vary
@@ -8608,16 +8622,4 @@ subroutine snodpth2(glacir,snwmax,snoanl, len, me)
       return
       end
 
-!>\ingroup mod_sfcsub
-      function message(prefix,index)
-      implicit none
-      character(len=*), intent(in) :: prefix
-      integer, intent(in) :: index
-      character(len=10) :: message
-      !
-      ! probably need to implement a check that len(prefix) + '-' + length of
-      ! string representation of index <= len(message)
-      write(message,fmt='(a,a,i0)') trim(prefix), '-', index
-      end function message
-
 !>@}