-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix
HoppingMatrix
with new schema (#61)
* Added HoppingMatrix, CrystalFieldSplitting to properties Added WignerSeitz to variables Removed common.py module * Added HoppingMatrix and CrystalFieldSplittings to Outputs list of properties * Added testing * Added todo in HoppingMatrix
- Loading branch information
1 parent
a7412b2
commit efceab6
Showing
6 changed files
with
210 additions
and
75 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -24,3 +24,4 @@ | |
ElectronicDensityOfStates, | ||
XASSpectra, | ||
) | ||
from .hopping_matrix import HoppingMatrix, CrystalFieldSplitting |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,106 @@ | ||
# | ||
# Copyright The NOMAD Authors. | ||
# | ||
# This file is part of NOMAD. See https://nomad-lab.eu for further info. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
import numpy as np | ||
|
||
from nomad.metainfo import Quantity, Section, Context | ||
|
||
from ..physical_property import PhysicalProperty | ||
|
||
|
||
class HoppingMatrix(PhysicalProperty): | ||
""" | ||
Transition probability between two atomic orbitals in a tight-binding model. | ||
""" | ||
|
||
iri = 'http://fairmat-nfdi.eu/taxonomy/HoppingMatrix' | ||
|
||
n_orbitals = Quantity( | ||
type=np.int32, | ||
description=""" | ||
Number of orbitals in the tight-binding model. | ||
""", | ||
) | ||
|
||
degeneracy_factors = Quantity( | ||
type=np.int32, | ||
shape=['*'], | ||
description=""" | ||
Degeneracy of each Wigner-Seitz point. | ||
""", | ||
) | ||
|
||
value = Quantity( | ||
type=np.complex128, | ||
unit='joule', | ||
description=""" | ||
Value of the hopping matrix in joules. The elements are complex numbers defined for each Wigner-Seitz point and | ||
each pair of orbitals; thus, `rank = [n_orbitals, n_orbitals]`. Note this contains also the onsite values, i.e., | ||
it includes the Wigner-Seitz point (0, 0, 0), hence the `CrystalFieldSplitting` values. | ||
""", | ||
) | ||
|
||
def __init__( | ||
self, m_def: Section = None, m_context: Context = None, **kwargs | ||
) -> None: | ||
super().__init__(m_def, m_context, **kwargs) | ||
# ! n_orbitals need to be set up during initialization of the class | ||
self.rank = ( | ||
[] if self.n_orbitals is None else [self.n_orbitals, self.n_orbitals] | ||
) | ||
self.name = self.m_def.name | ||
|
||
# TODO add normalization to extract DOS, band structure, etc, properties from `HoppingMatrix` | ||
|
||
def normalize(self, archive, logger) -> None: | ||
super().normalize(archive, logger) | ||
|
||
|
||
class CrystalFieldSplitting(PhysicalProperty): | ||
""" | ||
Energy difference between the degenerated orbitals of an ion in a crystal field environment. | ||
""" | ||
|
||
iri = 'http://fairmat-nfdi.eu/taxonomy/CrystalFieldSplitting' | ||
|
||
n_orbitals = Quantity( | ||
type=np.int32, | ||
description=""" | ||
Number of orbitals in the tight-binding model. | ||
""", | ||
) | ||
|
||
value = Quantity( | ||
type=np.float64, | ||
unit='joule', | ||
description=""" | ||
Value of the crystal field splittings in joules. This is the intra-orbital local contribution, i.e., the same orbital | ||
at the same Wigner-Seitz point (0, 0, 0). | ||
""", | ||
) | ||
|
||
def __init__( | ||
self, m_def: Section = None, m_context: Context = None, **kwargs | ||
) -> None: | ||
super().__init__(m_def, m_context, **kwargs) | ||
# ! n_orbitals need to be set up during initialization of the class | ||
self.rank = [] if self.n_orbitals is None else [self.n_orbitals] | ||
self.name = self.m_def.name | ||
|
||
def normalize(self, archive, logger) -> None: | ||
super().normalize(archive, logger) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,70 @@ | ||
# | ||
# Copyright The NOMAD Authors. | ||
# | ||
# This file is part of NOMAD. See https://nomad-lab.eu for further info. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
import pytest | ||
import numpy as np | ||
|
||
from nomad_simulations.properties import HoppingMatrix, CrystalFieldSplitting | ||
|
||
|
||
class TestHoppingMatrix: | ||
""" | ||
Test the `HoppingMatrix` class defined in `properties/hopping_matrix.py`. | ||
""" | ||
|
||
# ! Include this initial `test_default_quantities` method when testing your PhysicalProperty classes | ||
@pytest.mark.parametrize( | ||
'n_orbitals, rank', | ||
[ | ||
(None, []), | ||
(3, [3, 3]), | ||
], | ||
) | ||
def test_default_quantities(self, n_orbitals: int, rank: list): | ||
""" | ||
Test the default quantities assigned when creating an instance of the `HoppingMatrix` class. | ||
""" | ||
hopping_matrix = HoppingMatrix(n_orbitals=n_orbitals) | ||
assert hopping_matrix.iri == 'http://fairmat-nfdi.eu/taxonomy/HoppingMatrix' | ||
assert hopping_matrix.name == 'HoppingMatrix' | ||
assert hopping_matrix.rank == rank | ||
|
||
|
||
class TestCrystalFieldSplitting: | ||
""" | ||
Test the `CrystalFieldSplitting` class defined in `properties/hopping_matrix.py`. | ||
""" | ||
|
||
# ! Include this initial `test_default_quantities` method when testing your PhysicalProperty classes | ||
@pytest.mark.parametrize( | ||
'n_orbitals, rank', | ||
[ | ||
(None, []), | ||
(3, [3]), | ||
], | ||
) | ||
def test_default_quantities(self, n_orbitals: int, rank: list): | ||
""" | ||
Test the default quantities assigned when creating an instance of the `CrystalFieldSplitting` class. | ||
""" | ||
crystal_field = CrystalFieldSplitting(n_orbitals=n_orbitals) | ||
assert ( | ||
crystal_field.iri == 'http://fairmat-nfdi.eu/taxonomy/CrystalFieldSplitting' | ||
) | ||
assert crystal_field.name == 'CrystalFieldSplitting' | ||
assert crystal_field.rank == rank |