MOM6: Merge branch 'ESMG-dev/esmg' into dev/gfdl

- Updated DOME parameters to retain answers after NOAA-GFDL/MOM6@f738996
- Updates MOM_parameter_doc files for OBC experiments

- NOAA-GFDL/MOM6@f738996 Merge branch 'ESMG-dev/esmg' into dev/gfdl
- NOAA-GFDL/MOM6@d3b63db Merge branch 'dev/esmg' of https://github.com/ESMG/MOM6 into ESMG-dev/esmg
- NOAA-GFDL/MOM6@b2b8bf7 Merge pull request #821 from Hallberg-NOAA/correct_openMP
- NOAA-GFDL/MOM6@12410a1 Fix nudging with oblique OBCs.
- NOAA-GFDL/MOM6@ad3961c Time-filter on oblique OBCs.
- NOAA-GFDL/MOM6@50b850d Corrected two openMP directives
- NOAA-GFDL/MOM6@106b3e0 Merge remote-tracking branch 'gfdl/dev/gfdl' into oblique_fuss
- NOAA-GFDL/MOM6@40c2043 Merge remote-tracking branch 'gfdl/dev/gfdl' into oblique_fuss

ocean_only/DOME/MOM_input

@@ -215,8 +215,16 @@ OBC_USER_CONFIG = "DOME"        ! default = "file"
                                 !     USER - call a user modified routine.
 OBC_ZERO_VORTICITY = True       !   [Boolean] default = False
                                 ! If true, sets relative vorticity to zero on open boundaries.
+OBC_FREESLIP_VORTICITY = False  !   [Boolean] default = True
+                                ! If true, sets the normal gradient of tangential velocity to
+                                ! zero in the relative vorticity on open boundaries. This cannot
+                                ! be true if another OBC_XXX_VORTICITY option is True.
 OBC_ZERO_STRAIN = True          !   [Boolean] default = False
                                 ! If true, sets the strain used in the stress tensor to zero on open boundaries.
+OBC_FREESLIP_STRAIN = False     !   [Boolean] default = True
+                                ! If true, sets the normal gradient of tangential velocity to
+                                ! zero in the strain use in the stress tensor on open boundaries. This cannot
+                                ! be true if another OBC_XXX_STRAIN option is True.
 
 ! === module MOM_MEKE ===
 CDRAG = 0.002                   !   [nondim] default = 0.003

ocean_only/DOME/MOM_parameter_doc.all

@@ -229,7 +229,7 @@ OBC_NUMBER_OF_SEGMENTS = 1      ! default = 0
                                 ! The number of open boundary segments.
 OBC_ZERO_VORTICITY = True       !   [Boolean] default = False
                                 ! If true, sets relative vorticity to zero on open boundaries.
-OBC_FREESLIP_VORTICITY = False  !   [Boolean] default = False
+OBC_FREESLIP_VORTICITY = False  !   [Boolean] default = True
                                 ! If true, sets the normal gradient of tangential velocity to
                                 ! zero in the relative vorticity on open boundaries. This cannot
                                 ! be true if another OBC_XXX_VORTICITY option is True.
@@ -243,7 +243,7 @@ OBC_SPECIFIED_VORTICITY = False !   [Boolean] default = False
                                 ! be true if another OBC_XXX_VORTICITY option is True.
 OBC_ZERO_STRAIN = True          !   [Boolean] default = False
                                 ! If true, sets the strain used in the stress tensor to zero on open boundaries.
-OBC_FREESLIP_STRAIN = False     !   [Boolean] default = False
+OBC_FREESLIP_STRAIN = False     !   [Boolean] default = True
                                 ! If true, sets the normal gradient of tangential velocity to
                                 ! zero in the strain use in the stress tensor on open boundaries. This cannot
                                 ! be true if another OBC_XXX_STRAIN option is True.

ocean_only/DOME/MOM_parameter_doc.short

@@ -115,8 +115,16 @@ OBC_NUMBER_OF_SEGMENTS = 1      ! default = 0
                                 ! The number of open boundary segments.
 OBC_ZERO_VORTICITY = True       !   [Boolean] default = False
                                 ! If true, sets relative vorticity to zero on open boundaries.
+OBC_FREESLIP_VORTICITY = False  !   [Boolean] default = True
+                                ! If true, sets the normal gradient of tangential velocity to
+                                ! zero in the relative vorticity on open boundaries. This cannot
+                                ! be true if another OBC_XXX_VORTICITY option is True.
 OBC_ZERO_STRAIN = True          !   [Boolean] default = False
                                 ! If true, sets the strain used in the stress tensor to zero on open boundaries.
+OBC_FREESLIP_STRAIN = False     !   [Boolean] default = True
+                                ! If true, sets the normal gradient of tangential velocity to
+                                ! zero in the strain use in the stress tensor on open boundaries. This cannot
+                                ! be true if another OBC_XXX_STRAIN option is True.
 OBC_SEGMENT_001 = "J=N,I=110:100,SIMPLE" !
                                 ! Documentation needs to be dynamic?????
 ROTATION = "beta"               ! default = "2omegasinlat"

ocean_only/circle_obcs/MOM_parameter_doc.all

@@ -227,7 +227,7 @@ OBC_NUMBER_OF_SEGMENTS = 4      ! default = 0
                                 ! The number of open boundary segments.
 OBC_ZERO_VORTICITY = False      !   [Boolean] default = False
                                 ! If true, sets relative vorticity to zero on open boundaries.
-OBC_FREESLIP_VORTICITY = True   !   [Boolean] default = False
+OBC_FREESLIP_VORTICITY = True   !   [Boolean] default = True
                                 ! If true, sets the normal gradient of tangential velocity to
                                 ! zero in the relative vorticity on open boundaries. This cannot
                                 ! be true if another OBC_XXX_VORTICITY option is True.
@@ -241,7 +241,7 @@ OBC_SPECIFIED_VORTICITY = False !   [Boolean] default = False
                                 ! be true if another OBC_XXX_VORTICITY option is True.
 OBC_ZERO_STRAIN = False         !   [Boolean] default = False
                                 ! If true, sets the strain used in the stress tensor to zero on open boundaries.
-OBC_FREESLIP_STRAIN = True      !   [Boolean] default = False
+OBC_FREESLIP_STRAIN = True      !   [Boolean] default = True
                                 ! If true, sets the normal gradient of tangential velocity to
                                 ! zero in the strain use in the stress tensor on open boundaries. This cannot
                                 ! be true if another OBC_XXX_STRAIN option is True.

ocean_only/circle_obcs/MOM_parameter_doc.short

@@ -106,14 +106,6 @@ MAXIMUM_DEPTH = 600.0           !   [m]
 ! Controls where open boundaries are located, what kind of boundary condition to impose, and what data to apply, if any.
 OBC_NUMBER_OF_SEGMENTS = 4      ! default = 0
                                 ! The number of open boundary segments.
-OBC_FREESLIP_VORTICITY = True   !   [Boolean] default = False
-                                ! If true, sets the normal gradient of tangential velocity to
-                                ! zero in the relative vorticity on open boundaries. This cannot
-                                ! be true if another OBC_XXX_VORTICITY option is True.
-OBC_FREESLIP_STRAIN = True      !   [Boolean] default = False
-                                ! If true, sets the normal gradient of tangential velocity to
-                                ! zero in the strain use in the stress tensor on open boundaries. This cannot
-                                ! be true if another OBC_XXX_STRAIN option is True.
 OBC_ZERO_BIHARMONIC = True      !   [Boolean] default = False
                                 ! If true, zeros the Laplacian of flow on open boundaries in the biharmonic
                                 ! viscosity term.