Skip to content

Commit c13a8b0

Browse files
Merge pull request #266 from bessagroup/pr/1.5
Pr/1.5
2 parents f02b954 + ca49006 commit c13a8b0

File tree

101 files changed

+860
-16097
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+860
-16097
lines changed

Diff for: .coveragerc

-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
branch = True
44
source = src
55
omit =
6-
src/f3dasm/simulation/abaqus_script/*
7-
src/f3dasm/experiment/files/*
86
tests/*
97
**/__init__.py
10-
src/f3dasm/machinelearning/*
118

129
[report]
1310
# Regexes for lines to exclude from consideration

Diff for: .github/workflows/draft-pdf.yml

+5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,12 @@ name: Build JOSS paper
33
on:
44
pull_request:
55
branches:
6+
- "pr/**"
67
- "main"
8+
push:
9+
branches:
10+
- "pr/**"
11+
712

813
jobs:
914
paper:

Diff for: README.md

+4-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
f3dasm
22
------
3-
*Framework for data-driven design \& analysis of structures and materials*
3+
4+
<div align="center"><img src="https://raw.githubusercontent.com/bessagroup/f3dasm/pr/1.5/paper/f3dasm_logo_long.png" width="800"/></div>
45

56
***
67

@@ -41,31 +42,17 @@ The best way to get started is to follow the [installation instructions](https:/
4142

4243
## Illustrative benchmarks
4344

44-
This package includes a collection of illustrative benchmark studies that demonstrate the capabilities of the framework. These studies are available in the `/studies` folder, and include the following studies:
45+
This package includes a collection of illustrative benchmark studies that demonstrate the capabilities of the framework. These studies are available in the `/studies/` folder, and include the following studies:
4546

4647
- Benchmarking optimization algorithms against well-known benchmark functions
4748
- 'Fragile Becomes Supercompressible' ([Bessa et al. (2019)](https://onlinelibrary.wiley.com/doi/full/10.1002/adma.201904845))
4849

4950
## Authorship
5051

51-
* Current created and developer: [M.P. van der Schelling](https://github.com/mpvanderschelling/) ([email protected])
52+
* Current creator and developer: [M.P. van der Schelling](https://github.com/mpvanderschelling/) ([email protected])
5253

5354
The Bessa research group at TU Delft is small... At the moment, we have limited availability to help future users/developers adapting the code to new problems, but we will do our best to help!
5455

55-
56-
57-
## Referencing
58-
59-
If you use or edit our work, please cite at least one of the appropriate references:
60-
61-
[1] Bessa, M. A., Bostanabad, R., Liu, Z., Hu, A., Apley, D. W., Brinson, C., Chen, W., & Liu, W. K. (2017). A framework for data-driven analysis of materials under uncertainty: Countering the curse of dimensionality. Computer Methods in Applied Mechanics and Engineering, 320, 633-667.
62-
63-
[2] Bessa, M. A., & Pellegrino, S. (2018). Design of ultra-thin shell structures in the stochastic post-buckling range using Bayesian machine learning and optimization. International Journal of Solids and Structures, 139, 174-188.
64-
65-
[3] Bessa, M. A., Glowacki, P., & Houlder, M. (2019). Bayesian machine learning in metamaterial design: fragile becomes super-compressible. Advanced Materials, 31(48), 1904845.
66-
67-
[4] Mojtaba, M., Bostanabad, R., Chen, W., Ehmann, K., Cao, J., & Bessa, M. A. (2019). Deep learning predicts path-dependent plasticity. Proceedings of the National Academy of Sciences, 116(52), 26414-26420.
68-
6956
## Community Support
7057

7158
If you find any **issues, bugs or problems** with this template, please use the [GitHub issue tracker](https://github.com/bessagroup/f3dasm/issues) to report them.

Diff for: VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.8
1+
1.5.0

Diff for: docs/source/conf.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
project = 'f3dasm'
2828
author = 'Martin van der Schelling'
2929
copyright = '2024, Martin van der Schelling'
30-
version = '1.4.8'
31-
release = '1.4.8'
30+
version = '1.5.0'
31+
release = '1.5.0'
3232

3333

3434
# -- General configuration ----------------------------------------------------
@@ -138,4 +138,4 @@
138138
html_css_files = ['readthedocs-custom.css', 'theme_overrides.css', ]
139139

140140
# Source: https://www.sphinx-doc.org/en/master/usage/configuration.html#confval-html_show_sourcelink
141-
html_show_sourcelink = True
141+
html_show_sourcelink = False

Diff for: docs/source/img/contour_data.png

-59 KB
Binary file not shown.

Diff for: docs/source/img/contour_samples.png

-49.1 KB
Binary file not shown.

Diff for: docs/source/img/data-driven-process.png

680 KB
Loading

0 commit comments

Comments
 (0)