diff --git a/gcm_CPLFCST360NM2_setup b/gcm_CPLFCST360NM2_setup
index 49aff6b1..10002487 100755
--- a/gcm_CPLFCST360NM2_setup
+++ b/gcm_CPLFCST360NM2_setup
@@ -1742,6 +1742,7 @@ s?@CLDMICRO?$CLDMICRO?g
 s?>>>FORCEDAS<<<?$FORCEDAS?g
 s?>>>FORCEGCM<<<?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
+s?@shared_COUPLED?$shared_COUPLED?g
 s?>>>FORCAST<<<?$FORCAST?g
 s?@DATAOCEAN?$DATAOCEAN?g
 s?>>>GOCART<<<?$GOCART?g
diff --git a/gcm_CPLFCST360S2S_setup b/gcm_CPLFCST360S2S_setup
index 86088aaa..1ea5b3b1 100755
--- a/gcm_CPLFCST360S2S_setup
+++ b/gcm_CPLFCST360S2S_setup
@@ -1736,6 +1736,7 @@ s?@DASTUNING?#?g
 s?>>>FORCEDAS<<<?$FORCEDAS?g
 s?>>>FORCEGCM<<<?$FORCEGCM?g
 s?@COUPLED?$COUPLED?g
+s?@shared_COUPLED?$shared_COUPLED?g
 s?@CLDMICRO?$CLDMICRO?g
 s?>>>FORCAST<<<?$FORCAST?g
 s?@DATAOCEAN?$DATAOCEAN?g
diff --git a/gcm_forecast.tmpl b/gcm_forecast.tmpl
index bedb47d6..b1e2f875 100755
--- a/gcm_forecast.tmpl
+++ b/gcm_forecast.tmpl
@@ -354,7 +354,7 @@ setenv EMISSIONS @EMISSIONS
 @MOM5setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM5/@ATMOStag_@OCEANtag
 @MOM5setenv OBCSDIR  @COUPLEDIR/ocean_bcs/MOM5/${OGCM_IM}x${OGCM_JM}
 @MOM6setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM6/@ATMOStag_@OCEANtag
-@MOM6setenv OBCSDIR  @COUPLEDIR/ocean_bcs/MOM6/${OGCM_IM}x${OGCM_JM}
+@MOM6setenv OBCSDIR  @shared_COUPLED/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
 @COUPLEDsetenv SSTDIR  @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
 @COUPLEDsetenv BCTAG `basename $ABCSDIR`
 @DATAOCEAN setenv BCTAG `basename $BCSDIR`
diff --git a/gcm_run.j b/gcm_run.j
index ec772716..d8477ff7 100755
--- a/gcm_run.j
+++ b/gcm_run.j
@@ -317,9 +317,9 @@ setenv DATELINE  DC
 setenv EMISSIONS @EMISSIONS
 
 @MOM5setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM5/@ATMOStag_@OCEANtag
-@MOM5setenv OBCSDIR  @COUPLEDIR/ocean_bcs/MOM5/${OGCM_IM}x${OGCM_JM}
+@MOM5setenv OBCSDIR  @shared_COUPLED/ocean/MOM5/${OGCM_IM}x${OGCM_JM}
 @MOM6setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM6/@ATMOStag_@OCEANtag
-@MOM6setenv OBCSDIR  @COUPLEDIR/ocean_bcs/MOM6/${OGCM_IM}x${OGCM_JM}
+@MOM6setenv OBCSDIR  @shared_COUPLED/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
 @MOM5setenv SSTDIR  @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
 @MOM6setenv SSTDIR  @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
 @MOM5setenv BCTAG `basename $ABCSDIR`
diff --git a/gcm_run_benchmark.j b/gcm_run_benchmark.j
index a0d19df2..3cf3a228 100755
--- a/gcm_run_benchmark.j
+++ b/gcm_run_benchmark.j
@@ -310,9 +310,9 @@ setenv DATELINE  DC
 setenv EMISSIONS @EMISSIONS
 
 @MOM5setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM5/@ATMOStag_@OCEANtag
-@MOM5setenv OBCSDIR  @COUPLEDIR/ocean_bcs/MOM5/${OGCM_IM}x${OGCM_JM}
+@MOM5setenv OBCSDIR  @shared_COUPLED/ocean/MOM5/${OGCM_IM}x${OGCM_JM}
 @MOM6setenv ABCSDIR  @COUPLEDIR/atmosphere_bcs/@LSMBCS/MOM6/@ATMOStag_@OCEANtag
-@MOM6setenv OBCSDIR  @COUPLEDIR/ocean_bcs/MOM6/${OGCM_IM}x${OGCM_JM}
+@MOM6setenv OBCSDIR  @shared_COUPLED/ocean/MOM6/${OGCM_IM}x${OGCM_JM}
 @COUPLEDsetenv SSTDIR  @COUPLEDIR/SST/MERRA2/${OGCM_IM}x${OGCM_JM}
 @COUPLEDsetenv BCTAG `basename $ABCSDIR`
 @DATAOCEANsetenv BCTAG `basename $BCSDIR`
diff --git a/gcm_setup b/gcm_setup
index 9b1af5ec..d722c74d 100755
--- a/gcm_setup
+++ b/gcm_setup
@@ -614,14 +614,14 @@ if( $OGCM == TRUE ) then
     # Ocean Model
     # -----------
     OCNMODEL:
-    echo "Choose an ${C1}Ocean Model${CN}: (Default: ${C2}MOM5${CN})"
+    echo "Choose an ${C1}Ocean Model${CN}: (Default: ${C2}MOM6${CN})"
     echo "   ${C2}MOM5${CN}"
     echo "   ${C2}MOM6${CN}"
     echo "   ${C2}MIT${CN}"
 
     set OCNMODEL  = $<
     if ( .$OCNMODEL == . ) then
-       set OCNMODEL  = "MOM5"
+       set OCNMODEL  = "MOM6"
     else
        set OCNMODEL = `echo $OCNMODEL | tr "[:lower:]" "[:upper:]"`
 
@@ -653,7 +653,6 @@ if( $OGCM == TRUE ) then
        set MOM5 = "#DELETE"
        set DEFAULT_HISTORY_TEMPLATE="HISTORY.AOGCM.rc.tmpl"
        set MIT  = "#DELETE"
-       set OCEAN_NAME="MOM6"
     else if ( "$OCNMODEL" == "MIT" ) then
        set OCEAN_NAME="MIT"
        set OGCM_GRID_TYPE = llc
@@ -755,17 +754,8 @@ if( $OGCM == TRUE ) then
         else
             goto CORSLV
         endif
-    else
-        if ( $OCEAN_NAME == "MOM" ) then
-           set Resolution = `echo 360 200`
-        else if ( $OCEAN_NAME == "MOM6" ) then
-           # c12 MOM6 is default 72x36
-           if( $AGCM_IM ==  "c12" ) then
-              set Resolution = `echo 72 36`
-           else
-              set Resolution = `echo 360 210`
-           endif
-        endif
+    else if ( $OCEAN_NAME == "MOM" ) then
+        set Resolution = `echo 360 200`
 
         echo "Enter the Ocean Lat/Lon ${C1}Horizontal Resolution${CN}: ${C2}IM JM${CN} (Default:" $Resolution")"
         set Resolution = `echo $<`
@@ -774,16 +764,7 @@ if( $OGCM == TRUE ) then
            set OGCM_IM = $Resolution[1]
            set OGCM_JM = $Resolution[2]
         else
-           if ( $OCEAN_NAME == "MOM" ) then
-              set Resolution = `echo 360 200`
-           else if ( $OCEAN_NAME == "MOM6" ) then
-              # c12 MOM6 is default 72x36
-              if( $AGCM_IM ==  "c12" ) then
-                 set Resolution = `echo 72 36`
-              else
-                 set Resolution = `echo 360 210`
-              endif
-           endif
+           set Resolution = `echo 360 200`
 
            if( $num == 0 ) then
               set OGCM_IM = $Resolution[1]
@@ -793,6 +774,41 @@ if( $OGCM == TRUE ) then
            endif
         endif
 
+    else if ( "$OCNMODEL" == "MOM6" ) then
+       # For MOM6 we currently have only 3 allowed ocean resolutions based on the
+       # atmospheric resolution. The allowed are:
+       #
+       # Atm Res  Atm NXxNY  Atm IMxJM  Ocean NXxNY  Ocean IMxJM  Ocean LM
+       # -------  ---------  ---------  -----------  -----------  --------
+       # c12      1x6        12x72      3x2          72x36        50
+       # c90      5x36       90x540     90x2         540x458      50
+       # c180     30x36      180x1080   36x30        1440x1080    75
+       #
+       # See https://github.com/GEOS-ESM/GEOSgcm/wiki/Coupled-model-configurations-(GEOS-MOM6)
+
+       if ( $AGCM_IM == "c12" ) then
+          set OGCM_NX = 3
+          set OGCM_NY = 2
+          set OGCM_IM = 72
+          set OGCM_JM = 36
+          set OGCM_LM = 50
+       else if ( $AGCM_IM == "c90" ) then
+          set OGCM_NX = 90
+          set OGCM_NY = 2
+          set OGCM_IM = 540
+          set OGCM_JM = 458
+          set OGCM_LM = 50
+       else if ( $AGCM_IM == "c180" ) then
+          set OGCM_NX = 36
+          set OGCM_NY = 30
+          set OGCM_IM = 1440
+          set OGCM_JM = 1080
+          set OGCM_LM = 75
+       else
+          echo
+          echo "ERROR: MOM6 is currently only supported for c12, c90, and c180 atmospheric resolutions"
+          exit 1
+       endif
     endif
 
     set IMO = ${OGCM_IM}
@@ -825,17 +841,14 @@ if( $OGCM == TRUE ) then
     set OSTIA    = "#DELETE"
     set OCEANOUT = "#DELETE"
 
-    echo "Enter the Ocean Model ${C1}Vertical Resolution${CN}: ${C2}LM${CN} (Default: 50)"
-    set   OGCM_LM = $<
-    if( .$OGCM_LM == . ) then
-    set   OGCM_LM = 50
-    endif
+    # We only ask this if not MOM6
+    if ( "$OCNMODEL" != "MOM6" ) then
+       echo "Enter the Ocean Model ${C1}Vertical Resolution${CN}: ${C2}LM${CN} (Default: 50)"
+       set   OGCM_LM = $<
+       if( .$OGCM_LM == . ) then
+          set   OGCM_LM = 50
+       endif
 
-    # At the moment c12 MOM6 is default 3x2 ocean (and 1x6 atmos)
-    if( $AGCM_IM ==  "c12" ) then
-       set OGCM_NX = 3
-       set OGCM_NY = 2
-    else
        set OGCM_NX = 36
        set OGCM_NY = 10
     endif
@@ -1049,10 +1062,10 @@ if( $AGCM_IM ==  "c12" ) then
      set AGCM_IM  = 12
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      # C12 MOM6 should be 1x6 to match the default 3x2 ocean layout
-     if ( $OCEAN_NAME == "MOM6") then
-     set       NX = 1
+     if ( "$OCNMODEL" == "MOM6") then
+        set    NX = 1
      else
-     set       NX = 2
+        set    NX = 2
      endif
      set       NY = `expr $NX \* 6`
      set   HYDROSTATIC = $USE_HYDROSTATIC
@@ -1107,18 +1120,22 @@ if( $AGCM_IM ==  "c90" ) then
      set AGCM_IM  = 90
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      if( $OGCM == TRUE ) then
-          if( "$OCNMODEL" == "MIT" ) then
-              set  NX = 10
-              set  NY = 36
-          else
-              set  NX = $OGCM_NY
-              set  NY = $OGCM_NX
-          endif
-          set OCEAN_DT = $DT
+        if( "$OCNMODEL" == "MIT" ) then
+           set  NX = 10
+           set  NY = 36
+        else if ( "$OCNMODEL" == "MOM6") then
+           # For MOM6 c90 means atm NXxNY = 5x36
+           set  NX = 5
+           set  NY = 36
+        else
+           set  NX = $OGCM_NY
+           set  NY = $OGCM_NX
+        endif
+        set OCEAN_DT = $DT
      else
