Skip to content
Snippets Groups Projects
Commit ce0b98fc authored by Dave Whipp's avatar Dave Whipp
Browse files

Fixed typo; Added reading of dommat value for defining a dominant material type

parent 1464878f
No related branches found
No related tags found
No related merge requests found
......@@ -196,6 +196,10 @@ params%pressure0=0.d0
if (iproc==0) call scanfile (params%infile,'pressure0',params%pressure0,ires)
call mpi_bcast(params%pressure0,1,mpi_double_precision,0,mpi_comm_world,ierr)
dommat=-1
if (iproc==0) call scanfile (params%infile,'dommat',params%dommat,ires)
call mpi_bcast(params%dommat,1,mpi_integer,0,mpi_comm_world,ierr)
do i=0,params%nmat
write(cm,'(i3)') i
il=1
......@@ -265,13 +269,15 @@ do i=0,params%nmat
call mpi_bcast(mat(i)%mattrans,6,mpi_double_precision,0,mpi_comm_world,ierr)
mat(i)%transnum=i
if (iproc==0) call scanfile (params%infile,'transnum_xmin'//cm(il:3),mat(i)%transnum(1),ires)
if (iproc==0) call scanfile (params%infile,'transnum_xmax'//cm(il:3),mat(i)%transnum(2),ires)
if (iproc==0) call scanfile (params%infile,'transnum_ymin'//cm(il:3),mat(i)%transnum(3),ires)
if (iproc==0) call scanfile (params%infile,'transnum_ymax'//cm(il:3),mat(i)%transnum(4),ires)
if (iproc==0) call scanfile (params%infile,'transnum_zmin'//cm(il:3),mat(i)%transnum(5),ires)
if (iproc==0) call scanfile
if (maxval(mat(i)%transnum.gt.params%nmat) call stop_run ('error: transnum value is greater than nmat$')
if (proc==0) then
call scanfile (params%infile,'transnum_xmin'//cm(il:3),mat(i)%transnum(1),ires)
call scanfile (params%infile,'transnum_xmax'//cm(il:3),mat(i)%transnum(2),ires)
call scanfile (params%infile,'transnum_ymin'//cm(il:3),mat(i)%transnum(3),ires)
call scanfile (params%infile,'transnum_ymax'//cm(il:3),mat(i)%transnum(4),ires)
call scanfile (params%infile,'transnum_zmin'//cm(il:3),mat(i)%transnum(5),ires)
call scanfile (params%infile,'transnum_zmax'//cm(il:3),mat(i)%transnum(6),ires)
if (maxval(mat(i)%transnum.gt.params%nmat) call stop_run ('Error: transnum value is greater than nmat in read_input_file$')
endif
call mpi_bcast(mat(i)%transnum,6,mpi_integer,0,mpi_comm_world,ierr)
enddo
......@@ -1267,6 +1273,7 @@ if (params%debug.gt.0 .and. iproc.eq.0) then
write(*,'(a,l1)') shift//'bulkvisc ',params%bulkvisc
write(*,'(a,l1)') shift//'init_e2d ',params%init_e2d
write(*,'(a,e11.4)') shift//'e2d0 ',params%e2d0
write(*,'(a,i4)') shift//'dommat ',params%dommat
do i=1,params%nmat
write(*,'(a,i4,a)') shift//'--- Properties for material ',i,' ---'
write(*,'(a,e11.4)') shift//'density ',mat(i)%density
......@@ -1531,6 +1538,7 @@ if (params%debug.gt.1) then
write(threadinfo%Logunit,'(a32,l1)') 'bulkvisc ',params%bulkvisc
write(threadinfo%Logunit,'(a32,l1)') 'init_e2d ',params%init_e2d
write(threadinfo%Logunit,'(a32,e11.4)') 'e2d0 ',params%e2d0
write(threadinfo%Logunit,'(a32,i4)') 'dommat ',params%dommat
do i=1,params%nmat
write(threadinfo%Logunit,'(a,i4,a)') '--- Properties for material ',i,' ---'
write(threadinfo%Logunit,'(a32,e11.4)') 'density ',mat(i)%density
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment