Skip to content

Fix bugs for integrate background model and integrate heterogeneities #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
esleokan wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix bugs for integrate background model and integrate heterogeneities #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98462f0
Fix bug that int_over_background was not broadcast
esleokan Aug 21, 2018
487006f
allocate variables for integral over background and hetero
esleokan Aug 21, 2018
733d998
allocate some variables in integrate_1D (or 3D)_model
esleokan Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions src/slave.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,15 @@ function slave_work(parameters, sem_data, inv_mesh, fft_data, het_model) result(
allocate(weights(nptperstep))
allocate(int_kernel(nbasisfuncs_per_elem))

if (parameters%int_over_background) then
allocate(int_model(nbasisfuncs_per_elem))
end if


if (parameters%int_over_hetero) then
allocate(int_hetero(nbasisfuncs_per_elem))
end if

iclockold = tick(id=id_init, since=iclockold)

loop_elements: do ielement = 1, nelements
Expand Down Expand Up @@ -838,6 +847,9 @@ function integrate_1d_model(sem_data, inv_mesh, ielement) result(int_model)

nbasisfuncs_per_elem = inv_mesh%nbasisfuncs_per_elem
allocate(int_model(nbasisfuncs_per_elem))
allocate(random_points(3, nptperstep_model))
allocate(model_random_points(nmodel_parameters, nptperstep_model))


! Calculate integrated model parameters for this element
write(lu_out,'(A)', advance='no') ' Integrate model parameters...'
Expand Down Expand Up @@ -893,6 +905,8 @@ function integrate_3d_model(het_model, inv_mesh, ielement) result(int_hetero)

nbasisfuncs_per_elem = inv_mesh%nbasisfuncs_per_elem
allocate(int_hetero(nbasisfuncs_per_elem))
allocate(random_points(3,nptperstep_model))
allocate(hetero_random_points(nmodel_parameters_hetero,nptperstep_model))


write(lu_out,'(A)', advance='no') ' Integrate heterogeneities... '
Expand Down
1 change: 1 addition & 0 deletions src/type_parameter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,7 @@ subroutine read_parameters(this, input_file_in)
call pbroadcast_log(this%quasirandom, 0)
call pbroadcast_log(this%relative_kernel, 0)
call pbroadcast_log(this%int_over_volume, 0)
call pbroadcast_log(this%int_over_background, 0)
call pbroadcast_log(this%int_over_hetero, 0)
call pbroadcast_char(this%fftw_plan, 0)
call pbroadcast_log(this%plot_wavefields, 0)
Expand Down