Skip to content

Commit

Permalink
CCS1 runs with six cores.
Browse files Browse the repository at this point in the history
  • Loading branch information
kshedstrom committed Jun 29, 2016
1 parent bd59a04 commit 0cf8497
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
6 changes: 3 additions & 3 deletions src/core/MOM_continuity_PPM.F90
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ subroutine continuity_PPM(u, v, hin, h, uh, vh, dt, G, GV, CS, uhbt, vhbt, OBC,

apply_OBC_u_flather_east = .false. ; apply_OBC_u_flather_west = .false.
apply_OBC_v_flather_north = .false. ; apply_OBC_v_flather_south = .false.
if (present(OBC)) then ; if (associated(OBC)) then
if (present(OBC)) then ; if (OBC%this_pe) then
apply_OBC_u_flather_east = OBC%apply_OBC_u_flather_east
apply_OBC_u_flather_west = OBC%apply_OBC_u_flather_west
apply_OBC_v_flather_north = OBC%apply_OBC_v_flather_north
Expand Down Expand Up @@ -396,7 +396,7 @@ subroutine zonal_mass_flux(u, h_in, uh, dt, G, GV, CS, LB, uhbt, OBC, &
use_visc_rem = present(visc_rem_u)
apply_OBC_u = .false. ; set_BT_cont = .false.
if (present(BT_cont)) set_BT_cont = (associated(BT_cont))
if (present(OBC)) then ; if (associated(OBC)) then
if (present(OBC)) then ; if (OBC%this_pe) then
apply_OBC_u = OBC%apply_OBC_u
endif ; endif
ish = LB%ish ; ieh = LB%ieh ; jsh = LB%jsh ; jeh = LB%jeh ; nz = G%ke
Expand Down Expand Up @@ -1153,7 +1153,7 @@ subroutine meridional_mass_flux(v, h_in, vh, dt, G, GV, CS, LB, vhbt, OBC, &
use_visc_rem = present(visc_rem_v)
apply_OBC_v = .false. ; set_BT_cont = .false.
if (present(BT_cont)) set_BT_cont = (associated(BT_cont))
if (present(OBC)) then ; if (associated(OBC)) then
if (present(OBC)) then ; if (OBC%this_pe) then
apply_OBC_v = OBC%apply_OBC_v
endif ; endif
ish = LB%ish ; ieh = LB%ieh ; jsh = LB%jsh ; jeh = LB%jeh ; nz = G%ke
Expand Down
1 change: 0 additions & 1 deletion src/core/MOM_open_boundary.F90
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,6 @@ subroutine Radiation_Open_Bdry_Conds(OBC, u_new, u_old, v_new, v_old, &
is = G%isc ; ie = G%iec ; js = G%jsc ; je = G%jec ; nz = G%ke

if (.not.associated(OBC)) return
if (.not. OBC%this_pe) return
if (.not.(OBC%apply_OBC_u_flather_east .or. OBC%apply_OBC_u_flather_west .or. &
OBC%apply_OBC_v_flather_north .or. OBC%apply_OBC_v_flather_south)) &
return
Expand Down
2 changes: 1 addition & 1 deletion src/parameterizations/lateral/MOM_hor_visc.F90
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ subroutine horizontal_viscosity(u, v, h, diffu, diffv, MEKE, VarMix, G, GV, CS,
h_neglect = GV%H_subroundoff
h_neglect3 = h_neglect**3

if (present(OBC)) then ; if (associated(OBC)) then
if (present(OBC)) then ; if (OBC%this_pe) then
apply_OBC = OBC%apply_OBC_u_flather_east .or. OBC%apply_OBC_u_flather_west .or. &
OBC%apply_OBC_v_flather_north .or. OBC%apply_OBC_v_flather_south
endif ; endif
Expand Down
2 changes: 1 addition & 1 deletion src/parameterizations/vertical/MOM_vert_friction.F90
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ subroutine vertvisc(u, v, h, fluxes, visc, dt, OBC, ADp, CDp, G, GV, CS, &
call vertvisc_limit_vel(u, v, h, ADp, CDp, fluxes, visc, dt, G, GV, CS)

! Here the velocities associated with open boundary conditions are applied.
if (associated(OBC)) then
if (OBC%this_pe) then
if (OBC%apply_OBC_u) then
do k=1,nz ; do j=G%jsc,G%jec ; do I=Isq,Ieq
if (OBC%OBC_mask_u(I,j) .and. (OBC%OBC_kind_u(I,j) == OBC_SIMPLE)) &
Expand Down
4 changes: 2 additions & 2 deletions src/tracer/MOM_tracer_advect.F90
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ subroutine advect_x(Tr, hprev, uhr, uh_neglect, OBC, domore_u, ntr, Idt, &
enddo ; enddo
endif ! usePPM

if (associated(OBC)) then ; if (OBC%apply_OBC_u) then
if (OBC%this_pe) then ; if (OBC%apply_OBC_u) then
do_any_i = .false.
do I=is-1,ie
do_i(I) = .false.
Expand Down Expand Up @@ -730,7 +730,7 @@ subroutine advect_y(Tr, hprev, vhr, vh_neglect, OBC, domore_v, ntr, Idt, &
enddo ; enddo
endif ! usePPM

if (associated(OBC)) then ; if (OBC%apply_OBC_v) then
if (OBC%this_pe) then ; if (OBC%apply_OBC_v) then
do_any_i = .false.
do i=is,ie
do_i(i) = .false.
Expand Down

0 comments on commit 0cf8497

Please sign in to comment.