Skip to content

Commit

Permalink
add tests for AtomCenteredBasisSet and AtomCenteredFunction
Browse files Browse the repository at this point in the history
  • Loading branch information
EBB2675 committed Nov 20, 2024
1 parent 0f92eb9 commit e8fb5ef
Show file tree
Hide file tree
Showing 2 changed files with 115 additions and 8 deletions.
14 changes: 6 additions & 8 deletions src/nomad_simulations/schema_packages/basis_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -245,15 +245,13 @@ def normalize(self, archive: 'EntryArchive', logger: 'BoundLogger') -> None:

# Validation: Check that n_primitive matches the lengths of exponents and contraction coefficients
if self.n_primitive is not None:
if len(self.exponents or []) != self.n_primitive:
logger.error(
f"Mismatch in number of exponents: expected {self.n_primitive}, "
f"found {len(self.exponents or [])}."
if self.exponents is not None and len(self.exponents) != self.n_primitive:
raise ValueError(
f"Mismatch in number of exponents: expected {self.n_primitive}, found {len(self.exponents)}."
)
if len(self.contraction_coefficients or []) != self.n_primitive:
logger.error(
f"Mismatch in number of contraction coefficients: expected {self.n_primitive}, "
f"found {len(self.contraction_coefficients or [])}."
if self.contraction_coefficients is not None and len(self.contraction_coefficients) != self.n_primitive:
raise ValueError(
f"Mismatch in number of contraction coefficients: expected {self.n_primitive}, found {len(self.contraction_coefficients)}."
)


Expand Down
109 changes: 109 additions & 0 deletions tests/test_basis_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
APWOrbital,
APWPlaneWaveBasisSet,
AtomCenteredBasisSet,
AtomCenteredFunction,
BasisSetContainer,
MuffinTinRegion,
PlaneWaveBasisSet,
Expand Down Expand Up @@ -418,3 +419,111 @@ def test_quick_step() -> None:
],
}
# TODO: generate a QuickStep generator in the CP2K plugin


@pytest.mark.parametrize(
'basis_set_name, basis_type, role',
[
('cc-pVTZ', 'GTO', 'orbital'),
('def2-TZVP', 'GTO', 'auxiliary_scf'),
('aug-cc-pVDZ', 'STO', 'auxiliary_post_hf'),
('custom_basis', None, None), # Undefined type and role
],
)
def test_atom_centered_basis_set_init(basis_set_name, basis_type, role) -> None:
"""Test initialization of AtomCenteredBasisSet."""
bs = AtomCenteredBasisSet(basis_set=basis_set_name, type=basis_type, role=role)
assert bs.basis_set == basis_set_name
assert bs.type == basis_type
assert bs.role == role


@pytest.mark.parametrize(
'functions',
[
[
AtomCenteredFunction(
basis_type='spherical',
function_type='s',
n_primitive=3,
exponents=[1.0, 2.0, 3.0],
contraction_coefficients=[0.5, 0.3, 0.2],
),
],
[
AtomCenteredFunction(
basis_type='cartesian',
function_type='p',
n_primitive=1,
exponents=[0.5],
contraction_coefficients=[1.0],
),
AtomCenteredFunction(
basis_type='spherical',
function_type='d',
n_primitive=2,
exponents=[1.0, 2.0],
contraction_coefficients=[0.4, 0.6],
),
],
],
)
def test_atom_centered_basis_set_functional_composition(functions) -> None:
"""Test functional composition within AtomCenteredBasisSet."""
bs = AtomCenteredBasisSet(functional_composition=functions)
assert len(bs.functional_composition) == len(functions)
for f, ref_f in zip(bs.functional_composition, functions):
assert f.basis_type == ref_f.basis_type
assert f.function_type == ref_f.function_type
assert f.n_primitive == ref_f.n_primitive
assert np.allclose(f.exponents, ref_f.exponents)
assert np.allclose(f.contraction_coefficients, ref_f.contraction_coefficients)


