Skip to content

Commit 077addf

Browse files
IshaanDesaiIshaanDesai
authoredSep 22, 2024
Merge pull request #24 from DataAnalyticsEngineering/FANS-v0.2.0
Release v0.2.0
·
v0.3.0v0.2.0
2 parents 54ee6d2 + 5ba3637 commit 077addf

26 files changed

+883
-474
lines changed
 

‎.github/workflows/build.sh

-41
This file was deleted.

‎.github/workflows/build_and_package.yaml

-59
This file was deleted.

‎.github/workflows/build_and_test.yaml

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: Build and Test
2+
# Builds FANS inside various docker containers and runs the tests.
3+
4+
on:
5+
push:
6+
branches:
7+
- main
8+
- develop
9+
pull_request:
10+
workflow_dispatch:
11+
12+
concurrency:
13+
group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: ${{github.event_name == 'pull_request'}}
15+
16+
jobs:
17+
build:
18+
name: ${{ format('Ubuntu {0}', matrix.UBUNTU_VERSION) }}
19+
runs-on: ubuntu-latest
20+
container: unistuttgartdae/fans-ci:${{ matrix.UBUNTU_VERSION }}
21+
defaults:
22+
run:
23+
shell: "bash --login -eo pipefail {0}"
24+
env:
25+
FANS_BUILD_DIR: build
26+
FANS_MPI_USER: fans
27+
strategy:
28+
fail-fast: false
29+
matrix:
30+
UBUNTU_VERSION: [noble, jammy, focal]
31+
steps:
32+
- name: Checkout code
33+
uses: actions/checkout@v4
34+
35+
- name: Generate build directory
36+
run: mkdir -p ${{ env.FANS_BUILD_DIR }}
37+
38+
- name: Configure
39+
working-directory: ${{ env.FANS_BUILD_DIR }}
40+
run: |
41+
cmake --version
42+
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
43+
44+
- uses: actions/upload-artifact@v4
45+
if: failure()
46+
with:
47+
name: ${{ format('Ubuntu {0}', matrix.UBUNTU_VERSION) }} CMakeCache
48+
path: ${{ env.FANS_BUILD_DIR }}/CMakeCache.txt
49+
- uses: actions/upload-artifact@v4
50+
if: failure()
51+
with:
52+
name: ${{ format('Ubuntu {0}', matrix.UBUNTU_VERSION) }} CMakeLogs
53+
path: '${{ env.FANS_BUILD_DIR }}/CMakeFiles/*.log'
54+
- uses: actions/upload-artifact@v4
55+
if: failure()
56+
with:
57+
name: ${{ format('Ubuntu {0}', matrix.UBUNTU_VERSION) }} CompileCommands
58+
path: ${{ env.FANS_BUILD_DIR }}/compile_commands.json
59+
60+
- name: Compile
61+
working-directory: ${{ env.FANS_BUILD_DIR }}
62+
run:
63+
cmake --build . -j $(nproc) || cmake --build . -j1
64+
65+
- name: Adjust user rights
66+
run: chown -R ${{ env.FANS_MPI_USER }} ${{ env.FANS_BUILD_DIR }}
67+
68+
- name: Tests
69+
working-directory: ${{ env.FANS_BUILD_DIR }}
70+
run: su -c "ctest" ${{ env.FANS_MPI_USER }}
71+
72+
- uses: actions/upload-artifact@v4
73+
if: failure()
74+
with:
75+
name: ${{ format('Ubuntu {0}', matrix.UBUNTU_VERSION) }} CTest logs
76+
path: ${{ env.FANS_BUILD_DIR }}/Testing/Temporary/LastTest.log

‎.gitignore

+4-4
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ test/input_files/**/*.json
201201
!sphere.h5
202202

203203
# Test input files
204-
!test_LinearElasticIsotropic.json
205-
!test_LinearThermalIsotropic.json
206-
!test_PseudoPlasticLinearHardening.json
207-
!test_VonMisesPlasticLinearIsotropicHardening.json
204+
!test_LinearElastic.json
205+
!test_LinearThermal.json
206+
!test_PseudoPlastic.json
207+
!test_J2Plasticity.json

‎.pre-commit-config.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,10 @@ repos:
1414
rev: 22.12.0
1515
hooks:
1616
- id: black
17+
# clang-format for C/C++ formatting
18+
- repo: https://github.com/pre-commit/mirrors-clang-format
19+
rev: v8.0.1
20+
hooks:
21+
- id: clang-format
22+
args: ['--style=file']
23+
exclude: "include/json.hpp"

‎CHANGELOG.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# FANS Changelog
22