-          set  NX = 3
-          set  NY = `expr $NX \* 6`
-     set OCEAN_DT = $IRRAD_DT
+        set  NX = 3
+        set  NY = `expr $NX \* 6`
+        set OCEAN_DT = $IRRAD_DT
      endif
      set HYDROSTATIC = $USE_HYDROSTATIC
      set HIST_IM  = `expr $AGCM_IM \* 4`
@@ -1136,13 +1153,19 @@ if( $AGCM_IM ==  "c180" ) then
      set AGCM_IM  = 180
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      if( $OGCM == TRUE ) then
-          set  NX = $OGCM_NY
-          set  NY = $OGCM_NX
-     set OCEAN_DT = $DT
+        if ( "$OCNMODEL" == "MOM6") then
+           # For MOM6 c180 means atm NXxNY = 30x36
+           set  NX = 30
+           set  NY = 36
+        else
+           set  NX = $OGCM_NY
+           set  NY = $OGCM_NX
+        endif
+        set OCEAN_DT = $DT
      else
-          set  NX = 6
-          set  NY = `expr $NX \* 6`
-     set OCEAN_DT = $IRRAD_DT
+        set  NX = 6
+        set  NY = `expr $NX \* 6`
+        set OCEAN_DT = $IRRAD_DT
      endif
      set HYDROSTATIC = $USE_HYDROSTATIC
      set HIST_IM  = `expr $AGCM_IM \* 4`
@@ -1788,6 +1811,7 @@ if( $SITE == 'NAS' ) then
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /nobackup/$LOGNAME                                     # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm                  # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE              # Location of GWD_RIDGE files
               if ( "$OCNMODEL" == "MIT" ) then
                 setenv COUPLEDIR  /nobackupp2/estrobac/geos5/GRIDDIR                   # Coupled Ocean/Atmos Forcing
@@ -1834,7 +1858,8 @@ else if( $SITE == 'NCCS' ) then
               endif
               setenv CHMDIR     $SHARE/gmao_ops/fvInput_nc3                            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /discover/nobackup/$LOGNAME                            # user work directory
-              setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # Coupled Ocean/Atmos Forcing
+              setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # OLD Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
               if (${OGRIDTYP} == "LL") then
                 setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR
@@ -1876,6 +1901,7 @@ else if( $SITE == 'AWS' | $SITE == 'Azure' ) then
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3         # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /home/$LOGNAME                                         # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm               # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE           # Location of GWD_RIDGE files
 
 else
@@ -1913,6 +1939,7 @@ else
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3         # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /home/$LOGNAME                                         # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm               # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE           # Location of GWD_RIDGE files
               set NX = 1
               set NY = 6
@@ -2322,6 +2349,7 @@ s?@ICEFILE?$ICEFILE?g
 s?@KPARFILE?$KPARFILE?g
 s?@CHMDIR?$CHMDIR?g
 s?@COUPLEDIR?$COUPLEDIR?g
+s?@shared_COUPLED?$shared_COUPLED?g
 s?@GWDRSDIR?$GWDRSDIR?g
 s?@EXPDIR?$EXPDIR?g
 s?@EXPDSC?$EXPDSC?g
diff --git a/geoschemchem_setup b/geoschemchem_setup
index 261b5003..be0fd01b 100755
--- a/geoschemchem_setup
+++ b/geoschemchem_setup
@@ -614,14 +614,14 @@ if( $OGCM == TRUE ) then
     # Ocean Model
     # -----------
     OCNMODEL:
-    echo "Choose an ${C1}Ocean Model${CN}: (Default: ${C2}MOM5${CN})"
+    echo "Choose an ${C1}Ocean Model${CN}: (Default: ${C2}MOM6${CN})"
     echo "   ${C2}MOM5${CN}"
     echo "   ${C2}MOM6${CN}"
     echo "   ${C2}MIT${CN}"
 
     set OCNMODEL  = $<
     if ( .$OCNMODEL == . ) then
-       set OCNMODEL  = "MOM5"
+       set OCNMODEL  = "MOM6"
     else
        set OCNMODEL = `echo $OCNMODEL | tr "[:lower:]" "[:upper:]"`
 
@@ -653,7 +653,6 @@ if( $OGCM == TRUE ) then
        set MOM5 = "#DELETE"
        set DEFAULT_HISTORY_TEMPLATE="HISTORY.AOGCM.rc.tmpl"
        set MIT  = "#DELETE"
-       set OCEAN_NAME="MOM6"
     else if ( "$OCNMODEL" == "MIT" ) then
        set OCEAN_NAME="MIT"
        set OGCM_GRID_TYPE = llc
@@ -755,17 +754,8 @@ if( $OGCM == TRUE ) then
         else
             goto CORSLV
         endif
-    else
-        if ( $OCEAN_NAME == "MOM" ) then
-           set Resolution = `echo 360 200`
-        else if ( $OCEAN_NAME == "MOM6" ) then
-           # c12 MOM6 is default 72x36
-           if( $AGCM_IM ==  "c12" ) then
-              set Resolution = `echo 72 36`
-           else
-              set Resolution = `echo 360 210`
-           endif
-        endif
+    else if ( $OCEAN_NAME == "MOM" ) then
+        set Resolution = `echo 360 200`
 
         echo "Enter the Ocean Lat/Lon ${C1}Horizontal Resolution${CN}: ${C2}IM JM${CN} (Default:" $Resolution")"
         set Resolution = `echo $<`
@@ -774,16 +764,7 @@ if( $OGCM == TRUE ) then
            set OGCM_IM = $Resolution[1]
            set OGCM_JM = $Resolution[2]
         else
