Skip to content

Commit a828736

Browse files
authored
Merge pull request #66 from DataAnalyticsEngineering/FANS-v0.4.1
Release v0.4.1
2 parents 1bb7470 + 1461ee3 commit a828736

File tree

9 files changed

+25
-19
lines changed

9 files changed

+25
-19
lines changed

.github/workflows/docker.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
password: ${{ secrets.DOCKERHUB_TOKEN }}
2828

2929
- name: Build and push fans-ci image
30-
uses: docker/build-push-action@v5
30+
uses: docker/build-push-action@v6
3131
with:
3232
context: ${{ github.workspace }}
3333
file: docker/Dockerfile
@@ -42,7 +42,7 @@ jobs:
4242
build-args: UBUNTU_VERSION=${{ matrix.ubuntu-version }}
4343

4444
- name: Build and push fans-dev image
45-
uses: docker/build-push-action@v5
45+
uses: docker/build-push-action@v6
4646
with:
4747
context: ${{ github.workspace }}
4848
file: docker/Dockerfile

.github/workflows/test_pyfans.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
steps:
2323

2424
- name: Checkout repository
25-
uses: actions/checkout@v2
25+
uses: actions/checkout@v4
2626

2727
- name: Generate build directory
2828
run: mkdir -p ${{ env.FANS_BUILD_DIR }}

CHANGELOG.md

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

3+
## v0.4.1
4+
5+
- remove std::sqrt from constexpr - failed on Clang https://github.com/DataAnalyticsEngineering/FANS/pull/64
6+
37
## v0.4.0
48

59
- Support compilaion on MacOS X via conda-forge https://github.com/DataAnalyticsEngineering/FANS/pull/59

CMakeLists.txt

Lines changed: 1 addition & 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.4.0
8+
VERSION 0.4.1
99
LANGUAGES C CXX
1010
)
1111

FANS_Dashboard/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
44

55
[project]
66
name = "fans-dashboard"
7-
version = "0.4.0"
7+
version = "0.4.1"
88
requires-python = ">=3.13"
99
dependencies = [
1010
"numpy>=2.2.5,<3",

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ FANS requires a JSON input file specifying the problem parameters. Example input
233233
234234
- `macroscale_loading`: This defines the external loading applied to the microstructure. It is an array of arrays, where each sub-array represents a loading condition applied to the system. The format of the loading array depends on the problem type:
235235
- For `thermal` problems, the array typically has 3 components, representing the temperature gradients in the $x$, $y$, and $z$ directions.
236-
- For `mechanical` problems, the array must have 6 components, corresponding to the components of the strain tensor in Mandel notation (e.g., $[\varepsilon_{11},\; \varepsilon_{22},\; \varepsilon_{33},\; \sqrt{2}\varepsilon_{12},\; \sqrt{2}\varepsilon_{13},\; \sqrt{2}\varepsilon_{23}]$).
236+
- For `mechanical` problems, the array must have 6 components, corresponding to the components of the strain tensor in Mandel notation (e.g., $[\varepsilon_{11}, \varepsilon_{22}, \varepsilon_{33}, \sqrt{2}\varepsilon_{12}, \sqrt{2}\varepsilon_{13}, \sqrt{2}\varepsilon_{23}]$).
237237
238238
In the case of path/time-dependent loading as shown, for example as in plasticity problems, the `macroscale_loading` array can include multiple steps with corresponding loading conditions.
239239

docs/ReleaseGuide.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ The release of the `FANS` repository is made directly from a release branch call
66

77
1. Create a branch called `FANS-v1.2.3` from the latest commit of the `develop` branch.
88

9-
2. If it is a real release, [open a Pull Request `main` <-- `FANS-v1.2.3`](https://github.com/DataAnalyticsEngineering/FANS/compare/main...main) named after the version (i.e. `Release v1.2.3`) and briefly describe the new features of the release in the PR description.
9+
2. Bump the version in the `CHANGELOG.md`, the base `CMakeLists.txt`, and in the file `FANS_Dashboard/pyproject.toml` on the branch `FANS-v1.2.3`.
1010

11-
3. Bump the version in the `CHANGELOG.md` and the base `CMakeLists.txt` on the branch `FANS-v1.2.3`.
11+
3. Assuming you have pixi installed, run the command `pixi lock` in the base directory file to update the version of the FANS dashboard in the pixi lock file.
1212

13-
4. [Draft a new release](https://github.com/DataAnalyticsEngineering/FANS/releases/new) in the `Releases` section of the repository page in a web browser. The release tag needs to be the exact version number (i.e.`v1.2.3` or `v1.2.3rc1`, compare to [existing tags](https://github.com/DataAnalyticsEngineering/FANS/tags)). Use `@target:main`. Release title is also the version number (i.e. `v1.2.3` or `v1.2.3rc1`, compare to [existing releases](https://github.com/DataAnalyticsEngineering/FANS/tags)).
13+
4. If it is a real release, [open a Pull Request `main` <-- `FANS-v1.2.3`](https://github.com/DataAnalyticsEngineering/FANS/compare/main...main) named after the version (i.e. `Release v1.2.3`) and briefly describe the new features of the release in the PR description.
14+
15+
5. [Draft a new release](https://github.com/DataAnalyticsEngineering/FANS/releases/new) in the `Releases` section of the repository page in a web browser. The release tag needs to be the exact version number (i.e.`v1.2.3` or `v1.2.3rc1`, compare to [existing tags](https://github.com/DataAnalyticsEngineering/FANS/tags)). Use `@target:main`. Release title is also the version number (i.e. `v1.2.3` or `v1.2.3rc1`, compare to [existing releases](https://github.com/DataAnalyticsEngineering/FANS/tags)).
1416

1517
* *Note:* If it is a pre-release then the option *This is a pre-release* needs to be selected at the bottom of the page. Use `@target:FANS-v1.2.3` for a pre-release, since we will never merge a pre-release into `main`.
1618
* Use the `Auto-generate release notes` feature.
@@ -19,6 +21,6 @@ The release of the `FANS` repository is made directly from a release branch call
1921

2022
b) If this is a "real" release: As soon as one approving review is made, merge the release PR (from `FANS-v1.2.3`) into `main`.
2123

22-
5. Merge `main` into `develop` for synchronization of `develop`.
24+
6. Merge `main` into `develop` for synchronization of `develop`.
2325

24-
6. If everything is in order up to this point then the new version can be released by hitting the "Publish release" button in your Release Draft. This will create the corresponding tag.
26+
7. If everything is in order up to this point then the new version can be released by hitting the "Publish release" button in your Release Draft. This will create the corresponding tag.

include/solver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ void Solver<howmany>::postprocess(Reader reader, const char resultsFileName[], i
490490
const double Lx2 = reader.L[0] / 2.0;
491491
const double Ly2 = reader.L[1] / 2.0;
492492
const double Lz2 = reader.L[2] / 2.0;
493-
constexpr double rs2 = 1.0 / std::sqrt(2.0);
493+
constexpr double rs2 = 0.7071067811865475; // 1.0 / std::sqrt(2.0)
494494
VectorXd u_total(local_n0 * n_y * n_z * howmany);
495495
/* ---------- single sweep ------------------------------------------------- */
496496
ptrdiff_t n = 0;

pixi.lock

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)