-
Notifications
You must be signed in to change notification settings - Fork 312
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'ctsm5.1.dev112' into subset_mesh_slevis
Rework fates test definitions and add new fates tests This tag includes a number of updates to the fates test definitions and test list to gain more coverage: (1) Reorder and update the fates test definitions so that fates satellite phenology mode can be configured for cases using a compset. (2) Add a long-term exact restart test to catch issues that may arise due to updates to fates procedure calls during end of year simulation dates. (3) Add a no-competition + fixed biogeography, non-satellite phenology test definition to provide additional mode combination configuration. (4) Update the fates externals tag to incorporate a fix a vegetation temperature exact restart issue discovered while implementing (1) above. (5) Truncate all testmods starting with "Fates" to mitigate running over the limits on the length of testnames, typically when specifying custom `test_id` using `run_sys_test`. (6) Updates the expected failures list. Resolved conflicts: python/ctsm/subset_data.py
- Loading branch information
Showing
285 changed files
with
18,088 additions
and
7,251 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# Ran python directory through black python formatter | ||
4cd83cb3ee6d85eb909403487abf5eeaf4d98911 | ||
0aa2957c1f8603c63fa30b11295c06cfddff44a5 | ||
2cdb380febb274478e84cd90945aee93f29fa2e6 | ||
e44dc469439e02e9ee582dab274d890ebdfab104 | ||
565e7bcacbb0bba20ff80d680d8ad769676641c6 | ||
b88e1cd1b28e3609684c79a2ec0e88f26cfc362b | ||
51c102c5df2e0ef971b5f8eeeb477567899af63a | ||
7dacad70e74e2ec97f6492d4e7a3cb5dd498bcd7 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
name: black check on push and PR | ||
# | ||
# Run the python formatting in check mode | ||
# | ||
on: [push, pull_request] | ||
|
||
jobs: | ||
black-check: | ||
runs-on: ubuntu-latest | ||
steps: | ||
# Checkout the code | ||
- uses: actions/checkout@v2 | ||
# Use the latest stable version of the github action | ||
- uses: psf/black@stable | ||
with: | ||
# Use options and version identical to the conda environment | ||
# Using pyproject.toml makes sure this testing is consistent with our python directory testing | ||
options: "--check --config python/pyproject.toml" | ||
src: "./python" | ||
# Version should be coordinated with the ctsm_py conda environment under the python directory | ||
version: "22.3.0" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.