From c26e98047393439052f9d0b66c83c5dd9493fda9 Mon Sep 17 00:00:00 2001
From: joeolson42 <Joseph.B.Olson@noaa.gov>
Date: Fri, 25 Mar 2022 22:19:50 +0000
Subject: [PATCH 1/3] update submodule pointer for fv3atm

---
 FV3 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FV3 b/FV3
index 5d9f221866..dd68016fb1 160000
--- a/FV3
+++ b/FV3
@@ -1 +1 @@
-Subproject commit 5d9f22186624ca6549c5226189c6772193c3caef
+Subproject commit dd68016fb1ba15c4ead1ba9206bbbcabe515f299

From aec234c4d52560a1c489c296c7199311793a9746 Mon Sep 17 00:00:00 2001
From: "samuel.trahan" <Samuel.Trahan@noaa.gov>
Date: Thu, 31 Mar 2022 19:50:51 +0000
Subject: [PATCH 2/3] Update rrfs conus regression tests to compute fluxes.

---
 tests/default_vars.sh                      | 1 +
 tests/parm/rrfs_conus13km_hrrr.nml.IN      | 5 +++--
 tests/tests/rrfs_conus13km_hrrr_warm       | 1 +
 tests/tests/rrfs_conus13km_radar_tten_warm | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/default_vars.sh b/tests/default_vars.sh
index ea0afa7e20..6e66a188d6 100755
--- a/tests/default_vars.sh
+++ b/tests/default_vars.sh
@@ -839,6 +839,7 @@ export DO_MYNNEDMF=.false.
 export DO_MYJPBL=.false.
 export HURR_PBL=.false.
 export MONINQ_FAC=1.0
+export SFCLAY_COMPUTE_FLUX=.false.
 
 # Shallow/deep convection
 export DO_DEEP=.true.
diff --git a/tests/parm/rrfs_conus13km_hrrr.nml.IN b/tests/parm/rrfs_conus13km_hrrr.nml.IN
index e02e464757..d80e37f855 100644
--- a/tests/parm/rrfs_conus13km_hrrr.nml.IN
+++ b/tests/parm/rrfs_conus13km_hrrr.nml.IN
@@ -133,6 +133,7 @@
 /
 
 &gfs_physics_nml
+    sfclay_compute_flux = @[SFCLAY_COMPUTE_FLUX]
     fh_dfi_radar = @[FH_DFI_RADAR]
     bl_mynn_edmf = 1
     bl_mynn_edmf_mom = 1
@@ -222,8 +223,8 @@
     lwhtr = .true.
     n_var_lndp = @[N_VAR_LNDP]
     nsradar_reset = 3600
-    nst_anl = .false.
-    nstf_name = 2, 0, 0, 0, 0
+    nst_anl = .true.
+!    nstf_name = 2, 0, 0, 0, 0
     oz_phys = .false.
     oz_phys_2015 = .true.
     pdfcld = .false.
diff --git a/tests/tests/rrfs_conus13km_hrrr_warm b/tests/tests/rrfs_conus13km_hrrr_warm
index cdf7c35113..b3a0c134bc 100644
--- a/tests/tests/rrfs_conus13km_hrrr_warm
+++ b/tests/tests/rrfs_conus13km_hrrr_warm
@@ -32,6 +32,7 @@ export OUTPUT_HISTORY=.true.
 export OUTPUT_GRID=lambert_conformal
 export OUTPUT_FILE="'netcdf'"
 
+export SFCLAY_COMPUTE_FLUX=.true.
 export IALB=2
 export ICLIQ_SW=2
 export IEMS=2
diff --git a/tests/tests/rrfs_conus13km_radar_tten_warm b/tests/tests/rrfs_conus13km_radar_tten_warm
index 38a3d0df2a..102fb64b43 100644
--- a/tests/tests/rrfs_conus13km_radar_tten_warm
+++ b/tests/tests/rrfs_conus13km_radar_tten_warm
@@ -34,6 +34,7 @@ export OUTPUT_HISTORY=.true.
 export OUTPUT_GRID=lambert_conformal
 export OUTPUT_FILE="'netcdf'"
 
+export SFCLAY_COMPUTE_FLUX=.true.
 export IALB=2
 export ICLIQ_SW=2
 export IEMS=2

From e7f821633e01378b69d2f9eb3350778f4935487e Mon Sep 17 00:00:00 2001
From: "samuel.trahan" <Samuel.Trahan@noaa.gov>
Date: Thu, 31 Mar 2022 21:32:42 +0000
Subject: [PATCH 3/3] Remove nst_anl and a comment from the
 rrfs_conus13km_hrrr.nml.IN namelist template

---
 tests/parm/rrfs_conus13km_hrrr.nml.IN | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/parm/rrfs_conus13km_hrrr.nml.IN b/tests/parm/rrfs_conus13km_hrrr.nml.IN
index d80e37f855..0dd39df0a2 100644
--- a/tests/parm/rrfs_conus13km_hrrr.nml.IN
+++ b/tests/parm/rrfs_conus13km_hrrr.nml.IN
@@ -223,8 +223,6 @@
     lwhtr = .true.
     n_var_lndp = @[N_VAR_LNDP]
     nsradar_reset = 3600
-    nst_anl = .true.
-!    nstf_name = 2, 0, 0, 0, 0
     oz_phys = .false.
     oz_phys_2015 = .true.
     pdfcld = .false.