Thanks to visit codestin.com
Credit goes to github.com

Skip to content

EQV Fix #902

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
merged 2 commits into from
Jun 14, 2019
Merged

EQV Fix #902

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbbbf12
.eqv. operator doesn't have the precedence parts of the code assumes.…
vkbo Jun 14, 2019
91cbd8b
.not. is cleaner here ...
vkbo Jun 14, 2019
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
Prev Previous commit
.not. is cleaner here ...
  • Loading branch information
@vkbo
vkbo committed Jun 14, 2019
commit 91cbd8b3bb4e4d17ed27dd7fc139e6e5a9db70d4
10 changes: 5 additions & 5 deletions source/sixtrack_input.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down