From 63270daf00ddb6c9b3cb546bcb2e4532d181def7 Mon Sep 17 00:00:00 2001
From: Jessica Meixner <jessica.meixner@noaa.gov>
Date: Wed, 30 Aug 2023 15:49:51 -0400
Subject: [PATCH] Final Updates for HR2 (#1827)

This PR has the final updates for HR2.  There was one added variable for diagnostic output:
`iopt_diag=3` and required from land team. This also points to HR2 updates for initial conditions
which update the land states in `sfc*` files compared to HR1. Lastly, it was determined that the
setting to enable running on hera `WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=20`
actually will fail on WCOSS2. While not ideal, a setting that would run out of the box on both
hera and wcoss2 for C768 could not be found, therefore a comment was added noting WCOSS2
needs to use a different setting until it can be resolved.

Resolves #1500
---
 parm/config/gfs/config.coupled_ic | 2 +-
 parm/config/gfs/config.ufs        | 2 +-
 ush/parsing_namelists_FV3.sh      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/parm/config/gfs/config.coupled_ic b/parm/config/gfs/config.coupled_ic
index 809cc3c1a2..bafd4e111d 100644
--- a/parm/config/gfs/config.coupled_ic
+++ b/parm/config/gfs/config.coupled_ic
@@ -21,7 +21,7 @@ case "${CASE}" in
     export CPL_WAVIC=GEFSwave20210528v2
     ;;
   "C768")
-    export CPL_ATMIC=HR1
+    export CPL_ATMIC=HR2
     export CPL_ICEIC=HR1
     export CPL_OCNIC=HR1
     export CPL_WAVIC=HR1
diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs
index 3e1fa382d7..67075f300b 100644
--- a/parm/config/gfs/config.ufs
+++ b/parm/config/gfs/config.ufs
@@ -171,7 +171,7 @@ case "${fv3_res}" in
         export WRITE_GROUP=2
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10
         export WRITE_GROUP_GFS=4
-        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=20
+        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=20 #Note this should be 10 for WCOSS2
         ;;
     "C1152")
         export DELTIM=120
diff --git a/ush/parsing_namelists_FV3.sh b/ush/parsing_namelists_FV3.sh
index baf81602c2..0a499a8f26 100755
--- a/ush/parsing_namelists_FV3.sh
+++ b/ush/parsing_namelists_FV3.sh
@@ -345,6 +345,7 @@ cat >> input.nml <<EOF
   iopt_tbot    = ${iopt_tbot:-"2"}
   iopt_stc     = ${iopt_stc:-"1"}
   iopt_trs     = ${iopt_trs:-"2"}
+  iopt_diag    = ${iopt_diag:-"3"}
   debug        = ${gfs_phys_debug:-".false."}
   nstf_name    = ${nstf_name}
   nst_anl      = ${nst_anl}