Skip to content
Snippets Groups Projects
Commit 1de06cba authored by Mohamed, Fawzi Roberto (fawzi)'s avatar Mohamed, Fawzi Roberto (fawzi)
Browse files

meta 2.0 changes

parent bcb49a0b
No related branches found
No related tags found
No related merge requests found
...@@ -98,7 +98,7 @@ object RepoTagsNormalizer extends ExternalNormalizerGenerator( ...@@ -98,7 +98,7 @@ object RepoTagsNormalizer extends ExternalNormalizerGenerator(
case Calculation(archiveSet, c) => case Calculation(archiveSet, c) =>
val programNames: Set[String] = (for (v <- c.valueTable(Seq("section_run", "program_name"))) yield (v.stringValue))(breakOut) val programNames: Set[String] = (for (v <- c.valueTable(Seq("section_run", "program_name"))) yield (v.stringValue))(breakOut)
val programVersions: Set[String] = (for (v <- c.valueTable(Seq("section_run", "program_version"))) yield (v.stringValue))(breakOut) val programVersions: Set[String] = (for (v <- c.valueTable(Seq("section_run", "program_version"))) yield (v.stringValue))(breakOut)
val xcFunctionals: Set[String] = (for (v <- c.valueTable(Seq("section_run", "section_method", "section_XC_functionals", "XC_functional_name"))) yield (v.stringValue))(breakOut) val xcFunctionals: Set[String] = (for (v <- c.valueTable(Seq("section_run", "section_method", "section_xc_functionals", "xc_functional_name"))) yield (v.stringValue))(breakOut)
val electronicStructureMethods: Set[String] = (for (v <- c.valueTable(Seq("section_run", "section_method", "electronic_structure_method"))) yield (v.stringValue))(breakOut) val electronicStructureMethods: Set[String] = (for (v <- c.valueTable(Seq("section_run", "section_method", "electronic_structure_method"))) yield (v.stringValue))(breakOut)
val singleConfSections = c.sectionTable(Seq("section_run", "section_single_configuration_calculation")) val singleConfSections = c.sectionTable(Seq("section_run", "section_single_configuration_calculation"))
val nEnergyEvaluations = singleConfSections.lengthL val nEnergyEvaluations = singleConfSections.lengthL
...@@ -132,7 +132,7 @@ object RepoTagsNormalizer extends ExternalNormalizerGenerator( ...@@ -132,7 +132,7 @@ object RepoTagsNormalizer extends ExternalNormalizerGenerator(
writeOut(s"""{ writeOut(s"""{
"program_name": ${JsonUtils.normalizedStr(jn.JArray(programNames.map(jn.JString(_))(breakOut)))}, "program_name": ${JsonUtils.normalizedStr(jn.JArray(programNames.map(jn.JString(_))(breakOut)))},
"program_version": ${JsonUtils.normalizedStr(jn.JArray(programVersions.map(jn.JString(_))(breakOut)))}, "program_version": ${JsonUtils.normalizedStr(jn.JArray(programVersions.map(jn.JString(_))(breakOut)))},
"XC_functional_name": ${JsonUtils.normalizedStr(jn.JArray(xcFunctionals.map(jn.JString(_))(breakOut)))}, "xc_functional_name": ${JsonUtils.normalizedStr(jn.JArray(xcFunctionals.map(jn.JString(_))(breakOut)))},
"electronic_structure_method": ${JsonUtils.normalizedStr(jn.JArray(electronicStructureMethods.map(jn.JString(_))(breakOut)))}, "electronic_structure_method": ${JsonUtils.normalizedStr(jn.JArray(electronicStructureMethods.map(jn.JString(_))(breakOut)))},
"section_single_confguration_calculation.length": ${nEnergyEvaluations}, "section_single_confguration_calculation.length": ${nEnergyEvaluations},
"energy_total.last": ${lastEnergy.getOrElse("null")}, "energy_total.last": ${lastEnergy.getOrElse("null")},
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment