Skip to content
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

Jump to bottom

Resolution to Issue #19 (single threaded runs crash) #25

Merged
merged 1 commit into from
Sep 14, 2017
Merged

Resolution to Issue #19 (single threaded runs crash) #25

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
5 changes: 3 additions & 2 deletions cicecore/cicedynB/analysis/ice_diagnostics.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,8 @@ subroutine init_diags

if (abs(latpnt(n)) < c360 .and. abs(lonpnt(n)) < c360) then

!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,latdis,londis,totdis)
! MDT, 09/2017: Comment out OpenMP directives since loop is not thread-safe
!!$OMP PARALLEL DO PRIVATE(iblk,i,j,ilo,ihi,jlo,jhi,latdis,londis,totdis)
do iblk = 1, nblocks
this_block = get_block(blocks_ice(iblk),iblk)
ilo = this_block%ilo
Expand All @@ -1312,7 +1313,7 @@ subroutine init_diags
enddo ! i
enddo ! j
enddo ! iblk
!$OMP END PARALLEL DO
!!$OMP END PARALLEL DO

endif

Expand Down
4 changes: 2 additions & 2 deletions cicecore/shared/ice_init_column.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,8 @@ subroutine init_shortwave
real(kind= dbl_kind), dimension(ntrcr, ncat) :: &
ztrcr_sw

!$OMP PARALLEL DO PRIVATE(iblk,i,j,n,ilo,ihi,jlo,jhi,this_block, &
!$OMP cszn,l_print_point,debug,ipoint)
!!$OMP PARALLEL DO PRIVATE(iblk,i,j,n,ilo,ihi,jlo,jhi,this_block, &
!!$OMP cszn,l_print_point,debug,ipoint)
do iblk=1,nblocks

! Initialize
Expand Down