Skip to content

Modifications to compile #2

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

Open
david20011999 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Modifications to compile #2

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
4 changes: 2 additions & 2 deletions src/InputOutput.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,8 +700,8 @@ function ReadInParameterFile(filename) result (params)
singleRun = (params%params%StartCoreChar .eq. "0")
! Should probably have an input option to always output per core even when a single run - hence two lines here - but not
! currently implemented
params%outputParams%outputPerCore = .not. singleRun
params%outputParams%outputCombined = singleRun
params%outputParams%outputPerCore = .true.
params%outputParams%outputCombined = .true.

! No purpose is served in writing out swappable info if data is prephased
params%outputParams%outputSwappable = params%outputParams%outputSwappable .and. (.not. (params%GenotypeFileFormat /= 2))
Expand Down
8 changes: 5 additions & 3 deletions src/MemberManagerModule.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,16 @@ subroutine createCluster(manager, c, number)
class(MemberManager) :: manager
class(CoreType), intent(in), target :: c
integer, intent(in) :: number
integer :: nAnisG
logical, allocatable :: used(:)

logical, dimension(c%getNAnisG()) :: used
integer :: nAnisG, numUsed, curMax, curOrder, seed, i, curIndiv, curSize
integer :: numUsed, curMax, curOrder, seed, i, curIndiv, curSize
type(Genotype), pointer :: g1, g2

manager%c => c

nAnisG = c%getNAnisG()
nAnisG = c%getNAnisG()
allocate(used(nAnisG))
allocate(manager%order(nAnisG))
used = .false.
numUsed = 0
Expand Down