-           if ( $OCEAN_NAME == "MOM" ) then
-              set Resolution = `echo 360 200`
-           else if ( $OCEAN_NAME == "MOM6" ) then
-              # c12 MOM6 is default 72x36
-              if( $AGCM_IM ==  "c12" ) then
-                 set Resolution = `echo 72 36`
-              else
-                 set Resolution = `echo 360 210`
-              endif
-           endif
+           set Resolution = `echo 360 200`
 
            if( $num == 0 ) then
               set OGCM_IM = $Resolution[1]
@@ -793,6 +774,41 @@ if( $OGCM == TRUE ) then
            endif
         endif
 
+    else if ( "$OCNMODEL" == "MOM6" ) then
+       # For MOM6 we currently have only 3 allowed ocean resolutions based on the
+       # atmospheric resolution. The allowed are:
+       #
+       # Atm Res  Atm NXxNY  Atm IMxJM  Ocean NXxNY  Ocean IMxJM  Ocean LM
+       # -------  ---------  ---------  -----------  -----------  --------
+       # c12      1x6        12x72      3x2          72x36        50
+       # c90      5x36       90x540     90x2         540x458      50
+       # c180     30x36      180x1080   36x30        1440x1080    75
+       #
+       # See https://github.com/GEOS-ESM/GEOSgcm/wiki/Coupled-model-configurations-(GEOS-MOM6)
+
+       if ( $AGCM_IM == "c12" ) then
+          set OGCM_NX = 3
+          set OGCM_NY = 2
+          set OGCM_IM = 72
+          set OGCM_JM = 36
+          set OGCM_LM = 50
+       else if ( $AGCM_IM == "c90" ) then
+          set OGCM_NX = 90
+          set OGCM_NY = 2
+          set OGCM_IM = 540
+          set OGCM_JM = 458
+          set OGCM_LM = 50
+       else if ( $AGCM_IM == "c180" ) then
+          set OGCM_NX = 36
+          set OGCM_NY = 30
+          set OGCM_IM = 1440
+          set OGCM_JM = 1080
+          set OGCM_LM = 75
+       else
+          echo
+          echo "ERROR: MOM6 is currently only supported for c12, c90, and c180 atmospheric resolutions"
+          exit 1
+       endif
     endif
 
     set IMO = ${OGCM_IM}
@@ -825,17 +841,14 @@ if( $OGCM == TRUE ) then
     set OSTIA    = "#DELETE"
     set OCEANOUT = "#DELETE"
 
-    echo "Enter the Ocean Model ${C1}Vertical Resolution${CN}: ${C2}LM${CN} (Default: 50)"
-    set   OGCM_LM = $<
-    if( .$OGCM_LM == . ) then
-    set   OGCM_LM = 50
-    endif
+    # We only ask this if not MOM6
+    if ( "$OCNMODEL" != "MOM6" ) then
+       echo "Enter the Ocean Model ${C1}Vertical Resolution${CN}: ${C2}LM${CN} (Default: 50)"
+       set   OGCM_LM = $<
+       if( .$OGCM_LM == . ) then
+          set   OGCM_LM = 50
+       endif
 
-    # At the moment c12 MOM6 is default 3x2 ocean (and 1x6 atmos)
-    if( $AGCM_IM ==  "c12" ) then
-       set OGCM_NX = 3
-       set OGCM_NY = 2
-    else
        set OGCM_NX = 36
        set OGCM_NY = 10
     endif
@@ -1050,10 +1063,10 @@ if( $AGCM_IM ==  "c12" ) then
      set AGCM_IM  = 12
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      # C12 MOM6 should be 1x6 to match the default 3x2 ocean layout
-     if ( $OCEAN_NAME == "MOM6") then
-     set       NX = 1
+     if ( "$OCNMODEL" == "MOM6") then
+        set    NX = 1
      else
-     set       NX = 2
+        set    NX = 2
      endif
      set       NY = `expr $NX \* 6`
      set   HYDROSTATIC = $USE_HYDROSTATIC
@@ -1109,18 +1122,22 @@ if( $AGCM_IM ==  "c90" ) then
      set AGCM_IM  = 90
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      if( $OGCM == TRUE ) then
-          if( "$OCNMODEL" == "MIT" ) then
-              set  NX = 10
-              set  NY = 36
-          else
-              set  NX = $OGCM_NY
-              set  NY = $OGCM_NX
-          endif
-          set OCEAN_DT = $DT
+        if( "$OCNMODEL" == "MIT" ) then
+           set  NX = 10
+           set  NY = 36
+        else if ( "$OCNMODEL" == "MOM6") then
+           # For MOM6 c90 means atm NXxNY = 5x36
+           set  NX = 5
+           set  NY = 36
+        else
+           set  NX = $OGCM_NY
+           set  NY = $OGCM_NX
+        endif
+        set OCEAN_DT = $DT
      else
-          set  NX = 4
-          set  NY = `expr $NX \* 6`
-     set OCEAN_DT = $IRRAD_DT
+        set  NX = 3
+        set  NY = `expr $NX \* 6`
+        set OCEAN_DT = $IRRAD_DT
      endif
      set  LONG_DT = $DT
      set GEOSCHEMCHEM_DT = `expr $DT \* 2`
@@ -1141,13 +1158,19 @@ if( $AGCM_IM ==  "c180" ) then
      set AGCM_IM  = 180
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      if( $OGCM == TRUE ) then
-          set  NX = $OGCM_NY
-          set  NY = $OGCM_NX
-     set OCEAN_DT = $DT
+        if ( "$OCNMODEL" == "MOM6") then
+           # For MOM6 c180 means atm NXxNY = 30x36
+           set  NX = 30
+           set  NY = 36
+        else
+           set  NX = $OGCM_NY
+           set  NY = $OGCM_NX
+        endif
+        set OCEAN_DT = $DT
      else
-          set  NX = 6
-          set  NY = `expr $NX \* 6`
-     set OCEAN_DT = $IRRAD_DT
+        set  NX = 6
+        set  NY = `expr $NX \* 6`
+        set OCEAN_DT = $IRRAD_DT
      endif
      set HYDROSTATIC = $USE_HYDROSTATIC
      set HIST_IM  = `expr $AGCM_IM \* 4`
