Skip to content

Commit ec8f662

Browse files
committed
Merge branch 'release-1.5.0'
2 parents 25413e8 + 932db14 commit ec8f662

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+9629
-2713
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,3 @@ pentrc/pentrc
4040
sum/sum
4141
xdraw/pspack
4242
xdraw/xdraw
43-
44-
superlu/SuperLU_5.2.1/

coil/coil.f

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ SUBROUTINE coil_read(cdconfile,icoil_num,icoil_name,icoil_cur)
9999
$ TRIM(coil_name(ci))//".dat"
100100
CALL ascii_open(coil_unit,cfile,"old")
101101
coil(ci)%coil_name=TRIM(coil_name(ci))
102-
READ(coil_unit,'(3(1x,I4),1x,f7.2)')
102+
READ(coil_unit, *)
103103
$ coil(ci)%ncoil,coil(ci)%s,coil(ci)%nsec,coil(ci)%nw
104104
ALLOCATE(coil(ci)%cur(coil(ci)%ncoil))
105105
ALLOCATE(coil(ci)%x(coil(ci)%ncoil,coil(ci)%s,coil(ci)%nsec),
@@ -109,7 +109,7 @@ SUBROUTINE coil_read(cdconfile,icoil_num,icoil_name,icoil_cur)
109109
coil(ci)%cur(cj)=coil_cur(ci,cj)
110110
DO ck=1,coil(ci)%s
111111
DO cl=1,coil(ci)%nsec
112-
READ(coil_unit,'(3(1x,e12.4))')coil(ci)%x(cj,ck,cl),
112+
READ(coil_unit,*)coil(ci)%x(cj,ck,cl),
113113
$ coil(ci)%y(cj,ck,cl),coil(ci)%z(cj,ck,cl)
114114
ENDDO
115115
ENDDO

0 commit comments

Comments
 (0)