Initial Commit

d38e18cb · Berk Onat · d38e18cb · d38e18cb · d38e18cb · d38e18cb
Commit d38e18cb authored Mar 27, 2018 by Berk Onat
--- a/README.md
+++ b/README.md
+# Tinker Parser
+[NOMAD Laboratory CoE](http://nomad-coe.eu) parser for [TINKER](https://dasher.wustl.edu/tinker/)
+## Version 0.0.1
+
+This is the parser for Tinker in [TINKER](https://dasher.wustl.edu/tinker/).
+The official version lives at:
+
+    git@gitlab.mpcdf.mpg.de:nomad-lab/parser-tinker.git
+
+You can browse it at:
+
+    https://gitlab.rzg.mpg.de/nomad-lab/parser-tinker
+
+It relies on having the nomad-meta-info and the python-common repositories one level higher.
+The simplest way to have this is to check out nomad-lab-base recursively:
+
+    git clone --recursive git@gitlab.mpcdf.mpg.de:nomad-lab/nomad-lab-base.git
+
+This parser will be in the directory parsers/tinker of this repository.
+
+## Running and Testing the Parser
+### Requirements
+The required python packages can be installed with (see [python-common](https://gitlab.rzg.mpg.de/nomad-lab/python-common)):
+
+    pip install -r nomad-lab-base/python-common/requirements.txt
+
+### Usage
+Tinker MD log output files can be parsed with:
+
+    python TINKERParser.py [path/toFile]
+
+### Test Files
+Example log output files of Tinker can be found in the directory test/examples.
+More details about the calculations and files are explained in README file of test/examples.
+
--- a/parser/parser-tinker/.idea/misc.xml
+++ b/parser/parser-tinker/.idea/misc.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6.1 virtualenv at /labEnv3" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
--- a/parser/parser-tinker/.idea/modules.xml
+++ b/parser/parser-tinker/.idea/modules.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/parser-amber.iml" filepath="$PROJECT_DIR$/.idea/parser-amber.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
--- a/parser/parser-tinker/.idea/parser-amber.iml
+++ b/parser/parser-tinker/.idea/parser-amber.iml
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="projectConfiguration" value="Nosetests" />
+    <option name="PROJECT_TEST_RUNNER" value="Nosetests" />
+  </component>
+</module>
\ No newline at end of file
--- a/parser/parser-tinker/.idea/workspace.xml
+++ b/parser/parser-tinker/.idea/workspace.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="7426a5df-0b63-4709-ab28-0c6e68476f74" name="Default" comment="" />
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <option name="TRACKING_ENABLED" value="true" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
+  </component>
+  <component name="ProjectFrameBounds">
+    <option name="x" value="303" />
+    <option name="y" value="66" />
+    <option name="width" value="1602" />
+    <option name="height" value="1164" />
+  </component>
+  <component name="ProjectView">
+    <navigator currentView="ProjectPane" proportions="" version="1">
+      <flattenPackages />
+      <showMembers />
+      <showModules />
+      <showLibraryContents />
+      <hideEmptyPackages />
+      <abbreviatePackageNames />
+      <autoscrollToSource />
+      <autoscrollFromSource />
+      <sortByType />
+      <manualOrder />
+      <foldersAlwaysOnTop value="true" />
+    </navigator>
+    <panes>
+      <pane id="Scratches" />
+      <pane id="ProjectPane">
+        <subPane>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="parser-amber" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="parser-amber" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
+        </subPane>
+      </pane>
+      <pane id="Scope" />
+    </panes>
+  </component>
+  <component name="PropertiesComponent">
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+  </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
+  <component name="RunManager">
+    <configuration default="true" type="PythonConfigurationType" factoryName="Python">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="parser-amber" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="Tox" factoryName="Tox">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="parser-amber" />
+      <method />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Doctests">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="parser-amber" />
+      <option name="SCRIPT_NAME" value="" />
+      <option name="CLASS_NAME" value="" />
+      <option name="METHOD_NAME" value="" />
+      <option name="FOLDER_NAME" value="" />
+      <option name="TEST_TYPE" value="TEST_SCRIPT" />
+      <option name="PATTERN" value="" />
+      <option name="USE_PATTERN" value="false" />
+      <method />
+    </configuration>
+    <configuration default="true" type="tests" factoryName="Nosetests">
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs />
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="" />
+      <option name="IS_MODULE_SDK" value="false" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <module name="parser-amber" />
+      <option name="_new_regexPattern" value="&quot;&quot;" />
+      <option name="_new_additionalArguments" value="&quot;&quot;" />
+      <option name="_new_target" value="&quot;.&quot;" />
+      <option name="_new_targetType" value="&quot;PATH&quot;" />
+      <method />
+    </configuration>
+  </component>
+  <component name="ShelveChangesManager" show_recycled="false">
+    <option name="remove_strategy" value="false" />
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="7426a5df-0b63-4709-ab28-0c6e68476f74" name="Default" comment="" />
+      <created>1497006387415</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1497006387415</updated>
+    </task>
+    <servers />
+  </component>
+  <component name="ToolWindowManager">
+    <frame x="303" y="66" width="1602" height="1164" extended-state="0" />
+    <layout>
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2496879" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32968035" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
+      <window_info id="Data View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+      <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
+      <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
+      <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
+      <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+      <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+    </layout>
+  </component>
+  <component name="VcsContentAnnotationSettings">
+    <option name="myLimit" value="2678400000" />
+  </component>
+  <component name="VcsManagerConfiguration">
+    <ignored-roots>
+      <path value="$PROJECT_DIR$/../.." />
+    </ignored-roots>
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager />
+    <watches-manager />
+  </component>
+  <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/AMBERParser.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="0">
+          <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+          <folding>
+            <element signature="e#0#24#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AMBERParser.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="42" column="61" lean-forward="false" selection-start-line="42" selection-start-column="61" selection-end-line="42" selection-end-column="61" />
+          <folding>
+            <element signature="e#0#24#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+  </component>
+</project>
\ No newline at end of file
--- a/parser/parser-tinker/TINKERCommon.py
+++ b/parser/parser-tinker/TINKERCommon.py
+import logging
+import os
+
+PARSERNAME = "TINKER"
+PROGRAMNAME = "tinker"
+PARSERVERSION = "0.0.1"
+PARSERMETANAME = PARSERNAME.lower()
+PARSERTAG = 'x_' + PARSERMETANAME
+
+PARSER_INFO_DEFAULT = {
+        'name'   : PARSERMETANAME+'-parser', 
+        'version': PARSERVERSION
+}
+
+META_INFO_PATH = os.path.normpath(os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), 
+    "../../../../nomad-meta-info/meta_info/nomad_meta_info/"+PARSERMETANAME+".nomadmetainfo.json"))
+
+LOGGER = logging.getLogger("nomad."+PROGRAMNAME+"Parser")
+
+def set_excludeList(self):
+    """Sets the exclude list for x_
+
+    Returns:
+        the list of names
+    """
+    excludelist = [
+        PARSERTAG+'_mdin_verbatim_writeout',
+        PARSERTAG+'_dumm_text',
+        PARSERTAG+'_dummy',
+        PARSERTAG+'_mdin_wt'
+        ]
+    excludelist.extend([PARSERTAG+'_mdin_file_%s' % fileNL.lower() for fileNL in self.fileDict.keys()])
+    excludelist.extend([PARSERTAG+'_mdin_%s' % cntrlNL.lower() for cntrlNL in self.cntrlDict.keys()])
+    excludelist.extend([PARSERTAG+'_mdin_%s' % ewaldNL.lower() for ewaldNL in self.ewaldDict.keys()])
+    excludelist.extend([PARSERTAG+'_mdin_%s' % qmmmNL.lower() for qmmmNL in self.qmmmDict.keys()])
+    return excludelist
+
+def set_includeList():
+    """Sets the include list for x_
+
+    Returns:
+        the list of names
+    """
+    includelist = []
+    return includelist
+
+
--- a/parser/parser-tinker/TINKERDictionary.py
+++ b/parser/parser-tinker/TINKERDictionary.py
--- a/parser/parser-tinker/TINKERParser.py
+++ b/parser/parser-tinker/TINKERParser.py
--- a/parser/parser-tinker/setup_paths.py
+++ b/parser/parser-tinker/setup_paths.py
+import sys
+import os
+import os.path
+basedir = os.path.dirname(os.path.abspath(__file__))
+commondir = os.path.normpath(os.path.join(basedir,"../../../../python-common/common/python"))
+
+if not commondir in sys.path:
+    sys.path.insert(0, commondir)
--- a/src/main/scala/eu/nomad_lab/parsers/TinkerParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/TinkerParser.scala
+package eu.nomad_lab.parsers
+
+import eu.nomad_lab
+import eu.nomad_lab.DefaultPythonInterpreter
+import org.{ json4s => jn }
+import eu.{ nomad_lab => lab }
+import scala.collection.breakOut
+
+object TinkerParser extends SimpleExternalParserGenerator(
+  name = "TinkerParser",
+  parserInfo = jn.JObject(
+    ("name" -> jn.JString("TinkerParser")) ::
+      ("parserId" -> jn.JString("TinkerParser" + lab.TinkerVersionInfo.version)) ::
+      ("versionInfo" -> jn.JObject(
+        ("nomadCoreVersion" -> jn.JObject(lab.NomadCoreVersionInfo.toMap.map {
+          case (k, v) => k -> jn.JString(v.toString)
+        }(breakOut): List[(String, jn.JString)])) ::
+          (lab.TinkerVersionInfo.toMap.map {
+            case (key, value) =>
+              (key -> jn.JString(value.toString))
+          }(breakOut): List[(String, jn.JString)])
+      )) :: Nil
+  ),
+  mainFileTypes = Seq("text/.*"),
+  mainFileRe = """\s*#+\s*TINKER\s*---\s*Software\s*Tools\s*for\s*Molecular\s*Design\s*#+\s*""".r,
+  cmd = Seq(DefaultPythonInterpreter.pythonExe(), "${envDir}/parsers/tinker/parser/parser-tinker/TINKERParser.py",
+    "${mainFilePath}"),
+  resList = Seq(
+    "parser-tinker/TINKERParser.py",
+    "parser-tinker/TINKERDictionary.py",
+    "parser-tinker/TINKERCommon.py",
+    "parser-tinker/setup_paths.py",
+    "nomad_meta_info/public.nomadmetainfo.json",
+    "nomad_meta_info/common.nomadmetainfo.json",
+    "nomad_meta_info/meta_types.nomadmetainfo.json"
+    "nomad_meta_info/tinker.nomadmetainfo.json"
+  ) ++ DefaultPythonInterpreter.commonFiles(),
+  dirMap = Map(
+    "parser-tinker" -> "parsers/tinker/parser/parser-tinker",
+    "nomad_meta_info" -> "nomad-meta-info/meta_info/nomad_meta_info",
+    "python" -> "python-common/common/python/nomadcore"
+  ) ++ DefaultPythonInterpreter.commonDirMapping(),
+  metaInfoEnv = Some(lab.meta.KnownMetaInfoEnvs.tinker)
+)
+
--- a/src/test/scala/eu/nomad_lab/parsers/TinkerParserSpec.scala
+++ b/src/test/scala/eu/nomad_lab/parsers/TinkerParserSpec.scala
+package eu.nomad_lab.parsers
+
+import org.specs2.mutable.Specification
+
+object TinkerParserTests extends Specification {
+  "TinkerParserTest" >> {
+    "[Anion in Water (xyz sequence of outputs with 643 atoms)] test with json-events" >> {
+      ParserRun.parse(TinkerParser, "parsers/tinker/test/examples/anion/anion.log", "json-events") must_== ParseResult.ParseSuccess
+    }
+    "[Anion in Water (xyz sequence of outputs with 643 atoms)] test with json" >> {
+      ParserRun.parse(TinkerParser, "parsers/tinker/test/examples/anion/anion.log", "json") must_== ParseResult.ParseSuccess
+    }
+    "[Ice (.arc trajectory with 3024 atoms)] test with json-events" >> {
+      ParserRun.parse(TinkerParser, "parsers/tinker/test/examples/ice/ice.log", "json-events") must_== ParseResult.ParseSuccess
+    }
+    "[Ice (.arc trajectory with 3024 atoms)] test with json" >> {
+      ParserRun.parse(TinkerParser, "parsers/tinker/test/examples/ice/ice.log", "json") must_== ParseResult.ParseSuccess
+    }
+  }
+}
--- a/test/examples/README.md
+++ b/test/examples/README.md
+# Tests:
+### Source of Tests:
+
+The tests are taken from Tinker (version 8.1) examples in [TINKER](http://dasher.wustl.edu/tinker/).
+
+### TEST Directory for the TINKER Package
+
+This directory contains some test casess illustrating use of
+several of the programs in the TINKER package.
+
+For example, the argon.run file contains the commands to run
+the first test case. The resulting output is found in the file
+argon.log.
+
+#### ANION       
+estimation of the free energy of hydration
+of Cl- anion vs. Br- anion via a 2 picosecond
+simulation on a "hybrid" anion in a box of
+water, followed by free energy perturbation
+
+#### ARGON
+minimization followed by 6 picoseconds
+of a molecular dynamics run on a periodic
+box containing 150 argon atoms
+
+#### ENKEPHALIN
+generation of coordinates from the
+amino acid sequence and phi/psi angles,
+followed by energy minimization and
+determination of the lowest frequency
+normal mode
+
+#### ICE/WATER
+short MD simulation of the monoclinic ice V
+crystal form using the iAMOEBA water model,
+neighbor lists and PME electrostatics
+
--- a/test/examples/anion/anion.001
+++ b/test/examples/anion/anion.001
--- a/test/examples/anion/anion.002
+++ b/test/examples/anion/anion.002
--- a/test/examples/anion/anion.003
+++ b/test/examples/anion/anion.003
--- a/test/examples/anion/anion.004
+++ b/test/examples/anion/anion.004
--- a/test/examples/anion/anion.005
+++ b/test/examples/anion/anion.005
--- a/test/examples/anion/anion.006
+++ b/test/examples/anion/anion.006
--- a/test/examples/anion/anion.007
+++ b/test/examples/anion/anion.007
--- a/test/examples/anion/anion.008
+++ b/test/examples/anion/anion.008