@@ -1818,6 +1841,7 @@ if( $SITE == 'NAS' ) then
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /nobackup/$LOGNAME                                     # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm                  # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE              # Location of GWD_RIDGE files
               if ( "$OCNMODEL" == "MIT" ) then
                 setenv COUPLEDIR  /nobackupp2/estrobac/geos5/GRIDDIR                   # Coupled Ocean/Atmos Forcing
@@ -1864,7 +1888,8 @@ else if( $SITE == 'NCCS' ) then
               endif
               setenv CHMDIR     $SHARE/gmao_ops/fvInput_nc3                            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /discover/nobackup/$LOGNAME                            # user work directory
-              setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # Coupled Ocean/Atmos Forcing
+              setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # OLD Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
               if (${OGRIDTYP} == "LL") then
                 setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR
@@ -1906,6 +1931,7 @@ else if( $SITE == 'AWS' | $SITE == 'Azure' ) then
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3         # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /home/$LOGNAME                                         # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm               # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE           # Location of GWD_RIDGE files
 
 else
@@ -1943,6 +1969,7 @@ else
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3         # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /home/$LOGNAME                                         # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm               # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE           # Location of GWD_RIDGE files
               set NX = 1
               set NY = 6
@@ -2191,6 +2218,7 @@ if( $MPI == openmpi ) then
 
 # Open MPI and GEOS has issues with restart writing. Having the
 # oserver write them can be orders of magnitude faster
+
 set RESTART_BY_OSERVER = YES
 
 # This turns off an annoying warning when running
@@ -2351,6 +2379,7 @@ s?@ICEFILE?$ICEFILE?g
 s?@KPARFILE?$KPARFILE?g
 s?@CHMDIR?$CHMDIR?g
 s?@COUPLEDIR?$COUPLEDIR?g
+s?@shared_COUPLED?$shared_COUPLED?g
 s?@GWDRSDIR?$GWDRSDIR?g
 s?@EXPDIR?$EXPDIR?g
 s?@EXPDSC?$EXPDSC?g
diff --git a/gmichem_setup b/gmichem_setup
index 9855e0ed..86aac197 100755
--- a/gmichem_setup
+++ b/gmichem_setup
@@ -619,14 +619,14 @@ if( $OGCM == TRUE ) then
     # Ocean Model
     # -----------
     OCNMODEL:
-    echo "Choose an ${C1}Ocean Model${CN}: (Default: ${C2}MOM5${CN})"
+    echo "Choose an ${C1}Ocean Model${CN}: (Default: ${C2}MOM6${CN})"
     echo "   ${C2}MOM5${CN}"
     echo "   ${C2}MOM6${CN}"
     echo "   ${C2}MIT${CN}"
 
     set OCNMODEL  = $<
     if ( .$OCNMODEL == . ) then
-       set OCNMODEL  = "MOM5"
+       set OCNMODEL  = "MOM6"
     else
        set OCNMODEL = `echo $OCNMODEL | tr "[:lower:]" "[:upper:]"`
 
@@ -658,7 +658,6 @@ if( $OGCM == TRUE ) then
        set MOM5 = "#DELETE"
        set DEFAULT_HISTORY_TEMPLATE="HISTORY.AOGCM.rc.tmpl"
        set MIT  = "#DELETE"
-       set OCEAN_NAME="MOM6"
     else if ( "$OCNMODEL" == "MIT" ) then
        set OCEAN_NAME="MIT"
        set OGCM_GRID_TYPE = llc
@@ -760,17 +759,8 @@ if( $OGCM == TRUE ) then
         else
             goto CORSLV
         endif
-    else
-        if ( $OCEAN_NAME == "MOM" ) then
-           set Resolution = `echo 360 200`
-        else if ( $OCEAN_NAME == "MOM6" ) then
-           # c12 MOM6 is default 72x36
-           if( $AGCM_IM ==  "c12" ) then
-              set Resolution = `echo 72 36`
-           else
-              set Resolution = `echo 360 210`
-           endif
-        endif
+    else if ( $OCEAN_NAME == "MOM" ) then
+        set Resolution = `echo 360 200`
 
         echo "Enter the Ocean Lat/Lon ${C1}Horizontal Resolution${CN}: ${C2}IM JM${CN} (Default:" $Resolution")"
         set Resolution = `echo $<`
@@ -779,16 +769,7 @@ if( $OGCM == TRUE ) then
            set OGCM_IM = $Resolution[1]
            set OGCM_JM = $Resolution[2]
         else
-           if ( $OCEAN_NAME == "MOM" ) then
-              set Resolution = `echo 360 200`
-           else if ( $OCEAN_NAME == "MOM6" ) then
-              # c12 MOM6 is default 72x36
-              if( $AGCM_IM ==  "c12" ) then
-                 set Resolution = `echo 72 36`
-              else
-                 set Resolution = `echo 360 210`
-              endif
-           endif
+           set Resolution = `echo 360 200`
 
            if( $num == 0 ) then
               set OGCM_IM = $Resolution[1]
@@ -798,6 +779,41 @@ if( $OGCM == TRUE ) then
            endif
         endif
 
+    else if ( "$OCNMODEL" == "MOM6" ) then
+       # For MOM6 we currently have only 3 allowed ocean resolutions based on the
+       # atmospheric resolution. The allowed are:
+       #
+       # Atm Res  Atm NXxNY  Atm IMxJM  Ocean NXxNY  Ocean IMxJM  Ocean LM
+       # -------  ---------  ---------  -----------  -----------  --------
+       # c12      1x6        12x72      3x2          72x36        50
+       # c90      5x36       90x540     90x2         540x458      50
+       # c180     30x36      180x1080   36x30        1440x1080    75
+       #
+       # See https://github.com/GEOS-ESM/GEOSgcm/wiki/Coupled-model-configurations-(GEOS-MOM6)
+
+       if ( $AGCM_IM == "c12" ) then
+          set OGCM_NX = 3
+          set OGCM_NY = 2
+          set OGCM_IM = 72
+          set OGCM_JM = 36
+          set OGCM_LM = 50
+       else if ( $AGCM_IM == "c90" ) then
+          set OGCM_NX = 90
+          set OGCM_NY = 2
+          set OGCM_IM = 540
+          set OGCM_JM = 458
+          set OGCM_LM = 50
+       else if ( $AGCM_IM == "c180" ) then
+          set OGCM_NX = 36
+          set OGCM_NY = 30
+          set OGCM_IM = 1440
+          set OGCM_JM = 1080
+          set OGCM_LM = 75
+       else
+          echo
+          echo "ERROR: MOM6 is currently only supported for c12, c90, and c180 atmospheric resolutions"
+          exit 1
+       endif
     endif
 
     set IMO = ${OGCM_IM}
