Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
ff3af6a769 | |||
b6375203b5 | |||
02c9537ef9 | |||
47d6d39d91 |
@@ -73,7 +73,7 @@ def main(catalog_file, mc_file, pdf_file, m_file, m_select, mag_label, mc, m_max
|
|||||||
from math import ceil, floor, isnan
|
from math import ceil, floor, isnan
|
||||||
import numpy as np
|
import numpy as np
|
||||||
import dask
|
import dask
|
||||||
from dask.diagnostics import ProgressBar # use Dask progress bar
|
# from dask.diagnostics import ProgressBar # use Dask progress bar
|
||||||
import kalepy as kale
|
import kalepy as kale
|
||||||
import utm
|
import utm
|
||||||
from skimage.transform import resize
|
from skimage.transform import resize
|
||||||
@@ -90,6 +90,7 @@ def main(catalog_file, mc_file, pdf_file, m_file, m_select, mag_label, mc, m_max
|
|||||||
from matplotlib.contour import ContourSet
|
from matplotlib.contour import ContourSet
|
||||||
import xml.etree.ElementTree as ET
|
import xml.etree.ElementTree as ET
|
||||||
import json
|
import json
|
||||||
|
from concurrent.futures import ThreadPoolExecutor
|
||||||
|
|
||||||
logger = getDefaultLogger('igfash')
|
logger = getDefaultLogger('igfash')
|
||||||
|
|
||||||
@@ -132,7 +133,7 @@ verbose: {verbose}")
|
|||||||
logger.debug(f"Rbeast version {version('rbeast')}")
|
logger.debug(f"Rbeast version {version('rbeast')}")
|
||||||
logger.debug(f"Dask version {version('dask')}")
|
logger.debug(f"Dask version {version('dask')}")
|
||||||
|
|
||||||
dask.config.set(scheduler='processes')
|
dask.config.set(scheduler='threads', pool=ThreadPoolExecutor(16))
|
||||||
|
|
||||||
# run magnitude distribution modeling if selected by user and no magnitude pdf file provided
|
# run magnitude distribution modeling if selected by user and no magnitude pdf file provided
|
||||||
if m_select and m_range[0] == None and m_pdf[0] == None:
|
if m_select and m_range[0] == None and m_pdf[0] == None:
|
||||||
@@ -478,8 +479,8 @@ verbose: {verbose}")
|
|||||||
use_pp = True
|
use_pp = True
|
||||||
|
|
||||||
if use_pp: # use dask parallel computing
|
if use_pp: # use dask parallel computing
|
||||||
pbar = ProgressBar()
|
# pbar = ProgressBar()
|
||||||
pbar.register()
|
# pbar.register()
|
||||||
# iter = range(0,len(distances))
|
# iter = range(0,len(distances))
|
||||||
iter = indices
|
iter = indices
|
||||||
iml_grid_raw = [] # raw ground motion grids
|
iml_grid_raw = [] # raw ground motion grids
|
||||||
|
Reference in New Issue
Block a user