Skip to content
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

Implement anisotropic properties_container. #269

Merged
merged 8 commits into from
Dec 10, 2024
Merged

Implement anisotropic properties_container. #269

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a66d6a2
Fixed Apple clang cmake issues
Rohit-Kakodkar Dec 10, 2024
fd98954
Merge branch 'issue-228-anisotropy' into issue-250
Rohit-Kakodkar Dec 10, 2024
d4b7ce6
Implemented point properties for anisotropic media
Rohit-Kakodkar Dec 10, 2024
70b5e75
Added density to point properties
Rohit-Kakodkar Dec 10, 2024
dbcceb2
Minor Fix with value_type
Rohit-Kakodkar Dec 10, 2024
deaab98
Implement anisotropic properties_container.
icui Dec 10, 2024
0389cc9
Implement compute_properties
icui Dec 10, 2024
6fbebe5
Merge pull request #272 from PrincetonUniversity/issue-250
icui Dec 10, 2024
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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ repos:
- id: requirements-txt-fixer
- id: trailing-whitespace
- repo: https://github.com/pre-commit/mirrors-clang-format
rev: "v14.0.5"
rev: "v15.0.6"
hooks:
- id: clang-format
types_or: [c++]
Expand Down
307 changes: 307 additions & 0 deletions include/compute/properties/impl/properties_container.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,313 @@ struct properties_container<specfem::element::medium_tag::elastic,
}
};