@@ -830,17 +846,14 @@ if( $OGCM == TRUE ) then
     set OSTIA    = "#DELETE"
     set OCEANOUT = "#DELETE"
 
-    echo "Enter the Ocean Model ${C1}Vertical Resolution${CN}: ${C2}LM${CN} (Default: 50)"
-    set   OGCM_LM = $<
-    if( .$OGCM_LM == . ) then
-    set   OGCM_LM = 50
-    endif
+    # We only ask this if not MOM6
+    if ( "$OCNMODEL" != "MOM6" ) then
+       echo "Enter the Ocean Model ${C1}Vertical Resolution${CN}: ${C2}LM${CN} (Default: 50)"
+       set   OGCM_LM = $<
+       if( .$OGCM_LM == . ) then
+          set   OGCM_LM = 50
+       endif
 
-    # At the moment c12 MOM6 is default 3x2 ocean (and 1x6 atmos)
-    if( $AGCM_IM ==  "c12" ) then
-       set OGCM_NX = 3
-       set OGCM_NY = 2
-    else
        set OGCM_NX = 36
        set OGCM_NY = 10
     endif
@@ -1147,10 +1160,10 @@ if( $AGCM_IM ==  "c12" ) then
      set AGCM_IM  = 12
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      # C12 MOM6 should be 1x6 to match the default 3x2 ocean layout
-     if ( $OCEAN_NAME == "MOM6") then
-     set       NX = 1
+     if ( "$OCNMODEL" == "MOM6") then
+        set    NX = 1
      else
-     set       NX = 2
+        set    NX = 2
      endif
      set       NY = `expr $NX \* 6`
      set   HYDROSTATIC = $USE_HYDROSTATIC
@@ -1206,18 +1219,22 @@ if( $AGCM_IM ==  "c90" ) then
      set AGCM_IM  = 90
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      if( $OGCM == TRUE ) then
-          if( "$OCNMODEL" == "MIT" ) then
-              set  NX = 10
-              set  NY = 36
-          else
-              set  NX = $OGCM_NY
-              set  NY = $OGCM_NX
-          endif
-          set OCEAN_DT = $DT
+        if( "$OCNMODEL" == "MIT" ) then
+           set  NX = 10
+           set  NY = 36
+        else if ( "$OCNMODEL" == "MOM6") then
+           # For MOM6 c90 means atm NXxNY = 5x36
+           set  NX = 5
+           set  NY = 36
+        else
+           set  NX = $OGCM_NY
+           set  NY = $OGCM_NX
+        endif
+        set OCEAN_DT = $DT
      else
-          set  NX = 8
-          set  NY = `expr $NX \* 6`
-     set OCEAN_DT = $IRRAD_DT
+        set  NX = 3
+        set  NY = `expr $NX \* 6`
+        set OCEAN_DT = $IRRAD_DT
      endif
      set  LONG_DT = $DT
      set GMICHEM_DT = `expr $DT \* 2`
@@ -1238,13 +1255,19 @@ if( $AGCM_IM ==  "c180" ) then
      set AGCM_IM  = 180
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      if( $OGCM == TRUE ) then
-          set  NX = $OGCM_NY
-          set  NY = $OGCM_NX
-     set OCEAN_DT = $DT
+        if ( "$OCNMODEL" == "MOM6") then
+           # For MOM6 c180 means atm NXxNY = 30x36
+           set  NX = 30
+           set  NY = 36
+        else
+           set  NX = $OGCM_NY
+           set  NY = $OGCM_NX
+        endif
+        set OCEAN_DT = $DT
      else
-          set  NX = 10
-          set  NY = `expr $NX \* 6`
-     set OCEAN_DT = $IRRAD_DT
+        set  NX = 6
+        set  NY = `expr $NX \* 6`
+        set OCEAN_DT = $IRRAD_DT
      endif
      set HYDROSTATIC = $USE_HYDROSTATIC
      set HIST_IM  = `expr $AGCM_IM \* 4`
@@ -1979,6 +2002,7 @@ if( $SITE == 'NAS' ) then
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /nobackup/$LOGNAME                                     # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm                  # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE              # Location of GWD_RIDGE files
               if ( "$OCNMODEL" == "MIT" ) then
                 setenv COUPLEDIR  /nobackupp2/estrobac/geos5/GRIDDIR                   # Coupled Ocean/Atmos Forcing
@@ -2025,7 +2049,8 @@ else if( $SITE == 'NCCS' ) then
               endif
               setenv CHMDIR     $SHARE/gmao_ops/fvInput_nc3                            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /discover/nobackup/$LOGNAME                            # user work directory
-              setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # Coupled Ocean/Atmos Forcing
+              setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # OLD Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
               if (${OGRIDTYP} == "LL") then
                 setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR
@@ -2067,6 +2092,7 @@ else if( $SITE == 'AWS' | $SITE == 'Azure' ) then
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3         # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /home/$LOGNAME                                         # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm               # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE           # Location of GWD_RIDGE files
 
 else
@@ -2104,6 +2130,7 @@ else
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3         # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /home/$LOGNAME                                         # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm               # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE           # Location of GWD_RIDGE files
               set NX = 1
               set NY = 6
@@ -2358,6 +2385,7 @@ if( $MPI == openmpi ) then
 
 # Open MPI and GEOS has issues with restart writing. Having the
 # oserver write them can be orders of magnitude faster
