Marine DA configuration updates (#1922)

Minor updates the configuration related to running the marine DA and the coupled UFS. What's proposed in this PR: - Memory increased for the marine DA analysis step - The coupled UFS is (was?) running out of memory without the changes in `config.ufs`. - Updates to the IAU section of MOM_input to allow for a current increment.
NOAA-EMC · Oct 13, 2023 · ea4dfa5 · ea4dfa5
1 parent c2d112b
commit ea4dfa5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/parm/config/gfs/config.resources b/parm/config/gfs/config.resources
@@ -381,6 +381,7 @@ elif [[ "${step}" = "ocnanalrun" ]]; then
    case ${CASE} in
       C384)
         npes=480
+        export memory_ocnanalchkpt="2.8TB"
         ;;
       C48)
         npes=16
@@ -390,7 +391,7 @@ elif [[ "${step}" = "ocnanalrun" ]]; then
           exit 1
     esac
 
-    export wtime_ocnanalrun="00:30:00"
+    export wtime_ocnanalrun="00:15:00"
     export npe_ocnanalrun=${npes}
     export nth_ocnanalrun=1
     export is_exclusive=True

diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs
@@ -147,16 +147,16 @@ case "${fv3_res}" in
         ;;
     "C384")
         export DELTIM=300
-        export layout_x=6
+        export layout_x=8
         export layout_y=8
         export layout_x_gfs=8
         export layout_y_gfs=8
         export nthreads_fv3=2
         export nthreads_fv3_gfs=2
         export cdmbgwd="1.1,0.72,1.0,1.0"  # mountain blocking, ogwd, cgwd, cgwd src scaling
-        export WRITE_GROUP=2
-        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=8
-        export WRITE_GROUP_GFS=2
+        export WRITE_GROUP=4
+        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10
+        export WRITE_GROUP_GFS=4
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=10
         ;;
     "C768")

diff --git a/parm/ufs/mom6/MOM_input_template_025 b/parm/ufs/mom6/MOM_input_template_025
@@ -850,11 +850,11 @@ ODA_SALTINC_VAR = "Salt"        ! default = "sal_inc"
 ODA_THK_VAR = "h"               ! default = "h"
                                 ! The name of the int. depth inc. variable in
                                 ! ODA_INCUPD_FILE.
-ODA_INCUPD_UV = false           !
-!ODA_UINC_VAR = "u"             ! default = "u_inc"
+ODA_INCUPD_UV = true            !
+ODA_UINC_VAR = "u"              ! default = "u_inc"
                                 ! The name of the zonal vel. inc. variable in
                                 ! ODA_INCUPD_UV_FILE.
-!ODA_VINC_VAR = "v"             ! default = "v_inc"
+ODA_VINC_VAR = "v"              ! default = "v_inc"
                                 ! The name of the meridional vel. inc. variable in
                                 ! ODA_INCUPD_UV_FILE.
 ODA_INCUPD_NHOURS = @[ODA_INCUPD_NHOURS]            ! default=3.0

diff --git a/parm/ufs/mom6/MOM_input_template_500 b/parm/ufs/mom6/MOM_input_template_500
@@ -552,11 +552,11 @@ ODA_SALTINC_VAR = "Salt"        ! default = "sal_inc"
 ODA_THK_VAR = "h"               ! default = "h"
                                 ! The name of the int. depth inc. variable in
                                 ! ODA_INCUPD_FILE.
-ODA_INCUPD_UV = false           !
-!ODA_UINC_VAR = "u"             ! default = "u_inc"
+ODA_INCUPD_UV = true            !
+ODA_UINC_VAR = "u"              ! default = "u_inc"
                                 ! The name of the zonal vel. inc. variable in
                                 ! ODA_INCUPD_UV_FILE.
-!ODA_VINC_VAR = "v"             ! default = "v_inc"
+ODA_VINC_VAR = "v"              ! default = "v_inc"
                                 ! The name of the meridional vel. inc. variable in
                                 ! ODA_INCUPD_UV_FILE.
 ODA_INCUPD_NHOURS = @[ODA_INCUPD_NHOURS]            ! default=3.0