Commit 090ef2d1 authored by tomswinburne's avatar tomswinburne
Browse files

merge error fix

parent 9bdb7b5b
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -145,8 +145,6 @@ Required hardware/software

When using Intel compilers version 16.0 or later is required.

When using Intel compilers version 16.0 or later is required.

In order to use offload to co-processors, an Intel Xeon Phi
co-processor and an Intel compiler are required.

+0 −8
Original line number Diff line number Diff line
@@ -136,14 +136,6 @@ so that the selected fix continues in an uninterrupted fashion. The
random number generator state can only be restored when the number
of processors remains unchanged from what is recorded in the restart file.

These fixes write the cumulative global energy change and the
random number generator states to :doc:`binary restart files <restart>`.
See the :doc:`read_restart <read_restart>` command for info on how to
re-specify a fix in an input script that reads a restart file,
so that the selected fix continues in an uninterrupted fashion.  The
random number generator state can only be restored when the number
of processors remains unchanged from what is recorded in the restart file.

No information about these fixes are written to :doc:`binary restart files <restart>`.

The :doc:`fix_modify <fix_modify>` *temp* option is supported by these