Add initial C96/1 deg coupled model support

parm/config/gefs/config.ufs

@@ -256,6 +256,10 @@
       MOM6_RESTART_SETTING='r'
       MOM6_RIVER_RUNOFF='False'
       eps_imesh="4.0e-1"
+      MOM6_DIAG_COORD_DEF_Z_FILE="oceanda_zgrid_25L.nc"
+      MOM6_DIAG_MISVAL="0.0"
+      MOM6_ALLOW_LANDMASK_CHANGES='False'
+      TOPOEDITS=""
       ;;
     "100")
       ntasks_mom6=20
@@ -269,8 +273,15 @@
       MOM6_RESTART_SETTING='n'
       MOM6_RIVER_RUNOFF='False'
       eps_imesh="2.5e-1"
+      if [[ "${DO_JEDIOCNVAR:-NO}" = "YES" ]]; then
+        MOM6_DIAG_COORD_DEF_Z_FILE="oceanda_zgrid_75L.nc"
+        MOM6_DIAG_MISVAL="0.0"
+      else
+        MOM6_DIAG_COORD_DEF_Z_FILE="interpolate_zgrid_40L.nc"
+        MOM6_DIAG_MISVAL="-1e34"
+      fi
       ;;
-    "50")
+    "050")
       ntasks_mom6=60
       OCNTIM=3600
       NX_GLB=720
@@ -282,6 +293,15 @@
       MOM6_RESTART_SETTING='n'
       MOM6_RIVER_RUNOFF='True'
       eps_imesh="1.0e-1"
+      TOPOEDITS="ufs.topo_edits_011818.nc"
+      if [[ "${DO_JEDIOCNVAR:-NO}" = "YES" ]]; then
+        MOM6_DIAG_COORD_DEF_Z_FILE="oceanda_zgrid_75L.nc"
+        MOM6_DIAG_MISVAL="0.0"
+      else
+        MOM6_DIAG_COORD_DEF_Z_FILE="interpolate_zgrid_40L.nc"
+        MOM6_DIAG_MISVAL="-1e34"
+      fi
+      MOM6_ALLOW_LANDMASK_CHANGES='True'
       ;;
     "025")
       ntasks_mom6=220
@@ -295,6 +315,15 @@
       MOM6_RIVER_RUNOFF='True'
       MOM6_RESTART_SETTING="r"
       eps_imesh="1.0e-1"
+      TOPOEDITS=""
+      if [[ "${DO_JEDIOCNVAR:-NO}" = "YES" ]]; then
+        MOM6_DIAG_COORD_DEF_Z_FILE="oceanda_zgrid_75L.nc"
+        MOM6_DIAG_MISVAL="0.0"
+      else
+        MOM6_DIAG_COORD_DEF_Z_FILE="interpolate_zgrid_40L.nc"
+        MOM6_DIAG_MISVAL="-1e34"
+      fi
+      MOM6_ALLOW_LANDMASK_CHANGES='True'
       ;;
     *)
       echo "FATAL ERROR: Unsupported MOM6 resolution = ${mom6_res}, ABORT!"

parm/config/gfs/config.ocn

@@ -11,7 +11,6 @@ export DO_OCN_PERT_EPBL="NO"  # In MOM_input, this variable determines PERT_EPBL
 # Templated variables in MOM_input_template
 export MOM6_USE_LI2016="True" # set to False for restart reproducibility
 export MOM6_THERMO_SPAN="False"
-export MOM6_ALLOW_LANDMASK_CHANGES="False"
 
 if [[ "${DO_JEDIOCNVAR}" == "YES" ]]; then
   export ODA_INCUPD="True"

parm/config/gfs/config.resources

@@ -370,6 +370,9 @@ elif [[ "${step}" = "ocnanalbmat" ]]; then
       C384)
         npes=480
         ;;
+      C96)
+        npes=16
+        ;;
       C48)
         npes=16
         ;;
@@ -392,6 +395,9 @@ elif [[ "${step}" = "ocnanalrun" ]]; then
         npes=480
         export memory_ocnanalchkpt="2.8TB"
         ;;
+      C96)
+        npes=16
+        ;;
       C48)
         npes=16
         ;;
@@ -418,6 +424,9 @@ elif [[ "${step}" = "ocnanalchkpt" ]]; then
       C384)
         export memory_ocnanalchkpt="128GB"
         ;;
