Skip to content

Commit fd470b5

Browse files
committed
Merge branch 'main' of https://github.com/olivierbonte/Bigleaf.jl into fix/type_stability
2 parents 165e7ec + 2b0c17e commit fd470b5

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- Basic
1919
version:
2020
- '1'
21-
- '1.6'
21+
- '1.10'
2222
os:
2323
- ubuntu-latest
2424
arch:
@@ -58,7 +58,7 @@ jobs:
5858
with:
5959
version: '1'
6060
- uses: cjdoris/julia-downgrade-compat-action@v1
61-
if: ${{ matrix.version == '1.6' }}
61+
if: ${{ matrix.version == '1.10' }}
6262
with:
6363
skip: Pkg,TOML,Statistics
6464
- uses: julia-actions/julia-buildpkg@v1

.github/workflows/CompatHelper.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ jobs:
4848
# with:
4949
# ref: 'keepalive' # The branch, tag or SHA to checkout.
5050
# - uses: gautamkrishnar/keepalive-workflow@@v2
51-
keepalive-job:
52-
name: Keepalive Workflow
53-
runs-on: ubuntu-latest
54-
permissions:
55-
actions: write
56-
steps:
57-
- uses: actions/checkout@v4
58-
with:
59-
ref: 'keepalive' # The branch, tag or SHA to checkout.
60-
- uses: gautamkrishnar/keepalive-workflow@v2
51+
# keepalive-job:
52+
# name: Keepalive Workflow
53+
# runs-on: ubuntu-latest
54+
# permissions:
55+
# actions: write
56+
# steps:
57+
# - uses: actions/checkout@v4
58+
# with:
59+
# ref: 'keepalive' # The branch, tag or SHA to checkout.
60+
# - uses: gautamkrishnar/keepalive-workflow@v2

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ StatsBase = "0.33.12, 0.34"
3939
Suppressor = "0.2"
4040
Tables = "1.6.0"
4141
TimeZones = "1.6.1"
42-
julia = "1.6"
42+
julia = "1.10"
4343

4444
[workspace]
4545
projects = ["test", "docs"]

src/unit_conversions.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ The conversions are given by
127127
- ``G_{mol} = G_{ms} \\, pressure / (Rgas Tair)``
128128
- ``G_{ms} = G_{mol} \\, (Rgas Tair) / pressure``
129129
130-
where Tair is in Kelvin and pressure in Pa (converted from kPa internally).
130+
where Tair is in deg C and pressure in Pa (converted from kPa internally).
131131
132132
# References
133133
Jones, H_G_ 1992_ Plants and microclimate: a quantitative approach to

0 commit comments

Comments
 (0)