Skip to content

Fix compiling issues with -openmp #81

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 2 commits into from
Dec 2, 2014
Merged

Fix compiling issues with -openmp #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b615f0
Fix compiling issues with -openmp
nikizadehgfdl Dec 1, 2014
fc368fa
Missing $OMP private variables
nikizadehgfdl Dec 1, 2014
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
2 changes: 1 addition & 1 deletion src/core/MOM_PressureForce_analytic_FV.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ subroutine PressureForce_AFV_Bouss(h, tv, PFu, PFv, G, CS, ALE_CSp, p_atm, pbce,
!$OMP private(is_bk,ie_bk,js_bk,je_bk,Isq_bk,Ieq_bk,Jsq_bk, &
!$OMP Jeq_bk,ioff_bk,joff_bk,isd,ied,jsd,jed,pa_bk, &
!$OMP intx_pa_bk,inty_pa_bk,dpa_bk,intz_dpa_bk, &
!$OMP intx_dpa_bk,inty_dpa_bk,dz_bk)
!$OMP intx_dpa_bk,inty_dpa_bk,dz_bk,i,j)
do n = 1, G%nblocks
is_bk=G%Block(n)%isc ; ie_bk=G%Block(n)%iec
js_bk=G%Block(n)%jsc ; je_bk=G%Block(n)%jec
Expand Down
4 changes: 2 additions & 2 deletions src/parameterizations/lateral/MOM_MEKE.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ subroutine step_forward_MEKE(MEKE, h, SN_u, SN_v, visc, dt, G, CS)
! Length scale for MEKE derived diffusivity
if (CS%MEKE_KhCoeff>=0.) then
!$OMP parallel do default(none) shared(is,ie,js,je,MEKE,LmixScale,CS,G), &
!$OMP private(Lgrid,Ldeform,LdeformLim)
!$OMP private(Lgrid,Ldeform,LdeformLim,Lfrict,Ue,beta,Lrhines,SN,SN_u,SN_v,Leady)
do j=js-1,je+1 ; do i=is-1,ie+1
Lgrid = sqrt(G%areaT(i,j)) ! Grid scale
Ldeform = Lgrid * MEKE%Rd_dx_h(i,j) ! Deformation scale
Expand Down Expand Up @@ -455,7 +455,7 @@ subroutine step_forward_MEKE(MEKE, h, SN_u, SN_v, visc, dt, G, CS)
enddo ; enddo
endif
else
!$OMP parallel do default(none) shared(is,ie,js,je,MEKE,LmixScale,CSG)
!$OMP parallel do default(none) shared(is,ie,js,je,MEKE,LmixScale,CS,G)
do j=js-1,je+1 ; do i=is-1,ie+1
MEKE%Kh(i,j) = (CS%MEKE_KhCoeff*sqrt(2.*max(0.,MEKE%MEKE(i,j)))*LmixScale(i,j))
enddo ; enddo
Expand Down