Merge pull request #70 from njzjz/nopbc

support nopbc

Author: amcadmus

dpdata/deepmd/comp.py

@@ -48,6 +48,8 @@ def to_system_data(folder,
         data['forces'] = np.concatenate(all_forces, axis = 0)
     if len(all_virs) > 0:
         data['virials'] = np.concatenate(all_virs, axis = 0)
+    if os.path.isfile(os.path.join(folder, "nopbc")):
+        data['nopbc'] = True
     return data
 
 
@@ -101,5 +103,10 @@ def dump(folder,
             np.save(os.path.join(set_folder, 'virial'), virials[set_stt:set_end])
         if 'atom_pref' in data:
             np.save(os.path.join(set_folder, "atom_pref"), atom_pref[set_stt:set_end])
-        
+    try:
+        os.remove(os.path.join(folder, "nopbc"))
+    except OSError:
+        pass
+    if data.get("nopbc", False):
+        os.mknod(os.path.join(folder, "nopbc"))
 

dpdata/deepmd/raw.py

@@ -49,6 +49,8 @@ def to_system_data(folder, type_map = None, labels = True) :
             if os.path.exists(os.path.join(folder, 'virial.raw')) :
                 data['virials'] = np.loadtxt(os.path.join(folder, 'virial.raw'))
                 data['virials'] = np.reshape(data['virials'], [nframes, 3, 3])
+        if os.path.isfile(os.path.join(folder, "nopbc")):
+            data['nopbc'] = True
         return data
     else :        
         raise RuntimeError('not dir ' + folder)
@@ -67,5 +69,10 @@ def dump (folder, data) :
         np.savetxt(os.path.join(folder, 'force.raw'),   np.reshape(data['forces'],   [nframes, -1]))
     if 'virials' in data :
         np.savetxt(os.path.join(folder, 'virial.raw'), np.reshape(data['virials'], [nframes, 9]))
-    
+    try:
+        os.remove(os.path.join(folder, "nopbc"))
+    except OSError:
+        pass
+    if data.get("nopbc", False):
+        os.mknod(os.path.join(folder, "nopbc"))
 

dpdata/gaussian/log.py

@@ -69,4 +69,5 @@ def to_system_data(file_name, md=False):
     data['coords'] = np.array(coords_t)
     data['orig'] = np.array([0, 0, 0])
     data['cells'] = np.array([[[100., 0., 0.], [0., 100., 0.], [0., 0., 100.]] for _ in energy_t])
+    data['nopbc'] = True
     return data

dpdata/system.py

@@ -284,6 +284,7 @@ def sub_system(self, f_idx) :
             tmp.data[ii] = self.data[ii]
         tmp.data['cells'] = self.data['cells'][f_idx].reshape(-1, 3, 3)
         tmp.data['coords'] = self.data['coords'][f_idx].reshape(-1, self.data['coords'].shape[1], 3)
+        tmp.data['nopbc'] = self.nopbc
         return tmp
 
 
@@ -319,6 +320,9 @@ def append(self, system) :
             assert(all(eq))
         for ii in ['coords', 'cells'] :
             self.data[ii] = np.concatenate((self.data[ii], system[ii]), axis = 0)
+        if self.nopbc and not system.nopbc:
+            # appended system uses PBC, cancel nopbc 
+            self.data['nopbc'] = False
         return True
 
     def sort_atom_names(self, type_map=None):
@@ -726,6 +730,12 @@ def perturb(self,
                 perturbed_system.append(tmp_system)
         return perturbed_system
 
+    @property
+    def nopbc(self):
+        if self.data.get("nopbc", False):
+            return True
+        return False
+
 def get_cell_perturb_matrix(cell_pert_fraction):
     if cell_pert_fraction<0:
         raise RuntimeError('cell_pert_fraction can not be negative')
@@ -1018,6 +1028,7 @@ def from_gaussian_log(self, file_name, md=False):
             self.data = dpdata.gaussian.log.to_system_data(file_name, md=md)
         except AssertionError:
             self.data['energies'], self.data['forces']= [], []
+            self.data['nopbc'] = True
 
 
     def from_cp2k_output(self, file_name) :
@@ -1245,7 +1256,7 @@ def to_deepmd_npy(self, folder, set_size = 5000, prec=np.float32) :
 def check_System(data):
     keys={'atom_names','atom_numbs','cells','coords','orig','atom_types'}
     assert( isinstance(data,dict) )
-    assert( set(data.keys())==keys )
+    assert( keys.issubset(set(data.keys())) )
     if len(data['coords']) > 0 :
         assert( len(data['coords'][0])==len(data['atom_types'])==sum(data['atom_numbs']) )
     else :

tests/comp_sys.py

@@ -58,6 +58,9 @@ def test_coord(self):
                                            places = self.places,
                                            msg = 'coord[%d][%d][%d] failed' % (ff,ii,jj))
 
+    def test_nopbc(self):
+        self.assertEqual(self.system_1.nopbc, self.system_2.nopbc)
+
 
 class CompLabeledSys (CompSys) :
     def test_energy(self) :
@@ -97,4 +100,12 @@ def test_virial(self) :
                                            places = self.v_places,
                                            msg = 'virials[%d][%d][%d] failed' % (ff,ii,jj))
 
-                    
+class IsPBC:                    
+    def test_is_pbc(self):
+        self.assertFalse(self.system_1.nopbc)
+        self.assertFalse(self.system_2.nopbc)
+
+class IsNoPBC:                    
+    def test_is_nopbc(self):
+        self.assertTrue(self.system_1.nopbc)
+        self.assertTrue(self.system_2.nopbc)

tests/test_deepmd_comp.py

@@ -2,9 +2,9 @@
 import numpy as np
 import unittest
 from context import dpdata
-from comp_sys import CompLabeledSys, CompSys
+from comp_sys import CompLabeledSys, CompSys, IsPBC
 
-class TestDeepmdLoadDumpComp(unittest.TestCase, CompLabeledSys):
+class TestDeepmdLoadDumpComp(unittest.TestCase, CompLabeledSys, IsPBC):
     def setUp (self) :
         self.system_1 = dpdata.LabeledSystem('poscars/OUTCAR.h2o.md', 
                                              fmt = 'vasp/outcar')
@@ -25,7 +25,7 @@ def tearDown(self) :
             shutil.rmtree('tmp.deepmd.npy')
 
 
-class TestDeepmdCompNoLabels(unittest.TestCase, CompSys) :
+class TestDeepmdCompNoLabels(unittest.TestCase, CompSys, IsPBC) :
     def setUp (self) :
         self.system_1 = dpdata.System('poscars/POSCAR.h2o.md',
                                       fmt = 'vasp/poscar')
@@ -45,7 +45,7 @@ def tearDown(self) :
             shutil.rmtree('tmp.deepmd.npy')
 
 
-class TestDeepmdCompNoLabels(unittest.TestCase, CompSys) :
+class TestDeepmdCompNoLabels(unittest.TestCase, CompSys, IsPBC) :
     def setUp(self) :
         self.dir_name = 'tmp.deepmd.npy.nol'
         natoms = 3

tests/test_deepmd_raw.py

@@ -2,9 +2,9 @@
 import numpy as np
 import unittest
 from context import dpdata
-from comp_sys import CompLabeledSys, CompSys
+from comp_sys import CompLabeledSys, CompSys, IsPBC
 
-class TestDeepmdLoadRaw(unittest.TestCase, CompLabeledSys):
+class TestDeepmdLoadRaw(unittest.TestCase, CompLabeledSys, IsPBC):
     def setUp (self) :
         self.system_1 = dpdata.LabeledSystem('poscars/OUTCAR.h2o.md', 
                                              fmt = 'vasp/outcar')
@@ -17,7 +17,7 @@ def setUp (self) :
         self.v_places = 6
 
 
-class TestDeepmdDumpRaw(unittest.TestCase, CompLabeledSys):
+class TestDeepmdDumpRaw(unittest.TestCase, CompLabeledSys, IsPBC):
     def setUp (self) :
         self.system_1 = dpdata.LabeledSystem('poscars/OUTCAR.h2o.md', 
                                              fmt = 'vasp/outcar')
@@ -131,7 +131,7 @@ def test_npy_type_map_enforce (self) :
 
 
 
-class TestDeepmdRawNoLabels(unittest.TestCase, CompSys) :
+class TestDeepmdRawNoLabels(unittest.TestCase, CompSys, IsPBC) :
     def setUp (self) :
         self.system_1 = dpdata.System('poscars/POSCAR.h2o.md',
                                       fmt = 'vasp/poscar')
@@ -149,7 +149,7 @@ def tearDown(self) :
             shutil.rmtree('tmp.deepmd')
 
 
-class TestDeepmdCompNoLabels(unittest.TestCase, CompSys) :
+class TestDeepmdCompNoLabels(unittest.TestCase, CompSys, IsPBC) :
     def setUp(self) :
         self.dir_name = 'tmp.deepmd.nol'
         natoms = 3

tests/test_gaussian_log.py

@@ -2,7 +2,6 @@
 import numpy as np
 import unittest
 from context import dpdata
-from comp_sys import CompLabeledSys
 
 class TestGaussianLog :
     def test_atom_names(self) :
@@ -18,6 +17,9 @@ def test_atom_types(self) :
         for ii in range(len(self.atom_types)) :
             self.assertEqual(self.system.data['atom_types'][ii], self.atom_types[ii])
 
+    def test_nopbc(self):
+        self.assertEqual(self.system.nopbc, True)
+
 class TestGaussianLoadLog(unittest.TestCase, TestGaussianLog):
     def setUp (self) :
         self.system = dpdata.LabeledSystem('gaussian/methane.gaussianlog', 

tests/test_json.py

@@ -2,9 +2,9 @@
 import numpy as np
 import unittest
 from context import dpdata
-from comp_sys import CompLabeledSys
+from comp_sys import CompLabeledSys, IsPBC
 
-class TestJsonLoad(unittest.TestCase, CompLabeledSys):
+class TestJsonLoad(unittest.TestCase, CompLabeledSys, IsPBC):
     def setUp (self) :
         self.system_1 = dpdata.LabeledSystem('poscars/OUTCAR.h2o.md',
                                              fmt = 'vasp/outcar')
@@ -14,7 +14,7 @@ def setUp (self) :
         self.f_places = 6
         self.v_places = 4
 
-class TestAsDict(unittest.TestCase, CompLabeledSys):
+class TestAsDict(unittest.TestCase, CompLabeledSys, IsPBC):
     def setUp (self) :
         self.system_1 = dpdata.LabeledSystem('poscars/OUTCAR.h2o.md',
                                              fmt = 'vasp/outcar')

tests/test_lammps_dump_skipload.py

@@ -2,9 +2,9 @@
 import numpy as np
 import unittest
 from context import dpdata
-from comp_sys import CompSys
+from comp_sys import CompSys, IsPBC
 
-class TestLmpDumpSkip(unittest.TestCase, CompSys):
+class TestLmpDumpSkip(unittest.TestCase, CompSys, IsPBC):
 
     def setUp(self): 
         self.system_1 = dpdata.System(os.path.join('poscars', 'conf.5.dump'),