+      C96)
+        export memory_ocnanalchkpt="32GB"
+        ;;
       C48)
         export memory_ocnanalchkpt="32GB"
         ;;

parm/config/gfs/config.ufs

@@ -256,6 +256,10 @@ if [[ "${skip_mom6}" == "false" ]]; then
       MOM6_RESTART_SETTING='r'
       MOM6_RIVER_RUNOFF='False'
       eps_imesh="4.0e-1"
+      MOM6_DIAG_COORD_DEF_Z_FILE="oceanda_zgrid_25L.nc"
+      MOM6_DIAG_MISVAL="0.0"
+      MOM6_ALLOW_LANDMASK_CHANGES='False'
+      TOPOEDITS=""
       ;;
     "100")
       ntasks_mom6=20
@@ -264,13 +268,22 @@ if [[ "${skip_mom6}" == "false" ]]; then
       NY_GLB=320
       DT_DYNAM_MOM6='1800'
       DT_THERM_MOM6='3600'
-      FRUNOFF=""
+      FRUNOFF="runoff.daitren.clim.1deg.nc"
       CHLCLIM="seawifs_1998-2006_smoothed_2X.nc"
-      MOM6_RESTART_SETTING='n'
+      MOM6_RESTART_SETTING='r'
       MOM6_RIVER_RUNOFF='False'
       eps_imesh="2.5e-1"
+      TOPOEDITS="ufs.topo_edits_011818.nc"
+      if [[ "${DO_JEDIOCNVAR:-NO}" = "YES" ]]; then
+        MOM6_DIAG_COORD_DEF_Z_FILE="oceanda_zgrid_75L.nc"
+        MOM6_DIAG_MISVAL="0.0"
+      else
+        MOM6_DIAG_COORD_DEF_Z_FILE="interpolate_zgrid_40L.nc"
+        MOM6_DIAG_MISVAL="-1e34"
+      fi
+      MOM6_ALLOW_LANDMASK_CHANGES='True'
       ;;
-    "50")
+    "050")
       ntasks_mom6=60
       OCNTIM=3600
       NX_GLB=720
@@ -282,6 +295,15 @@ if [[ "${skip_mom6}" == "false" ]]; then
       MOM6_RESTART_SETTING='n'
       MOM6_RIVER_RUNOFF='True'
       eps_imesh="1.0e-1"
+      if [[ "${DO_JEDIOCNVAR:-NO}" = "YES" ]]; then
+        MOM6_DIAG_COORD_DEF_Z_FILE="oceanda_zgrid_75L.nc"
+        MOM6_DIAG_MISVAL="0.0"
+      else
+        MOM6_DIAG_COORD_DEF_Z_FILE="interpolate_zgrid_40L.nc"
+        MOM6_DIAG_MISVAL="-1e34"
+      fi
+      MOM6_ALLOW_LANDMASK_CHANGES='False'
+      TOPOEDITS=""
       ;;
     "025")
       ntasks_mom6=220
@@ -295,6 +317,15 @@ if [[ "${skip_mom6}" == "false" ]]; then
       MOM6_RIVER_RUNOFF='True'
       MOM6_RESTART_SETTING="r"
       eps_imesh="1.0e-1"
+      if [[ "${DO_JEDIOCNVAR:-NO}" = "YES" ]]; then
+        MOM6_DIAG_COORD_DEF_Z_FILE="oceanda_zgrid_75L.nc"
+        MOM6_DIAG_MISVAL="0.0"
+      else
+        MOM6_DIAG_COORD_DEF_Z_FILE="interpolate_zgrid_40L.nc"
+        MOM6_DIAG_MISVAL="-1e34"
+      fi
+      MOM6_ALLOW_LANDMASK_CHANGES='False'
+      TOPOEDITS=""
       ;;
     *)
       echo "FATAL ERROR: Unsupported MOM6 resolution = ${mom6_res}, ABORT!"
@@ -308,9 +339,13 @@ if [[ "${skip_mom6}" == "false" ]]; then
   export DT_DYNAM_MOM6 DT_THERM_MOM6
   export FRUNOFF
   export CHLCLIM
+  export TOPOEDITS
   export MOM6_RIVER_RUNOFF
   export MOM6_RESTART_SETTING
   export eps_imesh
