Skip to content

Localized OpenMP Threading #513

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
mattdturner merged 16 commits into from
Aug 18, 2020
Merged

Localized OpenMP Threading #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
830a1ab
Localized OpenMP threading in mode_forward
mattdturner Mar 3, 2020
3181d8a
Localized OpenMP threading in shared/
mattdturner Mar 31, 2020
9a3de98
Localized threaing in tracer_hmix_redi
mattdturner May 22, 2020
777afcb
Localized threading in mpas_ocn_gm
mattdturner May 23, 2020
0a3faa6
Remove main loop index from omp private
mattdturner May 28, 2020
b7f71ae
Add rk4 thread test
mark-petersen May 29, 2020
06fa737
Remove OpenMP from problematic loop
mattdturner Jun 1, 2020
95706ff
Bugfix for 2 incorrect !$omp directives
mattdturner Jun 10, 2020
218ec17
Remove calls to mpas_threading_barrier
mattdturner Jun 25, 2020
1a9a136
Add missing OMP variables to private clause
mattdturner Jun 30, 2020
b69d170
Correct bugs in OMP directives
mattdturner Jul 6, 2020
632fc05
Resolve rebase conflicts
mattdturner Jul 7, 2020
d3b62c0
Bugfixes after rebase
mattdturner Aug 5, 2020
c71962d
Add missing `omp end parallel`
mattdturner Aug 12, 2020
3c1fde2
Resolve merge conflicts after rebase
mattdturner Aug 13, 2020
1e3e025
Move scratch arrays to subroutines.
mattdturner Aug 13, 2020
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
7 changes: 0 additions & 7 deletions src/core_ocean/mode_forward/mpas_ocn_forward_mode.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ function ocn_forward_mode_init(domain, startTimeStamp) result(ierr)!{{{
block => block % next
end do

!$omp master
block => domain % blocklist
do while (associated(block))
call mpas_pool_get_subpool(block % structs, 'diagnostics', diagnosticsPool)
Expand All @@ -346,8 +345,6 @@ function ocn_forward_mode_init(domain, startTimeStamp) result(ierr)!{{{

block => block % next
end do
!$omp end master
!$omp barrier

! Update any mesh fields that may have been modified during init
call ocn_meshUpdateFields(domain)
Expand Down Expand Up @@ -588,12 +585,8 @@ function ocn_forward_mode_run(domain) result(ierr)!{{{
#ifdef MPAS_DEBUG
call mpas_log_write( ' Computing forward time step')
#endif
!$omp parallel default(firstprivate) shared(domain, dt, timeStamp)

call ocn_timestep(domain, dt, timeStamp)

!$omp end parallel

call mpas_timer_stop("time integration")

! Move time level 2 fields back into time level 1 for next time step
Expand Down
4 changes: 1 addition & 3 deletions src/core_ocean/mode_forward/mpas_ocn_time_integration.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ subroutine ocn_timestep(domain, dt, timeStamp)!{{{
call ocn_time_integrator_split(domain, dt)
endif

!$omp master
block => domain % blocklist
do while (associated(block))
call mpas_pool_get_subpool(block % structs, 'state', statePool)
Expand All @@ -127,12 +126,11 @@ subroutine ocn_timestep(domain, dt, timeStamp)!{{{
call mpas_set_time(xtime_timeType, dateTimeString=xtime)
call mpas_set_time(simulationStartTime_timeType, dateTimeString=simulationStartTime)
call mpas_get_timeInterval(xtime_timeType - simulationStartTime_timeType,dt=daysSinceStartOfSim)

daysSinceStartOfSim = daysSinceStartOfSim*days_per_second

block => block % next
end do
!$omp end master
!$omp barrier

end subroutine ocn_timestep!}}}

Expand Down
Loading