Skip to content

Commit aa19b43

Browse files
kks32kks32
committed
📝 🎨 Fix formatting issues
1 parent 51d405d commit aa19b43

File tree

8 files changed

+24
-28
lines changed

8 files changed

+24
-28
lines changed

‎include/solvers/mpm_base.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
#include "contact.h"
2222
#include "contact_friction.h"
2323
#include "mpm.h"
24-
#include "particle.h"
2524
#include "mpm_scheme.h"
2625
#include "mpm_scheme_usf.h"
2726
#include "mpm_scheme_usl.h"
27+
#include "particle.h"
2828
#include "vector.h"
2929

3030
namespace mpm {

‎include/solvers/mpm_explicit.tcc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ bool mpm::MPMExplicit<Tdim>::solve() {
6767

6868
// Interface
6969
interface_ = io_->analysis_bool("interface");
70-
70+
7171
// Initialise material
7272
this->initialise_materials();
7373

@@ -128,11 +128,11 @@ bool mpm::MPMExplicit<Tdim>::solve() {
128128

129129
// Compute forces
130130
mpm_scheme_->compute_forces(gravity_, phase, step_,
131-
set_node_concentrated_force_);
131+
set_node_concentrated_force_);
132132

133133
// Particle kinematics
134-
mpm_scheme_->compute_particle_kinematics(velocity_update_, phase,
135-
"Cundall", damping_factor_);
134+
mpm_scheme_->compute_particle_kinematics(velocity_update_, phase, "Cundall",
135+
damping_factor_);
136136

137137
// Update Stress Last
138138
mpm_scheme_->postcompute_stress_strain(phase, pressure_smoothing_);

‎include/solvers/mpm_scheme/mpm_scheme.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class MPMScheme {
2222
virtual inline void initialise();
2323

2424
//! Compute nodal kinematics - map mass and momentum to nodes
25-
//! \param[in] phase Phase to smooth pressure
25+
//! \param[in] phase Phase to smooth pressure
2626
virtual inline void compute_nodal_kinematics(unsigned phase);
2727

2828
//! Compute stress and strain

‎include/solvers/mpm_scheme/mpm_scheme.tcc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//! Constructor of stress update with mesh
22
template <unsigned Tdim>
3-
mpm::MPMScheme<Tdim>::MPMScheme(
4-
const std::shared_ptr<mpm::Mesh<Tdim>>& mesh, double dt) {
3+
mpm::MPMScheme<Tdim>::MPMScheme(const std::shared_ptr<mpm::Mesh<Tdim>>& mesh,
4+
double dt) {
55
// Assign mesh
66
mesh_ = mesh;
77
// Assign time increment

‎tests/contact_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#include "linear_function.h"
2121
#include "material.h"
2222
#include "mesh.h"
23+
#include "mpm_scheme_usf.h"
2324
#include "node.h"
2425
#include "partio_writer.h"
2526
#include "quadrilateral_element.h"
26-
#include "mpm_scheme_usf.h"
2727

2828
//! \brief Check stress update 3D case
2929
TEST_CASE("Contact test case", "[contact][friction][3D]") {

‎tests/solvers/mpm_explicit_usf_test.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ TEST_CASE("MPM 2D Explicit implementation is checked",
1818
const std::string analysis = "MPMExplicit2D";
1919
const std::string mpm_scheme = "usf";
2020
bool resume = false;
21-
REQUIRE(mpm_test::write_json(2, resume, analysis, mpm_scheme, fname) ==
22-
true);
21+
REQUIRE(mpm_test::write_json(2, resume, analysis, mpm_scheme, fname) == true);
2322

2423
// Write JSON Entity Sets file
2524
REQUIRE(mpm_test::write_entity_set() == true);
@@ -110,8 +109,7 @@ TEST_CASE("MPM 3D Explicit implementation is checked",
110109
const std::string analysis = "MPMExplicit3D";
111110
const std::string mpm_scheme = "usf";
112111
const bool resume = false;
113-
REQUIRE(mpm_test::write_json(3, resume, analysis, mpm_scheme, fname) ==
114-
true);
112+
REQUIRE(mpm_test::write_json(3, resume, analysis, mpm_scheme, fname) == true);
115113

116114
// Write JSON Entity Sets file
117115
REQUIRE(mpm_test::write_entity_set() == true);

‎tests/solvers/mpm_explicit_usl_test.cc‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ TEST_CASE("MPM 2D Explicit USL implementation is checked",
1818
const std::string analysis = "MPMExplicit2D";
1919
const std::string mpm_scheme = "usl";
2020
const bool resume = false;
21-
REQUIRE(mpm_test::write_json(2, resume, analysis, mpm_scheme, fname) ==
22-
true);
21+
REQUIRE(mpm_test::write_json(2, resume, analysis, mpm_scheme, fname) == true);
2322

2423
// Write JSON Entity Sets file
2524
REQUIRE(mpm_test::write_entity_set() == true);
@@ -101,8 +100,7 @@ TEST_CASE("MPM 3D Explicit USL implementation is checked",
101100
const std::string analysis = "MPMExplicit3D";
102101
const std::string mpm_scheme = "usl";
103102
const bool resume = false;
104-
REQUIRE(mpm_test::write_json(3, resume, analysis, mpm_scheme, fname) ==
105-
true);
103+
REQUIRE(mpm_test::write_json(3, resume, analysis, mpm_scheme, fname) == true);
106104

107105
// Write JSON Entity Sets file
108106
REQUIRE(mpm_test::write_entity_set() == true);

‎tests/solvers/mpm_scheme_test.cc‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
#include "hexahedron_element.h"
1818
#include "linear_function.h"
1919
#include "mesh.h"
20-
#include "node.h"
21-
#include "partio_writer.h"
22-
#include "quadrilateral_element.h"
2320
#include "mpm_scheme.h"
2421
#include "mpm_scheme_usf.h"
2522
#include "mpm_scheme_usl.h"
23+
#include "node.h"
24+
#include "partio_writer.h"
25+
#include "quadrilateral_element.h"
2626

2727
//! \brief Check stress update 3D case
2828
TEST_CASE("Stress update is checked for USF and USL",
@@ -194,10 +194,10 @@ TEST_CASE("Stress update is checked for USF and USL",
194194
REQUIRE_NOTHROW(mpm_scheme->compute_forces(gravity, phase, step, true));
195195

196196
// Particle kinematics
197-
REQUIRE_NOTHROW(mpm_scheme->compute_particle_kinematics(
198-
true, phase, "Cundall", 0.02));
199-
REQUIRE_NOTHROW(mpm_scheme->compute_particle_kinematics(
200-
false, phase, "Cundall", 0.02));
197+
REQUIRE_NOTHROW(
198+
mpm_scheme->compute_particle_kinematics(true, phase, "Cundall", 0.02));
199+
REQUIRE_NOTHROW(
200+
mpm_scheme->compute_particle_kinematics(false, phase, "Cundall", 0.02));
201201
REQUIRE_NOTHROW(
202202
mpm_scheme->compute_particle_kinematics(true, phase, "None", 0.02));
203203
REQUIRE_NOTHROW(
@@ -235,10 +235,10 @@ TEST_CASE("Stress update is checked for USF and USL",
235235
REQUIRE_NOTHROW(mpm_scheme->compute_forces(gravity, phase, step, true));
236236

237237
// Particle kinematics
238-
REQUIRE_NOTHROW(mpm_scheme->compute_particle_kinematics(
239-
true, phase, "Cundall", 0.02));
240-
REQUIRE_NOTHROW(mpm_scheme->compute_particle_kinematics(
241-
false, phase, "Cundall", 0.02));
238+
REQUIRE_NOTHROW(
239+
mpm_scheme->compute_particle_kinematics(true, phase, "Cundall", 0.02));
240+
REQUIRE_NOTHROW(
241+
mpm_scheme->compute_particle_kinematics(false, phase, "Cundall", 0.02));
242242
REQUIRE_NOTHROW(
243243
mpm_scheme->compute_particle_kinematics(true, phase, "None", 0.02));
244244
REQUIRE_NOTHROW(

0 commit comments

Comments
 (0)