+  export MOM6_DIAG_COORD_DEF_Z_FILE
+  export MOM6_DIAG_MISVAL
+  export MOM6_ALLOW_LANDMASK_CHANGES
 fi
 
 # CICE6 specific settings

parm/ufs/mom6/MOM_input_template_100

@@ -74,31 +74,6 @@ WRITE_GEOM = 2                  ! default = 1
 SAVE_INITIAL_CONDS = False      !   [Boolean] default = False
                                 ! If true, write the initial conditions to a file given by IC_OUTPUT_FILE.
 
-! === module MOM_oda_incupd ===
-ODA_INCUPD = @[ODA_INCUPD]         ! [Boolean] default = False
-                                ! If true, oda incremental updates will be applied
-                                ! everywhere in the domain.
-ODA_INCUPD_FILE = "mom6_increment.nc" ! The name of the file with the T,S,h increments.
-
-ODA_TEMPINC_VAR = "pt_inc"      ! default = "ptemp_inc"
-                                ! The name of the potential temperature inc. variable in
-                                ! ODA_INCUPD_FILE.
-ODA_SALTINC_VAR = "s_inc"       ! default = "sal_inc"
-                                ! The name of the salinity inc. variable in
-                                ! ODA_INCUPD_FILE.
-ODA_THK_VAR = "h_fg"            ! default = "h"
-                                ! The name of the int. depth inc. variable in
-                                ! ODA_INCUPD_FILE.
-
-ODA_UINC_VAR = "u_inc"          ! default = "u_inc"
-                                ! The name of the zonal vel. inc. variable in
-                                ! ODA_INCUPD_UV_FILE.
-ODA_VINC_VAR = "v_inc"          ! 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
-                                ! Number of hours for full update (0=direct insertion).
-
 ! === module MOM_domains ===
 TRIPOLAR_N = True               !   [Boolean] default = False
                                 ! Use tripolar connectivity at the northern edge of the domain.  With
@@ -346,7 +321,7 @@ DIAG_COORDS = "z Z ZSTAR"
                                 ! A list of string tuples associating diag_table modules to
                                 ! a coordinate definition used for diagnostics. Each string
                                 ! is of the form "MODULE_SUFFIX,PARAMETER_SUFFIX,COORDINATE_NAME".
-DIAG_COORD_DEF_Z="FILE:interpolate_zgrid_40L.nc,interfaces=zw"
+DIAG_COORD_DEF_Z="FILE:@[MOM6_DIAG_COORD_DEF_Z_FILE],interfaces=zw"
 DIAG_MISVAL = -1e34
 !AVAILABLE_DIAGS_FILE = "available_diags.002160" ! default = "available_diags.000000"
                                 ! A file into which to write a list of all available ocean diagnostics that can
@@ -831,6 +806,8 @@ ENERGYSAVEDAYS = 0.25           !   [days] default = 1.0
                                 ! other globally summed diagnostics.
 
 ! === module ocean_model_init ===
+
+! === module MOM_oda_incupd ===
 ODA_INCUPD = @[ODA_INCUPD]   ! [Boolean] default = False
                              ! If true, oda incremental updates will be applied
                              ! everywhere in the domain.
@@ -845,11 +822,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

ush/parsing_namelists_MOM6.sh

@@ -75,6 +75,9 @@ sed -e "s/@\[DT_THERM_MOM6\]/${DT_THERM_MOM6}/g" \
     -e "s/@\[CHLCLIM\]/${CHLCLIM}/g" \
     -e "s/@\[DO_OCN_SPPT\]/${OCN_SPPT}/g" \
     -e "s/@\[PERT_EPBL\]/${PERT_EPBL}/g" \
+    -e "s/@\[MOM6_DIAG_COORD_DEF_Z_FILE\]/${MOM6_DIAG_COORD_DEF_Z_FILE}/g" \
+    -e "s/@\[TOPOEDITS\]/${TOPOEDITS}/g" \
+    -e "s/@\[MOM6_DIAG_MISVAL\]/${MOM6_DIAG_MISVAL}/g" \
     -e "s/@\[ODA_INCUPD_NHOURS\]/${ODA_INCUPD_NHOURS}/g" \
     -e "s/@\[ODA_INCUPD\]/${ODA_INCUPD}/g" "${DATA}/INPUT/MOM_input_template_${OCNRES}" > "${DATA}/INPUT/MOM_input"
 rm "${DATA}/INPUT/MOM_input_template_${OCNRES}"