diff --git a/emmet-api/emmet/api/routes/materials/elasticity/query_operators.py b/emmet-api/emmet/api/routes/materials/elasticity/query_operators.py index 0b689ac7f1..fd3c94cc64 100644 --- a/emmet-api/emmet/api/routes/materials/elasticity/query_operators.py +++ b/emmet-api/emmet/api/routes/materials/elasticity/query_operators.py @@ -41,9 +41,9 @@ def query( crit = defaultdict(dict) # type: dict d = { - "elasticity.k_voigt": [k_voigt_min, k_voigt_max], - "elasticity.k_reuss": [k_reuss_min, k_reuss_max], - "elasticity.k_vrh": [k_vrh_min, k_vrh_max], + "bulk_modulus.voigt": [k_voigt_min, k_voigt_max], + "bulk_modulus.reuss": [k_reuss_min, k_reuss_max], + "bulk_modulus.vrh": [k_vrh_min, k_vrh_max], } for entry in d: @@ -91,9 +91,9 @@ def query( crit = defaultdict(dict) # type: dict d = { - "elasticity.g_voigt": [g_voigt_min, g_voigt_max], - "elasticity.g_reuss": [g_reuss_min, g_reuss_max], - "elasticity.g_vrh": [g_vrh_min, g_vrh_max], + "shear_modulus.voigt": [g_voigt_min, g_voigt_max], + "shear_modulus.reuss": [g_reuss_min, g_reuss_max], + "shear_modulus.vrh": [g_vrh_min, g_vrh_max], } for entry in d: @@ -134,11 +134,11 @@ def query( crit = defaultdict(dict) # type: dict d = { - "elasticity.universal_anisotropy": [ + "universal_anisotropy": [ elastic_anisotropy_min, elastic_anisotropy_max, ], - "elasticity.homogeneous_poisson": [poisson_min, poisson_max], + "homogeneous_poisson": [poisson_min, poisson_max], } for entry in d: diff --git a/emmet-api/emmet/api/routes/materials/elasticity/resources.py b/emmet-api/emmet/api/routes/materials/elasticity/resources.py index cdc1ccefeb..a16044a884 100644 --- a/emmet-api/emmet/api/routes/materials/elasticity/resources.py +++ b/emmet-api/emmet/api/routes/materials/elasticity/resources.py @@ -1,5 +1,5 @@ from maggma.api.resource import ReadOnlyResource -from emmet.core.elasticity_legacy import ElasticityDoc +from emmet.core.elasticity import ElasticityDoc from emmet.api.core.global_header import GlobalHeaderProcessor from maggma.api.query_operator import PaginationQuery, SortQuery, SparseFieldsQuery from emmet.api.routes.materials.elasticity.query_operators import ( diff --git a/emmet-api/tests/materials/elasticity/test_query_operators.py b/emmet-api/tests/materials/elasticity/test_query_operators.py index 2b0dd859a3..6fd265ebd6 100644 --- a/emmet-api/tests/materials/elasticity/test_query_operators.py +++ b/emmet-api/tests/materials/elasticity/test_query_operators.py @@ -21,7 +21,7 @@ def test_bulk_modulus_query(): k_vrh_max=5, ) - fields = ["elasticity.k_voigt", "elasticity.k_reuss", "elasticity.k_vrh"] + fields = ["bulk_modulus.voigt", "bulk_modulus.reuss", "bulk_modulus.vrh"] assert q == {"criteria": {field: {"$gte": 0, "$lte": 5} for field in fields}} @@ -51,7 +51,7 @@ def test_shear_modulus_query(): g_vrh_max=5, ) - fields = ["elasticity.g_voigt", "elasticity.g_reuss", "elasticity.g_vrh"] + fields = ["shear_modulus.voigt", "shear_modulus.reuss", "shear_modulus.vrh"] assert q == {"criteria": {field: {"$gte": 0, "$lte": 5} for field in fields}} @@ -79,7 +79,7 @@ def test_poisson_query(): poisson_max=5, ) - fields = ["elasticity.universal_anisotropy", "elasticity.homogeneous_poisson"] + fields = ["universal_anisotropy", "homogeneous_poisson"] assert q == {"criteria": {field: {"$gte": 0, "$lte": 5} for field in fields}} diff --git a/emmet-builders/emmet/builders/materials/summary.py b/emmet-builders/emmet/builders/materials/summary.py index 67153d83a8..1b7d5550ef 100644 --- a/emmet-builders/emmet/builders/materials/summary.py +++ b/emmet-builders/emmet/builders/materials/summary.py @@ -188,9 +188,7 @@ def get_items(self): ), } - sub_fields = { - HasProps.elasticity.value: "elasticity", - } + sub_fields = {} for collection, sub_field in sub_fields.items(): if data[collection] is not None: