Skip to content

Commit f44acd3

Browse files
Merge branch 'main' into reaction-rate-export
2 parents 7c45fe8 + 35b86fe commit f44acd3

105 files changed

Lines changed: 1000 additions & 2495 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_conda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
uses: actions/checkout@v6
1717

1818
- name: Set up Conda
19-
uses: conda-incubator/setup-miniconda@v3
19+
uses: conda-incubator/setup-miniconda@v4
2020
with:
2121
activate-environment: myenv
2222
miniforge-version: latest

.github/workflows/conda-nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fetch-depth: 0 # Full history for versioning
2020

2121
- name: Set up Miniconda
22-
uses: conda-incubator/setup-miniconda@v3
22+
uses: conda-incubator/setup-miniconda@v4
2323
with:
2424
miniforge-version: latest
2525
activate-environment: build

.github/workflows/doctest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
uses: actions/checkout@v6
1212

1313
- name: Set up Conda
14-
uses: conda-incubator/setup-miniconda@v3
14+
uses: conda-incubator/setup-miniconda@v4
1515
with:
1616
activate-environment: festim2-docs
1717
environment-file: docs/environment.yml

docs/source/conf.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
# Add the directory containing your Python script to the Python path
3838
sys.path.insert(0, os.path.abspath("."))
3939

40-
import map
4140

4241
m = map.generate_map()
4342
current_dir = os.path.dirname(__file__)

examples/advection_diffusion_multi_material.py

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

examples/convergence_rates.py

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

0 commit comments

Comments
 (0)