diff --git a/.gitlab-ci.yml.tmp b/.gitlab-ci.yml
similarity index 67%
rename from .gitlab-ci.yml.tmp
rename to .gitlab-ci.yml
index d905eed8307f4b078806ba9f3aa1f400902aede4..33b377c004cf72f9a081ecaec1bb6f6479d387db 100644
--- a/.gitlab-ci.yml.tmp
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-# gitlab-ci file for waves
+# gitlab-ci file for amfe-solvers
default:
image: rboman/waves-py3:2020.3
@@ -37,18 +37,6 @@ format:
when: on_failure
allow_failure: true
-build-no-tlnos:
- <<: *global_tag_def
- stage: build
- script:
- - git submodule init
- - git submodule update
- - rm -rf build workspace
- - mkdir build
- - cd build
- - cmake -Wno-dev -C ../CMake/disable-trilinos.cmake ..
- - make -j 8
-
build:
<<: *global_tag_def
stage: build
@@ -64,23 +52,6 @@ build:
paths:
- build/
expire_in: 1 day
-
-build-red:
- <<: *global_tag_def
- image: rboman/waves-py3-red:2020.3
- stage: build
- script:
- - git submodule init
- - git submodule update
- - rm -rf build workspace
- - mkdir build
- - cd build
- - cmake -Wno-dev ..
- - make -j 8
- artifacts:
- paths:
- - build/
- expire_in: 1 day
doxygen:
<<: *global_tag_def
@@ -104,13 +75,3 @@ ctest:
#timeout: 10 hours # will be available in 12.3
dependencies:
- build
-
-ctest-red:
- <<: *global_tag_def
- image: rboman/waves-py3-red:2020.3
- stage: test
- script:
- - cd build
- - ctest --output-on-failure -j 8 -R katoptron
- dependencies:
- - build-red
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000000000000000000000000000000000000..603ff1a5a94171b0b320e168413f4b35fdb783cf
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "ext/amfe"]
+ path = ext/amfe
+ url = .../amfe.git
diff --git a/Doxyfile.in b/Doxyfile.in
index 471f6ee75068d6a59a4da7ee3e5d9f34a880a417..a3282c30ab032eb420425b4aa05c30e09a75e2a9 100644
--- a/Doxyfile.in
+++ b/Doxyfile.in
@@ -782,15 +782,12 @@ WARN_LOGFILE =
# Note: If this tag is empty the current directory is searched.
INPUT = @PROJECT_SOURCE_DIR@/README.md \
- @PROJECT_SOURCE_DIR@/flow/src \
- @PROJECT_SOURCE_DIR@/fwk/src \
+ @PROJECT_SOURCE_DIR@/ext/amfe/fwk/src \
+ @PROJECT_SOURCE_DIR@/ext/amfe/tbox/src \
+ @PROJECT_SOURCE_DIR@/ext/amfe/tboxVtk/src \
@PROJECT_SOURCE_DIR@/heat/src \
- @PROJECT_SOURCE_DIR@/mirrors/src \
- @PROJECT_SOURCE_DIR@/katoptron/src \
- @PROJECT_SOURCE_DIR@/tbox/src \
- @PROJECT_SOURCE_DIR@/waves/src
-
-
+ @PROJECT_SOURCE_DIR@/waves/src
+
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
diff --git a/README.md b/README.md
index e38d97e1cdde4ca1f761b996fc2653d4b982a648..3d0f886a97070fa71015cc3b3d9f178200d761ee 100644
--- a/README.md
+++ b/README.md
@@ -1,39 +1,5 @@
-# waves
-Waves is a collection of general utilities and finite element tools for solving various PDE. The code is written in C++ interfaced in python through SWIG, and is developed at the University of Liège.
+# amfe-solvers
+Example of FE solvers using [amfe](https://gitlab.uliege.be/am-dept/amfe)
-
-
-## Features
-Set of python/C++ modules:
- [waves](/waves): 3D(Hex8) transient wave equation solver (FEM)
- - [flow](https://gitlab.uliege.be/am-dept/dartflo): 2D(Tri3) and 3D(Tetra4) steady full potential equation solver (FEM) - moved to [dartflo](https://gitlab.uliege.be/am-dept/dartflo)
- [heat](/heat): 2D(Tri3) steady nonlinear heat equation solver (multiscale FE²M)
- - [katoptron](/katoptron): 3D(Hex8 and Tetra4) linear thermomechanical equations with contact (FEM)
- - [tlnos](/tlnos): basic Trilinos examples
-
-Additional features:
- - [x] [Gmsh](http://geuz.org/gmsh/) support for mesh and post-processing
- - [x] [VTK](http://www.vtk.org/)/[PyQt](https://riverbankcomputing.com/software/pyqt/intro) support for post processing and basic GUI
- - [x] [OpenBLAS](http://www.openblas.net/) or [Intel MKL](https://software.intel.com/en-us/intel-mkl) support
- - [x] [Eigen3](http://eigen.tuxfamily.org/index.php?title=Main_Page) support for linear algebra
- - [Intel Pardiso](https://software.intel.com/content/www/us/en/develop/documentation/mkl-developer-reference-c/top/sparse-solver-routines/intel-mkl-pardiso-parallel-direct-sparse-solver-interface/pardiso.html) support
- - [MUMPS](http://mumps.enseeiht.fr/) support
- - [x] [TBB](https://www.threadingbuildingblocks.org/) support for multithreading
- - [x] [mpi4py](https://bitbucket.org/mpi4py/mpi4py) support for parallelization
- - [x] [Trilinos](https://trilinos.github.io/) support (for some modules)
-
-## Build
-
-Detailed build instructions can be found in the [wiki](https://gitlab.uliege.be/am-dept/waves/wikis/home).
-
-## References
-
-Liegeois Kim, [GMRES with embedded ensemble propagation for the efficient solution of parametric linear systems in uncertainty quantification of computational models with application to the thermomechanical simulation of an ITER front mirror](http://hdl.handle.net/2268/249334), University of Liège, 2020.
-
-Crovato Adrien, [Steady Transonic Aerodynamic and Aeroelastic Modeling for Preliminary Aircraft Design](http://hdl.handle.net/2268/251906), University of Liège, 2020.
-
-Liegeois K., Boman R., Phipps E., Wiesner T., and Arnst M., [GMRES with embedded ensemble propagation for the efficient solution of parametric linear systems in uncertainty quantification of computational models](http://hdl.handle.net/2268/248201), Computer Methods in Applied Mechanics and Engineering, Vol. 369, 2020.
-
-Crovato A., Boman R., Guner H., Terrapon V., Dimitriadis G., Almeida H., Prado A., Breviglieri C., Cabral P., and Silva, G., [A Full Potential Static Aeroelastic Solver for Preliminary Aircraft Design](http://hdl.handle.net/2268/237955), 18th International Forum on Aeroelasticity and Structural Dynamics, IFASD 2019.
-
-Bilocq Amaury, [Implementation of a viscous-inviscid interaction scheme in a finite element full potential solver](http://hdl.handle.net/2268/252195), University of Liège, 2020.
diff --git a/ext/amfe b/ext/amfe
new file mode 160000
index 0000000000000000000000000000000000000000..7b5a21b0c5fc3885a11e98ebc2e5acbd19bc55bf
--- /dev/null
+++ b/ext/amfe
@@ -0,0 +1 @@
+Subproject commit 7b5a21b0c5fc3885a11e98ebc2e5acbd19bc55bf
diff --git a/heat/tests/fe2/heat_mpi.sge.sh b/heat/tests/fe2/heat_mpi.sge.sh
old mode 100644
new mode 100755
diff --git a/heat/tests/fe2/heat_mpi.slurm.sh b/heat/tests/fe2/heat_mpi.slurm.sh
old mode 100644
new mode 100755