diff --git a/read_input_file.f90 b/read_input_file.f90 index f6575e920666ad123fde582daf803dbdcb038b23..6ea4b32debc97e0db4bb41df020498bc57a0230e 100644 --- a/read_input_file.f90 +++ b/read_input_file.f90 @@ -367,19 +367,30 @@ do i=1,params%ns call mpi_bcast(surface(i)%spread_surface_points,1,mpi_integer,0,mpi_comm_world,ierr) write(threadinfo%Logunit,*) 'surface ',i,'spread_surface_points',surface(i)%spread_surface_points + surface(i)%surface_type = 0 if (iproc==0) call scanfile (params%infile,'surface_type_'//cm(il:3),surface(i)%surface_type,ires) call mpi_bcast(surface(i)%surface_type,1,mpi_integer,0,mpi_comm_world,ierr) write(threadinfo%Logunit,*) 'surface ',i,'type',surface(i)%surface_type + surface(i)%sp01 = 0.d0 if (iproc==0) call scanfile (params%infile,'surface_param_01_'//cm(il:3),surface(i)%sp01,ires) + surface(i)%sp02 = 0.d0 if (iproc==0) call scanfile (params%infile,'surface_param_02_'//cm(il:3),surface(i)%sp02,ires) + surface(i)%sp03 = 0.d0 if (iproc==0) call scanfile (params%infile,'surface_param_03_'//cm(il:3),surface(i)%sp03,ires) + surface(i)%sp04 = 0.d0 if (iproc==0) call scanfile (params%infile,'surface_param_04_'//cm(il:3),surface(i)%sp04,ires) + surface(i)%sp05 = 0.d0 if (iproc==0) call scanfile (params%infile,'surface_param_05_'//cm(il:3),surface(i)%sp05,ires) + surface(i)%sp06 = 0.d0 if (iproc==0) call scanfile (params%infile,'surface_param_06_'//cm(il:3),surface(i)%sp06,ires) + surface(i)%sp07 = 0.d0 if (iproc==0) call scanfile (params%infile,'surface_param_07_'//cm(il:3),surface(i)%sp07,ires) + surface(i)%sp08 = 0.d0 if (iproc==0) call scanfile (params%infile,'surface_param_08_'//cm(il:3),surface(i)%sp08,ires) + surface(i)%sp09 = 0.d0 if (iproc==0) call scanfile (params%infile,'surface_param_09_'//cm(il:3),surface(i)%sp09,ires) + surface(i)%sp10 = 0.d0 if (iproc==0) call scanfile (params%infile,'surface_param_10_'//cm(il:3),surface(i)%sp10,ires) call mpi_bcast(surface(i)%sp01,1,mpi_double_precision,0,mpi_comm_world,ierr) @@ -429,22 +440,27 @@ write(threadinfo%Logunit,*) 'ref_on_faces',params%ref_on_faces do i=1,6 write(cm,'(i3)') i + cube_faces(i)%level = 1 if (iproc==0) call scanfile (params%infile,'level_face'//cm(3:3),cube_faces(i)%level,ires) call mpi_bcast(cube_faces(i)%level,1,mpi_integer,0,mpi_comm_world,ierr) write(threadinfo%Logunit,*) 'cube_faces level',cube_faces(i)%level + cube_faces(i)%l = 0.d0 if (iproc==0) call scanfile (params%infile,'l'//cm(3:3),cube_faces(i)%l,ires) call mpi_bcast(cube_faces(i)%l,1,mpi_double_precision,0,mpi_comm_world,ierr) write(threadinfo%Logunit,*) 'cube_faces l',cube_faces(i)%l + cube_faces(i)%r = 0.d0 if (iproc==0) call scanfile (params%infile,'r'//cm(3:3),cube_faces(i)%r,ires) call mpi_bcast(cube_faces(i)%r,1,mpi_double_precision,0,mpi_comm_world,ierr) write(threadinfo%Logunit,*) 'cube_faces r',cube_faces(i)%r + cube_faces(i)%b = 0.d0 if (iproc==0) call scanfile (params%infile,'b'//cm(3:3),cube_faces(i)%b,ires) call mpi_bcast(cube_faces(i)%b,1,mpi_double_precision,0,mpi_comm_world,ierr) write(threadinfo%Logunit,*) 'cube_faces b',cube_faces(i)%b + cube_faces(i)%t = 0.d0 if (iproc==0) call scanfile (params%infile,'t'//cm(3:3),cube_faces(i)%t,ires) call mpi_bcast(cube_faces(i)%t,1,mpi_double_precision,0,mpi_comm_world,ierr) write(threadinfo%Logunit,*) 'cube_faces t',cube_faces(i)%t @@ -657,6 +673,7 @@ do i=1,params%nsections sections(i)%xyz=0 if (iproc==0) call scanfile (params%infile,'xyz_'//cm(il:3),sections(i)%xyz,ires) + sections(i)%slice = 0.1d0 if (iproc==0) call scanfile (params%infile,'slice_'//cm(il:3),sections(i)%slice,ires) ! if (sections(i)%slice<0.d0 .or. sections(i)%slice>1.d0) call stop_run ('pb with slice value') @@ -783,8 +800,10 @@ do i=1,params%nsections sections(i)%scale=100.d0 if (iproc==0) call scanfile (params%infile,'scale_'//cm(il:3),sections(i)%scale,ires) + sections(i)%colormap = 'jet' if (iproc==0) call scanfile (params%infile,'colormap_'//cm(il:3),sections(i)%colormap,ires) + sections(i)%ncolours = 256 if (iproc==0) call scanfile (params%infile,'ncolours_'//cm(il:3),sections(i)%ncolours,ires) end do