diff --git a/src/seismic_hazard_forecasting.py b/src/seismic_hazard_forecasting.py index 3daf871..788c8df 100644 --- a/src/seismic_hazard_forecasting.py +++ b/src/seismic_hazard_forecasting.py @@ -436,20 +436,38 @@ verbose: {verbose}") # use dask parallel computing start = timer() - pbar = ProgressBar() - pbar.register() - # iter = range(0,len(distances)) - iter = indices - iml_grid_raw = [] # raw ground motion grids - for imt in products: - logger.info(f"Estimating {imt}") - imls = [dask.delayed(compute_IMT_exceedance)(rx_lat[i], rx_lon[i], distances[i].flatten(), fr, p, lambdas, - forecast_len, lambdas_perc, m_range, m_pdf, m_cdf, model, - log_level=logging.DEBUG, imt=imt, IMT_min=0.0, IMT_max=2.0, rtol=0.1, - rx_label=i) for i in iter] - iml = dask.compute(*imls) - iml_grid_raw.append(list(iml)) + use_pp = False + + if use_pp: + pbar = ProgressBar() + pbar.register() + # iter = range(0,len(distances)) + iter = indices + iml_grid_raw = [] # raw ground motion grids + for imt in products: + logger.info(f"Estimating {imt}") + + imls = [dask.delayed(compute_IMT_exceedance)(rx_lat[i], rx_lon[i], distances[i].flatten(), fr, p, lambdas, + forecast_len, lambdas_perc, m_range, m_pdf, m_cdf, model, + log_level=logging.DEBUG, imt=imt, IMT_min=0.0, IMT_max=2.0, rx_label=i, + rtol=0.1,rx_label=i) for i in iter] + iml = dask.compute(*imls) + iml_grid_raw.append(list(iml)) + + else: + + iml_grid_raw = [] + for imt in products: + iml = [] + for i in iter: + iml_i = compute_IMT_exceedance(rx_lat[i], rx_lon[i], distances[i].flatten(), fr, p, lambdas, forecast_len, + lambdas_perc, m_range, m_pdf, m_cdf, model, imt=imt, IMT_min = 0.0, + IMT_max = 2.0, rx_label = i, rtol = 0.01, use_cython=False) + iml.append(iml_i) + logger.info(f"Estimated {imt} at rx {i} is {iml_i}") + iml_grid_raw.append(iml) + end = timer() logger.info(f"Ground motion exceedance computation time: {round(end - start, 1)} seconds")