ufs-community · DeniseWorthen · Sep 21, 2021 · Mar 27, 2021 · Mar 27, 2021 · Mar 27, 2021
diff --git a/.gitmodules b/.gitmodules
@@ -28,8 +28,8 @@
   branch = emc/develop
 [submodule "MOM6"]
   path = MOM6-interface/MOM6
-  url = https://github.com/NOAA-EMC/MOM6
-  branch = dev/emc
+  url = https://github.com/jiandewang/MOM6
+  branch = feature/update-to-GFDL-20210914
 [submodule "CICE"]
   path = CICE-interface/CICE
   url = https://github.com/NOAA-EMC/CICE

diff --git a/MOM6-interface/MOM6 b/MOM6-interface/MOM6
diff --git a/MOM6-interface/mom6_files.cmake b/MOM6-interface/mom6_files.cmake
@@ -206,6 +206,7 @@ list(APPEND mom6_src_files
   MOM6/src/tracer/oil_tracer.F90
   MOM6/src/tracer/pseudo_salt_tracer.F90
   MOM6/src/tracer/tracer_example.F90
+  MOM6/src/tracer/MOM_CFC_cap.F90
 
   MOM6/src/user/BFB_initialization.F90
   MOM6/src/user/BFB_surface_forcing.F90

diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/tests/cpld_bmark_v16 b/tests/tests/cpld_bmark_v16
@@ -87,6 +87,9 @@ export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
 export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c384}

diff --git a/tests/tests/cpld_bmark_v16_nsst b/tests/tests/cpld_bmark_v16_nsst
@@ -87,6 +87,9 @@ export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
 export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c384}

diff --git a/tests/tests/cpld_bmark_wave_v16 b/tests/tests/cpld_bmark_wave_v16
@@ -87,6 +87,9 @@ export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
 export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c384}

diff --git a/tests/tests/cpld_bmark_wave_v16_noahmp b/tests/tests/cpld_bmark_wave_v16_noahmp
@@ -87,6 +87,9 @@ export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
 export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c384}

diff --git a/tests/tests/cpld_bmark_wave_v16_noahmp_35d b/tests/tests/cpld_bmark_wave_v16_noahmp_35d
@@ -79,6 +79,9 @@ export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
 export NPROC_ICE='80'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c384}

diff --git a/tests/tests/cpld_bmark_wave_v16_p7b b/tests/tests/cpld_bmark_wave_v16_p7b
@@ -87,6 +87,9 @@ export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
 export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c384}

diff --git a/tests/tests/cpld_bmark_wave_v16_p7b_35d b/tests/tests/cpld_bmark_wave_v16_p7b_35d
@@ -79,6 +79,9 @@ export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
 export NPROC_ICE='80'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c384}

diff --git a/tests/tests/cpld_control_c192 b/tests/tests/cpld_control_c192
@@ -86,6 +86,9 @@ export ICERES='0.50'
 export NX_GLB=720
 export NY_GLB=576
 export NPROC_ICE='24'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c192}

diff --git a/tests/tests/cpld_control_c384 b/tests/tests/cpld_control_c384
@@ -88,6 +88,9 @@ export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
 export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c384}

diff --git a/tests/tests/cpld_restart_bmark_v16 b/tests/tests/cpld_restart_bmark_v16
@@ -91,6 +91,9 @@ export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
 export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c384}

diff --git a/tests/tests/cpld_restart_c192 b/tests/tests/cpld_restart_c192
@@ -90,6 +90,9 @@ export ICERES='0.50'
 export NX_GLB=720
 export NY_GLB=576
 export NPROC_ICE='24'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c192}

diff --git a/tests/tests/cpld_restart_c384 b/tests/tests/cpld_restart_c384
@@ -92,6 +92,9 @@ export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
 export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent setting
 export CDMBWD=${CDMBWD_c384}

