merging changes in correct place

parent 29984947
......@@ -4,7 +4,7 @@
"meta_description":[
"Species of the atom (normally the atomic number Z, 0 or negative for ",
"unidentifed species or particles that are not ",
"atoms."],
"atoms)."],
"meta_parent_section":"section_topology",
"meta_abstract_types":[
"derived_quantity"],
......
{
"meta_name":"meta_query_description",
"meta_type":"type-value",
"meta_description":[
"Description of the field to be shown instead of meta_description when this field is used for querying"],
"meta_parent_section":"meta_info_entry",
"meta_data_type":"string"
}
......@@ -2,8 +2,8 @@
"meta_name":"calculation_uploader_name",
"meta_type":"type-value",
"meta_description":[
"Name of the uploader of this calculation, given as lastamen, ",
"firstname"],
"Name of the uploader of this calculation, given as 'firstName ",
"lastName'"],
"meta_parent_section":"section_calculation_info",
"meta_data_type":"string",
"meta_repeats":true
......
......@@ -8,6 +8,7 @@
"same method. The allowed strings are given in the [electronic structure method ",
"wiki page](https://gitlab.mpcdf.mpg.de/nomad-lab/nomad-meta-info/wikis/metainfo/",
"electronic-structure-method)."],
"meta_query_description":"String identifying (one of) the electronic structre method used in the calculation.",
"meta_parent_section":"section_method",
"meta_abstract_types":[
"settings_xc"],
......
......@@ -4,6 +4,7 @@
"meta_description":[
"Composition, i.e. cumulative chemical formula with atoms ordered by decreasing ",
"atomic number Z."],
"meta_query_description":"String identifying (one of) the electronic structre method used in the calculation.",
"meta_parent_section":"section_system",
"meta_abstract_types":[
"derived_quantity"],
......
......@@ -2,6 +2,7 @@
"meta_name":"system_configuration_consistent",
"meta_type":"type-value",
"meta_description":"Flag set is the configuration is consistent",
"meta_query_description":"Chemical composition, given as element name followed by its stoichiometric number, in any order. This formula is scale invariant, with respect to the number of atoms in the simulation cell. E.g., H2O yields systems where only one water molecule is present, as well as 64.",
"meta_parent_section":"section_system",
"meta_abstract_types":[
"derived_quantity"],
......
{
"meta_name":"system_type",
"meta_type":"type-value",
"meta_description":"Type of the system ",
"meta_description":"Type of the system.",
"meta_parent_section":"section_system",
"meta_abstract_types":[
"derived_quantity"],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment