Skip to content

Use the convenient formulation for 3d and variable density case too #60

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

Merged
merged 5 commits into from
Oct 28, 2022
Merged

Use the convenient formulation for 3d and variable density case too #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ea3ca80
working gradient test
joao-bapdm Oct 24, 2022
b98b9ed
update reference solutions in tests/
joao-bapdm Oct 26, 2022
a40d4c2
fix formulation for 3d cases too
joao-bapdm Oct 27, 2022
48c3dcf
Merge remote-tracking branch 'upstream/add_gradient' into add_gradient
joao-bapdm Oct 27, 2022
e76facb
fix damping alpha in space_model test
joao-bapdm Oct 27, 2022
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
6 changes: 3 additions & 3 deletions simwave/kernel/backend/c_code/forward/constant_density/3d/wave.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ double forward(f_type *u, f_type *velocity, f_type *damp,
f_type slowness = 1.0 / (velocity[domain_offset] * velocity[domain_offset]);

// denominator with damp coefficient
f_type denominator = (1.0 + damp[domain_offset] * dt / (2 * slowness));
f_type numerator = (1.0 - damp[domain_offset] * dt / (2 * slowness));
f_type denominator = (1.0 + damp[domain_offset] * dt / 2 );
f_type numerator = (1.0 - damp[domain_offset] * dt / 2 );

value *= (dtSquared / slowness) / denominator;

Expand Down Expand Up @@ -272,7 +272,7 @@ double forward(f_type *u, f_type *velocity, f_type *damp,
f_type slowness = 1.0 / (velocity[domain_offset] * velocity[domain_offset]);

// denominator with damp coefficient
f_type denominator = (1.0 + damp[domain_offset] * dt / (2 * slowness));
f_type denominator = (1.0 + damp[domain_offset] * dt / 2 );

f_type value = dtSquared / slowness * kws * wavelet[wavelet_offset] / denominator;

Expand Down
6 changes: 3 additions & 3 deletions simwave/kernel/backend/c_code/forward/variable_density/2d/wave.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ double forward(f_type *u, f_type *velocity, f_type *density, f_type *damp,
f_type slowness = 1.0 / (velocity[domain_offset] * velocity[domain_offset]);

// denominator with damp coefficient
f_type denominator = (1.0 + damp[domain_offset] * dt / (2 * slowness));
f_type numerator = (1.0 - damp[domain_offset] * dt / (2 * slowness));
f_type denominator = (1.0 + damp[domain_offset] * dt / 2 );
f_type numerator = (1.0 - damp[domain_offset] * dt / 2 );

value *= (dtSquared / slowness) / denominator;

Expand Down Expand Up @@ -273,7 +273,7 @@ double forward(f_type *u, f_type *velocity, f_type *density, f_type *damp,
f_type slowness = 1.0 / (velocity[domain_offset] * velocity[domain_offset]);

// denominator with damp coefficient
f_type denominator = (1.0 + damp[domain_offset] * dt / (2 * slowness));
f_type denominator = (1.0 + damp[domain_offset] * dt / 2 );

f_type value = dtSquared / slowness * kws * wavelet[wavelet_offset] / denominator;

Expand Down
6 changes: 3 additions & 3 deletions simwave/kernel/backend/c_code/forward/variable_density/3d/wave.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,8 @@ double forward(f_type *u, f_type *velocity, f_type *density, f_type *damp,
f_type slowness = 1.0 / (velocity[domain_offset] * velocity[domain_offset]);

// denominator with damp coefficient
f_type denominator = (1.0 + damp[domain_offset] * dt / (2 * slowness));
f_type numerator = (1.0 - damp[domain_offset] * dt / (2 * slowness));
f_type denominator = (1.0 + damp[domain_offset] * dt / 2 );
f_type numerator = (1.0 - damp[domain_offset] * dt / 2 );

value *= (dtSquared / slowness) / denominator;

Expand Down Expand Up @@ -297,7 +297,7 @@ double forward(f_type *u, f_type *velocity, f_type *density, f_type *damp,
f_type slowness = 1.0 / (velocity[domain_offset] * velocity[domain_offset]);

// denominator with damp coefficient
f_type denominator = (1.0 + damp[domain_offset] * dt / (2 * slowness));
f_type denominator = (1.0 + damp[domain_offset] * dt / 2 );

f_type value = dtSquared / slowness * kws * wavelet[wavelet_offset] / denominator;

Expand Down
3 changes: 0 additions & 3 deletions simwave/kernel/backend/c_code/gradient/constant_density/2d/wave.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@ double gradient(f_type *u, f_type *v, f_type *grad, f_type *velocity, f_type *da
f_type slowness = 1.0 / (velocity[domain_offset] * velocity[domain_offset]);

// denominator with damp coefficient
// f_type denominator = (1.0 + damp[domain_offset] * dt / (2 * slowness));
// f_type numerator = (1.0 - damp[domain_offset] * dt / (2 * slowness));
f_type denominator = (1.0 + damp[domain_offset] * dt / 2 );
f_type numerator = (1.0 - damp[domain_offset] * dt / 2 );

Expand Down Expand Up @@ -234,7 +232,6 @@ double gradient(f_type *u, f_type *v, f_type *grad, f_type *velocity, f_type *da
f_type slowness = 1.0 / (velocity[domain_offset] * velocity[domain_offset]);

// denominator with damp coefficient
// f_type denominator = (1.0 + damp[domain_offset] * dt / (2 * slowness));
f_type denominator = (1.0 + damp[domain_offset] * dt / 2 );

f_type value = dtSquared / slowness * kws * wavelet[wavelet_offset] / denominator;
Expand Down
Binary file modified tests/reference_solution/wavefield-3d-so-2.npy
View file
Open in desktop
Binary file not shown.
Binary file modified tests/reference_solution/wavefield-3d-so-8.npy
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion tests/test_space_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ def test_properties(self, dimension):
assert space_model.damping_length == (0.0,) * dimension * 2
assert space_model.boundary_condition == ('none',) * dimension * 2
assert space_model.damping_polynomial_degree == 3
assert space_model.damping_alpha == 0.001
assert space_model.damping_alpha == 0.002

@pytest.mark.parametrize(
'dimension, bbox, spacing, shape', [
Expand Down