-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into 230-replace-cable_gw_hydrof90-with-its-new-v…
…ersion
- Loading branch information
Showing
59 changed files
with
2,932 additions
and
3,313 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
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
---|---|---|
@@ -1,5 +1,5 @@ | ||
.md-grid { | ||
margin-left: auto; | ||
margin-right: auto; | ||
max-width: 70rem; | ||
} | ||
max-width: 120rem; | ||
} |
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
58 changes: 56 additions & 2 deletions
58
documentation/docs/developer_guide/contribution/review_guide.md
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 |
---|---|---|
@@ -1,5 +1,59 @@ | ||
# Review guidelines | ||
|
||
!!! note "Available soon" | ||
All contributions to the CABLE land surface model will be reviewed before inclusion in the model. The review is intended to ensure submissions to CABLE are of the best quality and integrate correctly within the CABLE's code design. | ||
|
||
The documentation is still a work in progress. This section will be made available soon. | ||
The review process checks that: | ||
|
||
- [the coding standards][coding-standards] have been applied | ||
- the documentation is understandable and follows at least the [minimum requirements][doc-min-req] | ||
- [the required test results][tests-req] are provided | ||
- the proposed changes address the problem explained in the issue and only this problem | ||
- the proposed changes are correct | ||
- the implementation of the changes follows the design of the CABLE model and will be maintainable | ||
|
||
## Final checks before asking for review | ||
|
||
Once you have finished the implementation of your changes and before asking for a review, please make sure: | ||
|
||
- the description of the pull request is up-to-date. | ||
- all the required test results are either linked to in comments or copied in. If you have performed tests beyond the required tests, make sure these tests and their results are described in comments in your pull request. | ||
- the automated checks pass. Contact the @CABLE-LSM/admin team, through a comment in your pull request, if you need help understanding a failure of these tests. | ||
- all conflicts have been solved. | ||
|
||
## Asking for review | ||
|
||
Once you are ready, [ask for a review by `CABLE-LSM/reviewers`][how-ask-review]. If you want a specific individual, you can use the same process to choose that person. Using the reviewers team is preferred as it will spread the workload across reviewers. | ||
|
||
In most cases, asking for one reviewer is enough. The system allows asking for multiple reviewers, please use this feature sparingly. It is often easier to ask for a single reviewer first and add another reviewer later as necessary. | ||
|
||
## Review process | ||
|
||
### Review response | ||
|
||
The reviewers team will try and reply to review requests quickly. If you think your review request has been lost, please ask for an update as a comment on your pull request and mention your reviewer (with @). | ||
|
||
The review is likely to be an iterative process between the reviewer and the author. As such, it is appreciated if you, the author, are responsive once the review process starts. Make sure to keep discussions polite and courteous. You can reject suggestions from reviewers but the reasoning has to be explained and the rejection has to be agreed to by the reviewer. | ||
|
||
[To incorporate code changes requested by the reviewer][how-review], you often need to incorporate these changes to your local repository and push them to GitHub again. It is possible for the reviewer to suggest changes that can be apply directly in GitHub. We recommend to: | ||
|
||
1. apply the suggestions you agree with via GitHub | ||
1. update your local branch with `git pull` | ||
1. apply other changes required by the review locally to your branch | ||
1. push the fully revised version to GitHub (`git push`) | ||
1. [ask for a re-review][how-re-review] once you have resolved all points raised by the reviewer | ||
|
||
The reviewer might ask for a complementary review by another individual if they think they are not able to review all aspects of a submission. | ||
|
||
To better understand the pull request interface for reviews on GitHub, please refer to [the GitHub documentation][github-review]. | ||
|
||
### Merge approved submission | ||
|
||
Once a reviewer has approved the pull request, you can merge it. We prefer if the author merges the pull request as it provides you a last chance to spot an issue. However, the admin team will periodically merge any pull request approved some time ago and that has not been merged. | ||
|
||
[coding-standards]: ../other_resources/coding_standards.md | ||
[doc-min-req]: ../documentation_guidelines/index.md | ||
[tests-req]: testing.md | ||
[how-ask-review]: resources/how_to.md#ask-a-review | ||
[how-review]: resources/how_to.md#understand-a-review | ||
[how-re-review]: resources/how_to.md#request-a-re-review | ||
[github-review]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests |
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 |
---|---|---|
@@ -1,16 +1,21 @@ | ||
//https://squidfunk.github.io/mkdocs-material/reference/math/#mathjax-docsjavascriptsmathjaxjs | ||
|
||
window.MathJax = { | ||
tex: { | ||
inlineMath: [["\\(", "\\)"]], | ||
displayMath: [["\\[", "\\]"]], | ||
processEscapes: true, | ||
processEnvironments: true | ||
}, | ||
options: { | ||
ignoreHtmlClass: ".*|", | ||
processHtmlClass: "arithmatex" | ||
} | ||
}; | ||
|
||
document$.subscribe(() => { | ||
MathJax.typesetPromise() | ||
}) | ||
tex: { | ||
inlineMath: [["\\(", "\\)"]], | ||
displayMath: [["\\[", "\\]"]], | ||
processEscapes: true, | ||
processEnvironments: true | ||
}, | ||
options: { | ||
ignoreHtmlClass: ".*|", | ||
processHtmlClass: "arithmatex" | ||
} | ||
}; | ||
|
||
document$.subscribe(() => { | ||
MathJax.startup.output.clearCache() | ||
MathJax.typesetClear() | ||
MathJax.texReset() | ||
MathJax.typesetPromise() | ||
}) |
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,11 @@ | ||
# CABLE constants | ||
|
||
Table 1 lists the various types of constants used in CABLE. A list of the numerical values of each type can be accessed through the left navigation bar. | ||
|
||
|
||
## Table 1: Various constants used in CABLE | ||
|
||
| CABLE constants | | ||
|------------------------| | ||
| Physical constants | | ||
| Mathematical constants | |
5 changes: 5 additions & 0 deletions
5
documentation/docs/user_guide/constants/mathematical_constants.md
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,5 @@ | ||
## Table 1: CABLE mathematical constants | ||
|
||
| Name | Value | | ||
|-----------------------|------------------| | ||
| pi | 3.1415927 | |
23 changes: 23 additions & 0 deletions
23
documentation/docs/user_guide/constants/physical_constants.md
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,23 @@ | ||
## Table 1: CABLE physical constants | ||
|
||
| Name | Value | Units | Description | | ||
|-----------------------|------------------|-----------------------------------------------------|-------------------------------------------------- | | ||
| tfrz | 273.16 | \( K \) | Temperature corresponding to \( 0^{\circ}C \) | | ||
| sboltz | 5.67E-8 | \( W \cdot m^{-2} \cdot K^{-4} \) | Stefan-Boltzmann constant | | ||
| emsoil | 1.0 | \( - \) | Soil emissivity | | ||
| emleaf | 1.0 | \( - \) | Leaf emissivity | | ||
| capp | 1004.64 | \( J \cdot kg^{-1} \cdot K^{-1} \) | Air specific heat | | ||
| hl | 2.5014E6 | \( J \cdot kg^{-1} \) | Latent heat of vaporization | | ||
| hlf | 0.334E6 | \( J \cdot kg^{-1} \) | Latent heat of fusion | | ||
| hls | 2.8350E6 | \( J \cdot kg^{-1} \) | Latent heat of Sublimation | | ||
| dheat | 21.5E-6 | \( cm^{2} \cdot s^{-1} \) | Molecular diffusivity for heat | | ||
| grav | 9.8086 | \( m \cdot s^{-2} \) | Gravity acceleration | | ||
| rgas | 8.3143 | \(J \cdot mol^{-1} \cdot K^{-1} \) | Universal gas const | | ||
| rmair | 0.02897 | \( kg \cdot mol^{-1} \) | Molecular weight of dry air | | ||
| rmh2o | 0.018016 | \( kg \cdot mol^{-1} \) | Molecular weight of water | | ||
| cgsnow | 2090.0 | \( J \cdot kg^{-1} \cdot K^{-1} \) | Specific heat for snow | | ||
| csice | 2.100E3 | \( J \cdot kg^{-1} \cdot K^{-1} \) | Specific heat for ice | | ||
| cswat | 4.218E3 | \( J \cdot kg^{-1} \cdot K^{-1} \) | Specific heat for water at \( 0^{\circ}C \) | | ||
| density_liq | 1000.0 | \( kg \cdot m^{-3} \) | Density of liquid water | | ||
| density_ice | 921.0 | \( kg \cdot m^{-3} \) | Density of ice | | ||
Oops, something went wrong.