3+
## v0.2.0
4+
5+
- Add integration tests https://github.com/DataAnalyticsEngineering/FANS/pull/20
6+
- Add GitHub Action workflow to build and test FANS https://github.com/DataAnalyticsEngineering/FANS/pull/19
7+
38
## v0.1.2
49

510
- Update TIK GitHub links in the documentation to public GitHub links https://github.com/DataAnalyticsEngineering/FANS/pull/13

‎CMakeLists.txt

+16-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.0...3.28)
55
# ##############################################################################
66

77
project(FANS
8-
VERSION 0.1.2
8+
VERSION 0.2.0
99
LANGUAGES C CXX
1010
)
1111

@@ -135,8 +135,8 @@ set_property(TARGET FANS_FANS PROPERTY PUBLIC_HEADER
135135

136136
include/material_models/LinearThermalIsotropic.h
137137
include/material_models/LinearElasticIsotropic.h
138-
include/material_models/PseudoPlasticLinearHardening.h
139-
include/material_models/VonMisesPlasticLinearIsotropicHardening.h
138+
include/material_models/PseudoPlastic.h
139+
include/material_models/J2Plasticity.h
140140
)
141141

142142
# ##############################################################################
@@ -251,6 +251,19 @@ install(
251251
COMPONENT FANS_Development
252252
)
253253

254+
# ##############################################################################
255+
# TESTING
256+
# ##############################################################################
257+
258+
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
259+
set(FANS_ENABLE_TESTING_DEFAULT ON)
260+
endif ()
261+
option(FANS_ENABLE_TESTING "Enable testing" ${FANS_ENABLE_TESTING_DEFAULT})
262+
if (FANS_ENABLE_TESTING)
263+
enable_testing()
264+
add_subdirectory(test)
265+
endif ()
266+
254267
# ##############################################################################
255268
# PACKAGING
256269
# ##############################################################################

‎FANS_Dashboard/FANS_Dashboard.ipynb

+9-9
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@
133133
"outputs": [],
134134
"source": [
135135
"# Specify which microstructures, load cases, and quantities to load\n",
136-
"microstructures_to_load = ['/sphere/32x32x32/ms']\n",
137-
"load_cases_to_load = ['load0']\n",
136+
"microstructures_to_load = list(hierarchy.keys())\n",
137+
"load_cases_to_load = list(hierarchy[microstructures_to_load[0]].keys())\n",
138138
"quantities_to_load = ['strain_average', 'stress_average', 'phase_stress_average_phase0', \"stress\"]\n",
139139
"time_steps_to_load = []\n",
140140
"\n",
@@ -143,7 +143,11 @@
143143
" quantities_to_load, \n",
144144
" microstructures_to_load, \n",
145145
" load_cases_to_load, \n",
146-
" time_steps_to_load)"
146+
" time_steps_to_load)\n",
147+
"\n",
148+
"strain_average = data[microstructures_to_load[0]][load_cases_to_load[0]]['strain_average'] \n",
149+
"stress_average = data[microstructures_to_load[0]][load_cases_to_load[0]]['stress_average']\n",
150+
"time_steps = data[microstructures_to_load[0]][load_cases_to_load[0]]['time_steps']\n"
147151
]
148152
},
149153
{
@@ -164,10 +168,6 @@
164168
"metadata": {},
165169
"outputs": [],
166170
"source": [
167-
"strain_average = data['/sphere/32x32x32/ms']['load0']['strain_average']\n",
168-
"stress_average = data['/sphere/32x32x32/ms']['load0']['stress_average']\n",
169-
"time_steps = data['/sphere/32x32x32/ms']['load0']['time_steps']\n",
170-
"\n",
171171
"# Specify measures to compute\n",
172172
"measures_to_compute = ['von_mises', 'hydrostatic', 'deviatoric', 'principal', \n",
173173
" 'max_shear', 'I_invariants', 'J_invariants', 'eigenvalues',\n",
@@ -209,8 +209,8 @@
209209
"# Postprocessing and writing to h5 file\n",
210210
"quantities_to_postprocess = ['stress_average', 'stress']\n",
211211
"measures_to_postprocess = ['deviatoric', 'von_mises']\n",
212-
"microstructures_to_postprocess = ['/sphere/32x32x32/ms']\n",
213-
"load_cases_to_postprocess = ['load0']\n",
212+
"microstructures_to_postprocess = microstructures_to_load[0]\n",
213+
"load_cases_to_postprocess = load_cases_to_load[0]\n",
214214
"\n",
215215
"processed_data = postprocess_and_write_to_h5(file_path, hierarchy, quantities_to_postprocess, measures_to_postprocess, \n",
216216
" microstructures_to_postprocess, load_cases_to_postprocess)"

0 commit comments

Comments
 (0)
Please sign in to comment.