Skip to content

Commit

Permalink
eventStop bugfix.
Browse files Browse the repository at this point in the history
  • Loading branch information
@FrankThomasTveter
FrankThomasTveter committed Jun 1, 2017
1 parent 8c7fa70 commit 98d6521
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 29 deletions.
54 changes: 27 additions & 27 deletions astro/src/astro/astroEvent.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6021,7 +6021,7 @@ subroutine reportLLMax(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=480
return
end if
C
Expand Down Expand Up @@ -6182,7 +6182,7 @@ subroutine reportLLMin(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=481
return
end if
if (nrep.eq.inrep) then ! no local minimum, check end points
Expand Down Expand Up @@ -6506,7 +6506,7 @@ subroutine reportMax(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=482
return
end if
if (nrep.gt.maxrep.and.maxrep.ne.0) then
Expand Down Expand Up @@ -7059,7 +7059,7 @@ subroutine reportMercTransit(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=483
return
end if
return
Expand Down Expand Up @@ -7213,7 +7213,7 @@ subroutine reportMin(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=484
return
end if
if (nrep.gt.maxrep.and.maxrep.ne.0) then
Expand Down Expand Up @@ -8301,7 +8301,7 @@ subroutine reportMoonPos(loclat,loclon,lochgt,
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=485
return
end if
if (nrep.gt.maxrep.and.maxrep.ne.0) then
Expand Down Expand Up @@ -9005,7 +9005,7 @@ subroutine reportSSPos(loclat,loclon,lochgt,
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=486
return
end if
if (nrep.gt.maxrep.and.maxrep.ne.0) then
Expand Down Expand Up @@ -9369,7 +9369,7 @@ subroutine reportSunEclipse(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=487
return
end if
C
Expand Down Expand Up @@ -9989,7 +9989,7 @@ subroutine reportSunPos(loclat,loclon,lochgt,
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=488
return
end if
if (nrep.gt.maxrep.and.maxrep.ne.0) then
Expand Down Expand Up @@ -10499,7 +10499,7 @@ subroutine reportUmbra(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=489
return
end if
C
Expand Down Expand Up @@ -10709,7 +10709,7 @@ subroutine reportVenusTransit(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=490
return
end if
C
Expand Down Expand Up @@ -10939,7 +10939,7 @@ real function searchLLMax(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=491
return
end if
if (maxrep.ne.0.and.nrep.eq.inrep) then ! no local minimum, check end points
Expand Down Expand Up @@ -11075,7 +11075,7 @@ real FUNCTION goldenLLMax(ax,bx,cx,f,tol,xmax,
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=492
return
end if
if(f1.lt.f2)then ! We are done. Output the best of the two current values.
Expand Down Expand Up @@ -11252,7 +11252,7 @@ real function searchLLMin(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=493
return
end if
if (maxrep.ne.0.and.nrep.eq.inrep) then ! no local minimum, check end points
Expand Down Expand Up @@ -11388,7 +11388,7 @@ real FUNCTION goldenLLMin(ax,bx,cx,f,tol,xmin,
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=494
return
end if
if(f1.lt.f2)then ! We are done. Output the best of the two current values.
Expand Down Expand Up @@ -11928,7 +11928,7 @@ real function XsearchLLTarget(tval,
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=495
return
end if
if (nrep.gt.maxrep.AND.MAXREP.NE.0) then
Expand Down Expand Up @@ -12081,7 +12081,7 @@ real function dsearchLLTarget(tval,
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=496
return
end if
if (bdeb)write(*,*)myname,'Found:',bok,jd,tstart,tend,dstart,dend
Expand Down Expand Up @@ -12592,7 +12592,7 @@ real function XsearchTarget(tval,
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=497
return
end if
if (nrep.gt.maxrep.AND.MAXREP.NE.0) then
Expand Down Expand Up @@ -12737,7 +12737,7 @@ real function dsearchTarget(tval,
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=498
return
end if
if (bdeb)write(*,*)myname,'Found:',bok,jd,tstart,tend,dstart,dend
Expand Down Expand Up @@ -13081,7 +13081,7 @@ real function searchMax(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=499
return
end if
if (nrep.gt.maxrep.AND.MAXREP.NE.0) then
Expand Down Expand Up @@ -13160,7 +13160,7 @@ real FUNCTION goldenMax(ax,bx,cx,f,tol,xmax,crc250,irc)
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=500
return
end if
if(f1.lt.f2)then ! We are done. Output the best of the two current values.
Expand Down Expand Up @@ -13807,7 +13807,7 @@ real function searchMercTransit(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=501
return
end if
C
Expand Down Expand Up @@ -13995,7 +13995,7 @@ real function searchMin(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=502
return
end if
if (nrep.gt.maxrep.AND.MAXREP.NE.0) then
Expand Down Expand Up @@ -14075,7 +14075,7 @@ real FUNCTION goldenMin(ax,bx,cx,f,tol,xmin,crc250,irc)
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=503
return
end if
if(f1.lt.f2)then ! We are done. Output the best of the two current values.
Expand Down Expand Up @@ -15631,7 +15631,7 @@ real function searchSunEclipse(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=504
return
end if
C
Expand Down Expand Up @@ -16431,7 +16431,7 @@ real function searchUmbra(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=505
return
end if
C
Expand Down Expand Up @@ -16665,7 +16665,7 @@ real function searchVenusTransit(
lencrc=length(crc250,250,10)
crc250=crc250(1:lencrc)//buff250
call chop0(crc250,250)
irc=457
irc=506
return
end if
C
Expand Down
2 changes: 0 additions & 2 deletions astro/src/astro/event.F
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,6 @@ subroutine execute_event()
dmi2=mi2
dsec2=sec2
dtstopJD=tstopJD
else
tstopJD=0.0D0
end if
C
if (debug) call cpu_time(cpuStart)
Expand Down

0 comments on commit 98d6521

Please sign in to comment.