adapted tests to fit new behaviour

Author: MichaelWolloch

atomate/vasp/test_files/PBESol_pre_opt_for_SCAN_Al/inputs/INCAR

@@ -19,7 +19,6 @@ LREAL = Auto
 LVTOT = True
 LWAVE = False
 MAGMOM = 1*0.0
-METAGGA = None
 NELM = 200
 NSW = 99
 PREC = Accurate

atomate/vasp/test_files/PBESol_pre_opt_for_SCAN_LiF/inputs/INCAR

@@ -19,7 +19,6 @@ LREAL = Auto
 LVTOT = True
 LWAVE = False
 MAGMOM = 2*0.0
-METAGGA = None
 NELM = 200
 NSW = 99
 PREC = Accurate

atomate/vasp/test_files/PBESol_pre_opt_for_SCAN_LiF_vdw/inputs/INCAR

@@ -19,7 +19,6 @@ LREAL = Auto
 LVTOT = True
 LWAVE = False
 MAGMOM = 2*0.0
-METAGGA = None
 NELM = 200
 NSW = 99
 PREC = Accurate

atomate/vasp/test_files/PBESol_pre_opt_for_SCAN_LiH/inputs/INCAR

@@ -19,7 +19,6 @@ LREAL = Auto
 LVTOT = True
 LWAVE = False
 MAGMOM = 2*-0.0
-METAGGA = None
 NELM = 200
 NSW = 99
 PREC = Accurate

atomate/vasp/workflows/tests/test_vasp_workflows.py

@@ -587,8 +587,6 @@ def test_SCAN_no_bandgap(self):
                 self.assertEqual(incar[p], 0.22)
             elif p == "ICHARG" or p == "ISTART":
                 self.assertEqual(incar[p], 1)
-            elif p == "METAGGA":
-                self.assertEqual(incar[p], "None")
             elif p == "GGA":
                 self.assertEqual(incar[p], "Ps")
             elif p == "EDIFFG":
@@ -644,8 +642,6 @@ def test_SCAN_small_bandgap(self):
                 self.assertEqual(incar[p], 0.22)
             elif p == "ICHARG" or p == "ISTART":
                 self.assertEqual(incar[p], 1)
-            elif p == "METAGGA":
-                self.assertEqual(incar[p], "None")
             elif p == "GGA":
                 self.assertEqual(incar[p], "Ps")
             elif p == "EDIFFG":
@@ -703,8 +699,6 @@ def test_SCAN_large_bandgap(self):
                 self.assertEqual(incar[p], 0.22)
             elif p == "ICHARG" or p == "ISTART":
                 self.assertEqual(incar[p], 1)
-            elif p == "METAGGA":
-                self.assertEqual(incar[p], "None")
             elif p == "GGA":
                 self.assertEqual(incar[p], "Ps")
             elif p == "EDIFFG":
@@ -780,8 +774,6 @@ def test_SCAN_with_vdw(self):
                 self.assertEqual(incar[p], 0.22)
             elif p == "ICHARG":
                 self.assertEqual(incar[p], 1)
-            elif p == "METAGGA":
-                self.assertEqual(incar[p], "None")
             elif p == "GGA":
                 self.assertEqual(incar[p], "Ps")
             elif p == "EDIFFG":