From b8b8abea3564ff05588e3f59e79bf1d5fc4292b9 Mon Sep 17 00:00:00 2001 From: Fabien Maussion Date: Wed, 7 Sep 2022 13:23:51 +0000 Subject: [PATCH] Rename files (#1468) --- oggm/cli/prepro_levels.py | 10 +++++----- oggm/tests/test_utils.py | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/oggm/cli/prepro_levels.py b/oggm/cli/prepro_levels.py index 7617aa1eb..4f620204c 100644 --- a/oggm/cli/prepro_levels.py +++ b/oggm/cli/prepro_levels.py @@ -475,24 +475,24 @@ def _time_log(): # And for level 2: shapes if len(gdirs_cent) > 0: - opath = os.path.join(sum_dir, f'{rgi_reg}_centerlines.shp') + opath = os.path.join(sum_dir, f'centerlines_{rgi_reg}.shp') utils.write_centerlines_to_shape(gdirs_cent, to_tar=True, path=opath) - opath = os.path.join(sum_dir, f'{rgi_reg}_centerlines_smoothed.shp') + opath = os.path.join(sum_dir, f'centerlines_smoothed_{rgi_reg}.shp') utils.write_centerlines_to_shape(gdirs_cent, to_tar=True, ensure_exterior_match=True, simplify_line=0.5, corner_cutting=5, path=opath) - opath = os.path.join(sum_dir, f'{rgi_reg}_flowlines.shp') + opath = os.path.join(sum_dir, f'flowlines_{rgi_reg}.shp') utils.write_centerlines_to_shape(gdirs_cent, to_tar=True, flowlines_output=True, path=opath) - opath = os.path.join(sum_dir, f'{rgi_reg}_geom_widths.shp') + opath = os.path.join(sum_dir, f'geom_widths_{rgi_reg}.shp') utils.write_centerlines_to_shape(gdirs_cent, to_tar=True, geometrical_widths_output=True, path=opath) - opath = os.path.join(sum_dir, f'{rgi_reg}_widths.shp') + opath = os.path.join(sum_dir, f'widths_{rgi_reg}.shp') utils.write_centerlines_to_shape(gdirs_cent, to_tar=True, corrected_widths_output=True, path=opath) diff --git a/oggm/tests/test_utils.py b/oggm/tests/test_utils.py index f936d99f7..cd5f18db1 100644 --- a/oggm/tests/test_utils.py +++ b/oggm/tests/test_utils.py @@ -1039,11 +1039,11 @@ def test_full_run(self): 'glacier_statistics_11.csv')) assert 'main_flowline_length' in df assert os.path.isfile(os.path.join(odir, 'RGI61', 'b_020', 'L2', - 'summary', '11_centerlines.tar.gz')) + 'summary', 'centerlines_11.tar.gz')) assert os.path.isfile(os.path.join(odir, 'RGI61', 'b_020', 'L2', - 'summary', '11_centerlines_smoothed.tar.gz')) + 'summary', 'centerlines_smoothed_11.tar.gz')) assert os.path.isfile(os.path.join(odir, 'RGI61', 'b_020', 'L2', - 'summary', '11_widths.tar.gz')) + 'summary', 'widths_11.tar.gz')) df = pd.read_csv(os.path.join(odir, 'RGI61', 'b_020', 'L3', 'summary', 'glacier_statistics_11.csv'), index_col=0)