Skip to content

Commit

Permalink
Merge branch 'ORNL:main' into crack_branching
Browse files Browse the repository at this point in the history
  • Loading branch information
diehlpk authored Sep 4, 2023
2 parents d464f37 + f65a7f6 commit 8fb8f42
Show file tree
Hide file tree
Showing 27 changed files with 49 additions and 31 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
BSD 3-Clause License

Copyright (c) 2022, Oak Ridge National Laboratory
Copyright (c) 2022-2023, Oak Ridge National Laboratory
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down
19 changes: 13 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ CabanaPD has the following dependencies:
|Dependency | Version | Required | Details|
|---------- | ------- |-------- |------- |
|CMake | 3.11+ | Yes | Build system
|Cabana | 4fdb7eeb | Yes | Performance portable particle algorithms
|Cabana | 31ba70d9 | Yes | Performance portable particle algorithms
|GTest | 1.10+ | No | Unit test framework

Cabana must be built with the following in order to work with CabanaPD:
|Cabana Dependency | Version | Required | Details|
|---------- | ------- |-------- |------- |
|CMake | 3.16+ | Yes | Build system
|MPI | GPU-Aware if CUDA/HIP enabled | Yes | Message Passing Interface
|Kokkos | 3.6.0+ | Yes | Performance portable on-node parallelism
|Kokkos | 3.7.0+ | Yes | Performance portable on-node parallelism
|HDF5 | master | No | Particle output
|SILO | master | No | Particle output

Expand Down Expand Up @@ -87,7 +87,7 @@ must be used:

Note that `hipcc` should be used for Kokkos, Cabana, and CabanaPD.

## Test
## Tests

Unit tests can be built by updating the CabanaPD CMake configuration in the
script above with:
Expand Down Expand Up @@ -122,9 +122,14 @@ example can be run with:
./CabanaPD/build/install/bin/KalthoffWinkler
```

New examples can be created by using the existing `KalthoffWinkler` as a
template to simulate other fracture problems. All inputs are currently
specified in `examples/kalthoff_winkler.cpp`
The third example is crack branching in soda-lime glass [3]. The example can be
run with:

```
./CabanaPD/build/install/bin/CrackBranching
```

New examples can be created by using any of the current cases as a template. All inputs are currently specified in the example source files themselves.

## References

Expand All @@ -138,6 +143,8 @@ loading, in Impact Loading and Dynamic Behavior of Materials, C.Y. Chiem, H.-D.
Kunze, and L.W. Meyer, eds., Vol 1, DGM Informationsgesellschaft Verlag (1988)
185-195.

[3] F. Bobaru and G. Zhang, Why do cracks branch? A peridynamic investigation of dynamic brittle fracture, International Journal of Fracture 196 (2015): 59–98.

## Contributing

We encourage you to contribute to CabanaPD! Please check the
Expand Down
11 changes: 11 additions & 0 deletions examples/crack_branching.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
/****************************************************************************
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
* BSD 3-clause license. For the licensing terms see the LICENSE file in *
* the top-level directory. *
* *
* SPDX-License-Identifier: BSD-3-Clause *
****************************************************************************/

#include <fstream>
#include <iostream>

Expand Down
2 changes: 1 addition & 1 deletion examples/elastic_wave.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion examples/kalthoff_winkler.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_Boundary.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_Comm.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_Force.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_Input.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_Input.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_Integrate.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_Output.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_Particles.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_Prenotch.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_Solver.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_Types.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion src/CabanaPD_config.hpp.cmakein
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion unit_test/TestCUDA_Category.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion unit_test/TestHIP_Category.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion unit_test/TestOPENMP_Category.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion unit_test/TestPTHREAD_Category.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion unit_test/TestSERIAL_Category.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion unit_test/mpi_unit_test_main.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion unit_test/tstComm.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion unit_test/tstForce.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down
2 changes: 1 addition & 1 deletion unit_test/tstIntegrator.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 2022 by Oak Ridge National Laboratory *
* Copyright (c) 2022-2023 by Oak Ridge National Laboratory *
* All rights reserved. *
* *
* This file is part of CabanaPD. CabanaPD is distributed under a *
Expand Down

0 comments on commit 8fb8f42

Please sign in to comment.