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

Basgra updates including the YASSO SOC model #3265

Merged
merged 97 commits into from
May 16, 2024

Conversation

juliusvira
Copy link
Contributor

Description

This PR adds a new soil organic carbon (SOC) model to the BASGRA grassland model, updates the wrappers, and adds unit tests for the wrappers. The SOC model is an adaptation of the YASSO20 (https://doi.org/10.5194/gmd-15-1735-2022); the user can switch between YASSO20 and the original BASGRA_N SOC model by setting a parameter. The YASSO implementation also includes an experimental nitrogen cycling extension, which can be optionally enabled.

Motivation and Context

The modifications to BASGRA provide an option to choose a more detailed SOC model when needed.

Review Time Estimate

  • Immediately
  • Within one week
  • When possible

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

  • My change requires a change to the documentation.
  • My name is in the list of CITATION.cff
  • I have updated the CHANGELOG.md.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

Julius Vira added 30 commits March 3, 2023 15:00
…to basgra-yasso

Conflicts:
	models/basgra/R/run_tests.R
…culate the tendencies due to decomposition. This simplifies the previously buggy flow of computation for plant to soil fluxes
@infotroph
Copy link
Member

Sorry for the long wait on this. @istfer @juliusvira is this ready to merge as soon as tests pass?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I started a comment about how these 12-MB IC files were too big for an R package, but on testing they compress remarkably well -- the entire PEcAn.BASGRA_1.7.2.tar.gz after this PR is still only 118 KB! So I think there's no action needed.

@mdietze
Copy link
Member

mdietze commented May 16, 2024

@juliusvira @istfer would love to get this PR in. It appears that @infotroph has submitted a PR to @juliusvira branch of pecan with some fixes that should resolve the GH Actions warnings. Could you pull that in? That should update this PR and then we should be good to go!

@mdietze mdietze added this pull request to the merge queue May 16, 2024
Merged via the queue into PecanProject:develop with commit 06e599f May 16, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants