tilupy 0.1.3__tar.gz → 0.1.4__tar.gz

{tilupy-0.1.3/src/tilupy.egg-info → tilupy-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tilupy
-Version: 0.1.3
+Version: 0.1.4
 Summary: Thin-layer models unified processing tool
 Author-email: Marc Peruzzetto <m.peruzzetto@brgm.fr>
 License: CeCILL-C FREE SOFTWARE LICENSE AGREEMENT
@@ -524,7 +524,7 @@ Keywords: thin-layer,shallow-water,display,simulation,model,processing,benchmark
 Classifier: License :: CeCILL-C Free Software License Agreement (CECILL-C)
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.10
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Provides-Extra: test
 Provides-Extra: dev

{tilupy-0.1.3 → tilupy-0.1.4}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tilupy"
-version = "0.1.3"
+version = "0.1.4"
 description = "Thin-layer models unified processing tool"
 readme = "README.md"
 authors = [{ name = "Marc Peruzzetto", email = "m.peruzzetto@brgm.fr" }]
@@ -20,7 +20,7 @@ keywords = ["thin-layer", "shallow-water", "display", "simulation", "model", "pr
 dependencies = [
     "seaborn", "requests",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.8"
 
 [project.optional-dependencies]
 test = ["pytest"]

{tilupy-0.1.3 → tilupy-0.1.4}/src/tilupy/cmd.py

@@ -11,60 +11,63 @@ import tilupy.read
 import os
 import argparse
 import glob
-    
+
 
 def process_results(fn_name, model, res_name, folder=None, param_files=None,
                     kwargs_read=None, **kwargs_fn):
-    
+
     assert(model is not None)
-    
+
     if folder is None:
         folder = os.getcwd()
-        
+
     if param_files is None:
         param_files = '*.txt'
-        
+
     print(folder, param_files)
-        
-    param_files = glob.glob(param_files, root_dir=folder)
-    
+
+    param_files = glob.glob(os.path.join(folder, param_files))
+
     if len(param_files) == 0:
         print('No parameter file matching param_files pattern was found')
         return
-        
+
     if kwargs_read is None:
         kwargs_read = dict()
-     
-    kw_read = dict(folder_base=folder)   
+
+    kw_read = dict(folder_base=folder)
     kw_read.update(kwargs_read)
-     
+
     for param_file in param_files:
         print_str = 'Processing simulation {:s}, {:s} {:s} .....'
         print(print_str.format(param_file, fn_name, res_name))
         kw_read['file_params'] = param_file
         res = tilupy.read.get_results(model, **kw_read)
         getattr(res, fn_name)(res_name, **kwargs_fn)
-        
-def to_raster(model=None, res_name='h', param_files=None, folder=None, 
+
+
+def to_raster(model=None, res_name='h', param_files=None, folder=None,
               kwargs_read=None, **kwargs):
-    
+
     kw = dict(fmt='asc')
     kw.update(kwargs)
-    
+
     process_results('save', model, res_name,
                     folder=folder, param_files=param_files,
                     kwargs_read=kwargs_read, **kw)
-    
-def plot_results(model=None, res_name='h', param_files=None, folder=None, 
+
+
+def plot_results(model=None, res_name='h', param_files=None, folder=None,
                  kwargs_read=None, **kwargs):
-    
+
     kw = dict(save=True)
     kw.update(kwargs)
-    
+
     process_results('plot', model, res_name,
                     folder=folder, param_files=param_files,
                     kwargs_read=kwargs_read, **kwargs)
-    
+
+
 def _get_parser(prog, description):
     parser = argparse.ArgumentParser(prog=prog,
                                      description=description,
@@ -80,6 +83,7 @@ def _get_parser(prog, description):
                         default=None, type=str)
     return parser
 
+
 def _tilupy_plot():
     parser = _get_parser('tilupy_plot', 'Plot thin-layer simulation results')
     parser.add_argument('--fmt', help=("Plot output format "
@@ -100,7 +104,8 @@ def _tilupy_plot():
                         )
     args = parser.parse_args()
     plot_results(**vars(args))
-    
+
+
 def _tilupy_to_raster():
     parser = _get_parser('tilupy_to_raster',
                          'Convert simulation results to rasters')
@@ -111,11 +116,10 @@ def _tilupy_to_raster():
     args = parser.parse_args()
     # plot_results(parser.model, parser.res_name)
     to_raster(**vars(args))
-    
-    
+
+
 if __name__ == '__main__':
-    
+
     # folder = 'd:/Documents/peruzzetto/tmp/test_shaltop/7p30e04_m3/coulomb'
     # plot_results('shaltop', 'h_max', '*18p00.txt', folder=folder)
     _tilupy_plot()
-    

{tilupy-0.1.3 → tilupy-0.1.4/src/tilupy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tilupy
-Version: 0.1.3
+Version: 0.1.4
 Summary: Thin-layer models unified processing tool
 Author-email: Marc Peruzzetto <m.peruzzetto@brgm.fr>
 License: CeCILL-C FREE SOFTWARE LICENSE AGREEMENT
@@ -524,7 +524,7 @@ Keywords: thin-layer,shallow-water,display,simulation,model,processing,benchmark
 Classifier: License :: CeCILL-C Free Software License Agreement (CECILL-C)
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Requires-Python: >=3.10
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Provides-Extra: test
 Provides-Extra: dev

tilupy-0.1.4/tests/test_shaltop.py

@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Wed Jul 19 15:39:38 2023
+
+@author: peruzzetto
+"""
+
+import os
+import shutil
+
+import tilupy.models.shaltop.initsimus as shinit
+import tilupy.cmd
+
+
+def test_shaltop_raster_to_input(folder_data):
+
+    folder_simus = os.path.join(folder_data, 'frankslide', 'shaltop')
+
+    raster_topo = os.path.join(folder_data, 'frankslide', 'rasters',
+                               'Frankslide_topography.asc')
+
+    file_topo_sh = os.path.join(folder_simus, 'topography.d')
+
+    if os.path.isfile(file_topo_sh):
+        os.remove(file_topo_sh)
+
+    shinit.raster_to_shaltop_txtfile(raster_topo, file_topo_sh)
+
+    raster_pile = os.path.join(folder_data, 'frankslide', 'rasters',
+                               'Frankslide_pile.asc')
+    file_mass_sh = os.path.join(folder_simus, 'init_mass.d')
+
+    if os.path.isfile(file_mass_sh):
+        os.remove(file_mass_sh)
+
+    shinit.raster_to_shaltop_txtfile(raster_pile, file_mass_sh)
+
+    assert os.path.isfile(file_topo_sh) & os.path.isfile(file_mass_sh)
+
+
+def test_shaltop_make_read_param_file(folder_data):
+
+    params = dict(nx=201, ny=201,
+                  per=201*20,
+                  pery=201*20,
+                  # Simulation maximum time in seconds (not comutation time)
+                  tmax=20,
+                  dt_im=10,  # Time interval (s) between snapshots recordings
+                  file_z_init='topography.d',  # Name of topography input file
+                  file_m_init='init_mass.d',  # name of init mass input file
+                  initz=0,  # Topography is read from file
+                  ipr=0,  # Initial mass is read from file
+                  hinit_vert=1,  # Initial is given as vertical thicknesses and
+                  # must be converted to thicknesses normal to topography
+                  eps0=1e-13,  # Minimum value for thicknesses and velocities
+                  # choice of rheology (Coulomb with constant basal friction)
+                  icomp=1,
+                  # Min x value (used for plots after simulation is over)
+                  x0=1000,
+                  y0=2000)  # Min y value (used for plots after simulation is over)
+
+    deltas = [15, 20, 25]
+    folder_simus = os.path.join(folder_data, 'frankslide', 'shaltop')
+    files_created = True
+
+    for delta in deltas:
+        params_txt = 'delta_{:05.2f}'.format(delta).replace('.', 'p')
+        param_file_path = os.path.join(folder_simus, params_txt + '.txt')
+        if os.path.isfile(param_file_path):
+            os.remove(param_file_path)
+        # Specify folder where outputs are stored
+        params['folder_output'] = params_txt
+        params['delta1'] = delta  # Specify the friction coefficient
+        # Write parameter file
+        shinit.write_params_file(params, directory=folder_simus,
+                                 file_name=params_txt + '.txt')
+
+        files_created = files_created & os.path.isfile(param_file_path)
+        if not files_created:
+            break
+
+        assert files_created
+
+
+def test_shaltop_plot_results(folder_data):
+
+    folder_simus = os.path.join(folder_data, 'frankslide', 'shaltop')
+    params_files = 'delta_*p00.txt'
+    folder_ress = [os.path.join(folder_data, 'frankslide', 'shaltop',
+                                'delta_{:d}p00'.format(delta), 'plots')
+                   for delta in [15, 20, 25]]
+    for folder in folder_ress:
+        if os.path.isdir(folder):
+            shutil.rmtree(folder)
+    tilupy.cmd.plot_results('shaltop', 'h', params_files, folder_simus,
+                            save=True, display_plot=False,
+                            figsize=(10/2.54, 10/2.54))
+    files_plots = ['h_0000.png', 'h_0001.png', 'h_0002.png']
+
+    all_files_created = True
+    for folder in folder_ress:
+        for file in files_plots:
+            file_path = os.path.join(folder, file)
+            all_files_created = all_files_created & os.path.isfile(file_path)
+
+    assert all_files_created

tilupy-0.1.3/tests/test_shaltop.py

@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-"""
-Created on Wed Jul 19 15:39:38 2023
-
-@author: peruzzetto
-"""
-
-import os
-
-import tilupy.models.shaltop.initsimus as shinit
-
-
-def test_shaltop_raster_to_input(folder_data):
-    
-    raster_topo = os.path.join(folder_data, 'frankslide', 'rasters', 
-                               'Frankslide_topography.asc')
-    
-    folder_simus = os.path.join(folder_data, 'frankslide', 'shaltop')
-    
-    file_topo_sh = os.path.join(folder_simus, 'topography.d')
-    
-    if os.path.isfile(file_topo_sh):
-        os.remove(file_topo_sh)
-    
-    shinit.raster_to_shaltop_txtfile(raster_topo, file_topo_sh)
-    
-    assert os.path.isfile(file_topo_sh)    
-
-def test_shaltop_make_read_param_file(folder_data):
-    
-    params = dict(nx=201, ny=201,
-                  per=201*20,
-                  pery=201*20,
-                  tmax=100, # Simulation maximum time in seconds (not comutation time)
-                  dt_im=10, # Time interval (s) between snapshots recordings
-                  file_z_init = 'topography.d', # Name of topography input file
-                  file_m_init = 'init_mass.d',# name of init mass input file
-                  initz=0, # Topography is read from file
-                  ipr=0, # Initial mass is read from file
-                  hinit_vert=1, # Initial is given as vertical thicknesses and 
-                  # must be converted to thicknesses normal to topography
-                  eps0=1e-13, #Minimum value for thicknesses and velocities
-                  icomp=1, # choice of rheology (Coulomb with constant basal friction)
-                  x0=1000, # Min x value (used for plots after simulation is over)
-                  y0=2000) # Min y value (used for plots after simulation is over)
-    
-    deltas = [15, 20, 25]
-    folder_simus = os.path.join(folder_data, 'frankslide', 'shaltop')
-    files_created = True
-    
-    for delta in deltas:
-        params_txt = 'delta_{:05.2f}'.format(delta).replace('.', 'p')
-        param_file_path = os.path.join(folder_simus,params_txt + '.txt')
-        if os.path.isfile(param_file_path):
-            os.remove(param_file_path)
-        params['folder_output'] = params_txt # Specify folder where outputs are stored
-        params['delta1'] = delta # Specify the friction coefficient
-        #Write parameter file
-        shinit.write_params_file(params, directory=folder_simus,
-                                 file_name=params_txt + '.txt')
-        
-        files_created = files_created & os.path.isfile(param_file_path)
-        if not files_created:
-            break
-        
-        assert files_created