From fbbbf1282895c9f375ff2bf08e074409799303c4 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" Date: Fri, 14 Jun 2019 16:46:28 +0200 Subject: [PATCH 1/2] .eqv. operator doesn't have the precedence parts of the code assumes. Also removed a few that were a bit inconsistent --- source/coll_db.f90 | 2 +- source/mod_alloc.f90 | 102 +++++++++++++++++++------------------- source/mod_ffield_aux.f90 | 6 +-- source/sixtrack_input.f90 | 8 +-- 4 files changed, 59 insertions(+), 59 deletions(-) diff --git a/source/coll_db.f90 b/source/coll_db.f90 index 3987c7fad..c58c4c746 100644 --- a/source/coll_db.f90 +++ b/source/coll_db.f90 @@ -332,7 +332,7 @@ subroutine cdb_writeDB_ROOT character(len=5) :: this_material = C_NULL_CHAR integer j - if(root_flag .eqv. .false. .or. root_CollimationDB /= 1) return + if((root_flag .eqv. .false.) .or. root_CollimationDB /= 1) return do j=1,cdb_nColl this_name = trim(adjustl(cdb_cNameUC(j)))//C_NULL_CHAR diff --git a/source/mod_alloc.f90 b/source/mod_alloc.f90 index 55939cbb6..68a6c9761 100644 --- a/source/mod_alloc.f90 +++ b/source/mod_alloc.f90 @@ -226,7 +226,7 @@ subroutine alloc1di16(input, eIdx, initial, ename, fIdxIn) fIdx = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -302,7 +302,7 @@ subroutine alloc2di16(input, eIdx1, eIdx2, initial, ename, fIdxIn1, fIdxIn2) fIdx2 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -393,7 +393,7 @@ subroutine alloc3di16(input, eIdx1, eIdx2, eIdx3, initial, ename, fIdxIn1, fIdxI fIdx3 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -482,7 +482,7 @@ subroutine alloc1di32(input, eIdx, initial, ename, fIdxIn) fIdx = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -558,7 +558,7 @@ subroutine alloc2di32(input, eIdx1, eIdx2, initial, ename, fIdxIn1, fIdxIn2) fIdx2 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -649,7 +649,7 @@ subroutine alloc3di32(input, eIdx1, eIdx2, eIdx3, initial, ename, fIdxIn1, fIdxI fIdx3 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -738,7 +738,7 @@ subroutine alloc1di64(input, eIdx, initial, ename, fIdxIn) fIdx = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -814,7 +814,7 @@ subroutine alloc2di64(input, eIdx1, eIdx2, initial, ename, fIdxIn1, fIdxIn2) fIdx2 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -905,7 +905,7 @@ subroutine alloc3di64(input, eIdx1, eIdx2, eIdx3, initial, ename, fIdxIn1, fIdxI fIdx3 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -998,7 +998,7 @@ subroutine alloc1dr32(input, eIdx, initial, ename, fIdxIn) fIdx = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -1074,7 +1074,7 @@ subroutine alloc2dr32(input, eIdx1, eIdx2, initial, ename, fIdxIn1, fIdxIn2) fIdx2 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -1165,7 +1165,7 @@ subroutine alloc3dr32(input, eIdx1, eIdx2, eIdx3, initial, ename, fIdxIn1, fIdxI fIdx3 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -1269,7 +1269,7 @@ subroutine alloc4dr32(input, eIdx1, eIdx2, eIdx3, eIdx4, initial, ename, fIdxIn1 fIdx4 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -1366,7 +1366,7 @@ subroutine alloc1dr64(input, eIdx, initial, ename, fIdxIn) fIdx = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -1442,7 +1442,7 @@ subroutine alloc2dr64(input, eIdx1, eIdx2, initial, ename, fIdxIn1, fIdxIn2) fIdx2 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -1533,7 +1533,7 @@ subroutine alloc3dr64(input, eIdx1, eIdx2, eIdx3, initial, ename, fIdxIn1, fIdxI fIdx3 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -1637,7 +1637,7 @@ subroutine alloc4dr64(input, eIdx1, eIdx2, eIdx3, eIdx4, initial, ename, fIdxIn1 fIdx4 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -1734,7 +1734,7 @@ subroutine alloc1dr128(input, eIdx, initial, ename, fIdxIn) fIdx = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -1810,7 +1810,7 @@ subroutine alloc2dr128(input, eIdx1, eIdx2, initial, ename, fIdxIn1, fIdxIn2) fIdx2 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -1901,7 +1901,7 @@ subroutine alloc3dr128(input, eIdx1, eIdx2, eIdx3, initial, ename, fIdxIn1, fIdx fIdx3 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -2005,7 +2005,7 @@ subroutine alloc4dr128(input, eIdx1, eIdx2, eIdx3, eIdx4, initial, ename, fIdxIn fIdx4 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -2107,7 +2107,7 @@ subroutine alloc1dc(input, strlen, eIdx, initial, ename, fIdxIn) fIdx = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -2184,7 +2184,7 @@ subroutine alloc2dc(input, strlen, eIdx1, eIdx2, initial, ename, fIdxIn1, fIdxIn fIdx2 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -2270,7 +2270,7 @@ subroutine alloc1ds(input, eIdx, initial, ename, fIdxIn) fIdx = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -2345,7 +2345,7 @@ subroutine alloc1dl(input, eIdx, initial, ename, fIdxIn) fIdx = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -2421,7 +2421,7 @@ subroutine alloc2dl(input, eIdx1, eIdx2, initial, ename, fIdxIn1, fIdxIn2) fIdx2 = 1 end if - if(allocated(input) .neqv. .true.) then + if(.not. allocated(input)) then #ifdef DEBUG write(alloc_log,"(a)") "ALLOC> Allocating array '"//ename//"'" @@ -2489,7 +2489,7 @@ subroutine dealloc1di16(input, ename) character(len=*), intent(in) :: ename integer(kind=int16), allocatable, intent(inout) :: input(:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2503,7 +2503,7 @@ subroutine dealloc2di16(input, ename) character(len=*), intent(in) :: ename integer(kind=int16), allocatable, intent(inout) :: input(:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2517,7 +2517,7 @@ subroutine dealloc3di16(input, ename) character(len=*), intent(in) :: ename integer(kind=int16), allocatable, intent(inout) :: input(:,:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2531,7 +2531,7 @@ subroutine dealloc1di32(input, ename) character(len=*), intent(in) :: ename integer(kind=int32), allocatable, intent(inout) :: input(:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2545,7 +2545,7 @@ subroutine dealloc2di32(input, ename) character(len=*), intent(in) :: ename integer(kind=int32), allocatable, intent(inout) :: input(:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2559,7 +2559,7 @@ subroutine dealloc3di32(input, ename) character(len=*), intent(in) :: ename integer(kind=int32), allocatable, intent(inout) :: input(:,:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2573,7 +2573,7 @@ subroutine dealloc1di64(input, ename) character(len=*), intent(in) :: ename integer(kind=int64), allocatable, intent(inout) :: input(:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2587,7 +2587,7 @@ subroutine dealloc2di64(input, ename) character(len=*), intent(in) :: ename integer(kind=int64), allocatable, intent(inout) :: input(:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2601,7 +2601,7 @@ subroutine dealloc3di64(input, ename) character(len=*), intent(in) :: ename integer(kind=int64), allocatable, intent(inout) :: input(:,:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2615,7 +2615,7 @@ subroutine dealloc1dr32(input, ename) character(len=*), intent(in) :: ename real(kind=real32), allocatable, intent(inout) :: input(:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2629,7 +2629,7 @@ subroutine dealloc2dr32(input, ename) character(len=*), intent(in) :: ename real(kind=real32), allocatable, intent(inout) :: input(:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2643,7 +2643,7 @@ subroutine dealloc3dr32(input, ename) character(len=*), intent(in) :: ename real(kind=real32), allocatable, intent(inout) :: input(:,:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2657,7 +2657,7 @@ subroutine dealloc4dr32(input, ename) character(len=*), intent(in) :: ename real(kind=real32), allocatable, intent(inout) :: input(:,:,:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2671,7 +2671,7 @@ subroutine dealloc1dr64(input, ename) character(len=*), intent(in) :: ename real(kind=real64), allocatable, intent(inout) :: input(:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2685,7 +2685,7 @@ subroutine dealloc2dr64(input, ename) character(len=*), intent(in) :: ename real(kind=real64), allocatable, intent(inout) :: input(:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2699,7 +2699,7 @@ subroutine dealloc3dr64(input, ename) character(len=*), intent(in) :: ename real(kind=real64), allocatable, intent(inout) :: input(:,:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2713,7 +2713,7 @@ subroutine dealloc4dr64(input, ename) character(len=*), intent(in) :: ename real(kind=real64), allocatable, intent(inout) :: input(:,:,:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2727,7 +2727,7 @@ subroutine dealloc1dr128(input, ename) character(len=*), intent(in) :: ename real(kind=real128), allocatable, intent(inout) :: input(:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2741,7 +2741,7 @@ subroutine dealloc2dr128(input, ename) character(len=*), intent(in) :: ename real(kind=real128), allocatable, intent(inout) :: input(:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2755,7 +2755,7 @@ subroutine dealloc3dr128(input, ename) character(len=*), intent(in) :: ename real(kind=real128), allocatable, intent(inout) :: input(:,:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2769,7 +2769,7 @@ subroutine dealloc4dr128(input, ename) character(len=*), intent(in) :: ename real(kind=real128), allocatable, intent(inout) :: input(:,:,:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2785,7 +2785,7 @@ subroutine dealloc1dc(input, strlen, ename) integer, intent(in) :: strlen !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2802,7 +2802,7 @@ subroutine dealloc2dc(input, strlen, ename) integer, intent(in) :: strlen !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2817,7 +2817,7 @@ subroutine dealloc1dl(input, ename) character(len=*), intent(in) :: ename logical, allocatable, intent(inout) :: input(:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if @@ -2831,7 +2831,7 @@ subroutine dealloc2dl(input, ename) character(len=*), intent(in) :: ename logical, allocatable, intent(inout) :: input(:,:) !Check that we are already allocated - if(allocated(input) .eqv. .FALSE.) then + if(.not. allocated(input)) then write(lerr,"(a)") "ALLOC> ERROR Trying to deallocate a NULL pointer: '"//ename//"'" stop end if diff --git a/source/mod_ffield_aux.f90 b/source/mod_ffield_aux.f90 index 1ba66ab11..cca866116 100644 --- a/source/mod_ffield_aux.f90 +++ b/source/mod_ffield_aux.f90 @@ -509,7 +509,7 @@ subroutine ReadVectPotCoeff(this,lun,norm,iErr) enddo endif - if (CoefSave.eqv..False.) then ! Create new coef + if (CoefSave.eqv..false.) then ! Create new coef tpij_Ax(1,tlinex,sline)=expx tpij_Ax(2,tlinex,sline)=expy tpTAx(tlinex,sline)=tpTAx(tlinex,sline) + ax @@ -531,7 +531,7 @@ subroutine ReadVectPotCoeff(this,lun,norm,iErr) enddo endif - if (CoefSave.eqv..False.) then ! Create new coef + if (CoefSave.eqv..false.) then ! Create new coef tpij_Ay(1,tliney,sline)=expx tpij_Ay(2,tliney,sline)=expy tpTAy(tliney,sline)=tpTAy(tliney,sline) + ay @@ -553,7 +553,7 @@ subroutine ReadVectPotCoeff(this,lun,norm,iErr) enddo endif - if (CoefSave.eqv..False.) then ! Create new coef + if (CoefSave.eqv..false.) then ! Create new coef tpij_Az(1,tlinez,sline)=expx tpij_Az(2,tlinez,sline)=expy tpTAz(tlinez,sline)=tpTAz(tlinez,sline) + az diff --git a/source/sixtrack_input.f90 b/source/sixtrack_input.f90 index d014cf135..a967a3750 100644 --- a/source/sixtrack_input.f90 +++ b/source/sixtrack_input.f90 @@ -575,11 +575,11 @@ subroutine sixin_parseInputLineSIMU(inLine, iLine, iErr) if(numPart > npart) then call expand_arrays(nele, numPart, nblz, nblo) end if - if(napx > 32 .and. sixin_forcePartSummary .eqv. .false.) then + if(napx > 32 .and. (sixin_forcePartSummary .eqv. .false.)) then write(lout,"(a)") "SIMU> NOTE More than 64 particles requested, switching off printing of particle summary." st_partsum = .false. end if - if(napx > 32 .and. sixin_forceWriteFort12 .eqv. .false.) then + if(napx > 32 .and. (sixin_forceWriteFort12 .eqv. .false.)) then write(lout,"(a)") "SIMU> NOTE More than 64 particles requested, switching off wriritng of fort.12." st_writefort12 = .false. end if @@ -1326,12 +1326,12 @@ subroutine sixin_parseInputLineTRAC(inLine, iLine, iErr) call expand_arrays(nele, napx*2, nblz, nblo) end if - if(napx > 32 .and. sixin_forcePartSummary .eqv. .false.) then + if(napx > 32 .and. (sixin_forcePartSummary .eqv. .false.)) then write(lout,"(a)") "TRAC> NOTE More than 64 particles requested, switching off printing of particle summary." st_partsum = .false. end if - if(napx > 32 .and. sixin_forceWriteFort12 .eqv. .false.) then + if(napx > 32 .and. (sixin_forceWriteFort12 .eqv. .false.)) then write(lout,"(a)") "TRAC> NOTE More than 64 particles requested, switching off wriritng of fort.12." st_writefort12 = .false. end if From 91cbd8b3bb4e4d17ed27dd7fc139e6e5a9db70d4 Mon Sep 17 00:00:00 2001 From: "Veronica K. B. Olsen" Date: Fri, 14 Jun 2019 16:52:21 +0200 Subject: [PATCH 2/2] .not. is cleaner here ... --- source/sixtrack_input.f90 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/source/sixtrack_input.f90 b/source/sixtrack_input.f90 index a967a3750..39d083a0a 100644 --- a/source/sixtrack_input.f90 +++ b/source/sixtrack_input.f90 @@ -575,11 +575,11 @@ subroutine sixin_parseInputLineSIMU(inLine, iLine, iErr) if(numPart > npart) then call expand_arrays(nele, numPart, nblz, nblo) end if - if(napx > 32 .and. (sixin_forcePartSummary .eqv. .false.)) then + if(napx > 32 .and. .not. sixin_forcePartSummary) then write(lout,"(a)") "SIMU> NOTE More than 64 particles requested, switching off printing of particle summary." st_partsum = .false. end if - if(napx > 32 .and. (sixin_forceWriteFort12 .eqv. .false.)) then + if(napx > 32 .and. .not. sixin_forceWriteFort12) then write(lout,"(a)") "SIMU> NOTE More than 64 particles requested, switching off wriritng of fort.12." st_writefort12 = .false. end if @@ -934,7 +934,7 @@ subroutine sixin_postInputSIMU(iErr) iErr = .true. end if - if((sixin_simu6D .eqv. .false.) .and. iclo6 > 0) then + if(iclo6 > 0 .and. .not. sixin_simu6D) then write(lout,"(a)") "SIMU> ERROR Can only calculated 6D closed orbit for 6D simulations." iErr = .true. end if @@ -1326,12 +1326,12 @@ subroutine sixin_parseInputLineTRAC(inLine, iLine, iErr) call expand_arrays(nele, napx*2, nblz, nblo) end if - if(napx > 32 .and. (sixin_forcePartSummary .eqv. .false.)) then + if(napx > 32 .and. .not. sixin_forcePartSummary) then write(lout,"(a)") "TRAC> NOTE More than 64 particles requested, switching off printing of particle summary." st_partsum = .false. end if - if(napx > 32 .and. (sixin_forceWriteFort12 .eqv. .false.)) then + if(napx > 32 .and. .not. sixin_forceWriteFort12) then write(lout,"(a)") "TRAC> NOTE More than 64 particles requested, switching off wriritng of fort.12." st_writefort12 = .false. end if