diff --git a/src/InputOutput.f90 b/src/InputOutput.f90 index 3bd8f8c..f47faf0 100644 --- a/src/InputOutput.f90 +++ b/src/InputOutput.f90 @@ -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)) diff --git a/src/MemberManagerModule.f90 b/src/MemberManagerModule.f90 index 4547c7d..4d55d17 100644 --- a/src/MemberManagerModule.f90 +++ b/src/MemberManagerModule.f90 @@ -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