From 0fe812a89fba7ea26aff15a14d0570ecd8fd6a9a Mon Sep 17 00:00:00 2001
From: Andrew-S-Rosen <asrosen93@gmail.com>
Date: Thu, 8 Feb 2024 21:18:36 -0800
Subject: [PATCH 1/3] Add missing r2scan parameters

---
 pymatgen/io/vasp/MPSCANRelaxSet.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pymatgen/io/vasp/MPSCANRelaxSet.yaml b/pymatgen/io/vasp/MPSCANRelaxSet.yaml
index 16e796a7582..ac92a0e3b11 100644
--- a/pymatgen/io/vasp/MPSCANRelaxSet.yaml
+++ b/pymatgen/io/vasp/MPSCANRelaxSet.yaml
@@ -10,9 +10,12 @@ INCAR:
   ENCUT: 680
   IBRION: 2
   ISIF: 3
+  ISMEAR: 0
   ISPIN: 2
+  KSPACING: 0.22
   LORBIT: 11
   LASPH: True
+  LELF: False
   LREAL: Auto
   LMIXTAU: True
   LCHARG: True # write CHGCAR
@@ -24,6 +27,7 @@ INCAR:
   NELM: 200
   NSW: 99
   PREC: Accurate
+  SIGMA: 0.05
 POTCAR_FUNCTIONAL: PBE_54
 POTCAR:
   Ac: Ac

From d0ec2774b680b134514f5d5c9669ea4ac3a05e59 Mon Sep 17 00:00:00 2001
From: Andrew Rosen <asrosen93@gmail.com>
Date: Thu, 8 Feb 2024 21:21:50 -0800
Subject: [PATCH 2/3] fix

---
 pymatgen/io/vasp/MPSCANRelaxSet.yaml | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pymatgen/io/vasp/MPSCANRelaxSet.yaml b/pymatgen/io/vasp/MPSCANRelaxSet.yaml
index ac92a0e3b11..ade0010c893 100644
--- a/pymatgen/io/vasp/MPSCANRelaxSet.yaml
+++ b/pymatgen/io/vasp/MPSCANRelaxSet.yaml
@@ -10,24 +10,23 @@ INCAR:
   ENCUT: 680
   IBRION: 2
   ISIF: 3
-  ISMEAR: 0
+  ISMEAR: 0 # included to have some reasonable default
   ISPIN: 2
-  KSPACING: 0.22
-  LORBIT: 11
+  KSPACING: 0.22 # included to have some reasonable default
+  LAECHG: True
   LASPH: True
-  LELF: False
-  LREAL: Auto
+  LCHARG: True
+  LELF: False # LELF = True restricts calculation to KPAR = 1
   LMIXTAU: True
-  LCHARG: True # write CHGCAR
-  LAECHG: True # write AECCAR
-  LELF: False # don't write ELFCAR, restricts calculation to KPAR = 1
-  LWAVE: False # Don't write WAVECAR
-  LVTOT: True # write LOCPOT
+  LORBIT: 11
+  LREAL: Auto
+  LVTOT: True
+  LWAVE: False
   METAGGA: R2SCAN
   NELM: 200
   NSW: 99
   PREC: Accurate
-  SIGMA: 0.05
+  SIGMA: 0.05 # included to have some reasonable default
 POTCAR_FUNCTIONAL: PBE_54
 POTCAR:
   Ac: Ac

From ab589e9935d7e9d65067fdd494b139d35978053d Mon Sep 17 00:00:00 2001
From: Andrew-S-Rosen <asrosen93@gmail.com>
Date: Fri, 16 Feb 2024 05:25:14 -0800
Subject: [PATCH 3/3] Update hash

---
 tests/io/vasp/test_sets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/io/vasp/test_sets.py b/tests/io/vasp/test_sets.py
index c65a94546f9..d041523ea0f 100644
--- a/tests/io/vasp/test_sets.py
+++ b/tests/io/vasp/test_sets.py
@@ -115,7 +115,7 @@ def test_sets_changed(self):
             "MPAbsorptionSet.yaml": "5931e1cb3cf8ba809b3d4f4a5960d728c682adf1",
             "MPHSERelaxSet.yaml": "0d0d96a620461071cfd416ec9d5d6a8d2dfd0855",
             "MPRelaxSet.yaml": "f2949cdc5dc8cd0bee6d39a5df0d6a6b7c144821",
-            "MPSCANRelaxSet.yaml": "2d31ee637cb5d4d96f2e0aba3772a52cbcceb348",
+            "MPSCANRelaxSet.yaml": "167668225129002b49dc3550c04659869b9b9e47",
             "MVLGWSet.yaml": "104ae93c3b3be19a13b0ee46ebdd0f40ceb96597",
             "MVLRelax52Set.yaml": "4cfc6b1bd0548e45da3bde4a9c65b3249da13ecd",
             "PBE54Base.yaml": "ec317781a7f344beb54c17a228db790c0eb49282",