+
 set RESTART_BY_OSERVER = YES
 
 # This turns off an annoying warning when running
@@ -2518,6 +2546,7 @@ s?@ICEFILE?$ICEFILE?g
 s?@KPARFILE?$KPARFILE?g
 s?@CHMDIR?$CHMDIR?g
 s?@COUPLEDIR?$COUPLEDIR?g
+s?@shared_COUPLED?$shared_COUPLED?g
 s?@GWDRSDIR?$GWDRSDIR?g
 s?@EXPDIR?$EXPDIR?g
 s?@EXPDSC?$EXPDSC?g
diff --git a/stratchem_setup b/stratchem_setup
index b3ca20c5..7b81eba4 100755
--- a/stratchem_setup
+++ b/stratchem_setup
@@ -614,14 +614,14 @@ if( $OGCM == TRUE ) then
     # Ocean Model
     # -----------
     OCNMODEL:
-    echo "Choose an ${C1}Ocean Model${CN}: (Default: ${C2}MOM5${CN})"
+    echo "Choose an ${C1}Ocean Model${CN}: (Default: ${C2}MOM6${CN})"
     echo "   ${C2}MOM5${CN}"
     echo "   ${C2}MOM6${CN}"
     echo "   ${C2}MIT${CN}"
 
     set OCNMODEL  = $<
     if ( .$OCNMODEL == . ) then
-       set OCNMODEL  = "MOM5"
+       set OCNMODEL  = "MOM6"
     else
        set OCNMODEL = `echo $OCNMODEL | tr "[:lower:]" "[:upper:]"`
 
@@ -653,7 +653,6 @@ if( $OGCM == TRUE ) then
        set MOM5 = "#DELETE"
        set DEFAULT_HISTORY_TEMPLATE="HISTORY.AOGCM.rc.tmpl"
        set MIT  = "#DELETE"
-       set OCEAN_NAME="MOM6"
     else if ( "$OCNMODEL" == "MIT" ) then
        set OCEAN_NAME="MIT"
        set OGCM_GRID_TYPE = llc
@@ -755,17 +754,8 @@ if( $OGCM == TRUE ) then
         else
             goto CORSLV
         endif
-    else
-        if ( $OCEAN_NAME == "MOM" ) then
-           set Resolution = `echo 360 200`
-        else if ( $OCEAN_NAME == "MOM6" ) then
-           # c12 MOM6 is default 72x36
-           if( $AGCM_IM ==  "c12" ) then
-              set Resolution = `echo 72 36`
-           else
-              set Resolution = `echo 360 210`
-           endif
-        endif
+    else if ( $OCEAN_NAME == "MOM" ) then
+        set Resolution = `echo 360 200`
 
         echo "Enter the Ocean Lat/Lon ${C1}Horizontal Resolution${CN}: ${C2}IM JM${CN} (Default:" $Resolution")"
         set Resolution = `echo $<`
@@ -774,16 +764,7 @@ if( $OGCM == TRUE ) then
            set OGCM_IM = $Resolution[1]
            set OGCM_JM = $Resolution[2]
         else
-           if ( $OCEAN_NAME == "MOM" ) then
-              set Resolution = `echo 360 200`
-           else if ( $OCEAN_NAME == "MOM6" ) then
-              # c12 MOM6 is default 72x36
-              if( $AGCM_IM ==  "c12" ) then
-                 set Resolution = `echo 72 36`
-              else
-                 set Resolution = `echo 360 210`
-              endif
-           endif
+           set Resolution = `echo 360 200`
 
            if( $num == 0 ) then
               set OGCM_IM = $Resolution[1]
@@ -793,6 +774,41 @@ if( $OGCM == TRUE ) then
            endif
         endif
 
+    else if ( "$OCNMODEL" == "MOM6" ) then
+       # For MOM6 we currently have only 3 allowed ocean resolutions based on the
+       # atmospheric resolution. The allowed are:
+       #
+       # Atm Res  Atm NXxNY  Atm IMxJM  Ocean NXxNY  Ocean IMxJM  Ocean LM
+       # -------  ---------  ---------  -----------  -----------  --------
+       # c12      1x6        12x72      3x2          72x36        50
+       # c90      5x36       90x540     90x2         540x458      50
+       # c180     30x36      180x1080   36x30        1440x1080    75
+       #
+       # See https://github.com/GEOS-ESM/GEOSgcm/wiki/Coupled-model-configurations-(GEOS-MOM6)
+
+       if ( $AGCM_IM == "c12" ) then
+          set OGCM_NX = 3
+          set OGCM_NY = 2
+          set OGCM_IM = 72
+          set OGCM_JM = 36
+          set OGCM_LM = 50
+       else if ( $AGCM_IM == "c90" ) then
+          set OGCM_NX = 90
+          set OGCM_NY = 2
+          set OGCM_IM = 540
+          set OGCM_JM = 458
+          set OGCM_LM = 50
+       else if ( $AGCM_IM == "c180" ) then
+          set OGCM_NX = 36
+          set OGCM_NY = 30
+          set OGCM_IM = 1440
+          set OGCM_JM = 1080
+          set OGCM_LM = 75
+       else
+          echo
+          echo "ERROR: MOM6 is currently only supported for c12, c90, and c180 atmospheric resolutions"
+          exit 1
+       endif
     endif
 
     set IMO = ${OGCM_IM}
@@ -825,17 +841,14 @@ if( $OGCM == TRUE ) then
     set OSTIA    = "#DELETE"
     set OCEANOUT = "#DELETE"
 
-    echo "Enter the Ocean Model ${C1}Vertical Resolution${CN}: ${C2}LM${CN} (Default: 50)"
-    set   OGCM_LM = $<
-    if( .$OGCM_LM == . ) then
-    set   OGCM_LM = 50
-    endif
+    # We only ask this if not MOM6
+    if ( "$OCNMODEL" != "MOM6" ) then
+       echo "Enter the Ocean Model ${C1}Vertical Resolution${CN}: ${C2}LM${CN} (Default: 50)"
+       set   OGCM_LM = $<
+       if( .$OGCM_LM == . ) then
+          set   OGCM_LM = 50
+       endif
 
