fixed mesh object to reflect new changes in master, k-eff looks consistent

This commit is contained in:
Bryan Herman 2011-12-11 14:05:08 -05:00
parent a1a15e8445
commit 5000a899f4
2 changed files with 11 additions and 7 deletions

View file

@ -155,6 +155,7 @@ contains
allocate(m % dimension(n))
allocate(m % origin(n))
allocate(m % width(n))
allocate(m % upper_right(n))
! read dimensions in each direction
m % dimension = mesh_ % dimension
@ -175,6 +176,9 @@ contains
end if
m % width = mesh_ % width
! set upper right coordinate
m % upper_right = m % origin + m % dimension * m % width
! add mesh to dictionary
call dict_add_key(mesh_dict, m % id, 1)
@ -203,8 +207,8 @@ contains
t % n_bins(T_MESH) = t % n_bins(T_MESH) + product(m % dimension)
! read and set incoming energy mesh filter
if (len_trim(energy_) > 0) then
call split_string(energy_,words,n_words)
if (len_trim(mesh_ % energy) > 0) then
call split_string(mesh_ % energy,words,n_words)
ng = n_words
allocate(t % energy_in(n_words))
do j = 1,n_words
@ -227,8 +231,8 @@ contains
else if (i == 2) then
! read and set outgoing energy mesh filter
if (len_trim(energy_) > 0) then
call split_string(energy_, words, n_words)
if (len_trim(mesh_ % energy) > 0) then
call split_string(mesh_ % energy, words, n_words)
allocate(t % energy_out(n_words))
do j = 1, n_words
t % energy_out(j) = str_to_real(words(j))

View file

@ -43,10 +43,10 @@ program main
if (master) call print_runtime()
end if
! call cmfd calculation
call execute_cmfd()
! call cmfd calculation
call execute_cmfd()
! deallocate arrays
! deallocate arrays
call free_memory()
contains