Skip to content

Commit e506616

Browse files
authored
Merge pull request #65 from UniMainzGeo/PBC
This is LaMEM version 3.0.0! Among other things it includes the following list of key changes: • Hybrid multigrid preconditioner framework (assembled/matrix-free) • Matrix-free Jacobian operator • Improved 2D multigrid coarsening (for quasi 2D setups) • Block direct solver • Periodic boundary conditions (mechanical and thermal) • wBFBT preconditioner (Rudi at al, 2017) • Automated solver options and stop tolerances
2 parents 88f7ba7 + af7fc30 commit e506616

584 files changed

Lines changed: 106595 additions & 179852 deletions

File tree

Some content is hidden

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

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,11 @@ jobs:
110110
- name: Install dependencies 1
111111
run: sudo apt-get update && sudo apt-get install -y xorg-dev mesa-utils xvfb libgl1 freeglut3-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxext-dev
112112
- name: Install dependencies 2
113-
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
113+
run: julia --project=doc/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
114114
- name: Build and deploy
115115
env:
116116
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token
117117
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key
118118
run: DISPLAY=:0 xvfb-run -s '-screen 0 1024x768x24'
119-
julia --project=docs/ docs/make.jl
119+
julia --project=doc/ doc/make.jl
120120

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ Dave May
2424
Garrett Apuzen-Ito
2525
Jana Schierjott
2626
Sam Howell
27+
Wenrong Cao

CITATION.cff

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ message: >-
55
metadata from this file.
66
type: software
77
authors:
8-
- given-names: Anton
8+
- given-names: Anton A.
99
family-names: Popov
10+
orcid: 'https://orcid.org/0000-0002-8075-8406'
1011
affiliation: Johannes Gutenberg University Mainz
11-
- given-names: Boris
12+
- given-names: Boris J.P.
1213
family-names: Kaus
1314
orcid: 'https://orcid.org/0000-0002-0247-8660'
1415
affiliation: Johannes Gutenberg University Mainz
1516
keywords:
1617
- computational geosciences
1718
- high-performance computing
18-
license: GPL-3.0
19+
license: MIT

CONTRIBUTING.md

Lines changed: 0 additions & 129 deletions
This file was deleted.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2011-2023 JGU Mainz, Boris Kaus, Anton Popov
3+
Copyright (c) 2011-2026 JGU Mainz, Boris Kaus, Anton Popov
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "LaMEM_C"
22
uuid = "29b6043d-3311-4c16-b469-b02bf85cb680"
33
authors = ["Anton Popov <popov@uni-mainz.de>", "Boris Kaus <kaus@uni-mainz.de>"]
4-
version = "2.2.1"
4+
version = "3.0.0"
55

66
[deps]
77
DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"

README

Lines changed: 0 additions & 27 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ quasi-Newton solvers (provided through the PETSc interface).
1515

1616
LaMEM has been tested on a variety of machines ranging from laptops to a massively parallel cluster with 458'752 cores.
1717

18-
![Getting Started](./docs/src/assets/img/LaMEM_overview.png)
18+
![Getting Started](./doc/src/assets/img/LaMEM_overview.png)
1919

2020
## Getting started
2121

-191 KB
Binary file not shown.

doc/LaMEM_options/canonical_solver_options.txt

Lines changed: 0 additions & 140 deletions
This file was deleted.

0 commit comments

Comments
 (0)