-    # At the moment c12 MOM6 is default 3x2 ocean (and 1x6 atmos)
-    if( $AGCM_IM ==  "c12" ) then
-       set OGCM_NX = 3
-       set OGCM_NY = 2
-    else
        set OGCM_NX = 36
        set OGCM_NY = 10
     endif
@@ -1050,10 +1063,10 @@ if( $AGCM_IM ==  "c12" ) then
      set AGCM_IM  = 12
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      # C12 MOM6 should be 1x6 to match the default 3x2 ocean layout
-     if ( $OCEAN_NAME == "MOM6") then
-     set       NX = 1
+     if ( "$OCNMODEL" == "MOM6") then
+        set    NX = 1
      else
-     set       NX = 2
+        set    NX = 2
      endif
      set       NY = `expr $NX \* 6`
      set   HYDROSTATIC = $USE_HYDROSTATIC
@@ -1109,18 +1122,22 @@ if( $AGCM_IM ==  "c90" ) then
      set AGCM_IM  = 90
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      if( $OGCM == TRUE ) then
-          if( "$OCNMODEL" == "MIT" ) then
-              set  NX = 10
-              set  NY = 36
-          else
-              set  NX = $OGCM_NY
-              set  NY = $OGCM_NX
-          endif
-          set OCEAN_DT = $DT
+        if( "$OCNMODEL" == "MIT" ) then
+           set  NX = 10
+           set  NY = 36
+        else if ( "$OCNMODEL" == "MOM6") then
+           # For MOM6 c90 means atm NXxNY = 5x36
+           set  NX = 5
+           set  NY = 36
+        else
+           set  NX = $OGCM_NY
+           set  NY = $OGCM_NX
+        endif
+        set OCEAN_DT = $DT
      else
-          set  NX = 6
-          set  NY = `expr $NX \* 6`
-     set OCEAN_DT = $IRRAD_DT
+        set  NX = 3
+        set  NY = `expr $NX \* 6`
+        set OCEAN_DT = $IRRAD_DT
      endif
      set  LONG_DT = $DT
      set SC_SPLIT = 1
@@ -1141,13 +1158,19 @@ if( $AGCM_IM ==  "c180" ) then
      set AGCM_IM  = 180
      set AGCM_JM  = `expr $AGCM_IM \* 6`
      if( $OGCM == TRUE ) then
-          set  NX = $OGCM_NY
-          set  NY = $OGCM_NX
-     set OCEAN_DT = $DT
+        if ( "$OCNMODEL" == "MOM6") then
+           # For MOM6 c180 means atm NXxNY = 30x36
+           set  NX = 30
+           set  NY = 36
+        else
+           set  NX = $OGCM_NY
+           set  NY = $OGCM_NX
+        endif
+        set OCEAN_DT = $DT
      else
-          set  NX = 8
-          set  NY = `expr $NX \* 6`
-     set OCEAN_DT = $IRRAD_DT
+        set  NX = 6
+        set  NY = `expr $NX \* 6`
+        set OCEAN_DT = $IRRAD_DT
      endif
      set HYDROSTATIC = $USE_HYDROSTATIC
      set HIST_IM  = `expr $AGCM_IM \* 4`
@@ -1803,6 +1826,7 @@ if( $SITE == 'NAS' ) then
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /nobackup/$LOGNAME                                     # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm                  # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE              # Location of GWD_RIDGE files
               if ( "$OCNMODEL" == "MIT" ) then
                 setenv COUPLEDIR  /nobackupp2/estrobac/geos5/GRIDDIR                   # Coupled Ocean/Atmos Forcing
@@ -1849,7 +1873,8 @@ else if( $SITE == 'NCCS' ) then
               endif
               setenv CHMDIR     $SHARE/gmao_ops/fvInput_nc3                            # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /discover/nobackup/$LOGNAME                            # user work directory
-              setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # Coupled Ocean/Atmos Forcing
+              setenv COUPLEDIR  ${BOUNDARY_DIR}/ssd/aogcm             # OLD Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/osse2/stage/BCS_FILES/GWD_RIDGE # Location of GWD_RIDGE files
               if (${OGRIDTYP} == "LL") then
                 setenv SSTDIR /discover/nobackup/estrobac/geos5/SSTDIR
@@ -1891,6 +1916,7 @@ else if( $SITE == 'AWS' | $SITE == 'Azure' ) then
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3         # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /home/$LOGNAME                                         # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm               # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE           # Location of GWD_RIDGE files
 
 else
@@ -1928,6 +1954,7 @@ else
               setenv CHMDIR     ${BOUNDARY_DIR}/fvInput_nc3         # locations of Aerosol Chemistry BCs
               setenv WRKDIR     /home/$LOGNAME                                         # user work directory
               setenv COUPLEDIR  ${BOUNDARY_DIR}/aogcm               # Coupled Ocean/Atmos Forcing
+              setenv shared_COUPLED  ${BOUNDARY_DIR}/bcs_shared/make_bcs_inputs             # Coupled Ocean/Atmos Forcing
               setenv GWDRSDIR   ${BOUNDARY_DIR}/GWD_RIDGE           # Location of GWD_RIDGE files
               set NX = 1
               set NY = 6
@@ -2176,6 +2203,7 @@ if( $MPI == openmpi ) then
 
 # Open MPI and GEOS has issues with restart writing. Having the
 # oserver write them can be orders of magnitude faster
+
 set RESTART_BY_OSERVER = YES
 
 # This turns off an annoying warning when running
@@ -2336,6 +2364,7 @@ s?@ICEFILE?$ICEFILE?g
 s?@KPARFILE?$KPARFILE?g
 s?@CHMDIR?$CHMDIR?g
 s?@COUPLEDIR?$COUPLEDIR?g
+s?@shared_COUPLED?$shared_COUPLED?g
 s?@GWDRSDIR?$GWDRSDIR?g
 s?@EXPDIR?$EXPDIR?g
 s?@EXPDSC?$EXPDSC?g