Merge pull request #157 from ewquon/update_windtools

Update windtools
a2e-mmc · Mar 24, 2023 · c534597 · c534597
2 parents b5f8855 + 8d95cef
commit c534597
Show file tree

Hide file tree

Showing 30 changed files with 1,014 additions and 290 deletions.
diff --git a/README.md b/README.md
@@ -106,6 +106,13 @@ cd /path/to/a2e-mmc/mmctools
 pip install -e .
 ```
 
+### `windtools`
+
+This repository includes a subtree from https://github.com/NREL/windtools, which 
+provides an essential plotting library (importable as `from mmctools.plotting
+import ...`) as well as other simulation post-processing helper modules.
+
+
 ## Code Development Principles
 
 - All code should be usable in, and demonstrated by, Jupyter notebooks.

diff --git a/mmctools/__init__.py b/mmctools/__init__.py
@@ -20,5 +20,5 @@
 # enable `from mmctools.foo.bar import baz # to import baz from windtools.foo.bar`
 import os
 mmctools_module = os.path.split(__file__)[0]
-__path__.append(os.path.join(mmctools_module,'windtools','windtools'))
+__path__.append(os.path.join(mmctools_module,'..','windtools','windtools'))
 
diff --git a/mmctools/windtools/windtools/io/ensight.py b/mmctools/windtools/windtools/io/ensight.py
diff --git a/mmctools/windtools/windtools/io/vtk.py b/mmctools/windtools/windtools/io/vtk.py
diff --git a/setup.py b/setup.py
@@ -28,7 +28,7 @@
 URL = 'https://github.com/a2e-mmc/mmctools'
 EMAIL = '[email protected]'
 AUTHOR = 'U.S. Department of Energy'
-REQUIRES_PYTHON = '>=3.10.6'
+REQUIRES_PYTHON = '>=3.10.5'
 VERSION = '0.1.1'
 
 # What packages are required for this module to be executed?

diff --git a/mmctools/windtools/.gitignore → windtools/.gitignore b/mmctools/windtools/.gitignore → windtools/.gitignore
diff --git a/mmctools/windtools/LICENSE → windtools/LICENSE b/mmctools/windtools/LICENSE → windtools/LICENSE
diff --git a/mmctools/windtools/README.md → windtools/README.md b/mmctools/windtools/README.md → windtools/README.md
diff --git a/...tools/bin/sowfa_convert_source_history.py → ...tools/bin/sowfa_convert_source_history.py b/...tools/bin/sowfa_convert_source_history.py → ...tools/bin/sowfa_convert_source_history.py
diff --git a/...s/bin/sowfa_extract_elevation_from_stl.py → ...s/bin/sowfa_extract_elevation_from_stl.py b/...s/bin/sowfa_extract_elevation_from_stl.py → ...s/bin/sowfa_extract_elevation_from_stl.py
diff --git a/mmctools/windtools/bin/sowfa_log_to_df.py → windtools/bin/sowfa_log_to_df.py b/mmctools/windtools/bin/sowfa_log_to_df.py → windtools/bin/sowfa_log_to_df.py