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

Remove #ifdef MPI from main routines and minor refactoring #251

Merged
merged 39 commits into from
Mar 3, 2022
Merged

Remove #ifdef MPI from main routines and minor refactoring #251

merged 39 commits into from
Mar 3, 2022

Conversation

conradtchan
Copy link
Collaborator

Type of PR:
other

Description:

  • Small formatting and comment changes
  • Added #ifdef MPI around all use mpi statements in MPI-related modules, making them safe to call when compiling without MPI
  • Removed #ifdef MPI from density, force, and kdtree routines to improve code readability
  • Refactored conditional blocks in density and force to improve code readability
  • Aligned OMP pragmas with code indentation
  • Reorganised public and private variables and routines, hiding unnecessarily public declarations
  • Renamed MPI-related modules to begin with mpi_
  • Fixed some compiler warnings related to unused variables
  • Remove unused MPI functions

Testing:
Test suite with and without MPI enabled

Did you run the bots? yes

conradtchan and others added 30 commits February 28, 2022 16:25
@conradtchan
name every omp critical section
9565d4e
@conradtchan
fix ifort build error: critical section names
e5fa0fb 
cannot be the same as variable names
@conradtchan
remove cryptic debugging printout
47e2a7b
@conradtchan
bugfix: some critical sections require the same name
31a7e4a
@conradtchan
tidy indentation
8e2408b
@conradtchan
compact logicals
b309435
@conradtchan
subroutine to reset stacks
2dad5bf
@conradtchan
Merge branch 'omp-critical-named' into mpi-formatting
a59cd4e
@conradtchan
tidy remote iteration counter
d45a837
@conradtchan
remove unnecessary mpi barriers in dens
f765289
@conradtchan
dummy version of get_mpitype_of_kdnode for non-mpi mode
8cbeb73
@conradtchan
remove unused send_recv function
e0719f0
@conradtchan
amend previous commit
9f5f3d5
@conradtchan
remove unused cart_shift_diag subroutine
7c38b1b
@conradtchan
mpi_utils: make all variables and subroutines available in non-mpi mode
b4eb4ff
@conradtchan
dummy get_mpitype for dens and force
bbf28ae
@dliptai
expose get_mpitype_of_celldens
321a319
@dliptai
expose get_mpitype_of_cellforce
f7c542b
@conradtchan
rename stack.F90:stack to mpi_stack.F90:mpistack
93dc8da
@conradtchan
rename balance module to mpibalance
6fd8184
@conradtchan
set mpi stacksize to zero if running without MPI
6d3318e
@conradtchan
remove #ifdef MPI from mpi_stack
37be213
@conradtchan
reorganise public and private variables in mpi_stack
2cb3448
@conradtchan
amend previous commit
d13359e
@conradtchan
remove unused variables in mpi_stack
763270a
@dliptai
make stub version of balancedomains()
86c7336
@dliptai
fix indentation and reduce compiler warnings
03ee723
@dliptai
remove #ifdef MPI from initial.f90
70ad360
@dliptai
rename domain module to mpidomain
6e60749
@dliptai
remove some #ifdef MPI s
8d92b7c
@conradtchan conradtchan requested a review from dliptai March 2, 2022 05:57
@dliptai
Copy link
Collaborator

dliptai commented Mar 3, 2022

Addresses #55

@conradtchan conradtchan merged commit 8743426 into danieljprice:master Mar 3, 2022
@conradtchan conradtchan deleted the use-mpi branch March 3, 2022 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dliptai dliptai dliptai approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@conradtchan @dliptai