Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Fixes # (issue)
# Checklist

- [ ] I have performed a self-review of my own code
- [ ] I have run [clang-format](https://docs.openmc.org/en/latest/devguide/styleguide.html#automatic-formatting) (version 15) on any C++ source files (if applicable)
- [ ] I have run [clang-format](https://docs.openmc.org/en/latest/devguide/styleguide.html#automatic-formatting) (version 18) on any C++ source files (if applicable)
- [ ] I have followed the [style guidelines](https://docs.openmc.org/en/latest/devguide/styleguide.html#python) for Python source files (if applicable)
- [ ] I have made corresponding changes to the documentation (if applicable)
- [ ] I have added tests that prove my fix is effective or that my feature works (if applicable)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
style: file
files-changed-only: true
tidy-checks: '-*'
version: '15' # clang-format version
version: '18' # clang-format version
format-review: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'cpp-format-suggest') }}
passive-reviews: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'cpp-format-suggest') }}
file-annotations: true
Expand Down
4 changes: 2 additions & 2 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ When modifying C++ public APIs, update corresponding ctypes signatures in `openm
- **Include order**: Related header first, then C/C++ stdlib, third-party libs, local headers
- **Comments**: C++-style (`//`) only, never C-style (`/* */`)
- **Standard**: C++17 features allowed
- **Formatting**: Run `clang-format` (version 15) before committing; install via `tools/dev/install-commit-hooks.sh`
- **Formatting**: Run `clang-format` (version 18) before committing; install via `tools/dev/install-commit-hooks.sh`

### Python Style
- **PEP8** compliant
Expand Down Expand Up @@ -295,4 +295,4 @@ Check for optional features:
2. **ID conflicts**: Python objects with duplicate IDs trigger `IDWarning`, use `reset_auto_ids()` between tests
3. **MPI builds**: Code must work with and without MPI; use `#ifdef OPENMC_MPI` guards
4. **Path handling**: Use `pathlib.Path` in new Python code, not `os.path`
5. **Clang-format version**: CI uses version 15; other versions may produce different formatting
5. **Clang-format version**: CI uses version 18; other versions may produce different formatting
2 changes: 1 addition & 1 deletion docs/source/devguide/styleguide.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ whenever a file is saved. For example, `Visual Studio Code
support for running clang-format.

.. note::
OpenMC's CI uses `clang-format` version 15. A different version of `clang-format`
OpenMC's CI uses `clang-format` version 18. A different version of `clang-format`
may produce different line changes and as a result fail the CI test.

Miscellaneous
Expand Down
2 changes: 1 addition & 1 deletion include/openmc/volume_calc.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class VolumeCalculation {
vector<double> atoms; //!< Number of atoms for each nuclide
vector<double> uncertainty; //!< Uncertainty on number of atoms
int iterations; //!< Number of iterations needed to obtain the results
}; // Results for a single domain
}; // Results for a single domain

// Constructors
VolumeCalculation(pugi::xml_node node);
Expand Down
2 changes: 1 addition & 1 deletion src/mgxs.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ Mgxs::Mgxs(const std::string& in_name, const vector<double>& mat_kTs,
}
}
} // end switch
} // end microscopic temperature loop
} // end microscopic temperature loop

// Now combine the microscopic data at each relevant temperature
// We will do this by treating the multiple temperatures of a nuclide as
Expand Down
Loading