Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial draft of new quantum yield module #267

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7886411
Initial draft of new quantum yield module: some mypy issues
davidorme Jul 25, 2024
d2ad700
Fixing typing and other issues
davidorme Jul 25, 2024
07a9912
Regression test for QuantumYieldSandoval
davidorme Jul 25, 2024
425b248
Simpler sandoval test data set and test fixes
davidorme Jul 25, 2024
29b6959
Added sandoval parameters to PModelConsts, update regresssion test va…
davidorme Jul 31, 2024
0ad2fb5
Rework reference code files, initial unit test suite
davidorme Jul 31, 2024
8dd18ba
Added use of QuantumYield registry to tests
davidorme Jul 31, 2024
14a9c86
Use QuantumYieldABC implementation in PModel ! SubdailyPModel not imp…
davidorme Jul 31, 2024
39cb832
Use QuantumYieldABC implementation in PModel ! SubdailyPModel not imp…
davidorme Jul 31, 2024
a81d0fe
Moving C3/C4 handling within different kphio approaches ! Subdaily st…
davidorme Jul 31, 2024
84a1d67
QuantumYield should inherit constants from PModelEnvironment, not dir…
davidorme Aug 1, 2024
1cadd6b
Updating subdaily
davidorme Aug 1, 2024
fce92d9
Better R in sandoval_kphio
davidorme Aug 1, 2024
2495d84
pytest importlib mode not behaving: https://github.com/pytest-dev/pyt…
davidorme Aug 1, 2024
dfb23e2
doctest output format fixes
davidorme Aug 1, 2024
d5b392f
Updating new approach to handle arrays of kphio values with QuantumYi…
davidorme Aug 2, 2024
0e23f5f
 Cleaner calculation of kphio in subdaily P model, mypy fixes
davidorme Aug 2, 2024
758b70a
Rethink of SubdailyPModel behaviour with array kphio
davidorme Aug 2, 2024
add9c5c
Refixing doctests - local numpy outdated
davidorme Aug 2, 2024
e758592
Doc updates
davidorme Aug 6, 2024
2246a61
P model user docs update
davidorme Aug 7, 2024
3239cb4
Fixing issue with typed but not populated attributes in summarise
davidorme Aug 7, 2024
ed5ad06
Doc fixing and notebook updates
davidorme Aug 7, 2024
387d3c9
Docstring update for quantum yield
davidorme Aug 7, 2024
67b1e04
Replacing and removing the calc_ftemp_kphio and calc_ftemp_inst_vcmax…
davidorme Aug 8, 2024
2467eb3
Working out how to pass around arrhenius mode cleanly
davidorme Aug 8, 2024
22daf34
Fixes from @j-emberton and then test and doctest snagging
davidorme Aug 8, 2024
1ee9a5b
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Aug 8, 2024
d00331e
Do _not_ jupytext the Sphinx conf.py
davidorme Aug 8, 2024
d612861
Merge branch 'develop' into 266-additional-kphio-method-using-aridity…
davidorme Aug 8, 2024
16b45aa
Merge branch 'develop' into 266-additional-kphio-method-using-aridity…
davidorme Sep 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ repos:
hooks:
- id: jupytext
args: [--pipe, black]
files: docs/source
files: docs/source
exclude: docs/source/conf.py
additional_dependencies:
- black==24.4.2 # Matches hook

3 changes: 2 additions & 1 deletion docs/source/_toc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ subtrees:
- file: users/pmodel/pmodel_details/worked_examples.md
- file: users/pmodel/pmodel_details/photosynthetic_environment.md
- file: users/pmodel/pmodel_details/optimal_chi.md
- file: users/pmodel/pmodel_details/lue_limitation.md
- file: users/pmodel/pmodel_details/quantum_yield.md
- file: users/pmodel/pmodel_details/jmax_limitation.md
- file: users/pmodel/pmodel_details/envt_variation_outputs.md
- file: users/pmodel/pmodel_details/soil_moisture.md
- file: users/pmodel/pmodel_details/extreme_values.md
Expand Down
1 change: 0 additions & 1 deletion docs/source/api/constants_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
1 change: 0 additions & 1 deletion docs/source/api/core_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
9 changes: 8 additions & 1 deletion docs/source/api/pmodel_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down Expand Up @@ -50,6 +49,14 @@ kernelspec:
:members:
```

## The {mod}`~pyrealm.pmodel.quantum_yield` submodule

```{eval-rst}
.. automodule:: pyrealm.pmodel.quantum_yield
:autosummary:
:members:
```

## The {mod}`~pyrealm.pmodel.functions` submodule

```{eval-rst}
Expand Down
1 change: 0 additions & 1 deletion docs/source/api/splash_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
1 change: 0 additions & 1 deletion docs/source/api/tmodel_api.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
10 changes: 9 additions & 1 deletion docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@

from pyrealm import __version__ as pyrealm_version

# +
sys.path.insert(0, os.path.abspath("../"))
# -


# -- Project information -----------------------------------------------------
Expand Down Expand Up @@ -55,7 +57,9 @@
external_toc_path = "_toc.yml" # optional, default: _toc.yml
external_toc_exclude_missing = False # optional, default: False

# + [markdown]
# Citation styling
# -


def bracket_style() -> BracketStyle:
Expand All @@ -82,7 +86,7 @@ class MyReferenceStyle(AuthorYearReferenceStyle):
)

bibtex_reference_style = "author_year_round"

bibtex_default_style = "plain"

# Cross-reference checking
# TODO - find some better solution than this to all of these bizarre cross reference
Expand Down Expand Up @@ -142,13 +146,15 @@ class MyReferenceStyle(AuthorYearReferenceStyle):
),
]

# +
intersphinx_mapping = {
"pytest": ("https://docs.pytest.org/en/stable/", None),
"numpy": ("https://numpy.org/doc/stable/", None),
"python": ("https://docs.python.org/3/", None),
"xarray": ("https://docs.xarray.dev/en/stable/", None),
"shapely": ("https://shapely.readthedocs.io/en/stable/", None),
}
# -


autodoc_default_flags = ["members"]
Expand Down Expand Up @@ -195,6 +201,7 @@ class MyReferenceStyle(AuthorYearReferenceStyle):
# html_theme = 'sphinx_material'
html_theme = "sphinx_rtd_theme"

# +
html_theme_options = {
"logo_only": False,
"display_version": True,
Expand All @@ -208,6 +215,7 @@ class MyReferenceStyle(AuthorYearReferenceStyle):
"includehidden": True,
"titles_only": False,
}
# -


# Add any paths that contain custom static files (such as style sheets) here,
Expand Down
1 change: 0 additions & 1 deletion docs/source/development/code_qa_and_typing.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
1 change: 0 additions & 1 deletion docs/source/development/code_testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
1 change: 0 additions & 1 deletion docs/source/development/documentation.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
1 change: 0 additions & 1 deletion docs/source/development/github_actions.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
1 change: 0 additions & 1 deletion docs/source/development/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
1 change: 0 additions & 1 deletion docs/source/development/profiling_and_benchmarking.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
1 change: 0 additions & 1 deletion docs/source/development/pyrealm_build_data.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
1 change: 0 additions & 1 deletion docs/source/development/release_process.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
1 change: 0 additions & 1 deletion docs/source/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ jupytext:
extension: .md
format_name: myst
format_version: 0.13
jupytext_version: 1.16.4
kernelspec:
display_name: Python 3
language: python
Expand Down
Loading
Loading