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

Add shear and compression wave velocities to Linear Elastic Material Properties for #692 #705

Merged
merged 19 commits into from
Mar 3, 2021
Merged

Add shear and compression wave velocities to Linear Elastic Material Properties for #692 #705

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
32fdba3
initiate absorbing constraint
cgeudeker Nov 10, 2020
2360285
initiate absorbing constraint
cgeudeker Nov 12, 2020
10c6415
initiate bounding constraint update
cgeudeker Nov 22, 2020
cee7b4e
Test Case Attempt
cgeudeker Nov 29, 2020
04e38ef
Working Test Case
cgeudeker Dec 7, 2020
7e7ebfc
3D test case
cgeudeker Dec 15, 2020
7210c21
3D test case, clang-format
cgeudeker Dec 15, 2020
e1a3c2e
Earthquake Material Property
cgeudeker Feb 10, 2021
917cdbc
Earthquake Material Property
cgeudeker Feb 10, 2021
59bcff1
Earthquake Material Property
cgeudeker Feb 10, 2021
d1e42ef
Earthquake Material Properties
cgeudeker Feb 10, 2021
dbf0023
Earthquake Material Properties, test case
cgeudeker Feb 10, 2021
3b431c3
Earthquake Material Properties, clang format
cgeudeker Feb 10, 2021
b392949
Remove Layer Thickness from material property
cgeudeker Feb 20, 2021
1187ad0
Merge branch 'develop' into material
kks32 Feb 20, 2021
de75919
Earthquake Boolean Removal and Fixed Test Case
cgeudeker Feb 23, 2021
8f98064
Earthquake Boolean Removal and Fixed Test Case
cgeudeker Feb 23, 2021
2c44bee
Merge branch 'material' of https://github.com/cgeudeker/mpm into mate…
cgeudeker Feb 23, 2021
30ef52e
Variable renames and 3d Test Case
cgeudeker Mar 2, 2021
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
4 changes: 4 additions & 0 deletions include/materials/linear_elastic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ class LinearElastic : public Material<Tdim> {
double poisson_ratio_{std::numeric_limits<double>::max()};
//! Bulk modulus
double bulk_modulus_{std::numeric_limits<double>::max()};
//! S-Wave Velocity
double s_wave_velocity_{std::numeric_limits<double>::max()};
//! P-Wave Velocity
double p_wave_velocity_{std::numeric_limits<double>::max()};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
//! S-Wave Velocity
double s_wave_velocity_{std::numeric_limits<double>::max()};
//! P-Wave Velocity
double p_wave_velocity_{std::numeric_limits<double>::max()};
//! Compressional Wave Velocity
double vp_{std::numeric_limits<double>::max()};
//! Shear wave Velocity
double vs_{std::numeric_limits<double>::max()};

}; // LinearElastic class
} // namespace mpm

Expand Down
12 changes: 12 additions & 0 deletions include/materials/linear_elastic.tcc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,22 @@ mpm::LinearElastic<Tdim>::LinearElastic(unsigned id,
material_properties.at("youngs_modulus").template get<double>();
poisson_ratio_ =
material_properties.at("poisson_ratio").template get<double>();

// Calculate bulk modulus
bulk_modulus_ = youngs_modulus_ / (3.0 * (1. - 2. * poisson_ratio_));

// Calculate constrained and shear modulus
double constrained_modulus =
youngs_modulus_ * (1. - poisson_ratio_) /
((1. + poisson_ratio_) * (1. - 2. * poisson_ratio_));
double shear_modulus = youngs_modulus_ / (2.0 * (1. + poisson_ratio_));

// Calculate wave velocities
p_wave_velocity_ = sqrt(constrained_modulus / density_);
s_wave_velocity_ = sqrt(shear_modulus / density_);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
p_wave_velocity_ = sqrt(constrained_modulus / density_);
s_wave_velocity_ = sqrt(shear_modulus / density_);
vp_ = sqrt(constrained_modulus / density_);
vs_ = sqrt(shear_modulus / density_);


properties_ = material_properties;

// Set elastic tensor
this->compute_elastic_tensor();
} catch (Json::exception& except) {
Expand Down
18 changes: 16 additions & 2 deletions tests/materials/linear_elastic_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,6 @@ TEST_CASE("LinearElastic is checked in 2D", "[material][linear_elastic][2D]") {
Approx(jmaterial["density"]).epsilon(Tolerance));
REQUIRE(material->template property<double>("youngs_modulus") ==
Approx(jmaterial["youngs_modulus"]).epsilon(Tolerance));
REQUIRE(material->template property<double>("poisson_ratio") ==
Approx(jmaterial["poisson_ratio"]).epsilon(Tolerance));

// Check if state variable is initialised
SECTION("State variable is initialised") {
Expand Down Expand Up @@ -147,6 +145,22 @@ TEST_CASE("LinearElastic is checked in 2D", "[material][linear_elastic][2D]") {
REQUIRE(stress(4) == Approx(0.00000000000000e+00).epsilon(Tolerance));
REQUIRE(stress(5) == Approx(0.00000000000000e+00).epsilon(Tolerance));
}

SECTION("LinearElastic check properties earthquake") {
unsigned id = 0;
jmaterial["p_wave_velocity"] = 116.023870223;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an incorrect text, you can't pass the values of p_wave and s_wave velocity and check if that's correct.

jmaterial["s_wave_velocity"] = 62.0173672946;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
jmaterial["p_wave_velocity"] = 116.023870223;
jmaterial["s_wave_velocity"] = 62.0173672946;


auto material =
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Check in 3D too

Factory<mpm::Material<Dim>, unsigned, const Json&>::instance()->create(
"LinearElastic2D", std::move(id), jmaterial);

// Get P-Wave and S-Wave Velocities
REQUIRE(material->template property<double>("p_wave_velocity") ==
Approx(jmaterial["p_wave_velocity"]).epsilon(Tolerance));
REQUIRE(material->template property<double>("s_wave_velocity") ==
Approx(jmaterial["s_wave_velocity"]).epsilon(Tolerance));
}
}

//! Check linearelastic class in 3D
Expand Down