Merge pull request #31 from VirtualPlanetaryLaboratory/FolderExists

Folder exists
VirtualPlanetaryLaboratory · Sep 26, 2023 · 4390312 · 4390312
2 parents d13a6fe + 9a72101
commit 4390312
Show file tree

Hide file tree

Showing 71 changed files with 79 additions and 1,476 deletions.
diff --git a/bigplanet/__init__.py b/bigplanet/__init__.py
@@ -13,5 +13,5 @@
 __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)"
 __copyright__ = "Copyright 2020  Caitlyn Wilhelm"
 
-from .bp_extract import *
+from .extract import *
 from .bigplanet import *
diff --git a/bigplanet/bigplanet_archive.py → bigplanet/archive.py b/bigplanet/bigplanet_archive.py → bigplanet/archive.py
@@ -9,9 +9,9 @@
 import numpy as np
 import pandas as pd
 
-from .bp_extract import *
-from .bp_get import *
-from .bp_process import *
+from .extract import *
+from .read import *
+from .process import *
 
 
 def Archive(bpInputFile, cores, quiet, force, ignorecorrupt, verbose):

diff --git a/bigplanet/bigplanet.py b/bigplanet/bigplanet.py
@@ -9,10 +9,10 @@
 import numpy as np
 import pandas as pd
 
-from .bigplanet_archive import Archive
-from .bigplanet_filter import Filter
-from .bp_extract import Md5CheckSum
-from .bp_get import ReadFile
+from .archive import Archive
+from .filter import Filter
+from .extract import Md5CheckSum
+from .read import ReadFile
 
 
 def Main(

diff --git a/bigplanet/bp_extract.py → bigplanet/extract.py b/bigplanet/bp_extract.py → bigplanet/extract.py
@@ -13,8 +13,8 @@
 import pandas as pd
 from scipy import stats
 
-from .bp_get import GetVplanetHelp
-from .bp_process import DictToBP
+from .read import GetVplanetHelp
+from .process import DictToBP
 
 
 def BPLFile(hf, ignore_corrupt=False):

diff --git a/bigplanet/bigplanet_filter.py → bigplanet/filter.py b/bigplanet/bigplanet_filter.py → bigplanet/filter.py
@@ -12,9 +12,9 @@
 import numpy as np
 import pandas as pd
 
-from .bp_extract import *
-from .bp_get import *
-from .bp_process import *
+from .extract import *
+from .read import *
+from .process import *
 
 
 def SplitsaKey(saKeylist, verbose):

diff --git a/bigplanet/bp_process.py → bigplanet/process.py b/bigplanet/bp_process.py → bigplanet/process.py
diff --git a/bigplanet/bp_get.py → bigplanet/read.py b/bigplanet/bp_get.py → bigplanet/read.py
diff --git a/tests/CreateHDF5/__init__.py b/tests/CreateHDF5/__init__.py
@@ -13,5 +13,5 @@
 __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)"
 __copyright__ = "Copyright 2020  Caitlyn Wilhelm"
 
-from bigplanet.bp_extract import *
+from bigplanet.extract import *
 from bigplanet import *
diff --git a/tests/CreateHDF5/test_CreateHDF5.py b/tests/CreateHDF5/test_CreateHDF5.py
@@ -51,6 +51,11 @@ def test_CreateHDF5():
         # checks if the bpl files exist
         assert os.path.isfile(file) == True
 
+        shutil.rmtree(path / "BP_CreateHDF5")
+        os.remove(path / ".BP_CreateHDF5")
+        os.remove(path / ".BP_CreateHDF5_BPL")
+        os.remove(path / "BP_CreateHDF5.bpa")
+        os.remove(path / "BP_CreateHDF5.md5")
 
 if __name__ == "__main__":
     test_CreateHDF5()
diff --git a/tests/ExtractArchive/__init__.py b/tests/ExtractArchive/__init__.py
@@ -13,5 +13,5 @@
 __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)"
 __copyright__ = "Copyright 2020  Caitlyn Wilhelm"
 
-from bigplanet.bp_extract import *
+from bigplanet.extract import *
 from bigplanet import *
diff --git a/tests/ExtractArchive/test_ExtractArchive.py b/tests/ExtractArchive/test_ExtractArchive.py
@@ -28,8 +28,6 @@ def test_ExtractArchive():
             os.remove(path / ".BP_Extract_BPL")
         if (path / "BP_Extract.bpa").exists():
             os.remove(path / "BP_Extract.bpa")
-        if (path / "../BP_Extract.md5").exists():
-            os.remove(path / "../BP_Extract.md5")
         if (path / "BP_Extract.md5").exists():
             os.remove(path / "BP_Extract.md5")
 
@@ -46,9 +44,7 @@ def test_ExtractArchive():
         # Run bigplanet
         print("Running BigPlanet.")
         sys.stdout.flush()
-
-        ######## SOMETHING IS WRONG WITH MD5CHECKSUMS! #######
-        subprocess.check_output(["bigplanet", "-ignorecorrupt", "bpl.in", "-a"], cwd=path)
+        subprocess.check_output(["bigplanet", "bpl.in", "-a"], cwd=path)
 
         file = bp.BPLFile(path / "BP_Extract.bpa")
 
@@ -59,9 +55,13 @@ def test_ExtractArchive():
 
         assert np.isclose(earth_Instellation_final[0], 1367.635318)
         assert np.isclose(earth_Instellation_final[1], 341.90883)
-
         assert np.isclose(sun_RotPer_initial[0], 86400.0)
 
+        shutil.rmtree(path / "BP_Extract")
+        os.remove(path / ".BP_Extract")
+        os.remove(path / ".BP_Extract_BPL")
+        os.remove(path / "BP_Extract.bpa")
+        os.remove(path / "BP_Extract.md5")
 
 if __name__ == "__main__":
     test_ExtractArchive()
diff --git a/tests/ExtractFilterArchive/__init__.py b/tests/ExtractFilterArchive/__init__.py
@@ -13,5 +13,5 @@
 __author__ = "Caitlyn Wilhelm (cwilhelm@uw.edu)"
 __copyright__ = "Copyright 2020  Caitlyn Wilhelm"
 
-from bigplanet.bp_extract import *
+from bigplanet.extract import *
 from bigplanet import *
diff --git a/tests/ExtractFilterArchive/test_ExtractFilterArchive.py b/tests/ExtractFilterArchive/test_ExtractFilterArchive.py
@@ -30,8 +30,6 @@ def test_ExtractFilterArchive():
             os.remove(path / "BP_Extract.bpa")
         if (path / "Test.bpf").exists():
             os.remove(path / "Test.bpf")
-        if (path / "../BP_Extract.md5").exists():
-            os.remove(path / "../BP_Extract.md5")
         if (path / "BP_Extract.md5").exists():
             os.remove(path / "BP_Extract.md5")
 
@@ -73,6 +71,12 @@ def test_ExtractFilterArchive():
         assert np.isclose(vpl_stoptime_option[0], 4.5e9)
         assert np.isclose(earth_tman_forward[0][0], 3000.0)
 
+        shutil.rmtree(path / "BP_Extract")
+        os.remove(path / ".BP_Extract")
+        os.remove(path / ".BP_Extract_BPL")
+        os.remove(path / "BP_Extract.bpa")
+        os.remove(path / "Test.bpf")
+        os.remove(path / "BP_Extract.md5")
 
 if __name__ == "__main__":
     test_ExtractFilterArchive()
diff --git a/tests/ExtractFilterRaw/.BP_Extract b/tests/ExtractFilterRaw/.BP_Extract
diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a0/earth.in b/tests/ExtractFilterRaw/BP_Extract/semi_a0/earth.in
diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a0/sun.in b/tests/ExtractFilterRaw/BP_Extract/semi_a0/sun.in
diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a0/vpl.in b/tests/ExtractFilterRaw/BP_Extract/semi_a0/vpl.in
diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a0/vplanet_log b/tests/ExtractFilterRaw/BP_Extract/semi_a0/vplanet_log
diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a1/earth.in b/tests/ExtractFilterRaw/BP_Extract/semi_a1/earth.in
diff --git a/tests/ExtractFilterRaw/BP_Extract/semi_a1/sun.in b/tests/ExtractFilterRaw/BP_Extract/semi_a1/sun.in