Skip to content

100x more lines #3

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
iancrossfield wants to merge 6 commits into
base: master
Choose a base branch
from
Open

100x more lines #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5235b4e
100x more lines
iancrossfield Jun 27, 2018
9c3c196
100x more lines
iancrossfield Jun 27, 2018
5538cb5
100x more lines
iancrossfield Jun 27, 2018
8e19263
100x more lines
iancrossfield Jun 27, 2018
68042f5
100x more lines
iancrossfield Jun 27, 2018
e870f4e
100x more lines
iancrossfield Jun 27, 2018
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
5 changes: 3 additions & 2 deletions src/Abunplot.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ subroutine abunplot
include 'Linex.com'
include 'Pstuff.com'
include 'Dummy.com'
real*4 ep(2500),abb(2500),logrw(2500),wavepl(2500)
equivalence (ep,dummy3(1)),(abb,dummy3(1251)),(logrw,dummy3(2501))
real*4 ep(250000),abb(250000),logrw(250000),wavepl(250000)
equivalence (ep,dummy3(1)),(abb,dummy3(125001)),
. (logrw,dummy3(250001))
real*4 style(1),ymed
character ion*4

Expand Down
6 changes: 3 additions & 3 deletions src/Equivs.com
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@ c for synthetic spectra may be accomplished without allocating
c large amounts of additional memory for the code.
c******************************************************************************

real*4 chunk(100000,5)
real*4 chunk(10000000,5)
equivalence (chunk(1,1),a(1,1)),
. (chunk(1,2),a(1,21)),
. (chunk(1,3),a(1,41)),
. (chunk(1,4),a(1,61)),
. (chunk(1,5),a(1,81))

real*4 xsyn(100000), dev(100000)
real*4 xsyn(10000000), dev(10000000)
equivalence (xsyn,kapnu0(1,1)), (dev,kapnu0(1,21))

real*4 y(100000), z(100000)
real*4 y(10000000), z(10000000)
equivalence (y,kapnu0(1,41)), (z,kapnu0(1,61))

5 changes: 2 additions & 3 deletions src/Inlines.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ subroutine inlines (num)
endif
endif

340 nlines = 2500 - nstrong
340 nlines = 250000 - nstrong
j = 1
333 if (linfileopt .eq. 0) then
read (nflines,1002,end=311) wave1(j),atom1(j),e(j,1),gf(j),
Expand Down Expand Up @@ -253,7 +253,7 @@ subroutine inlines (num)


c*****quit the routine normally
if (nlines+nstrong .lt. 2500) then
if (nlines+nstrong .lt. 250000) then
if (sstop .gt. wave1(nlines)+10.) sstop = wave1(nlines)+10.
endif
lim1line = 1
Expand Down Expand Up @@ -295,4 +295,3 @@ subroutine inlines (num)
end



18 changes: 9 additions & 9 deletions src/Linex.com
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ c "kapnu0" are often over-written with plotting data,
c so leave them alone or suffer unspeakable programming tortures.
c******************************************************************************

real*8 a(2500,100), dopp(2500,100), kapnu0(2500,100)
real*8 gf(2500), wave1(2500), atom1(2500), e(2500,2),
. chi(2500,3), amass(2500), charge(2500), d0(2500),
. dampnum(2500), gf1(2500), width(2500),
. abundout(2500), widout(2500), strength(2500),
. rdmass(2500), gambark(2500), alpbark(2500),
. wid1comp(2500)
real*8 a(250000,100), dopp(250000,100), kapnu0(250000,100)
real*8 gf(250000), wave1(250000), atom1(250000), e(250000,2),
. chi(250000,3), amass(250000), charge(250000), d0(250000),
. dampnum(250000), gf1(250000), width(250000),
. abundout(250000), widout(250000), strength(250000),
. rdmass(250000), gambark(250000), alpbark(250000),
. wid1comp(250000)
real*8 kapnu(100), taunu(100), cd(100), sline(100)
real*8 d(5000), dellam(400), w(100),
. rwtab(3000), gftab(3000), gfhold
Expand All @@ -24,9 +24,9 @@ c******************************************************************************
. delwave, wave, waveold, st1
real*8 gammatot, gammav, gammas, gammar
integer lim1, lim2, mode, ndepths, ncurve, nlines,nstrong,
. lim1line, lim2line, ntabtot, group(2500),
. lim1line, lim2line, ntabtot, group(250000),
. iabatom, molflag, dostrong, gfstyle
character*7 damptype(2500)
character*7 damptype(250000)

common/linex/a, dopp, kapnu0,
. gf, wave1, atom1, e,
Expand Down
2 changes: 1 addition & 1 deletion src/Linlimit.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ subroutine linlimit
return
endif
enddo
if (nlines+nstrong .eq. 2500) then
if (nlines+nstrong .eq. 250000) then
lim2line = -1
else
lim2line = nlines
Expand Down
2 changes: 1 addition & 1 deletion src/Weedout.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ subroutine weedout
endif
endif
enddo
if (nlines +nstrong .eq. 2500) then
if (nlines +nstrong .eq. 250000) then
call inlines (6)
go to 1
endif
Expand Down