Merge remote-tracking branch 'EMC/develop' into updateUFS101223

JessicaMeixner-NOAA · Oct 14, 2023 · c8b0702 · c8b0702
2 parents 6a61d8a + 9a8911a
commit c8b0702
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/ci/scripts/check_ci.sh b/ci/scripts/check_ci.sh
@@ -89,7 +89,7 @@ for pr in ${pr_list}; do
     # Check to see if this PR that was opened by the weekly tests and if so close it if it passed on all platforms
     weekly_labels=$(${GH} pr view "${pr}" --repo "${REPO_URL}"  --json headRefName,labels,author --jq 'select(.author.login | contains("emcbot")) | select(.headRefName | contains("weekly_ci")) | .labels[].name ') || true
     if [[ -n "${weekly_labels}" ]]; then
-      num_platforms=$(find ../platforms -type f -name "config.*")
+      num_platforms=$(find ../platforms -type f -name "config.*" | wc -l)
       passed=0
       for platforms in ../platforms/config.*; do
         machine=$(basename "${platforms}" | cut -d. -f2)

diff --git a/parm/config/gefs/config.resources b/parm/config/gefs/config.resources
@@ -806,7 +806,7 @@ elif [[ ${step} = "eupd" ]]; then
       fi
     elif [[ ${CASE} = "C384" ]]; then
       export npe_eupd=270
-      export nth_eupd=2
+      export nth_eupd=8
       if [[ "${machine}" = "WCOSS2" ]]; then
         export npe_eupd=315
         export nth_eupd=14

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