From 7882a6f2626a5e21ca840b48d4c8782a5c4e61e2 Mon Sep 17 00:00:00 2001
From: Chris Marsh <chrismarsh.c2@gmail.com>
Date: Wed, 11 Jan 2023 13:40:05 -0600
Subject: [PATCH] Reverts the meshgen.py name in favour of the original
 mesher.py

---
 meshgen.py => mesher.py                                | 6 +++---
 pysrc/mesher/__init__.py                               | 2 --
 pysrc/{mesher => mesher_utls}/MPI_do_parameterize.py   | 0
 pysrc/{mesher => mesher_utls}/MPI_regularize_inputs.py | 0
 pysrc/mesher_utls/__init__.py                          | 2 ++
 setup.py                                               | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename meshgen.py => mesher.py (99%)
 delete mode 100644 pysrc/mesher/__init__.py
 rename pysrc/{mesher => mesher_utls}/MPI_do_parameterize.py (100%)
 rename pysrc/{mesher => mesher_utls}/MPI_regularize_inputs.py (100%)
 create mode 100644 pysrc/mesher_utls/__init__.py

diff --git a/meshgen.py b/mesher.py
similarity index 99%
rename from meshgen.py
rename to mesher.py
index d44c3fb..111727f 100755
--- a/meshgen.py
+++ b/mesher.py
@@ -37,7 +37,7 @@
 
 import inspect
 from natsort import natsorted
-import mesher
+import mesher_utls
 
 gdal.UseExceptions()  # Enable exception support
 ogr.UseExceptions()  # Enable exception support
@@ -710,7 +710,7 @@ def main():
         with open(f'pickled_param_args_{cz}.pickle', 'wb') as f:
             cloudpickle.dump(param_args, f)
 
-    MPI_do_parameterize_path = os.path.join(os.path.join(os.path.dirname(mesher.__file__),
+    MPI_do_parameterize_path = os.path.join(os.path.join(os.path.dirname(mesher_utls.__file__),
                                                       'MPI_do_parameterize.py'))
     if MPI_exec_str is not None:
         exec_str = f"""{MPI_exec_str} {MPI_do_parameterize_path} pickled_param_args_RANK.pickle False {configfile}"""
@@ -1045,7 +1045,7 @@ def regularize_inputs(base_dir, exec_str, gdal_prefix, input_files, pixel_height
     with open('pickled_param_args.pickle', 'wb') as f:
         cloudpickle.dump(param_args, f)
 
-    MPI_regularize_path = os.path.join(os.path.dirname(mesher.__file__),
+    MPI_regularize_path = os.path.join(os.path.dirname(mesher_utls.__file__),
                                                       'MPI_regularize_inputs.py')
     if MPI_exec_str is not None:
         exec_str = f"""{MPI_exec_str} {MPI_regularize_path} pickled_param_args.pickle False"""
diff --git a/pysrc/mesher/__init__.py b/pysrc/mesher/__init__.py
deleted file mode 100644
index d79207e..0000000
--- a/pysrc/mesher/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from mesher.MPI_regularize_inputs import regularize_inputs
-from mesher.MPI_do_parameterize import do_parameterize
diff --git a/pysrc/mesher/MPI_do_parameterize.py b/pysrc/mesher_utls/MPI_do_parameterize.py
similarity index 100%
rename from pysrc/mesher/MPI_do_parameterize.py
rename to pysrc/mesher_utls/MPI_do_parameterize.py
diff --git a/pysrc/mesher/MPI_regularize_inputs.py b/pysrc/mesher_utls/MPI_regularize_inputs.py
similarity index 100%
rename from pysrc/mesher/MPI_regularize_inputs.py
rename to pysrc/mesher_utls/MPI_regularize_inputs.py
diff --git a/pysrc/mesher_utls/__init__.py b/pysrc/mesher_utls/__init__.py
new file mode 100644
index 0000000..cf8b279
--- /dev/null
+++ b/pysrc/mesher_utls/__init__.py
@@ -0,0 +1,2 @@
+from mesher_utls.MPI_regularize_inputs import regularize_inputs
+from mesher_utls.MPI_do_parameterize import do_parameterize
diff --git a/setup.py b/setup.py
index e12ec3c..671d6ce 100644
--- a/setup.py
+++ b/setup.py
@@ -45,7 +45,7 @@ def get_installed_gdal_version():
 USE_CONAN = str(USE_CONAN).upper() 
 
 setup(name='mesher',
-    version='2.0.0',
+    version='2.0.1',
     description='Landsurface model mesh generation',
     long_description="""
     Mesher is a novel multi-objective unstructured mesh generation software that allows mesh generation to be generated from an arbitrary number of hydrologically important features while maintaining a variable spatial resolution. 
@@ -68,7 +68,7 @@ def get_installed_gdal_version():
     include_package_data=True,
     cmake_args=['-DCMAKE_BUILD_TYPE:STRING=Release',
               '-DUSE_CONAN:BOOL='+USE_CONAN],
-    scripts=["meshgen.py","tools/mesh2vtu.py", "tools/meshmerge.py","tools/meshpermutation.py","tools/meshstats.py"],
+    scripts=["mesher.py","tools/mesh2vtu.py", "tools/meshmerge.py","tools/meshpermutation.py","tools/meshstats.py"],
     install_requires=['vtk','pygdal'+get_installed_gdal_version(), 'numpy', 'scipy', 'matplotlib', 'cloudpickle',
                       'metis', 'mpi4py', 'natsort'],
     setup_requires=setup_requires,