Skip to content

Commit 3a3cea4

Browse files
TLCFEMTLCFEM
authored
v3.0 (#142)
1 parent e233e92 commit 3a3cea4

File tree

605 files changed

+85531
-52240
lines changed

Some content is hidden

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

605 files changed

+85531
-52240
lines changed

‎.github/workflows/dev-mkl-vtk.yml

+10-10
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ jobs:
1515
run: |
1616
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
1717
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
18-
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-linux.tar.gz
19-
tar xf VTK-9.2.5-linux.tar.gz
18+
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-linux.tar.gz
19+
tar xf VTK-9.2.6-linux.tar.gz
2020
- name: Golang
2121
uses: actions/setup-go@v3
2222
- name: Compile
2323
run: |
2424
go build Checker/updater.go
25-
sudo apt-get update && sudo apt-get install mesa-common-dev mesa-utils freeglut3-dev libglvnd-dev dpkg-dev xz-utils intel-oneapi-mkl-devel intel-oneapi-compiler-dpcpp-cpp intel-oneapi-compiler-fortran
25+
sudo apt-get update && sudo apt-get install mesa-common-dev mesa-utils freeglut3-dev libglvnd-dev dpkg-dev xz-utils intel-oneapi-mkl-devel-2023.0.0 intel-oneapi-compiler-dpcpp-cpp-2023.0.0 intel-oneapi-compiler-fortran-2023.0.0
2626
source /opt/intel/oneapi/setvars.sh
2727
cmake -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DCMAKE_Fortran_COMPILER=ifx -DCMAKE_BUILD_TYPE=Debug -DBUILD_MULTITHREAD=ON -DUSE_HDF5=ON -DUSE_EXTERNAL_VTK=ON -DVTK_DIR=./lib/cmake/vtk-9.2/ -DUSE_MKL=ON -DMKLROOT=/opt/intel/oneapi/mkl/latest/ -DLINK_DYNAMIC_MKL=OFF -DCMAKE_INSTALL_PREFIX=suanPan-linux-mkl-vtk .
2828
make install -j"$(nproc)"
@@ -33,8 +33,8 @@ jobs:
3333
./suanPan-linux-mkl-vtk/bin/suanPan -v
3434
- uses: actions/upload-artifact@v3
3535
with:
36-
name: suanPan-2.9.0-1.x86_64.deb
37-
path: suanPan-2.9.0-1.x86_64.deb
36+
name: suanPan-3.0.0-1.x86_64.deb
37+
path: suanPan-3.0.0-1.x86_64.deb
3838
fedora-mkl-vtk-dev:
3939
runs-on: ubuntu-22.04
4040
timeout-minutes: 60
@@ -59,19 +59,19 @@ jobs:
5959
uses: actions/checkout@v3
6060
- name: Install MKL VTK
6161
run: |
62-
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-linux.tar.gz
63-
tar xf VTK-9.2.5-linux.tar.gz
62+
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-linux.tar.gz
63+
tar xf VTK-9.2.6-linux.tar.gz
6464
- name: Compile
6565
run: |
6666
source /opt/intel/oneapi/setvars.sh
6767
cmake -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DCMAKE_Fortran_COMPILER=ifx -DCMAKE_BUILD_TYPE=Debug -DBUILD_MULTITHREAD=ON -DUSE_HDF5=ON -DUSE_EXTERNAL_VTK=ON -DVTK_DIR=./lib/cmake/vtk-9.2/ -DUSE_MKL=ON -DMKLROOT=/opt/intel/oneapi/mkl/latest/ -DLINK_DYNAMIC_MKL=OFF .
6868
make package -j"$(nproc)"
6969
- name: Test
7070
run: |
71-
dnf install ./suanPan-2.9.0-1.x86_64.rpm -y
71+
dnf install ./suanPan-3.0.0-1.x86_64.rpm -y
7272
suanPan -v
7373
- name: Upload
7474
uses: actions/upload-artifact@v3
7575
with:
76-
name: suanPan-2.9.0-1.x86_64.rpm
77-
path: suanPan-2.9.0-1.x86_64.rpm
76+
name: suanPan-3.0.0-1.x86_64.rpm
77+
path: suanPan-3.0.0-1.x86_64.rpm

‎.github/workflows/dev-vtk.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313
uses: actions/checkout@v3
1414
- name: Install VTK
1515
run: |
16-
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-linux.tar.gz
17-
tar xf VTK-9.2.5-linux.tar.gz
16+
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-linux.tar.gz
17+
tar xf VTK-9.2.6-linux.tar.gz
1818
- name: Golang
1919
uses: actions/setup-go@v3
2020
- name: Compile
@@ -30,41 +30,41 @@ jobs:
3030
./suanPan-linux-openblas-vtk/bin/suanPan -v
3131
- uses: actions/upload-artifact@v3
3232
with:
33-
name: suanPan-2.9.0-1.x86_64.deb
34-
path: suanPan-2.9.0-1.x86_64.deb
33+
name: suanPan-3.0.0-1.x86_64.deb
34+
path: suanPan-3.0.0-1.x86_64.deb
3535
macos-openblas-vtk-dev:
3636
runs-on: macos-11
37-
timeout-minutes: 60
37+
timeout-minutes: 100
3838
steps:
3939
- name: Clone
4040
uses: actions/checkout@v3
4141
- name: Install VTK
4242
run: |
43-
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-macos.tar.gz
44-
tar xf VTK-9.2.5-macos.tar.gz
43+
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-macos.tar.gz
44+
tar xf VTK-9.2.6-macos.tar.gz
4545
- name: Golang
4646
uses: actions/setup-go@v3
4747
- name: Compile
4848
run: |
4949
export CC=$(brew --prefix llvm@15)/bin/clang && export CXX=$(brew --prefix llvm@15)/bin/clang++ && export FC=gfortran-11
5050
go build Checker/updater.go
5151
brew install glfw glew libomp
52-
cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_MULTITHREAD=ON -DUSE_HDF5=ON -DUSE_EXTERNAL_VTK=ON -DVTK_DIR=./lib/cmake/vtk-9.2/ -DCMAKE_INSTALL_PREFIX=suanPan-macos-openblas-vtk .
52+
cmake -DCMAKE_C_STANDARD_INCLUDE_DIRECTORIES=$(brew --prefix libomp)/include -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=$(brew --prefix libomp)/include -DCMAKE_Fortran_STANDARD_INCLUDE_DIRECTORIES=$(brew --prefix libomp)/include -DCMAKE_BUILD_TYPE=Debug -DBUILD_MULTITHREAD=ON -DUSE_HDF5=ON -DUSE_EXTERNAL_VTK=ON -DVTK_DIR=./lib/cmake/vtk-9.2/ -DCMAKE_INSTALL_PREFIX=suanPan-macos-openblas-vtk .
5353
make install -j4
5454
- name: Test
5555
run: |
5656
export DYLD_LIBRARY_PATH=/Users/runner/work/suanPan/suanPan/suanPan-macos-openblas-vtk/lib/
5757
./suanPan-macos-openblas-vtk/bin/suanPan -v
5858
windows-openblas-vtk-dev:
5959
runs-on: windows-2022
60-
timeout-minutes: 90
60+
timeout-minutes: 100
6161
steps:
6262
- name: Clone
6363
uses: actions/checkout@v3
6464
- name: Install VTK
6565
run: |
66-
C:/msys64/usr/bin/wget.exe https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-win.7z
67-
7z x VTK-9.2.5-win.7z
66+
C:/msys64/usr/bin/wget.exe https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-win.7z
67+
7z x VTK-9.2.6-win.7z
6868
- name: Golang
6969
uses: actions/setup-go@v3
7070
- name: Compile

‎.github/workflows/dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
gcov: true
3030
macos-dev:
3131
runs-on: macos-11
32-
timeout-minutes: 60
32+
timeout-minutes: 100
3333
steps:
3434
- name: Clone
3535
uses: actions/checkout@v3

‎.github/workflows/master-mkl-vtk.yml

+12-12
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
echo "SP_TIME=daily-$(date +''%Y%m%d%H'')" >> $GITHUB_ENV
1717
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
1818
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
19-
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-linux.tar.gz
20-
tar xf VTK-9.2.5-linux.tar.gz
19+
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-linux.tar.gz
20+
tar xf VTK-9.2.6-linux.tar.gz
2121
- name: Golang
2222
uses: actions/setup-go@v3
2323
- name: Compile
@@ -33,7 +33,7 @@ jobs:
3333
tar czf suanPan-linux-mkl-vtk.tar.gz suanPan-linux-mkl-vtk
3434
- name: Test
3535
run: |
36-
sudo apt-get install ./suanPan-2.9.0-1.x86_64.deb -y
36+
sudo apt-get install ./suanPan-3.0.0-1.x86_64.deb -y
3737
suanPan -v
3838
export LD_LIBRARY_PATH=/home/runner/work/suanPan/suanPan/suanPan-linux-mkl-vtk/lib
3939
cd suanPan-linux-mkl-vtk/bin
@@ -51,8 +51,8 @@ jobs:
5151
uses: svenstaro/upload-release-action@v2
5252
with:
5353
repo_token: ${{ secrets.GITHUB_TOKEN }}
54-
file: suanPan-2.9.0-1.x86_64.deb
55-
asset_name: suanPan-2.9.0-1.x86_64.deb
54+
file: suanPan-3.0.0-1.x86_64.deb
55+
asset_name: suanPan-3.0.0-1.x86_64.deb
5656
tag: ${{ env.SP_TIME }}
5757
prerelease: true
5858
overwrite: true
@@ -67,8 +67,8 @@ jobs:
6767
echo "SP_TIME=daily-$(date +''%Y%m%d%H'')" >> $GITHUB_ENV
6868
wget -O- https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB | gpg --dearmor | sudo tee /usr/share/keyrings/oneapi-archive-keyring.gpg > /dev/null
6969
echo "deb [signed-by=/usr/share/keyrings/oneapi-archive-keyring.gpg] https://apt.repos.intel.com/oneapi all main" | sudo tee /etc/apt/sources.list.d/oneAPI.list
70-
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-linux.tar.gz
71-
tar xf VTK-9.2.5-linux.tar.gz
70+
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-linux.tar.gz
71+
tar xf VTK-9.2.6-linux.tar.gz
7272
- name: Golang
7373
uses: actions/setup-go@v3
7474
- name: Compile
@@ -116,22 +116,22 @@ jobs:
116116
uses: actions/checkout@v3
117117
- name: Install MKL VTK
118118
run: |
119-
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-linux.tar.gz
120-
tar xf VTK-9.2.5-linux.tar.gz
119+
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-linux.tar.gz
120+
tar xf VTK-9.2.6-linux.tar.gz
121121
- name: Compile
122122
run: |
123123
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_MULTITHREAD=ON -DUSE_HDF5=ON -DUSE_EXTERNAL_VTK=ON -DVTK_DIR=./lib/cmake/vtk-9.2/ -DUSE_MKL=ON -DMKLROOT=/opt/intel/oneapi/mkl/latest/ -DUSE_INTEL_OPENMP=OFF -DLINK_DYNAMIC_MKL=OFF .
124124
make package -j"$(nproc)"
125125
- name: Test
126126
run: |
127-
dnf install ./suanPan-2.9.0-1.x86_64.rpm -y
127+
dnf install ./suanPan-3.0.0-1.x86_64.rpm -y
128128
suanPan -v
129129
- name: RPM
130130
uses: svenstaro/upload-release-action@v2
131131
with:
132132
repo_token: ${{ secrets.GITHUB_TOKEN }}
133-
file: suanPan-2.9.0-1.x86_64.rpm
134-
asset_name: suanPan-2.9.0-1.x86_64.rpm
133+
file: suanPan-3.0.0-1.x86_64.rpm
134+
asset_name: suanPan-3.0.0-1.x86_64.rpm
135135
tag: ${{ env.SP_TIME }}
136136
prerelease: true
137137
overwrite: true

‎.github/workflows/master-vtk.yml

+16-16
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
- name: Install VTK
1515
run: |
1616
echo "SP_TIME=daily-$(date +''%Y%m%d%H'')" >> $GITHUB_ENV
17-
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-linux.tar.gz
18-
tar xf VTK-9.2.5-linux.tar.gz
17+
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-linux.tar.gz
18+
tar xf VTK-9.2.6-linux.tar.gz
1919
- name: Golang
2020
uses: actions/setup-go@v3
2121
- name: Compile
@@ -41,23 +41,23 @@ jobs:
4141
overwrite: true
4242
macos-openblas-vtk:
4343
runs-on: macos-11
44-
timeout-minutes: 60
44+
timeout-minutes: 100
4545
steps:
4646
- name: Clone
4747
uses: actions/checkout@v3
4848
- name: Install VTK
4949
run: |
5050
echo "SP_TIME=daily-$(date +''%Y%m%d%H'')" >> $GITHUB_ENV
51-
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-macos.tar.gz
52-
tar xf VTK-9.2.5-macos.tar.gz
51+
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-macos.tar.gz
52+
tar xf VTK-9.2.6-macos.tar.gz
5353
- name: Golang
5454
uses: actions/setup-go@v3
5555
- name: Compile
5656
run: |
5757
export CC=$(brew --prefix llvm@15)/bin/clang && export CXX=$(brew --prefix llvm@15)/bin/clang++ && export FC=gfortran-11
5858
go build Checker/updater.go
5959
brew install glfw glew libomp
60-
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_MULTITHREAD=ON -DUSE_HDF5=ON -DUSE_EXTERNAL_VTK=ON -DVTK_DIR=./lib/cmake/vtk-9.2/ -DCMAKE_INSTALL_PREFIX=suanPan-macos-openblas-vtk .
60+
cmake -DCMAKE_C_STANDARD_INCLUDE_DIRECTORIES=$(brew --prefix libomp)/include -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=$(brew --prefix libomp)/include -DCMAKE_Fortran_STANDARD_INCLUDE_DIRECTORIES=$(brew --prefix libomp)/include -DCMAKE_BUILD_TYPE=Release -DBUILD_MULTITHREAD=ON -DUSE_HDF5=ON -DUSE_EXTERNAL_VTK=ON -DVTK_DIR=./lib/cmake/vtk-9.2/ -DCMAKE_INSTALL_PREFIX=suanPan-macos-openblas-vtk .
6161
make install -j4
6262
- name: Pack
6363
run: |
@@ -77,23 +77,23 @@ jobs:
7777
overwrite: true
7878
macos-openblas-vtk-no-avx:
7979
runs-on: macos-11
80-
timeout-minutes: 60
80+
timeout-minutes: 100
8181
steps:
8282
- name: Clone
8383
uses: actions/checkout@v3
8484
- name: Install VTK
8585
run: |
8686
echo "SP_TIME=daily-$(date +''%Y%m%d%H'')" >> $GITHUB_ENV
87-
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-macos.tar.gz
88-
tar xf VTK-9.2.5-macos.tar.gz
87+
wget https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-macos.tar.gz
88+
tar xf VTK-9.2.6-macos.tar.gz
8989
- name: Golang
9090
uses: actions/setup-go@v3
9191
- name: Compile
9292
run: |
9393
export CC=$(brew --prefix llvm@15)/bin/clang && export CXX=$(brew --prefix llvm@15)/bin/clang++ && export FC=gfortran-11
9494
go build Checker/updater.go
9595
brew install glfw glew libomp
96-
cmake -DCMAKE_BUILD_TYPE=Release -DUSE_AVX=OFF -DBUILD_MULTITHREAD=ON -DUSE_HDF5=ON -DUSE_EXTERNAL_VTK=ON -DVTK_DIR=./lib/cmake/vtk-9.2/ -DCMAKE_INSTALL_PREFIX=suanPan-macos-openblas-vtk-no-avx .
96+
cmake -DCMAKE_C_STANDARD_INCLUDE_DIRECTORIES=$(brew --prefix libomp)/include -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES=$(brew --prefix libomp)/include -DCMAKE_Fortran_STANDARD_INCLUDE_DIRECTORIES=$(brew --prefix libomp)/include -DCMAKE_BUILD_TYPE=Release -DUSE_AVX=OFF -DBUILD_MULTITHREAD=ON -DUSE_HDF5=ON -DUSE_EXTERNAL_VTK=ON -DVTK_DIR=./lib/cmake/vtk-9.2/ -DCMAKE_INSTALL_PREFIX=suanPan-macos-openblas-vtk-no-avx .
9797
make install -j4
9898
- name: Pack
9999
run: |
@@ -113,15 +113,15 @@ jobs:
113113
overwrite: true
114114
windows-openblas-vtk:
115115
runs-on: windows-2022
116-
timeout-minutes: 90
116+
timeout-minutes: 100
117117
steps:
118118
- name: Clone
119119
uses: actions/checkout@v3
120120
- name: Install VTK
121121
run: |
122122
echo ("SP_TIME=daily-"+(get-date -format "yyyyMMddHH")) >> $env:GITHUB_ENV
123-
C:/msys64/usr/bin/wget.exe https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-win.7z
124-
7z x VTK-9.2.5-win.7z
123+
C:/msys64/usr/bin/wget.exe https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-win.7z
124+
7z x VTK-9.2.6-win.7z
125125
- name: Golang
126126
uses: actions/setup-go@v3
127127
- name: Compile
@@ -146,15 +146,15 @@ jobs:
146146
overwrite: true
147147
windows-openblas-vtk-no-avx:
148148
runs-on: windows-2022
149-
timeout-minutes: 90
149+
timeout-minutes: 100
150150
steps:
151151
- name: Clone
152152
uses: actions/checkout@v3
153153
- name: Install VTK
154154
run: |
155155
echo ("SP_TIME=daily-"+(get-date -format "yyyyMMddHH")) >> $env:GITHUB_ENV
156-
C:/msys64/usr/bin/wget.exe https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.5-win.7z
157-
7z x VTK-9.2.5-win.7z
156+
C:/msys64/usr/bin/wget.exe https://github.com/TLCFEM/prebuilds/releases/download/latest/VTK-9.2.6-win.7z
157+
7z x VTK-9.2.6-win.7z
158158
- name: Golang
159159
uses: actions/setup-go@v3
160160
- name: Compile

‎.github/workflows/master.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
overwrite: true
3737
macos-openblas:
3838
runs-on: macos-11
39-
timeout-minutes: 60
39+
timeout-minutes: 100
4040
steps:
4141
- name: Clone
4242
uses: actions/checkout@v3

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ $RECYCLE.BIN/
4242
/MSVC/suanPan/superlu/x64/*
4343
/MSVC/suanPan/superlumt/x64/*
4444
venv
45+
.cache
4546

4647
# Windows shortcuts
4748
*.lnk

‎CHANGELOG.md

+13
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,19 @@
66
2. The `SPIKE` solver may occasionally hang, to circumvent, try to avoid mixing compilers from different vendors.
77
3. The `MUMPS` solver throws segfaults with large matrices.
88

9+
## version 3.0
10+
11+
1. add experimental `MAGMA` based GPU sparse solver [#123](https://github.com/TLCFEM/suanPan/pull/123)
12+
2. add nonlinear transformation for shell elements [#124](https://github.com/TLCFEM/suanPan/pull/124)
13+
3. update `VTK` to version `9.2.6`
14+
4. add `CustomNodeGroup` [#126](https://github.com/TLCFEM/suanPan/pull/126)
15+
5. add `TranslationConnector` [#127](https://github.com/TLCFEM/suanPan/pull/127)
16+
6. add `CustomAmplitude` [#129](https://github.com/TLCFEM/suanPan/pull/129)
17+
7. update `Armadillo` to version `12.2` [#134](https://github.com/TLCFEM/suanPan/pull/134)
18+
8. add `AsymmElastic1D` [#135](https://github.com/TLCFEM/suanPan/pull/135)
19+
9. update `TBB` to version `2021.9.0`
20+
10. update `MUMPS` to version `5.6.0`
21+
922
## version 2.9
1023

1124
1. matrix optimsation

‎CITATION.cff

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ keywords:
2828
- IGA
2929
- Solid Mechanics
3030
license: GPL-3.0
31-
version: '2.9'
32-
date-released: '2023-02-25'
31+
version: '3.0'
32+
date-released: '2023-05-13'

‎CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ set(CMAKE_CXX_STANDARD 20)
99
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1010
set(CMAKE_INCLUDE_CURRENT_DIR ON)
1111
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
12+
set(CMAKE_GNUtoMS ON)
1213

1314
include(CheckLanguage)
1415
check_language(Fortran)
@@ -331,7 +332,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
331332
set(CPACK_PACKAGE_ICON ${ROOT}/Resource/suanPan-ua.svg)
332333
set(CPACK_PACKAGE_RELEASE 1)
333334
set(CPACK_PACKAGE_VENDOR "tlcfem")
334-
set(CPACK_PACKAGE_VERSION "2.9.0")
335+
set(CPACK_PACKAGE_VERSION "3.0.0")
335336
set(CPACK_PACKAGE_DESCRIPTION "An Open Source, Parallel and Heterogeneous Finite Element Analysis Framework")
336337
set(CPACK_PACKAGE_HOMEPAGE_URL "https://github.com/TLCFEM/suanPan")
337338

‎Constraint/RestitutionWallPenalty.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
#include "RestitutionWallPenalty.h"
1919
#include <Domain/DomainBase.h>
20-
#include <Domain/FactoryHelper.hpp>
20+
#include <Domain/Factory.hpp>
2121
#include <Solver/Integrator/Integrator.h>
2222
#include <Step/Step.h>
2323

@@ -87,7 +87,7 @@ int RestitutionWallPenalty::process(const shared_ptr<DomainBase>& D) {
8787
void RestitutionWallPenalty::stage(const shared_ptr<DomainBase>& D) {
8888
auto& W = D->get_factory();
8989

90-
auto trial_acceleration = get_trial_acceleration(W);
90+
auto trial_acceleration = W->modify_trial_acceleration();
9191
for(const auto& I : node_pool) {
9292
auto t_acceleration = I->get_trial_acceleration();
9393
t_acceleration.head(n_dim) = trial_acceleration_handler(I) - dot(incre_acceleration_handler(I), outer_norm) * outer_norm;

‎Domain/CMakeLists.txt

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
target_sources(${PROJECT_NAME} PRIVATE
22
ConditionalModifier.cpp
33
Domain.cpp
4-
DomainBase.cpp
54
DomainHelper.cpp
65
DomainState.cpp
76
ExternalModule.cpp
87
Factory.hpp
9-
FactoryHelper.hpp
108
Group/ElementGroup.cpp
119
Group/Group.cpp
1210
Group/GroupGroup.cpp
1311
Group/NodeGroup.cpp
12+
Group/CustomNodeGroup.cpp
1413
Node.cpp
1514
Storage.hpp
1615
Tag.cpp

0 commit comments

Comments
 (0)