From f4478806eb0635791561b3489e87e4860ba6c585 Mon Sep 17 00:00:00 2001
From: NeilBarton-NOAA <neil.barton@noaa.gov>
Date: Tue, 5 Mar 2024 22:00:27 +0000
Subject: [PATCH] WCOSS2 again

---
 parm/config/gefs/config.ufs | 27 ++++++++++++++-------------
 workflow/hosts/hera.yaml    |  2 +-
 workflow/hosts/wcoss2.yaml  |  2 +-
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/parm/config/gefs/config.ufs b/parm/config/gefs/config.ufs
index fcb40a4ee8..45214277cc 100644
--- a/parm/config/gefs/config.ufs
+++ b/parm/config/gefs/config.ufs
@@ -120,18 +120,18 @@ case "${fv3_res}" in
         ;;
     "C384")
         export DELTIM=300
-        export layout_x=6
-        export layout_y=8
-        export layout_x_gfs=8
-        export layout_y_gfs=8
-        export nthreads_fv3=2
-        export nthreads_fv3_gfs=2
+        export layout_x=16
+        export layout_y=16
+        export layout_x_gfs=16
+        export layout_y_gfs=16
+        export nthreads_fv3=1
+        export nthreads_fv3_gfs=1
         export cdmbgwd="1.1,0.72,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
         export cdmbgwd_gsl="5.0,5.0,1.0,1.0"   # settings for GSL drag suite
         export knob_ugwp_tauamp=0.8e-3      # setting for UGWPv1 non-stationary GWD
-        export WRITE_GROUP=2
-        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=8
-        export WRITE_GROUP_GFS=2
+        export WRITE_GROUP=1
+        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10
+        export WRITE_GROUP_GFS=1
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=10
         ;;
     "C768")
@@ -206,8 +206,8 @@ export ntasks_quilt_gfs
 # Determine whether to use parallel NetCDF based on resolution
 case ${fv3_res} in
   "C48" | "C96" | "C192" | "C384")
-    OUTPUT_FILETYPE_ATM="netcdf"
-    OUTPUT_FILETYPE_SFC="netcdf"
+    OUTPUT_FILETYPE_ATM="netcdf_parallel"
+    OUTPUT_FILETYPE_SFC="netcdf_parallel"
     ;;
   "C768" | "C1152" | "C3072")
     OUTPUT_FILETYPE_ATM="netcdf_parallel"
@@ -306,7 +306,7 @@ if [[ "${skip_mom6}" == "false" ]]; then
       TOPOEDITS=""
       ;;
     "025")
-      ntasks_mom6=220
+      ntasks_mom6=130
       OCNTIM=1800
       NX_GLB=1440
       NY_GLB=1080
@@ -403,7 +403,8 @@ if [[ "${skip_ww3}" == "false" ]]; then
       ntasks_ww3=100
       ;;
     "glo_025")
-      ntasks_ww3=262
+      ntasks_ww3=250
+      nthreads_ww3=1
       ;;
     "glo_200")
       ntasks_ww3=30
diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml
index 71d444ed00..723910dd43 100644
--- a/workflow/hosts/hera.yaml
+++ b/workflow/hosts/hera.yaml
@@ -1,6 +1,6 @@
 BASE_GIT: '/scratch1/NCEPDEV/global/glopara/git'
 DMPDIR: '/scratch1/NCEPDEV/global/glopara/dump'
-BASE_CPLIC: '/scratch1/NCEPDEV/global/glopara/data/ICSDIR/prototype_ICs'
+BASE_CPLIC: '/scratch2/NCEPDEV/stmp3/Neil.Barton/ICs'
 PACKAGEROOT: '/scratch1/NCEPDEV/global/glopara/nwpara'
 COMINsyn: '/scratch1/NCEPDEV/global/glopara/com/gfs/prod/syndat'
 HOMEDIR: '/scratch1/NCEPDEV/global/${USER}'
diff --git a/workflow/hosts/wcoss2.yaml b/workflow/hosts/wcoss2.yaml
index cfb141061c..813dd6d956 100644
--- a/workflow/hosts/wcoss2.yaml
+++ b/workflow/hosts/wcoss2.yaml
@@ -1,6 +1,6 @@
 BASE_GIT: '/lfs/h2/emc/global/save/emc.global/git'
 DMPDIR: '/lfs/h2/emc/dump/noscrub/dump'
-BASE_CPLIC: '/lfs/h2/emc/global/noscrub/emc.global/data/ICSDIR/prototype_ICs'
+BASE_CPLIC: '/lfs/h2/emc/ens/noscrub/neil.barton/ICs'
 PACKAGEROOT: '${PACKAGEROOT:-"/lfs/h1/ops/prod/packages"}'
 COMINsyn: '/lfs/h1/ops/prod/com/gfs/v16.3/syndat'
 HOMEDIR: '/lfs/h2/emc/global/noscrub/${USER}'