Making barotropic fix look symmetric.

Author: kshedstrom

src/core/MOM.F90

@@ -114,6 +114,7 @@ module MOM
 use MOM_open_boundary,         only : register_temp_salt_segments, update_segment_tracer_reservoirs
 use MOM_open_boundary,         only : open_boundary_register_restarts, remap_OBC_fields
 use MOM_open_boundary,         only : open_boundary_setup_vert, update_OBC_segment_data
+use MOM_open_boundary,         only : initialize_segment_data
 use MOM_open_boundary,         only : rotate_OBC_config, rotate_OBC_init
 use MOM_porous_barriers,       only : porous_widths_layer, porous_widths_interface, porous_barriers_init
 use MOM_porous_barriers,       only : porous_barrier_CS
@@ -3025,13 +3026,8 @@ subroutine initialize_MOM(Time, Time_init, param_file, dirs, CS, &
       call update_ALE_sponge_field(CS%ALE_sponge_CSp, S_in, G, GV, CS%S)
     endif
 
-    if (associated(OBC_in)) then
+    if (associated(OBC_in)) &
       call rotate_OBC_init(OBC_in, G, GV, US, param_file, CS%tv, restart_CSp, CS%OBC)
-      if (CS%OBC%some_need_no_IO_for_data) then
-        call calc_derived_thermo(CS%tv, CS%h, G, GV, US)
-        call update_OBC_segment_data(G, GV, US, CS%OBC, CS%tv, CS%h, Time)
-      endif
-    endif
 
     deallocate(u_in)
     deallocate(v_in)

src/core/MOM_barotropic.F90

@@ -2466,16 +2466,33 @@ subroutine btstep(U_in, V_in, eta_in, dt, bc_accel_u, bc_accel_v, forces, pbce,
 
     ! Update factor so that nothing changes outside of the OBC (problem for interior OBCs only)
     if (associated(OBC)) then ; if (OBC%OBC_pe) then
-      do j=jsv,jev
+!     do j=jsv,jev
+!       if (OBC%specified_u_BCs_exist_globally .or. OBC%open_u_BCs_exist_globally) then
+!         do i=isv,iev-1 ; if (OBC%segnum_u(I,j) /= OBC_NONE) then
+!           if (OBC%segment(OBC%segnum_u(I,j))%direction == OBC_DIRECTION_E) then
+!             factor(i+1,j) = 0.0
+!           elseif (OBC%segment(OBC%segnum_u(I,j))%direction == OBC_DIRECTION_W) then
+!             factor(i,j) = 0.0
+!           endif
+!         endif ; enddo
+!       endif
+      do i=isv,iev
         if (OBC%specified_u_BCs_exist_globally .or. OBC%open_u_BCs_exist_globally) then
-          do i=isv,iev-1 ; if (OBC%segnum_u(I,j) /= OBC_NONE) then
-            if (OBC%segment(OBC%segnum_u(I,j))%direction == OBC_DIRECTION_E) then
-              factor(i+1,j) = 0.0
-            elseif (OBC%segment(OBC%segnum_u(I,j))%direction == OBC_DIRECTION_W) then
-              factor(i,j) = 0.0
+          do j=jsv,jev
+            if (OBC%segnum_u(I-1,j) /= OBC_NONE) then
+              if (OBC%segment(OBC%segnum_u(I-1,j))%direction == OBC_DIRECTION_E) then
+                factor(i,j) = 0.0
+              endif
+            endif
+            if (OBC%segnum_u(I,j) /= OBC_NONE) then
+              if (OBC%segment(OBC%segnum_u(I,j))%direction == OBC_DIRECTION_W) then
+                factor(i,j) = 0.0
+              endif
             endif
-          endif ; enddo
+          enddo
         endif
+      enddo
+      do j=jsv,jev
         if (OBC%specified_v_BCs_exist_globally .or. OBC%open_v_BCs_exist_globally) then
           do i=isv,iev
             if (OBC%segnum_v(i,J-1) /= OBC_NONE) then

src/core/MOM_open_boundary.F90

@@ -6055,13 +6055,13 @@ subroutine rotate_OBC_init(OBC_in, G, GV, US, param_file, tv, restart_CS, OBC)
                  "If true, Temperature and salinity are used as state "//&
                  "variables.", default=.true., do_not_log=.true.)
 
+  if (use_temperature) &
+    call fill_temp_salt_segments(G, GV, US, OBC, tv)
+
   do l = 1, OBC%number_of_segments
     call rotate_OBC_segment_data(OBC_in%segment(l), OBC%segment(l), G%HI%turns)
   enddo
 
-  if (use_temperature) &
-    call fill_temp_salt_segments(G, GV, US, OBC, tv)
-
   call open_boundary_init(G, GV, US, param_file, OBC, restart_CS)
 end subroutine rotate_OBC_init