Skip to content

Commit 236ea5d

Browse files
authored
Merge pull request #213 from OpenTerrace/development
Development
2 parents 839d366 + 37d111b commit 236ea5d

28 files changed

Lines changed: 10504 additions & 752 deletions

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ share/python-wheels/
2525
MANIFEST
2626
src/
2727
*.lock
28+
site
2829

2930
# PyInstaller
3031
# Usually these files are written by a python script from a template

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,9 @@ OpenTerrace is built from the ground up to be flexible for easy integration in s
2525
- **EXTENDABLE**
2626
Modules for new materials such as non-spherical rocks or exotic Phase Change Materials (PCM) can easily be plugged into the OpenTerrace framework.
2727

28-
## Want to contribute?
29-
Contributions are most welcome! Feel free to send pull requests or [get in touch](https://openterrace.github.io/openterrace-python/contact/) to discuss how to collaborate.
28+
## Want to join the list of contributors?
29+
OpenTerrace welcomes contributions! Find more details [here](./CONTRIBUTING.md). Current list of contributors:
30+
31+
<a href="https://github.com/OpenTerrace/openterrace-python/graphs/contributors">
32+
<img src="https://contrib.rocks/image?repo=OpenTerrace/openterrace-python&max=204" />
33+
</a>

docs/overrides/home.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,17 @@
55
{{ super() }}
66
<style>
77

8+
9+
810
.md-main {
911
flex-grow: 0
1012
}
1113

14+
.md-container {
15+
background: linear-gradient(to bottom, var(--md-primary-fg-color), hsla(160deg,47%,55%,1) 99%,#fff 99%)
16+
17+
}
18+
1219
.md-main__inner {
1320
display: flex;
1421
height: 100%;
@@ -17,10 +24,10 @@
1724
.tx-container {
1825
padding-top: .0rem;
1926
background: linear-gradient(to bottom, var(--md-primary-fg-color), hsla(160deg,47%,55%,1) 99%,#fff 99%)
27+
padding-bottom: .0rem;
2028
}
2129

2230
.tx-hero {
23-
margin: 32px 2.8rem;
2431
color: var(--md-primary-bg-color);
2532
justify-content: center;
2633
}

docs/user-guide/domains/lumped.md

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

mkdocs.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ plugins:
6464
handlers:
6565
python:
6666
paths: [openterrace] # search packages in the src folder
67-
setup_commands:
68-
- import sys
69-
- sys.path.append('openterrace')
67+
options:
68+
docstring_style: google
7069

7170
nav:
7271
- index.md
@@ -97,7 +96,6 @@ nav:
9796
- user-guide/domains/block_1d.md
9897
- user-guide/domains/sphere_1d.md
9998
- user-guide/domains/hollow_sphere_1d.md
100-
- user-guide/domains/lumped.md
10199
- Numerical schemes:
102100
- Diffusion:
103101
- user-guide/diffusion_schemes/central_difference_1d.md

openterrace/__init__.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
__version__ = "0.0.0" # This will be overwritten by the dynamic versioning by Poetry
2-
from openterrace.openterrace import Simulate
2+
from openterrace.openterrace import Setup
3+
from openterrace.openterrace import Phase
34
from openterrace.analytical_functions import *
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import os, glob
2+
modules = glob.glob(os.path.join(os.path.dirname(__file__), "*.py"))
3+
__all__ = [ os.path.basename(f)[:-3] for f in modules if os.path.isfile(f) and not f.endswith('__init__.py')]
4+
from . import *

openterrace/boundary_conditions/fixed_gradient.py

Whitespace-only changes.

openterrace/boundary_conditions/fixed_value.py

Whitespace-only changes.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import numpy as np
2+
import numba as nb
3+
4+
@nb.njit
5+
def lax_wendorf_1d(x, F):
6+
"""Second-order accurate, conditionally stable, conservative Lax-Wendroff advection scheme.
7+
"""
8+
_out = np.zeros_like(x)
9+
for j in range(1, x.shape[0]-1):
10+
for i in range(0, x.shape[1]):
11+
_out[j,i] = x[j,i] - 0.5 * F[0,j,i] * (x[j+1,i] - x[j-1,i]) + 0.5 * F[0,j,i]**2 * (x[j+1,i] - 2*x[j,i] + x[j-1,i])
12+
return _out

0 commit comments

Comments
 (0)