From c8237da65e4552490454546d9000351a5c7df1b6 Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Mon, 19 Oct 2026 07:24:27 +0200 Subject: [PATCH 1/3] Do not export CSV files in per-model subdirectories The ASCE summaries are built from the datastore, so the per-site CSV exports of each mosaic model are not needed by mosaic run_site. --- openquake/commands/mosaic.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/openquake/commands/mosaic.py b/openquake/commands/mosaic.py index 6578d52119c..83a9ad88e20 100644 --- a/openquake/commands/mosaic.py +++ b/openquake/commands/mosaic.py @@ -117,8 +117,6 @@ def from_file(fname, mosaic_dir, asce_dir, concurrent_jobs, dic = dict(sites=sites, vs30=str(vs30), asce_version=asce_version, siteid=' '.join(map(str, ids[model]))) params = get_params_from(dic, mosaic_dir, job_ini=job_ini) - params['exports'] = 'csv' - params['export_dir'] = os.path.abspath(os.path.join(asce_dir, model)) # del params['postproc_func'] allparams.append(params) models.append(model) From 184b34809a5a0d24d464b131124c43e256b572de Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Mon, 19 Oct 2026 07:31:17 +0200 Subject: [PATCH 2/3] Revert "Do not export CSV files in per-model subdirectories" This reverts commit c8237da65e4552490454546d9000351a5c7df1b6. --- openquake/commands/mosaic.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openquake/commands/mosaic.py b/openquake/commands/mosaic.py index 83a9ad88e20..6578d52119c 100644 --- a/openquake/commands/mosaic.py +++ b/openquake/commands/mosaic.py @@ -117,6 +117,8 @@ def from_file(fname, mosaic_dir, asce_dir, concurrent_jobs, dic = dict(sites=sites, vs30=str(vs30), asce_version=asce_version, siteid=' '.join(map(str, ids[model]))) params = get_params_from(dic, mosaic_dir, job_ini=job_ini) + params['exports'] = 'csv' + params['export_dir'] = os.path.abspath(os.path.join(asce_dir, model)) # del params['postproc_func'] allparams.append(params) models.append(model) From 6c3b6fb16ca1255893c5e538446365f0168e72fe Mon Sep 17 00:00:00 2001 From: Michele Simionato Date: Mon, 19 Oct 2026 09:37:22 +0200 Subject: [PATCH 3/3] Remove the per-model export subdirectories after oq mosaic run_site The command is used only in the tests: the exports are kept until the run ends, then removed, so the tests can check that the export works. --- openquake/commands/mosaic.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/openquake/commands/mosaic.py b/openquake/commands/mosaic.py index 6578d52119c..b4ca2faa7b4 100644 --- a/openquake/commands/mosaic.py +++ b/openquake/commands/mosaic.py @@ -19,6 +19,7 @@ import os import sys import time +import shutil import logging import getpass import cProfile @@ -130,6 +131,10 @@ def from_file(fname, mosaic_dir, asce_dir, concurrent_jobs, logctxs = engine.create_jobs( allparams, loglevel, None, getpass.getuser(), None) engine.run_jobs(logctxs, concurrent_jobs) + # oq mosaic run_site is used only in the tests: the exported files + # are not needed, except for testing that the export works + for model in models: + shutil.rmtree(os.path.join(asce_dir, model), ignore_errors=True) out = [] count_errors = 0 asce = {}