You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
-[ ]Updated [develop.toml](/MODFLOW-ORG/modflow6/doc/ReleaseNotes/develop.toml) with a plain-language description of the bug fix, change, feature; required for changes that may affect users
14
+
-[ ]Added a release note fragment to [doc/ReleaseNotes/changes/](/MODFLOW-ORG/modflow6/doc/ReleaseNotes/changes) with a plain-language description of the bug fix, change, or feature; required for changes that may affect users
15
15
-[ ] Updated [input and output guide](/MODFLOW-ORG/modflow6/doc/mf6io)
16
16
-[ ] Removed checklist items not relevant to this pull request
Copy file name to clipboardExpand all lines: CONTRIBUTING.md
+11-5Lines changed: 11 additions & 5 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -66,11 +66,17 @@ To submit a pull request (PR):
66
66
67
67
1. To avoid duplicating effort, [search](https://github.com/MODFLOW-ORG/modflow6/pulls) for an open or closed PR that relates to your submission.
68
68
2. Fork the MODFLOW-ORG/modflow6 repo and make your changes in a new branch, following our style and commit message guidelines and [including appropriate test cases](./DEVELOPER.md#writing-tests).
69
-
3.[Check the spelling and formatting](./DEVELOPER.md#formatting) of any modified or new Fortran source files, python files definition files, markdown, and LaTeX files.
70
-
4.[Rebuild makefiles](./DEVELOPER.md#generating-makefiles) and update MSVS project files if you added, removed, or renamed any source files.
71
-
5.[Run the full test suite](./DEVELOPER.md#running-tests) and make sure all tests pass.
72
-
6. Push your branch to GitHub and create a pull request to the `develop` branch.
73
-
7. If we suggest changes:
69
+
3. For user-facing changes (new features, bug fixes, behavior changes), add a release note fragment to `doc/ReleaseNotes/changes/`. Name the file with a short descriptive slug, e.g. `wel-auto-flow-reduce-auxname.toml`. Each fragment is a TOML file with three keys:
70
+
```toml
71
+
section = "features"# or "fixes" or "examples"
72
+
subsection = "stress"# see [subsections] in doc/ReleaseNotes/schema.toml for valid values
73
+
description = "Description of the change..."
74
+
```
75
+
4.[Check the spelling and formatting](./DEVELOPER.md#formatting) of any modified or new Fortran source files, python files definition files, markdown, and LaTeX files.
76
+
5.[Rebuild makefiles](./DEVELOPER.md#generating-makefiles) and update MSVS project files if you added, removed, or renamed any source files.
77
+
6.[Run the full test suite](./DEVELOPER.md#running-tests) and make sure all tests pass.
78
+
7. Push your branch to GitHub and create a pull request to the `develop` branch.
Copy file name to clipboardExpand all lines: DEVELOPER.md
+2-2Lines changed: 2 additions & 2 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -957,8 +957,8 @@ This process can be repeated periodically to stay in sync with the develop branc
957
957
958
958
To deprecate a MODFLOW 6 input/output option in a DFN file:
959
959
960
-
- Add a new `deprecated x.y.z` attribute to the appropriate variable in the package DFN file, where `x.y.z` is the version the deprecation is introduced. Mention the deprecation prominently in the release notes.
961
-
- If support for the deprecated option is removed (typically after at least 2 minor or major releases or 1 year), add a new `removed x.y.z` attribute to the variable in the DFN file, where `x.y.z` is the version in which support for the option was removed. The line containing `deprecated x.y.z` should not be deleted. Mention the removal prominently in the release notes.
960
+
- Add a new `deprecated x.y.z` attribute to the appropriate variable in the package DFN file, where `x.y.z` is the version the deprecation is introduced. Mention the deprecation prominently in the release notes by adding a fragment to `doc/ReleaseNotes/changes/`.
961
+
- If support for the deprecated option is removed (typically after at least 2 minor or major releases or 1 year), add a new `removed x.y.z` attribute to the variable in the DFN file, where `x.y.z` is the version in which support for the option was removed. The line containing `deprecated x.y.z` should not be deleted. Mention the removal prominently in the release notes by adding a fragment to `doc/ReleaseNotes/changes/`.
962
962
- Deprecated/removed attributes are not removed from DFN files but remain in perpetuity. The `doc/mf6io/mf6ivar/deprecations.py` script generates a markdown deprecation table which is converted to LaTeX by `doc/ReleaseNotes/mk_deprecations.py` for inclusion in the MODFLOW 6 release notes. Deprecations and removals should still be mentioned separately in the release notes, however.
Copy file name to clipboardExpand all lines: distribution/README.md
+4-4Lines changed: 4 additions & 4 deletions
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -141,9 +141,9 @@ Before proceeding with a release, check for deprecated DFN variables due for rem
141
141
142
142
### Review release notes
143
143
144
-
Double-check release notes in `doc/ReleaseNotes/develop.toml` with the authors of any changes to be included in the release.
144
+
Double-check release notes in `doc/ReleaseNotes/changes/` with the authors of any changes to be included in the release. Each file in that directory is one release note item.
145
145
146
-
For hotfix releases, `develop.toml`must be trimmed manually on the release branch. For patch releases made from `develop`, release notes are automatically filtered to include only fixes.
146
+
For hotfix releases, fragment files for features not included in the hotfix must be removed manually on the release branch. For patch releases made from `develop`, release notes are automatically filtered to include only fixes.
147
147
148
148
**Note**: For all releases, add a line to the Release History section of `ReleaseNotes.tex` providing the version number, date and DOI of the release, e.g. `6.4.4 & February 13, 2024 & \url{https://doi.org/10.5066/P9FL1JCC}`. DOIs are updated with minor releases and remain the same for patch releases.
149
149
@@ -209,15 +209,15 @@ This will substitute the new version number into the necessary files and set `ID
209
209
210
210
#### Update release notes
211
211
212
-
Generate a `develop.tex` file from `develop.toml`:
212
+
Generate a `develop.tex` file from the release note fragments:
213
213
214
214
```shell
215
215
pixi run make-release-notes
216
216
```
217
217
218
218
Move/rename it to `doc/ReleaseNotes/previous/vx.y.z.tex` (where `x.y.z` is the version just released), then insert a new line `\input{./previous/vx.y.z.tex}` at the top of `doc/ReleaseNotes/appendixA.tex`.
219
219
220
-
If this was not a hotfix, trim `doc/ReleaseNotes/develop.toml` as necessary to remove items just released.
220
+
Delete all fragment files in `doc/ReleaseNotes/changes/` that were included in the release. The `.gitkeep` file should remain so the directory is tracked by git.
221
221
222
222
Create and merge (don't squash) a pull request from this branch into `develop`.
Add files to this directory to describe user-facing changes (bug fixes, new features, new examples, etc) to be included in the next release of MODFLOW 6.
4
+
5
+
To add a release note, create a `.toml` file with a short descriptive name, e.g. `wel-auto-flow-reduce-auxname.toml`:
6
+
7
+
```toml
8
+
section = "fixes"
9
+
subsection = "stress"
10
+
description = "Plain-language description of the change..."
11
+
```
12
+
13
+
Valid values for `section` and `subsection` are defined in `doc/ReleaseNotes/schema.toml`.
14
+
15
+
Files are merged by the `mk_releasenotes.py` script underlying the `pixi run make-release-notes` task.
16
+
17
+
Delete all fragment files included in the release. This directory should be empty (aside from this README) after the post-release reset.
description = "The adaptive time stepping algorithm (ATS) was not working correctly in parallel mode. This applies to GWT and GWE models, when the model time step derived from the ATS\\_PERCEL parameter is not uniform across processes. In such a case, a deadlock occurred and the simulation was stalled. This fix ensures that the actual calculation time steps are synchronized across all processes such that they remain in lockstep."
description = "The BMI interface's get\\_grid\\_model\\_type function worked only for numerical model types such as GWF, GWT, and GWE, but would crash for PRT models. Fix the function's implementation to work with all model types."
0 commit comments