def test_atom_centered_basis_set_normalize() -> None:
"""Test normalization of AtomCenteredBasisSet."""
bs = AtomCenteredBasisSet(
basis_set='cc-pVTZ',
type='GTO',
role='orbital',
functional_composition=[
AtomCenteredFunction(
basis_type='spherical',
function_type='s',
n_primitive=2,
exponents=[1.0, 2.0],
contraction_coefficients=[0.5, 0.5],
)
],
)
bs.normalize(None, logger)
# Add checks for normalized behavior, if any
assert bs.basis_set == 'cc-pVTZ'

def test_atom_centered_basis_set_invalid_data() -> None:
"""Test behavior with missing or invalid data."""
bs = AtomCenteredBasisSet(
basis_set='invalid_basis',
type=None, # Missing type
role=None, # Missing role
)
assert bs.basis_set == 'invalid_basis'
assert bs.type is None
assert bs.role is None

# Test functional composition with invalid data
invalid_function = AtomCenteredFunction(
basis_type='spherical',
function_type='s',
n_primitive=2,
exponents=[1.0], # Mismatched length
contraction_coefficients=[0.5, 0.5],
)
bs.functional_composition = [invalid_function]

# Call normalize to trigger validation
with pytest.raises(ValueError, match="Mismatch in number of exponents"):
invalid_function.normalize(None, logger)



1 comment on commit e8fb5ef

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Coverage

Coverage Report
FileStmtsMissCoverMissing
src/nomad_simulations
   __init__.py4250%3–4
   _version.py11282%5–6
src/nomad_simulations/schema_packages
   __init__.py15287%39–41
   atoms_state.py1902189%13–15, 201–204, 228, 283–284, 352–353, 355, 537, 549–550, 611–615, 630–634, 641
   basis_set.py2552989%8–9, 122–133, 172–185, 252–253, 481–485, 507–508, 552–555, 674, 705, 707
   general.py89891%4–7, 121, 185, 295–296, 306
   model_method.py2737971%10–12, 171–174, 177–184, 276–277, 297, 318–339, 355–381, 384–401, 587, 780, 791, 833–840, 878, 897, 977, 1034, 1109, 1223, 1236
   model_system.py3483789%45–51, 235, 254, 258, 261, 264, 290, 376–377, 454–455, 472–473, 686–689, 736–743, 917–918, 1140–1144, 1150–1151, 1159–1160, 1165, 1188
   numerical_settings.py2746477%12–14, 133, 204, 274, 276–277, 280–283, 287–288, 295–298, 307–310, 314–317, 319–322, 327–330, 336–339, 526–553, 628, 663–666, 690, 693, 738, 740–743, 747, 751, 798, 802–823, 878–879, 946, 968
   outputs.py1201092%9–10, 252–255, 295–298, 323, 325, 362, 381
   physical_property.py102793%20–22, 202, 331–333
   variables.py861286%8–10, 98, 121, 145, 167, 189, 211, 233, 256, 276
src/nomad_simulations/schema_packages/properties
   band_gap.py51590%8–10, 135–136
   band_structure.py1232580%9–11, 232–265, 278, 285, 321–322, 325, 372–373, 378
   energies.py42979%7–9, 36, 57, 82, 103, 119, 134
   fermi_surface.py17476%7–9, 40
   forces.py22673%7–9, 36, 56, 79
   greens_function.py991387%7–9, 210–211, 214, 235–236, 239, 260–261, 264, 400
   hopping_matrix.py29583%7–9, 58, 94
   permittivity.py48883%7–9, 97–105
   spectral_profile.py26012851%9–11, 57–60, 95–98, 199–300, 356–368, 393–396, 416, 421–424, 466–502, 526, 573–576, 592–593, 598–604
   thermodynamics.py752764%7–9, 35, 56, 72, 81, 90, 101, 110, 137, 147, 157, 172–174, 177, 193, 213–215, 218, 234, 254–256, 259
src/nomad_simulations/schema_packages/utils
   utils.py791680%8–11, 65–74, 83–84, 89, 92, 169–170
TOTAL262351980% 

Tests Skipped Failures Errors Time
410 0 💤 0 ❌ 0 🔥 6.103s ⏱️

Please sign in to comment.