Latest dev/cryo

Merge branch 'dev/cryo' of github.com:gfdl-cryosphere/MOM6 into gfdl_cryo

Author: OlgaSergienko

ac/makedep

@@ -389,7 +389,9 @@ def scan_fortran_file(src_file, defines=None):
 
     cpp_defines = defines if defines is not None else []
 
-    cpp_macros = dict([t.split('=') for t in cpp_defines])
+    cpp_macros = dict(
+        [t.split('=') if '=' in t else (t, None) for t in cpp_defines]
+    )
     cpp_group_stack = []
 
     with io.open(src_file, 'r', errors='replace') as file:
@@ -454,13 +456,14 @@ def scan_fortran_file(src_file, defines=None):
             # Activate a new macro (ignoring the value)
             match = re_cpp_define.match(line)
             if match:
+                # TODO: Tokenize this, don't hunt for `(` in `macro`.
                 tokens = line.strip()[1:].split(maxsplit=2)
                 macro = tokens[1]
                 value = tokens[2] if tokens[2:] else None
                 if '(' in macro:
                     # TODO: Actual handling of function macros
                     macro, arg = macro.split('(', maxsplit=1)
-                    value = '(' + arg + value
+                    value = '(' + arg + value if value else '(' + arg
                 cpp_macros[macro] = value
 
             # Deactivate a macro

src/core/MOM.F90

@@ -1863,12 +1863,14 @@ subroutine ALE_regridding_and_remapping(CS, G, GV, US, u, v, h, tv, dtdia, Time_
       call remap_dyn_split_RK2_aux_vars(G, GV, CS%dyn_split_RK2_CSp, h_old_u, h_old_v, h_new_u, h_new_v, CS%ALE_CSp)
     endif
 
-    if (associated(CS%OBC)) then
+    if (associated(CS%OBC) .or. associated(CS%visc%Kv_shear_Bu)) then
       call pass_var(h, G%Domain, complete=.false.)
       call pass_var(h_new, G%Domain, complete=.true.)
-      call remap_OBC_fields(G, GV, h, h_new, CS%OBC, PCM_cell=PCM_cell)
     endif
 
+    if (associated(CS%OBC)) &
+      call remap_OBC_fields(G, GV, h, h_new, CS%OBC, PCM_cell=PCM_cell)
+
     call remap_vertvisc_aux_vars(G, GV, CS%visc, h, h_new, CS%ALE_CSp, CS%OBC)
     if (associated(CS%visc%Kv_shear)) &
       call pass_var(CS%visc%Kv_shear, G%Domain, To_All+Omit_Corners, clock=id_clock_pass, halo=1)

src/core/MOM_dynamics_split_RK2.F90

@@ -1338,10 +1338,11 @@ subroutine remap_dyn_split_RK2_aux_vars(G, GV, CS, h_old_u, h_old_v, h_new_u, h_
     call ALE_remap_velocities(ALE_CSp, G, GV, h_old_u, h_old_v, h_new_u, h_new_v, CS%u_av, CS%v_av)
     call pass_vector(CS%u_av, CS%v_av, G%Domain, complete=.false.)
     call ALE_remap_velocities(ALE_CSp, G, GV, h_old_u, h_old_v, h_new_u, h_new_v, CS%CAu_pred, CS%CAv_pred)
-    call pass_vector(CS%CAu_pred, CS%CAv_pred, G%Domain, complete=.true.)
+    call pass_vector(CS%CAu_pred, CS%CAv_pred, G%Domain, complete=.false.)
   endif
 
   call ALE_remap_velocities(ALE_CSp, G, GV, h_old_u, h_old_v, h_new_u, h_new_v, CS%diffu, CS%diffv)
+  call pass_vector(CS%diffu, CS%diffv, G%Domain, complete=.true.)
 
 end subroutine remap_dyn_split_RK2_aux_vars