Skip to content

Commit

Permalink
Merge pull request #1537 from glotzerlab/release-3.11.0
Browse files Browse the repository at this point in the history
Release 3.11.0
  • Loading branch information
joaander authored Apr 14, 2023
2 parents 948eb6d + 5725264 commit ee8897a
Show file tree
Hide file tree
Showing 15 changed files with 34 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 3.10.0
current_version = 3.11.0
commit = False
tag = False
parse = ^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))(?:\.(?P<number>0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)))?$
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ body:
attributes:
label: HOOMD-blue version
description: What version of HOOMD-blue are you using?
placeholder: 3.10.0
placeholder: 3.11.0
validations:
required: true
- type: markdown
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.2
with:
fetch-depth: 0
submodules: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Run stale action
uses: actions/stale@v7.0.0
uses: actions/stale@v8.0.0
with:
operations-per-run: 120
delete-branch: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/templates/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.2
with:
fetch-depth: 0
submodules: true
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/templates/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ env:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.2
with:
path: code
submodules: true
Expand Down Expand Up @@ -209,7 +209,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Use jetstream2-admin/start
uses: glotzerlab/jetstream2-admin/[email protected].1
uses: glotzerlab/jetstream2-admin/[email protected].2
with:
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Use jetstream2-admin/start
uses: glotzerlab/jetstream2-admin/[email protected].1
uses: glotzerlab/jetstream2-admin/[email protected].2
with:
OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.2
with:
path: code
submodules: true
Expand Down Expand Up @@ -192,7 +192,7 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.2
with:
path: code
submodules: true
Expand Down Expand Up @@ -255,7 +255,7 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.2
with:
path: code
submodules: true
Expand Down Expand Up @@ -305,7 +305,7 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.2
with:
path: code
submodules: true
Expand Down Expand Up @@ -370,7 +370,7 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.2
with:
path: code
submodules: true
Expand Down Expand Up @@ -487,7 +487,7 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.2
with:
path: code
submodules: true
Expand Down Expand Up @@ -559,7 +559,7 @@ jobs:
run: ( shopt -s dotglob nullglob; rm -rf ./* )
shell: bash
- name: Checkout
uses: actions/checkout@v3.3.0
uses: actions/checkout@v3.5.2
with:
path: code
submodules: true
Expand Down
2 changes: 2 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,5 @@ Raymond Asare <[email protected]> rayasare <[email protected]>
Marco Klement <[email protected]> Marco Klement, M.Sc <[email protected]>
Chris Jones <[email protected]> <[email protected]>
Melody Zhang <[email protected]> Melody Zhang <[email protected]>
Jen Bradley <[email protected]> Jen Bradley <[email protected]>
Jen Bradley <[email protected]> janbridley <[email protected]>
4 changes: 2 additions & 2 deletions BUILDING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ Clone using Git_::

$ git clone --recursive https://github.com/glotzerlab/hoomd-blue

Release tarballs are also available as `GitHub release`_ assets: `Download hoomd-v3.10.0.tar.gz`_.
Release tarballs are also available as `GitHub release`_ assets: `Download hoomd-v3.11.0.tar.gz`_.

.. seealso::

Expand All @@ -158,7 +158,7 @@ Release tarballs are also available as `GitHub release`_ assets: `Download hoomd
Execute ``git submodule update --init`` to fetch the submodules each time you switch branches
and the submodules show as modified.

.. _Download hoomd-v3.10.0.tar.gz: https://github.com/glotzerlab/hoomd-blue/releases/download/v3.10.0/hoomd-v3.10.0.tar.gz
.. _Download hoomd-v3.11.0.tar.gz: https://github.com/glotzerlab/hoomd-blue/releases/download/v3.11.0/hoomd-v3.11.0.tar.gz
.. _GitHub release: https://github.com/glotzerlab/hoomd-blue/releases
.. _git book: https://git-scm.com/book
.. _Git: https://git-scm.com/
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ Change Log
v3.x
----

v3.11.0 (not yet released)
^^^^^^^^^^^^^^^^^^^^^^^^^^
v3.11.0 (2023-04-14)
^^^^^^^^^^^^^^^^^^^^

Added:

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ add_subdirectory (CMake)

################################
## Version information
set(HOOMD_VERSION_RAW "3.10.0")
set(HOOMD_VERSION_RAW "3.11.0")
string(REGEX MATCH "(.*)\\.(.*)\\.(.*)$" _hoomd_version_match ${HOOMD_VERSION_RAW})
set(HOOMD_VERSION_MAJOR ${CMAKE_MATCH_1})
set(HOOMD_VERSION_MINOR ${CMAKE_MATCH_2})
Expand Down
14 changes: 7 additions & 7 deletions hoomd/hpmc/ComputeSDF.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,11 @@ template<class Shape> class ComputeSDF : public Compute
double m_xmax; //!< Maximum lambda value
double m_dx; //!< Histogram step size

bool m_shape_requires_expansion_moves; //!< If expansion moves are required
std::vector<double> m_hist_compression; //!< Raw histogram data
std::vector<double> m_sdf_compression; //!< Computed SDF
std::vector<double> m_hist_expansion; //!< Raw histogram data
std::vector<double> m_sdf_expansion; //!< Computed SDF
bool m_shape_requires_expansion_moves; //!< If expansion moves are required
std::vector<double> m_hist_compression; //!< Raw histogram data
std::vector<double> m_sdf_compression; //!< Computed SDF
std::vector<double> m_hist_expansion; //!< Raw histogram data
std::vector<double> m_sdf_expansion; //!< Computed SDF

//! Find the maximum particle separation beyond which all interactions are zero
Scalar getMaxInteractionDiameter();
Expand Down Expand Up @@ -591,7 +591,7 @@ template<class Shape> void ComputeSDF<Shape>::countHistogramLinearSearch(uint64_
{
hist_weight_ptl_i_compression = 1.0; // = 1-e^(-\infty)
min_bin_compression = bin_to_sample;
} // end if (hard_overlap)
} // end if (hard_overlap)

// if no hard overlap, check for a soft overlap if we have
// patches
Expand Down Expand Up @@ -644,7 +644,7 @@ template<class Shape> void ComputeSDF<Shape>::countHistogramLinearSearch(uint64_
{
hist_weight_ptl_i_expansion = 1.0; // = 1-e^(-\infty)
min_bin_expansion = bin_to_sample;
} // end if (hard_overlap)
} // end if (hard_overlap)

// if no hard overlap, check for a soft overlap if necessary
if (!hard_overlap && m_mc->getPatchEnergy())
Expand Down
4 changes: 2 additions & 2 deletions hoomd/hpmc/external/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ class CPPExternalPotential(ExternalField):
Your code *must* return a value.
.. _VectorMath.h: https://github.com/glotzerlab/hoomd-blue/blob/\
v3.10.0/hoomd/VectorMath.h
v3.11.0/hoomd/VectorMath.h
.. _BoxDim.h: https://github.com/glotzerlab/hoomd-blue/blob/\
v3.10.0/hoomd/BoxDim.h
v3.11.0/hoomd/BoxDim.h
Example:
.. code-block:: python
Expand Down
2 changes: 1 addition & 1 deletion hoomd/hpmc/pair/user.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class CPPPotentialBase(AutotunedObject):
HOOMD-blue source code.
.. _VectorMath.h: https://github.com/glotzerlab/hoomd-blue/blob/\
v3.10.0/hoomd/VectorMath.h
v3.11.0/hoomd/VectorMath.h
Note:
Your code *must* return a value.
Expand Down
4 changes: 2 additions & 2 deletions sphinx-doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
copyright = f'2009-{ year } The Regents of the University of Michigan'
author = 'The Regents of the University of Michigan'

version = '3.10.0'
release = '3.10.0'
version = '3.11.0'
release = '3.11.0'

language = 'en'

Expand Down

0 comments on commit ee8897a

Please sign in to comment.