223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed allocatable hybridIA return value, finalized IO_lc

This commit is contained in:
Philip Eisenlohr 2007-03-26 15:03:21 +00:00
parent 11bb61b2a8
commit 86d7f222ae
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
trunk/IO.f90
View File

@ -110,13 +110,14 @@
character(len=*) ODFfileName
character(len=80) line
character(len=*), parameter :: fileFormat = '(A80)'
integer(pInt) i,j,bin,pos(7),Nast,NnonZero,Nset,Nreps,reps,phi1,Phi,phi2
integer(pInt) i,j,bin,Nast,NnonZero,Nset,Nreps,reps,phi1,Phi,phi2
integer(pInt), dimension(7) :: pos
integer(pInt), dimension(3) :: steps
integer(pInt), dimension(:), allocatable :: binSet
real(pReal) center,sum_dV_V,prob,dg_0,C,lowerC,upperC,rnd
real(pReal), dimension(3) :: limits,deltas
real(pReal), dimension(:,:,:), allocatable :: dV_V
real(pReal), dimension(:,:), allocatable :: IO_hybridIA
real(pReal), dimension(3,Nast) :: IO_hybridIA
if (.not. IO_open_file(999,ODFfileName)) goto 100
@ -212,7 +213,6 @@
end do
end do
allocate(IO_hybridIA(3,Nast))
do i=1,Nast
if (i < Nast) then
call random_number(rnd)
@ -230,9 +230,7 @@
return
! on error
100 if (allocated(IO_hybridIA)) deallocate(IO_hybridIA)
allocate(IO_hybridIA(1,1))
IO_hybridIA = -1
100 IO_hybridIA = -1
close(999)
return
@ -425,7 +423,6 @@
integer(pInt) i
IO_lc = line
!forall (i=1:len(line),64<iachar(line(i:i)) .and. iachar(line(i:i))<91) IO_lc(i:i)=achar(iachar(line(i:i))+32)
do i=1,len(line)
if(64<iachar(line(i:i)) .and. iachar(line(i:i))<91) IO_lc(i:i)=achar(iachar(line(i:i))+32)
enddo
@ -445,10 +442,10 @@
character (len=*) line
integer(pInt) i
!forall (i=1:len(line),64<iachar(line(i:i)) .and. iachar(line(i:i))<91) line(i:i)=achar(iachar(line(i:i))+32)
do i=1,len(line)
if(64<iachar(line(i:i)) .and. iachar(line(i:i))<91) line(i:i)=achar(iachar(line(i:i))+32)
enddo
return
END SUBROUTINE