[1.1] Refactor again some files and finish translation

Author: lucduron

README.md

@@ -9,9 +9,9 @@ TatooineMesher
 
 Set of 4 command line scripts:
 * `densify_cross_sections.py` : interpolate initial and intermediate cross-sections
-* `mesher_and_interpolator.py`: mesh and interpolate from a set of cross-sections
-* `mesh_crue10_run.py` : visualize Crue10 model geometry and results
+* `mesh_and_interpolate.py`: mesh and/or interpolate from a set of cross-sections
 * `mesh_mascaret_run.py` : visualize Mascaret model geometry and results
+* `mesh_crue10_run.py` : visualize Crue10 model geometry and results
 
 The command line scripts of TatooineMesher are located in the `cli` folder.
 

cli/densify_cross_sections.py

@@ -2,13 +2,14 @@
 """
 densify_cross_sections.py
 
-Interpolate intermediate cross-sections
+Interpolate initial and intermediate cross-sections
+Multiple variables are supported if input cross-sections file is a shapefile with POINTZ type.
 """
 from time import perf_counter
 
-from tatooinemesher.constraint_lines import ConstraintLine
+from tatooinemesher.constraint_line import ConstraintLine
 from tatooinemesher.mesh_constructor import MeshConstructor
-from tatooinemesher.sections import CrossSectionSequence
+from tatooinemesher.section import CrossSectionSequence
 from tatooinemesher.utils.arg_command_line import MyArgParse
 from tatooinemesher.utils import get_hydraulic_axis, logger, set_logger_level, TatooineException
 
@@ -39,7 +40,7 @@ def densify_cross_sections(args):
             raise TatooineException("A 2D interpolation is only compatible with 2 constraint lines!")
         section_seq.find_and_add_limits(constraint_lines, args.dist_max)
 
-    #section_seq.export_sections_shp('profils_travers_export_profil.shp')
+    #section_seq.export_sections_shp('export_cross-sections.shp')
 
     mesh_constr = MeshConstructor(section_seq=section_seq, lat_step=args.lat_step,
                                   nb_pts_lat=args.nb_pts_lat, interp_values=args.interp_values)

cli/mesher_and_interpolator.py renamed to cli/mesh_and_interpolate.py

@@ -1,20 +1,20 @@
 #!/usr/bin/env python3
 """
-mesher_and_interpolator.py
+mesh_and_interpolate.py
 
 Channel mesher and/or interpolator from cross-sections
 """
 #TODO: integrate "seuils?" (local correction of the bathymetry)
 from time import perf_counter
 
-from tatooinemesher.constraint_lines import ConstraintLine
+from tatooinemesher.constraint_line import ConstraintLine
 from tatooinemesher.mesh_constructor import MeshConstructor
-from tatooinemesher.sections import CrossSection, CrossSectionSequence
+from tatooinemesher.section import CrossSection, CrossSectionSequence
 from tatooinemesher.utils.arg_command_line import MyArgParse
 from tatooinemesher.utils import get_hydraulic_axis, logger, set_logger_level, TatooineException
 
 
-def mesher_and_interpolator(args):
+def mesh_and_interpolate(args):
     set_logger_level(args.verbose)
     t1 = perf_counter()
 
@@ -83,13 +83,13 @@ def mesher_and_interpolator(args):
 #                          help="distance around groynes to modify nodes close to them "
 #                               "(should be less than lateral and longitudinal space step)")
 # Outputs
-parser.add_out_mesh_file()
+parser.add_out_mesh_file(is_optional=True)
 parser.outfile_args.add_argument("--outfile_nodes", help="output points set file with mesh nodes (*.shp, *.xyz)")
 
 
 if __name__ == '__main__':
     args = parser.parse_args()
     try:
-        mesher_and_interpolator(args)
+        mesh_and_interpolate(args)
     except TatooineException as e:
         logger.critical(e.message)

cli/mesh_crue10_run.py

@@ -30,9 +30,9 @@
 from crue10.study import Study
 from crue10.utils import CrueError
 
-from tatooinemesher.constraint_lines import ConstraintLine
+from tatooinemesher.constraint_line import ConstraintLine
 from tatooinemesher.mesh_constructor import MeshConstructor
-from tatooinemesher.sections import CrossSection, CrossSectionSequence
+from tatooinemesher.section import CrossSection, CrossSectionSequence
 from tatooinemesher.interp.raster import interp_raster
 from tatooinemesher.utils.arg_command_line import MyArgParse
 from tatooinemesher.utils import logger, resample_2d_line, set_logger_level, TatooineException

cli/mesh_mascaret_run.py

@@ -14,9 +14,9 @@
 from mascaret.mascaret_file import MascaretFile
 from mascaret.mascaretgeo_file import MascaretGeoFile
 
-from tatooinemesher.constraint_lines import ConstraintLine
+from tatooinemesher.constraint_line import ConstraintLine
 from tatooinemesher.mesh_constructor import MeshConstructor
-from tatooinemesher.sections import CrossSection, CrossSectionSequence
+from tatooinemesher.section import CrossSection, CrossSectionSequence
 from tatooinemesher.utils.arg_command_line import MyArgParse
 from tatooinemesher.utils import logger, set_logger_level, TatooineException
 

tatooinemesher/__init__.py

@@ -1 +1 @@
-VERSION = '1.0'
+VERSION = '1.1'