Skip to content

Commit 07cb827

Browse files
authored
Merge branch 'master' into overflow_fixed
2 parents e083a77 + ab4131e commit 07cb827

Some content is hidden

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

41 files changed

+30512
-29350
lines changed

.clang-format

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,4 +270,7 @@ WhitespaceSensitiveMacros:
270270
- NS_SWIFT_NAME
271271
- PP_STRINGIZE
272272
- STRINGIZE
273+
---
274+
Language: JavaScript
275+
ColumnLimit: 80
273276
...

.github/CODEOWNERS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# All files in the repository must be reviewed by one of these users
2+
* @Alomir @dlebauer @mdietze @infotroph @mswilburn

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<!-- Please fill out the sections below to help reviewers. -->
2+
3+
## Summary
4+
5+
- **Motivation**: Why is this change needed?
6+
- **What**: Short description of the functional or documentation changes
7+
8+
## How to test
9+
10+
Steps to reproduce and verify the change locally:
11+
12+
```bash
13+
make
14+
cd tests/smoke/<new-or-updated-test> ../../sipnet -i sipnet.in
15+
```
16+
17+
## Related issues
18+
19+
- Fixes #<issue> (or "Relates to #N" if this is not a resolution of that ticket)
20+
21+
## Checklist
22+
23+
- [ ] Tests added for new features
24+
- [ ] Documentation updated (if applicable)
25+
- [ ] `docs/CHANGELOG.md` updated with noteworthy changes
26+
- [ ] Code formatted with `clang-format` (run `git clang-format` if needed)
27+
- [ ] Requested review from at least one CODEOWNER
28+
29+
**For model structure changes:**
30+
- [ ] Removed `\fraktur` font formatting from `docs/model-structure.md` for implemented features
31+
32+
---
33+
34+
**Note**: See [CONTRIBUTING.md](../docs/CONTRIBUTING.md) for additional guidance. This repository uses automated formatting checks; if the pre-commit hook blocks your commit, run `git clang-format` to format staged changes.

.github/workflows/deploy.yml

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

.github/workflows/docs-build.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Build and Upload Docs
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
types: [opened, synchronize, reopened, closed]
9+
10+
permissions:
11+
contents: read # needed for checkout
12+
pages: write # to deploy to GitHub Pages
13+
id-token: write # to authenticate with GitHub Pages
14+
15+
concurrency:
16+
group: "pages"
17+
cancel-in-progress: true
18+
19+
jobs:
20+
build:
21+
name: docs-build
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Checkout
25+
uses: actions/checkout@v4
26+
27+
- name: Install system deps
28+
run: |
29+
sudo apt-get update
30+
sudo apt-get install -y doxygen graphviz
31+
python3 -m pip install --upgrade pip
32+
python3 -m pip install mkdocs mkdocs-material pymdown-extensions
33+
34+
- name: Build docs (MkDocs + Doxygen)
35+
run: |
36+
make clean document
37+
touch site/.nojekyll
38+
39+
- name: Upload Pages artifact
40+
uses: actions/upload-pages-artifact@v3
41+
with:
42+
path: site

.github/workflows/docs-publish.yml

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Publish Docs
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
7+
permissions:
8+
contents: read
9+
pages: write
10+
id-token: write
11+
12+
concurrency:
13+
group: "pages-prod"
14+
cancel-in-progress: true
15+
16+
jobs:
17+
build:
18+
name: docs-build
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v4
23+
24+
- name: Install system deps
25+
run: |
26+
sudo apt-get update
27+
sudo apt-get install -y doxygen graphviz
28+
python3 -m pip install --upgrade pip
29+
python3 -m pip install mkdocs mkdocs-material pymdown-extensions
30+
31+
- name: Build docs (MkDocs + Doxygen)
32+
run: |
33+
make clean document
34+
touch site/.nojekyll
35+
36+
- name: Upload Pages artifact
37+
uses: actions/upload-pages-artifact@v3
38+
with:
39+
path: site
40+
41+
deploy:
42+
name: deploy-pages
43+
needs: build
44+
environment:
45+
name: github-pages
46+
url: ${{ steps.deployment.outputs.page_url }}
47+
runs-on: ubuntu-latest
48+
permissions:
49+
pages: write
50+
id-token: write
51+
steps:
52+
- name: Deploy to GitHub Pages
53+
id: deployment
54+
uses: actions/deploy-pages@v4

.github/workflows/link-check.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ jobs:
2828
--max-retries 3
2929
--retry-wait-time 2
3030
--format markdown
31-
--exclude https://doi.org/*
31+
--exclude '^https://doi\.org/'
32+
--exclude '^https://russellranch\.ucdavis\.edu'
3233
.
3334
fail: true
3435
env:

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ $(SIPNET_LIB): $(SIPNET_OFILES)
6565
GCC_VERSION = $(shell $(CC) --version)
6666
info:
6767
@echo "System info"
68-
@echo "ARCH: $(shell arch)"
68+
@echo "ARCH: $(shell uname -m)"
6969
@echo "CC: $(GCC_VERSION)"
7070
@echo ""
7171

docs/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ sections to include in release notes:
3434
- Soil mineral pool (#170)
3535
- Nitrogen effects of fertilization (#173)
3636
- `logAppend` logging function (#173)
37+
- Nitrogen volatilization (#175)
38+
- Nitrogen leaching (#178)
39+
- Soil and litter organic N pools (#195, #199)
40+
- Organic N handling for fertilization and soil dynamics (#199)
41+
- Dynamic C:N for soil and litter (#214)
42+
- Updates for soil and litter respiration (tillage and C:N effects) (#214)
3743

3844
### Fixed
3945

docs/CODE_OF_CONDUCT.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# Code of Conduct
2+
3+
**Our Pledge**
4+
5+
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
6+
7+
**Our Standards**
8+
9+
Examples of behavior that contributes to creating a positive environment include:
10+
11+
* Using welcoming and inclusive language
12+
* Being respectful of differing viewpoints and experiences
13+
* Gracefully accepting constructive criticism
14+
* Focusing on what is best for the community
15+
* Showing empathy towards other community members
16+
17+
Examples of unacceptable behavior by participants include:
18+
19+
* The use of sexualized language or imagery and unwelcome sexual attention or advances
20+
* Trolling, insulting/derogatory comments, and personal or political attacks
21+
* Public or private harassment
22+
* Publishing others' private information, such as a physical or electronic address, without explicit permission
23+
* Other conduct which could reasonably be considered inappropriate in a professional setting
24+
25+
26+
27+
**Our Responsibilities**
28+
29+
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
30+
31+
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
32+
33+
**Scope**
34+
35+
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
36+
37+
**Enforcement**
38+
39+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at pecanproj[at]gmail.com and/or reaching out to maintainers on the PEcAn Project Slack. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
40+
41+
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
42+
43+
**Attribution**
44+
45+
This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org/) version 1.4, available at [http://contributor-covenant.org/version/1/4](http://contributor-covenant.org/version/1/4/).

0 commit comments

Comments
 (0)