Changing line terminators to Unix

parent 916aab01
......@@ -172,7 +172,7 @@ Module CFML_EoS
!!---- Update: 23/09/2016
!!
Type, public :: EoS_Type
character(len=80) :: Title=" " ! Descriptive title of EoS, set by user
character(len=80) :: Title=" " ! Descriptive title of EoS, set by user
character(len=20) :: System=" " ! Crystal system name
character(len=15) :: Model=" " ! Murnaghan, Birch-Murnaghan, Vinet, Natural-Strain
character(len=20) :: TModel=" " ! Name for thermal model
......@@ -225,7 +225,7 @@ Module CFML_EoS
character(len=30) :: system ! Crystal system name, including setting info (e.g. b-unique for mono)
type(EoS_Type), allocatable, dimension(:) :: EoS ! EoS Parameters
End Type EoS_List_Type
!!----
!!---- TYPE :: EOS_CELL_TYPE
!!--..
......@@ -234,13 +234,13 @@ Module CFML_EoS
Type, public :: EoS_Cell_Type
integer :: N=0 ! Max index of used EoS in List - depends on crystal system: 6 for triclinic or mono, 3 for rest
character(len=30) :: system ! Crystal system name, including setting info (e.g. b-unique for mono)
type(EoS_Type),dimension(0:6) :: EoS ! EoS Parameters for V,a,b,c,d100,d010,d001
type(Eos_type) :: eosc ! The common factors to all EoS in an EoS
integer,dimension(0:6) :: loaded = 0 ! 0 when absent, 1 when eos present, 2 set by symmetry, 3 when possible to calc (set by set_cell_types)
type(EoS_Type),dimension(0:6) :: EoS ! EoS Parameters for V,a,b,c,d100,d010,d001
type(Eos_type) :: eosc ! The common factors to all EoS in an EoS
integer,dimension(0:6) :: loaded = 0 ! 0 when absent, 1 when eos present, 2 set by symmetry, 3 when possible to calc (set by set_cell_types)
character(len=1),dimension(0:6,3) :: cout = ' ' ! output array for reporting PV, VT and PVT types of EoS
End Type EoS_Cell_Type
End Type EoS_Cell_Type
!!----
!!---- TYPE :: EOS_DATA_TYPE
!!--..
......@@ -6257,9 +6257,9 @@ Contains
else if(index(text,'COMMENT') /= 0)then
idoc=idoc+1
if(idoc <= size(eos%doc))eos%doc(idoc)=trim(text(c:))
else if(index(text,'SYSTEM') /= 0)then
if(idoc <= size(eos%doc))eos%doc(idoc)=trim(text(c:))
else if(index(text,'SYSTEM') /= 0)then
eos%system=trim(adjustl(text(c:)))
else if(index(text,'MODEL') /= 0)then
......@@ -7505,9 +7505,9 @@ Contains
write(unit=lun,fmt='(a)') 'Comment ='//trim(eos%doc(i))
end if
end do
write(unit=lun,fmt='(a)',iostat=ierr) ' '
!> Crystal system
write(unit=lun,fmt='(a)',iostat=ierr) ' '
!> Crystal system
write(unit=lun,fmt='(a,a)',iostat=ierr) 'System =',trim(eos%system)
!> eos type
......@@ -7629,7 +7629,7 @@ Contains
!real(kind=cp),dimension(6) :: parvals(7)
!real(kind=cp),dimension(6) :: esd
!real(kind=cp),dimension(19):: parout,esdout
!real(kind=cp) :: v0,agt,fp,fs
!real(kind=cp) :: v0,agt,fp,fs
!> init
nprint=0 ! output counter
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment