Skip to content

Commit 0489ee2

Browse files
committed
Update/fix instructions in README.md
1 parent f345239 commit 0489ee2

File tree

1 file changed

+37
-15
lines changed

1 file changed

+37
-15
lines changed

README.md

Lines changed: 37 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,30 +15,52 @@ based only on the basic mechanisms provided in the main Cantera repository.
1515
> restrictive licensing requirements.
1616
>
1717
> **If you use this data in scientific publications, please cite the original papers**
18-
> associated with each mechanism. Suitable citations are included in the `description`
19-
> field of each mechanism file.
18+
> associated with each mechanism. Suitable citations are usually included in the
19+
> `description` field of each mechanism file.
2020
2121
## Adding files for new examples
2222

23-
To implement an example requiring a new input file, the following steps should be
24-
followed:
23+
To implement an example requiring a new input file, make sure to have forked both
24+
`Cantera/cantera` and `Cantera/cantera-example-data` repositories. Steps outlined below
25+
must use the local Git checkouts of your personal forks.
2526

27+
### Create example and input file(s)
28+
29+
- Create a new feature branch in your personal fork of the `cantera` repository.
2630
- Create your new example in your local Git checkout of Cantera.
27-
- Create the new input file in the `data/example_data` subdirectory.
28-
- Commit the example to a new feature branch.
29-
* :warning: Make sure you _do not_ add the input file or an update of the
31+
- In the `data/example_data` subdirectory (a Git submodule), configure your fork of
32+
`cantera-example-data` as a remote and create a feature branch for your input file(s).
33+
- Create the new input file(s) in the `data/example_data` subdirectory.
34+
- Verify that your example performs as expected locally.
35+
36+
### Commit new files to your forks
37+
38+
- From within the `data/example_data` subdirectory, commit the input file(s) to your
39+
feature branch in your `cantera-example-data` repository.
40+
- From the root folder, commit the example to your feature branch in your `cantera`
41+
repository.
42+
* :warning: Make sure you _do not_ add the input file(s) or an update of the
3043
`example_data` submodule to this branch.
31-
- Commit the input file to a feature branch in the `example_data` submodule.
32-
- Create a pull request for your example in the main Cantera repository
33-
- Create a pull request in the `cantera-example-data` repository which includes the
34-
reference `Cantera/cantera#XYZ` in the title where `XYZ` is the number of your PR in
35-
the main repository.
44+
45+
### Create pull requests on GitHub
46+
47+
- Create a pull request for your example in the main `Cantera/cantera` repository.
48+
* You should see multiple failing jobs. For new Python examples, descriptions start
49+
with `CI / Run Python 3.XX examples on ubuntu-YY.ZZ` for tests with different
50+
Python and ubuntu versions. For examples using other Cantera APIs, multiple other CI
51+
jobs may fail.
52+
- Create a pull request in the `Cantera/cantera-example-data` repository with the
53+
reference `(Cantera/cantera#XYZ)` in the title, where `XYZ` is the
54+
number of your PR in the main repository.
55+
- Subsequent pushes to your feature branch on the main PR will result in the following:
3656
* The CI process in the main repository will automatically check out this submodule
3757
PR so the new input file is available for those jobs that run the examples.
3858
* You should see one failing job, with the description `Linters / Check for unmerged
3959
example-data pull request (pull_request)`. This is a reminder for maintainers for
4060
the remaining steps that need to be completed before merging the PR.
41-
- Once PR reviews are completed and all expected tests pass, the PR on the
42-
`cantera-example-data` can be merged.
61+
- Once the PR review of the `cantera-example-data` branch is completed, it will be
62+
merged by maintainers.
4363
- Finally, the PR branch for the main repository can be updated to include the update
44-
of the `example_data` submodule, and this PR can be merged.
64+
of the `example_data` submodule, which should be reset to the official Cantera
65+
`cantera-example-data` repository. At this point, all CI jobs should pass. Once the
66+
PR review is completed, the PR is ready to be merged.

0 commit comments

Comments
 (0)