Skip to content

Fixes compilation issues with -openmp #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adcroft merged 1 commit into from
Oct 8, 2014
Merged

Fixes compilation issues with -openmp #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/parameterizations/lateral/MOM_MEKE.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ subroutine step_forward_MEKE(MEKE, h, visc, dt, G, CS)

!$OMP parallel default(none) shared(MEKE,CS,is,ie,js,je,nz,src,mass,G,h,I_mass, &
!$OMP sdt,drag_vel_u,visc,drag_vel_v,drag_rate_visc, &
!$OMP drag_rate,Rho0,MEKE_decay,sdt_damp,cdrag2, *
!$OMP drag_rate,Rho0,MEKE_decay,sdt_damp,cdrag2, &
!$OMP bottomFac2) &
!$OMP private(ldamping)

Expand All @@ -152,7 +152,7 @@ subroutine step_forward_MEKE(MEKE, h, visc, dt, G, CS)
enddo

if (associated(MEKE%mom_src)) then
!$OMP do
!!$OMP do
! do j=js,je ; do i=is,ie
! MEKE%MEKE(i,j) = MEKE%MEKE(i,j) - I_mass(i,j) * &
! (sdt*CS%MEKE_FrCoeff)*MEKE%mom_src(i,j)
Expand All @@ -164,7 +164,7 @@ subroutine step_forward_MEKE(MEKE, h, visc, dt, G, CS)
endif

if (associated(MEKE%GM_src)) then
!$OMP do
!!$OMP do
! do j=js,je ; do i=is,ie
! MEKE%MEKE(i,j) = MEKE%MEKE(i,j) - I_mass(i,j) * &
! (sdt*CS%MEKE_GMcoeff)*MEKE%GM_src(i,j)
Expand All @@ -175,10 +175,11 @@ subroutine step_forward_MEKE(MEKE, h, visc, dt, G, CS)
enddo ; enddo
endif

!$OMP do
!!$OMP do
!do j=js,je ; do i=is,ie
! MEKE%MEKE(i,j) = max(0.0,MEKE%MEKE(i,j) + (sdt*CS%MEKE_BGsrc)*G%mask2dT(i,j))
!enddo ; enddo
!$OMP do
do j=js,je ; do i=is,ie
MEKE%MEKE(i,j) = max(0.0, MEKE%MEKE(i,j) + sdt*src(i,j) )*G%mask2dT(i,j)
enddo ; enddo
Expand Down
4 changes: 2 additions & 2 deletions src/parameterizations/vertical/MOM_diabatic_driver.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,8 +1231,8 @@ subroutine make_frazil(h, tv, G, CS, p_surf)
if (.not.CS%pressure_dependent_frazil) then
do k=1,nz ; do i=is,ie ; pressure(i,k) = 0.0 ; enddo ; enddo
endif
!$OMP parallel do default(none) shared(is,ie,js,je,CS,G,h,nz,tv) &
!$OMP private(fraz_col,T_fr_set,T_freeze,hc) &
!$OMP parallel do default(none) shared(is,ie,js,je,CS,G,h,nz,tv,p_surf) &
!$OMP private(fraz_col,T_fr_set,T_freeze,hc,ps) &
!$OMP firstprivate(pressure)
do j=js,je
ps(:) = 0.0
Expand Down