template <>
struct properties_container<specfem::element::medium_tag::elastic,
specfem::element::property_tag::anisotropic> {

constexpr static auto dimension = specfem::dimension::type::dim2;
constexpr static auto value_type = specfem::element::medium_tag::elastic;
constexpr static auto property_type =
specfem::element::property_tag::anisotropic;

using ViewType = typename Kokkos::View<type_real ***, Kokkos::LayoutLeft,
Kokkos::DefaultExecutionSpace>;

int nspec; ///< total number of acoustic spectral elements
int ngllz; ///< number of quadrature points in z dimension
int ngllx; ///< number of quadrature points in x dimension

ViewType rho;
ViewType::HostMirror h_rho;
ViewType c11;
ViewType::HostMirror h_c11;
ViewType c13;
ViewType::HostMirror h_c13;
ViewType c15;
ViewType::HostMirror h_c15;
ViewType c33;
ViewType::HostMirror h_c33;
ViewType c35;
ViewType::HostMirror h_c35;
ViewType c55;
ViewType::HostMirror h_c55;
ViewType c12;
ViewType::HostMirror h_c12;
ViewType c23;
ViewType::HostMirror h_c23;
ViewType c25;
ViewType::HostMirror h_c25;

properties_container() = default;

properties_container(const int nspec, const int ngllz, const int ngllx)
: nspec(nspec), ngllz(ngllz), ngllx(ngllx),
rho("specfem::compute::properties::rho", nspec, ngllz, ngllx),
h_rho(Kokkos::create_mirror_view(rho)),
c11("specfem::compute::properties::c11", nspec, ngllz, ngllx),
h_c11(Kokkos::create_mirror_view(c11)),
c12("specfem::compute::properties::c12", nspec, ngllz, ngllx),
h_c12(Kokkos::create_mirror_view(c12)),
c13("specfem::compute::properties::c13", nspec, ngllz, ngllx),
h_c13(Kokkos::create_mirror_view(c13)),
c15("specfem::compute::properties::c15", nspec, ngllz, ngllx),
h_c15(Kokkos::create_mirror_view(c15)),
c33("specfem::compute::properties::c33", nspec, ngllz, ngllx),
h_c33(Kokkos::create_mirror_view(c33)),
c35("specfem::compute::properties::c35", nspec, ngllz, ngllx),
h_c35(Kokkos::create_mirror_view(c35)),
c55("specfem::compute::properties::c55", nspec, ngllz, ngllx),
h_c55(Kokkos::create_mirror_view(c55)),
c23("specfem::compute::properties::c23", nspec, ngllz, ngllx),
h_c23(Kokkos::create_mirror_view(c23)),
c25("specfem::compute::properties::c25", nspec, ngllz, ngllx),
h_c25(Kokkos::create_mirror_view(c25)) {}

template <
typename PointProperties,
typename std::enable_if_t<!PointProperties::simd::using_simd, int> = 0>
KOKKOS_FORCEINLINE_FUNCTION void
load_device_properties(const specfem::point::index<dimension> &index,
PointProperties &property) const {

static_assert(PointProperties::dimension == dimension,
"Dimension mismatch");
static_assert(PointProperties::medium_tag == value_type,
"Medium tag mismatch");
static_assert(PointProperties::property_tag == property_type,
"Property tag mismatch");

const int ispec = index.ispec;
const int iz = index.iz;
const int ix = index.ix;

property.c11 = c11(ispec, iz, ix);
property.c12 = c12(ispec, iz, ix);
property.c13 = c13(ispec, iz, ix);
property.c15 = c15(ispec, iz, ix);
property.c33 = c33(ispec, iz, ix);
property.c35 = c35(ispec, iz, ix);
property.c55 = c55(ispec, iz, ix);
property.c23 = c23(ispec, iz, ix);
property.c25 = c25(ispec, iz, ix);
}

template <
typename PointProperties,
typename std::enable_if_t<PointProperties::simd::using_simd, int> = 0>
KOKKOS_FORCEINLINE_FUNCTION void
load_device_properties(const specfem::point::simd_index<dimension> &index,
PointProperties &property) const {

static_assert(PointProperties::dimension == dimension,
"Dimension mismatch");
static_assert(PointProperties::medium_tag == value_type,
"Medium tag mismatch");
static_assert(PointProperties::property_tag == property_type,
"Property tag mismatch");

using simd = typename PointProperties::simd;
using mask_type = typename simd::mask_type;
using tag_type = typename simd::tag_type;

const int ispec = index.ispec;
const int iz = index.iz;
const int ix = index.ix;

mask_type mask([&](std::size_t lane) { return index.mask(lane); });

Kokkos::Experimental::where(mask, property.rho)
.copy_from(&rho(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c11)
.copy_from(&c11(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c12)
.copy_from(&c12(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c13)
.copy_from(&c13(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c15)
.copy_from(&c15(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c33)
.copy_from(&c33(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c35)
.copy_from(&c35(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c55)
.copy_from(&c55(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c23)
.copy_from(&c23(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c25)
.copy_from(&c25(ispec, iz, ix), tag_type());
}

template <
typename PointProperties,
typename std::enable_if_t<!PointProperties::simd::using_simd, int> = 0>
inline void
load_host_properties(const specfem::point::index<dimension> &index,
PointProperties &property) const {

static_assert(PointProperties::dimension == dimension,
"Dimension mismatch");
static_assert(PointProperties::medium_tag == value_type,
"Medium tag mismatch");
static_assert(PointProperties::property_tag == property_type,
"Property tag mismatch");

const int ispec = index.ispec;
const int iz = index.iz;
const int ix = index.ix;

property.rho = h_rho(ispec, iz, ix);
property.c11 = h_c11(ispec, iz, ix);
property.c12 = h_c12(ispec, iz, ix);
property.c13 = h_c13(ispec, iz, ix);
property.c15 = h_c15(ispec, iz, ix);
property.c33 = h_c33(ispec, iz, ix);
property.c35 = h_c35(ispec, iz, ix);
property.c55 = h_c55(ispec, iz, ix);
property.c23 = h_c23(ispec, iz, ix);
property.c25 = h_c25(ispec, iz, ix);
}

template <
typename PointProperties,
typename std::enable_if_t<PointProperties::simd::using_simd, int> = 0>
inline void
load_host_properties(const specfem::point::simd_index<dimension> &index,
PointProperties &property) const {

static_assert(PointProperties::dimension == dimension,
"Dimension mismatch");
static_assert(PointProperties::medium_tag == value_type,
"Medium tag mismatch");
static_assert(PointProperties::property_tag == property_type,
"Property tag mismatch");

using simd = typename PointProperties::simd;
using mask_type = typename simd::mask_type;
using tag_type = typename simd::tag_type;

const int ispec = index.ispec;
const int iz = index.iz;
const int ix = index.ix;

mask_type mask([&](std::size_t lane) { return index.mask(lane); });

Kokkos::Experimental::where(mask, property.rho)
.copy_from(&h_rho(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c11)
.copy_from(&h_c11(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c13)
.copy_from(&h_c13(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c15)
.copy_from(&h_c15(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c33)
.copy_from(&h_c33(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c35)
.copy_from(&h_c35(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c55)
.copy_from(&h_c55(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c23)
.copy_from(&h_c23(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c25)
.copy_from(&h_c25(ispec, iz, ix), tag_type());
}

void copy_to_device() {
Kokkos::deep_copy(rho, h_rho);
Kokkos::deep_copy(c11, h_c11);
Kokkos::deep_copy(c13, h_c13);
Kokkos::deep_copy(c15, h_c15);
Kokkos::deep_copy(c33, h_c33);
Kokkos::deep_copy(c35, h_c35);
Kokkos::deep_copy(c55, h_c55);
Kokkos::deep_copy(c23, h_c23);
Kokkos::deep_copy(c25, h_c25);
}

void copy_to_host() {
Kokkos::deep_copy(h_rho, rho);
Kokkos::deep_copy(h_c11, c11);
Kokkos::deep_copy(h_c13, c13);
Kokkos::deep_copy(h_c15, c15);
Kokkos::deep_copy(h_c33, c33);
Kokkos::deep_copy(h_c35, c35);
Kokkos::deep_copy(h_c55, c55);
Kokkos::deep_copy(h_c23, c23);
Kokkos::deep_copy(h_c25, c25);
}

template <
typename PointProperties,
typename std::enable_if_t<!PointProperties::simd::using_simd, int> = 0>
inline void assign(const specfem::point::index<dimension> &index,
const PointProperties &property) const {

static_assert(PointProperties::dimension == dimension,
"Dimension mismatch");
static_assert(PointProperties::medium_tag == value_type,
"Medium tag mismatch");
static_assert(PointProperties::property_tag == property_type,
"Property tag mismatch");

const int ispec = index.ispec;
const int iz = index.iz;
const int ix = index.ix;

h_rho(ispec, iz, ix) = property.rho;
h_c11(ispec, iz, ix) = property.c11;
h_c13(ispec, iz, ix) = property.c13;
h_c15(ispec, iz, ix) = property.c15;
h_c33(ispec, iz, ix) = property.c33;
h_c35(ispec, iz, ix) = property.c35;
h_c55(ispec, iz, ix) = property.c55;
h_c23(ispec, iz, ix) = property.c23;
h_c25(ispec, iz, ix) = property.c25;
}

template <
typename PointProperties,
typename std::enable_if_t<PointProperties::simd::using_simd, int> = 0>
inline void assign(const specfem::point::simd_index<dimension> &index,
const PointProperties &property) const {

static_assert(PointProperties::dimension == dimension,
"Dimension mismatch");
static_assert(PointProperties::medium_tag == value_type,
"Medium tag mismatch");
static_assert(PointProperties::property_tag == property_type,
"Property tag mismatch");

using simd = typename PointProperties::simd;
using mask_type = typename simd::mask_type;
using tag_type = typename simd::tag_type;

const int ispec = index.ispec;
const int iz = index.iz;
const int ix = index.ix;

mask_type mask([&, this](std::size_t lane) { return index.mask(lane); });

Kokkos::Experimental::where(mask, property.rho)
.copy_to(&h_rho(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c11)
.copy_to(&h_c11(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c13)
.copy_to(&h_c13(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c15)
.copy_to(&h_c15(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c33)
.copy_to(&h_c33(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c35)
.copy_to(&h_c35(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c55)
.copy_to(&h_c55(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c23)
.copy_to(&h_c23(ispec, iz, ix), tag_type());
Kokkos::Experimental::where(mask, property.c25)
.copy_to(&h_c25(ispec, iz, ix), tag_type());
}
};

template <>
struct properties_container<specfem::element::medium_tag::acoustic,
specfem::element::property_tag::isotropic> {
Expand Down
18 changes: 18 additions & 0 deletions include/compute/properties/properties.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ struct properties {
specfem::element::medium_tag::elastic,
specfem::element::property_tag::isotropic>
elastic_isotropic; ///< Elastic isotropic material properties
specfem::compute::impl::properties::material_property<
specfem::element::medium_tag::elastic,
specfem::element::property_tag::anisotropic>
elastic_anisotropic; ///< Elastic anisotropic material properties
specfem::compute::impl::properties::material_property<
specfem::element::medium_tag::acoustic,
specfem::element::property_tag::isotropic>
Expand Down Expand Up @@ -177,6 +181,11 @@ load_on_device(const IndexType &lcoord,
(PropertyTag == specfem::element::property_tag::isotropic)) {
properties.elastic_isotropic.load_device_properties(l_index,
point_properties);
} else if constexpr ((MediumTag == specfem::element::medium_tag::elastic) &&
(PropertyTag ==
specfem::element::property_tag::anisotropic)) {
properties.elastic_anisotropic.load_device_properties(l_index,
point_properties);
} else if constexpr ((MediumTag == specfem::element::medium_tag::acoustic) &&
(PropertyTag ==
specfem::element::property_tag::isotropic)) {
Expand Down Expand Up @@ -227,6 +236,11 @@ void load_on_host(const IndexType &lcoord,
(PropertyTag == specfem::element::property_tag::isotropic)) {
properties.elastic_isotropic.load_host_properties(l_index,
point_properties);
} else if constexpr ((MediumTag == specfem::element::medium_tag::elastic) &&
(PropertyTag ==
specfem::element::property_tag::anisotropic)) {
properties.elastic_anisotropic.load_host_properties(l_index,
point_properties);
} else if constexpr ((MediumTag == specfem::element::medium_tag::acoustic) &&
(PropertyTag ==
specfem::element::property_tag::isotropic)) {
Expand Down Expand Up @@ -275,6 +289,10 @@ void store_on_host(const IndexType &lcoord,
if constexpr ((MediumTag == specfem::element::medium_tag::elastic) &&
(PropertyTag == specfem::element::property_tag::isotropic)) {
properties.elastic_isotropic.assign(l_index, point_properties);
} else if constexpr ((MediumTag == specfem::element::medium_tag::elastic) &&
(PropertyTag ==
specfem::element::property_tag::anisotropic)) {
properties.elastic_anisotropic.assign(l_index, point_properties);
} else if constexpr ((MediumTag == specfem::element::medium_tag::acoustic) &&
(PropertyTag ==
specfem::element::property_tag::isotropic)) {
Expand Down
Loading