diff --git a/tests/tests/datm_cdeps_mx025_cfsr b/tests/tests/datm_cdeps_mx025_cfsr
@@ -30,13 +30,16 @@ export atm_petlist_bounds=$APB_cdeps_025
 export med_petlist_bounds=$MPB_cdeps_025
 export ocn_petlist_bounds=$OPB_cdeps_025
 export ice_petlist_bounds=$IPB_cdeps_025
-export NPROC_ICE='48'
 
 # ocn/ice resolution
 export OCNRES='025'
 export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
+export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent files
 export MOM_INPUT="MOM_input_template_${OCNRES}"

diff --git a/tests/tests/datm_cdeps_mx025_gefs b/tests/tests/datm_cdeps_mx025_gefs
@@ -38,13 +38,16 @@ export atm_petlist_bounds=$APB_cdeps_025
 export med_petlist_bounds=$MPB_cdeps_025
 export ocn_petlist_bounds=$OPB_cdeps_025
 export ice_petlist_bounds=$IPB_cdeps_025
-export NPROC_ICE='48'
 
 # ocn/ice resolution
 export OCNRES='025'
 export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
+export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent files
 export MOM_INPUT="MOM_input_template_${OCNRES}"

diff --git a/tests/tests/datm_mx025_cfsr b/tests/tests/datm_mx025_cfsr
@@ -30,13 +30,16 @@ export atm_petlist_bounds=$APB_datm_025
 export med_petlist_bounds=$MPB_datm_025
 export ocn_petlist_bounds=$OPB_datm_025
 export ice_petlist_bounds=$IPB_datm_025
-export NPROC_ICE='48'
 
 # atm/ocn/ice resolution
 export OCNRES='025'
 export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
+export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent files
 export MOM_INPUT="MOM_input_template_${OCNRES}"

diff --git a/tests/tests/datm_mx025_gefs b/tests/tests/datm_mx025_gefs
@@ -26,13 +26,16 @@ export atm_petlist_bounds=$APB_datm_025
 export med_petlist_bounds=$MPB_datm_025
 export ocn_petlist_bounds=$OPB_datm_025
 export ice_petlist_bounds=$IPB_datm_025
-export NPROC_ICE='48'
 
 # atm/ocn/ice resolution
 export OCNRES='025'
 export ICERES='0.25'
 export NX_GLB=1440
 export NY_GLB=1080
+export NPROC_ICE='48'
+export np2=`expr $NPROC_ICE / 2`
+export BLCKX=`expr $NX_GLB / $np2`
+export BLCKY=`expr $NY_GLB / 2`
 
 # resolution dependent files
 export MOM_INPUT="MOM_input_template_${OCNRES}"
+2 −1		config_src/drivers/mct_cap/mom_surface_forcing_mct.F90
+41 −33		config_src/drivers/nuopc_cap/mom_cap.F90
+26 −1		config_src/drivers/nuopc_cap/mom_cap_methods.F90
+24 −7		config_src/drivers/nuopc_cap/mom_ocean_model_nuopc.F90
+85 −10		config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
+2 −1		config_src/drivers/solo_driver/MESO_surface_forcing.F90
+115 −11		src/core/MOM_forcing_type.F90
+3 −1		src/core/MOM_unit_tests.F90
+14 −3		src/core/MOM_variables.F90
+13 −5		src/parameterizations/lateral/MOM_MEKE.F90
+6 −5		src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
+2 −2		src/parameterizations/lateral/MOM_thickness_diffuse.F90
+131 −117		src/parameterizations/vertical/MOM_CVMix_KPP.F90
+2 −2		src/parameterizations/vertical/MOM_CVMix_conv.F90
+35 −11		src/parameterizations/vertical/MOM_diabatic_driver.F90
+691 −0		src/tracer/MOM_CFC_cap.F90
+14 −14		src/tracer/MOM_tracer_diabatic.F90
+32 −1		src/tracer/MOM_tracer_flow_control.F90
+45 −7		src/user/MOM_wave_interface.F90
+1 −1		src/user/tidal_bay_initialization.F90