From 9c089d9cbe13f5b30960d5d411bf64bf1ee5f237 Mon Sep 17 00:00:00 2001
From: Paul Saxe <paul@thesaxes.net>
Date: Wed, 15 Nov 2023 12:29:09 -0500
Subject: [PATCH] Updates for v2022.1.0 including PM6-ORG

---
 HISTORY.rst                |  4 ++++
 mopac_step/metadata.py     | 21 ++++++++++++++++++++-
 mopac_step/optimization.py |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/HISTORY.rst b/HISTORY.rst
index dcfb489..3cf684e 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,6 +1,10 @@
 =======
 History
 =======
+2023.11.15 -- More updates for v2022.1.0
+  * Added PM6-ORG Hamiltonian to options
+  * Added other new data types for the AUX file.
+    
 2023.11.14 -- Updated for MOPAC v2022.1.0
   * MOPAC v2022.1.0 added GRADIENT_NORM_UPDATED to the AUX file. This updates adds it to
     the results recognized by the plug-in
diff --git a/mopac_step/metadata.py b/mopac_step/metadata.py
index 1f064ed..44bbc0a 100644
--- a/mopac_step/metadata.py
+++ b/mopac_step/metadata.py
@@ -38,6 +38,13 @@
                         "optimization": True,
                         "code": "mopac",
                     },
+                    "PM6-ORG": {
+                        "elements": "1-60,62-83",
+                        "periodic": True,
+                        "reactions": True,
+                        "optimization": True,
+                        "code": "mopac",
+                    },
                     "PM6-D3": {
                         "description": (
                             "The PM6 Hamiltonian with Grimme's corrections for "
@@ -1505,13 +1512,25 @@
         "type": "float",
         "units": "kcal/mol/Å",
     },
-    "GRADIENT_UPDATED": {
+    "GRADIENTS_UPDATED": {
         "calculation": ["optimization"],
         "description": "forces in trajectory",
         "dimensionality": ["nsteps", [3, "n_atoms"]],
         "type": "float",
         "units": "kcal/mol/Å",
     },
+    "VOIGT_STRESS": {
+        "description": "Voigt stress",
+        "dimensionality": [6],
+        "type": "float",
+        "units": "GPa",
+    },
+    "VOIGT_STRESS_UPDATED": {
+        "description": "Voigt stress in trajectory",
+        "dimensionality": [6],
+        "type": "float",
+        "units": "GPa",
+    },
     "HEAT_CAPACITY_TOT": {
         "calculation": ["thermodynamics", "vibrations"],
         "description": "heat capacity",
diff --git a/mopac_step/optimization.py b/mopac_step/optimization.py
index 564789a..db7d0d9 100644
--- a/mopac_step/optimization.py
+++ b/mopac_step/optimization.py
@@ -83,7 +83,7 @@ def description_text(self, P=None):
         text += "\n\n"
 
         if self.is_expr(P["hamiltonian"]):
-            kwargs = {}
+            kwargs = {"Hamiltonian": "{{" + P["hamiltonian"] + "}}"}
         else:
             kwargs = {"Hamiltonian": P["hamiltonian"]}
         text += seamm.standard_parameters.structure_handling_description(P, **kwargs)