Skip to content

Commit 9d7c94f

Browse files
authored
Merge pull request #116 from DataAnalyticsEngineering/FANS-v0.6.0
2 parents 51040dc + 5936830 commit 9d7c94f

36 files changed

+16157
-7073
lines changed

.github/workflows/build_and_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/checkout@v5
3434

3535
- name: Set up pixi
36-
uses: prefix-dev/[email protected].2
36+
uses: prefix-dev/[email protected].3
3737
with:
3838
environments: dashboard
3939

.github/workflows/pixi_build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@v5
2424

2525
- name: Set up pixi
26-
uses: prefix-dev/[email protected].2
26+
uses: prefix-dev/[email protected].3
2727
with:
2828
environments: default
2929

.github/workflows/run-checks.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ jobs:
2020
{
2121
"MD013": false,
2222
"MD033": false,
23-
"MD034": false
23+
"MD034": false,
24+
"MD041": false
2425
}
2526
EOF
2627
- name: Lint markdown files (markdownlint)

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# FANS Changelog
22

3+
## v0.6.0
4+
5+
- Introduce MaterialManager abstraction class to handle multiple material models within the microstructure [#115](https://github.com/DataAnalyticsEngineering/FANS/pull/115)
6+
- Bugfix: `homogenized_tangent` was computed but not written to HDF5 output [#113](https://github.com/DataAnalyticsEngineering/FANS/pull/113)
7+
38
## v0.5.2
49

510
- Bugfix: Fix bad initial guess for time steps > 0 [#109](https://github.com/DataAnalyticsEngineering/FANS/pull/109)

CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.21)
55
# ##############################################################################
66

77
project(FANS
8-
VERSION 0.5.2
8+
VERSION 0.6.0
99
LANGUAGES C CXX
1010
)
1111

@@ -151,6 +151,7 @@ target_include_directories(FANS_FANS PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SO
151151
set_property(TARGET FANS_FANS PROPERTY PUBLIC_HEADER
152152
include/general.h
153153
include/matmodel.h
154+
include/MaterialManager.h
154155
include/reader.h
155156
include/solverCG.h
156157
include/solverFP.h

FANS_Dashboard/FANS_Dashboard.ipynb

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,6 @@
2020
"9. [Summary](#summary)"
2121
]
2222
},
23-
{
24-
"cell_type": "markdown",
25-
"metadata": {},
26-
"source": [
27-
"## Prerequisites\n",
28-
"To start using the FANS Dashboard, ensure that the necessary Python packages and modules are installed. The required imports in your Jupyter Notebook should include:\n",
29-
"- `numpy`\n",
30-
"- `h5py`\n",
31-
"- `plotly`\n",
32-
"- `collections`\n",
33-
"- `argparse`\n",
34-
"- `lxml`\n",
35-
"- `re`\n",
36-
"- `nbformat`"
37-
]
38-
},
3923
{
4024
"cell_type": "markdown",
4125
"metadata": {},
@@ -98,7 +82,7 @@
9882
"outputs": [],
9983
"source": [
10084
"# Example usage\n",
101-
"file_path = '../test/test_results.h5'\n",
85+
"file_path = '../test/output/test_J2Plasticity.h5'\n",
10286
"\n",
10387
"# Extract hierarchy information from the file\n",
10488
"hierarchy = identify_hierarchy(file_path)\n",
@@ -323,7 +307,7 @@
323307
],
324308
"metadata": {
325309
"kernelspec": {
326-
"display_name": "default",
310+
"display_name": "Python 3",
327311
"language": "python",
328312
"name": "python3"
329313
},
@@ -337,7 +321,7 @@
337321
"name": "python",
338322
"nbconvert_exporter": "python",
339323
"pygments_lexer": "ipython3",
340-
"version": "3.13.3"
324+
"version": "3.13.7"
341325
}
342326
},
343327
"nbformat": 4,

0 commit comments

Comments
 (0)