crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 22:26:08 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Changed '3d raster' name for new plotting capability to 'voxel'

Browse source
This commit is contained in:
nhorelik 2013-04-13 22:50:18 -04:00
parent 55996dd06b
commit a903af9bbc
4 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/input_xml.F90
View file

@ -2174,10 +2174,10 @@ contains
select case (plot_(i) % type)
case ("slice")
pl % type = PLOT_TYPE_SLICE
case ("3draster")
pl % type = PLOT_TYPE_3DRASTER
case ("voxel")
pl % type = PLOT_TYPE_VOXEL
case default
message = "Unsupported plot type '" // plot_(i) % type &
message = "Unsupported plot type '" // trim(plot_(i) % type) &
// "' in plot " // trim(to_str(pl % id))
call fatal_error()
end select
@ -2187,9 +2187,9 @@ contains
case (PLOT_TYPE_SLICE)
pl % path_plot = trim(path_input) // trim(to_str(pl % id)) // &
"_" // trim(plot_(i) % filename) // ".ppm"
case (PLOT_TYPE_3DRASTER)
case (PLOT_TYPE_VOXEL)
pl % path_plot = trim(path_input) // trim(to_str(pl % id)) // &
"_" // trim(plot_(i) % filename) // ".3draster"
"_" // trim(plot_(i) % filename) // ".voxel"
end select
! Copy plot pixel size
@ -2202,11 +2202,11 @@ contains
trim(to_str(pl % id))
call fatal_error()
end if
else if (pl % type == PLOT_TYPE_3DRASTER) then
else if (pl % type == PLOT_TYPE_VOXEL) then
if (size(plot_(i) % pixels) == 3) then
pl % pixels = plot_(i) % pixels
else
message = "<pixels> must be length 3 in 3draster plot " // &
message = "<pixels> must be length 3 in voxel plot " // &
trim(to_str(pl % id))
call fatal_error()
end if
@ -2214,8 +2214,8 @@ contains
! Copy plot background color
if (associated(plot_(i) % background)) then
if (pl % type == PLOT_TYPE_3DRASTER) then
message = "Background color ignored in 3D raster plot " // &
if (pl % type == PLOT_TYPE_VOXEL) then
message = "Background color ignored in voxel plot " // &
trim(to_str(pl % id))
call warning()
end if
@ -2265,11 +2265,11 @@ contains
trim(to_str(pl % id))
call fatal_error()
end if
else if (pl % type == PLOT_TYPE_3DRASTER) then
else if (pl % type == PLOT_TYPE_VOXEL) then
if (size(plot_(i) % width) == 3) then
pl % width = plot_(i) % width
else
message = "<width> must be length 3 in 3draster plot " // &
message = "<width> must be length 3 in voxel plot " // &
trim(to_str(pl % id))
call fatal_error()
end if
@ -2306,8 +2306,8 @@ contains
! Copy user specified colors
if (associated(plot_(i) % col_spec_)) then
if (pl % type == PLOT_TYPE_3DRASTER) then
message = "Color specifications ignored in 3D raster plot " // &
if (pl % type == PLOT_TYPE_VOXEL) then
message = "Color specifications ignored in voxel plot " // &
trim(to_str(pl % id))
call warning()
end if
@ -2351,8 +2351,8 @@ contains
! Deal with masks
if (associated(plot_(i) % mask_)) then
if (pl % type == PLOT_TYPE_3DRASTER) then
message = "Mask ignored in 3D raster plot " // &
if (pl % type == PLOT_TYPE_VOXEL) then
message = "Mask ignored in voxel plot " // &
trim(to_str(pl % id))
call warning()
end if

6
src/output.F90
View file

@ -1324,8 +1324,8 @@ contains
! Plot type
if (pl % type == PLOT_TYPE_SLICE) then
write(ou,100) "Plot Type:", "Slice"
else if (pl % type == PLOT_TYPE_3DRASTER) then
write(ou,100) "Plot Type:", "3D Raster"
else if (pl % type == PLOT_TYPE_VOXEL) then
write(ou,100) "Plot Type:", "Voxel"
end if
! Plot parameters
@ -1350,7 +1350,7 @@ contains
end select
write(ou,100) "Pixels:", trim(to_str(pl % pixels(1))) // " " // &
trim(to_str(pl % pixels(2)))
else if (pl % type == PLOT_TYPE_3DRASTER) then
else if (pl % type == PLOT_TYPE_VOXEL) then
write(ou,100) "Voxels:", trim(to_str(pl % pixels(1))) // " " // &
trim(to_str(pl % pixels(2))) // " " // trim(to_str(pl % pixels(3)))
end if

2
src/plot.F90
View file

@ -36,7 +36,7 @@ contains
if (pl % type == PLOT_TYPE_SLICE) then
! create 2d image
call create_ppm(pl)
else if (pl % type == PLOT_TYPE_3DRASTER) then
else if (pl % type == PLOT_TYPE_VOXEL) then
! create dump for 3D silomesh utility script
call create_3d_dump(pl)
end if

2
src/plot_header.F90
View file

@ -31,7 +31,7 @@ module plot_header
! Plot type
integer, parameter :: PLOT_TYPE_SLICE = 1
integer, parameter :: PLOT_TYPE_3DRASTER = 2
integer, parameter :: PLOT_TYPE_VOXEL = 2
! Plot basis plane
integer, parameter :: PLOT_BASIS_XY = 1