Skip to content

Commit a1d1f96

Browse files
committed
Merge remote-tracking branch 'origin/main' into docs-up
2 parents 548fed9 + 915ed3e commit a1d1f96

File tree

4 files changed

+7
-1
lines changed

4 files changed

+7
-1
lines changed

docs/Project.toml

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ NQCDistributions = "657014a1-bd25-4aa2-92cb-cbcede0310ad"
1818
NQCDynamics = "36248dfb-79eb-4f4d-ab9c-e29ea5f33e14"
1919
NQCModels = "c814dc9f-a51f-4eaf-877f-82eda4edad48"
2020
Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
21-
PyCall = "438e738f-606a-5dbb-bf0a-cddfbfd45ab0"
2221
PythonCall = "6099a3de-0909-46bc-b1f4-468b9a2dfc0d"
2322
RingPolymerArrays = "81cd853e-d334-476c-b156-f95acc8a32dc"
2423
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"

docs/make.jl

+3
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ end
2727
assets=["assets/favicon.ico", "assets/citations.css"],
2828
size_threshold = 5000*1024,
2929
example_size_threshold = 8000*1024,
30+
size_threshold = 5000*1024,
31+
example_size_threshold = 8000*1024,
3032
),
3133
authors="James Gardner and contributors.",
3234
pages=[
@@ -38,6 +40,7 @@ end
3840
"NQCModels.jl" => Any[
3941
"NQCModels/overview.md"
4042
"NQCModels/combining_models.md"
43+
"NQCModels/combining_models.md"
4144
"NQCModels/analyticmodels.md"
4245
"NQCModels/machinelearningmodels.md"
4346
"NQCModels/fullsizemodels.md"

docs/src/NQCModels/machinelearningmodels.md

+3
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,13 @@ h2.set_calculator(calc)
9090
We can obtain the energies and forces from `ase` directly in the usual way, converting
9191
them to atomic units using [UnitfulAtomic](https://github.com/sostock/UnitfulAtomic.jl).
9292

93+
9394
```julia-repl
9495
using Unitful, UnitfulAtomic;
9596
austrip(pyconvert(Float64,h2.get_total_energy()) * u"eV")
9697
austrip.(pyconvert(Matrix{Float64}, h2.get_forces()) .* u"eV/Å")
98+
austrip(pyconvert(Float64,h2.get_total_energy()) * u"eV")
99+
austrip.(pyconvert(Matrix{Float64}, h2.get_forces()) .* u"eV/Å")
97100
```
98101

99102
!!! warning

docs/src/examples/reactive_scattering.md

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ surface (`height` keyword) with a normal incidence.
3232
As usual, all quantities default to atomic units. Here we use [Unitful](https://painterqubits.github.io/Unitful.jl/stable/)
3333
to input the translational energy and height using different units, where they are later converted internally.
3434

35+
```julia @example h2scatter
3536
```julia @example h2scatter
3637
using NQCDynamics
3738
using Unitful

0 commit comments

Comments
 (0)