Skip to content

Commit cca109f

Browse files
committed
minor adjustments to Mesh and NumericalIntegration
1 parent 646430c commit cca109f

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

src/nomad_simulations/schema_packages/model_method.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,7 @@ def normalize(self, archive: 'EntryArchive', logger: 'BoundLogger') -> None:
12241224

12251225

12261226
class MolecularHamiltonianSubTerms(BaseModelMethod):
1227-
type=Quantity(
1227+
type = Quantity(
12281228
type=MEnum('coulomb', 'exchange'),
12291229
description="""
12301230
Typical sub-terms of the molecular hamiltonian.
@@ -1233,4 +1233,4 @@ class MolecularHamiltonianSubTerms(BaseModelMethod):
12331233
)
12341234

12351235
def normalize(self, archive: 'EntryArchive', logger: 'BoundLogger') -> None:
1236-
super().normalize(archive, logger)
1236+
super().normalize(archive, logger)

src/nomad_simulations/schema_packages/numerical_settings.py

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ class Mesh(ArchiveSection):
9292
""",
9393
)
9494

95+
spacing = Quantity(
96+
type=np.float64,
97+
shape=['dimensionality'],
98+
description='Grid spacing for equidistant meshes. Ignored for other kinds.',
99+
)
100+
95101
points = Quantity(
96102
type=np.complex128,
97103
shape=['n_points', 'dimensionality'],
@@ -117,14 +123,16 @@ class Mesh(ArchiveSection):
117123
In the fixed grid methods, the number of angular grid points is predetermined for
118124
ranges of radial grid points, while in the adaptive methods, the angular grid is adjusted
119125
on-the-fly for each radial point according to some accuracy criterion.
120-
"""
126+
""",
121127
)
122128

123129
def normalize(self, archive: 'EntryArchive', logger: 'BoundLogger') -> None:
124130
super().normalize(archive, logger)
125131

126132
if self.dimensionality not in [1, 2, 3]:
127-
logger.error('`dimensionality` meshes different than 1, 2, or 3 are not supported.')
133+
logger.error(
134+
'`dimensionality` meshes different than 1, 2, or 3 are not supported.'
135+
)
128136

129137

130138
class NumericalIntegration(NumericalSettings):
@@ -145,10 +153,10 @@ class NumericalIntegration(NumericalSettings):
145153
"""
146154

147155
coordinate = Quantity(
148-
type=MEnum('all', 'radial', 'angular'),
156+
type=MEnum('full', 'radial', 'angular'),
149157
description="""
150-
Coordinate over which the integration is performed. `all` means the integration is performed in
151-
all the space. `radial` and `angular` describe cases where the integration is performed for
158+
Coordinate over which the integration is performed. `full` means the integration is performed in
159+
entire space. `radial` and `angular` describe cases where the integration is performed for
152160
functions which can be splitted into radial and angular distributions (e.g., orbital wavefunctions).
153161
""",
154162
)
@@ -158,16 +166,16 @@ class NumericalIntegration(NumericalSettings):
158166
description="""
159167
Integration rule used. This can be any 1D Gaussian quadrature rule or multi-dimensional `angular` rules,
160168
e.g., Lebedev quadrature rule (see e.g., Becke, Chem. Phys. 88, 2547 (1988)).
161-
"""
169+
""",
162170
)
163171

164-
weight_partitioning = Quantity(
172+
weight_approximtion = Quantity(
165173
type=str,
166174
description="""
167175
Approximation applied to the weight when doing the numerical integration.
168176
See e.g., C. W. Murray, N. C. Handy
169177
and G. J. Laming, Mol. Phys. 78, 997 (1993).
170-
"""
178+
""",
171179
)
172180

173181
mesh = SubSection(sub_section=Mesh.m_def)
@@ -937,4 +945,4 @@ class GTOIntegralDecomposition(NumericalSettings):
937945
)
938946

939947
def normalize(self, archive: 'EntryArchive', logger: 'BoundLogger') -> None:
940-
super().normalize(archive, logger)
948+
super().normalize(archive, logger)

0 commit comments

Comments
 (0)