Commit Graph

63 Commits

Author SHA1 Message Date
ftong 3136c4985d disable cython 2025-09-24 14:05:22 +02:00
ftong deb7005604 Force use of fork in multiprocessing
From Tomasz Balawajder:
"Since we are using a Java service to launch the Python process, its behavior differs from running the script directly on the cluster.

By default, Dask uses fork() to create worker processes. However, when running under the JVM, the start method defaults to spawn, which does not share memory between processes. This caused the slowdown and unexpected behavior.

I’ve forced Python to use fork() in the configuration, and now the application completes in the same time as when executed with sbatch."
2025-09-23 11:41:08 +02:00
ftong fe9d886499 interpolation is always used on the final grid 2025-09-12 10:37:03 +02:00
ftong f7eb39c43c add final image smoothing through binlinear interpolation 2025-09-10 18:39:43 +02:00
ftong 00bd39a098 impose requirement of minimum size of range of output data to do image processing 2025-09-10 16:33:11 +02:00
ftong 5a1f43d6cd enforce: user must have "activity rate estimation" unselected for custom rate to be used
Previously, user could enter a value enter the  custom rate box, enable "activity rate estimation" and the custom rate box would disappear but the program would still see the value previously entered and use it even though it was no longer visible in the user interface
2025-09-10 12:00:50 +02:00
ftong a1c0ae36bb set a minimum number of computed grid values to trigger upscaling of grid image 2025-09-09 14:41:02 +02:00
ftong 63351ceb10 fix weighting option selection 2025-09-09 11:03:05 +02:00
ftong 65759b86f1 change search interval for PGV to be different than that for PGA/SA 2025-09-09 10:56:35 +02:00
asia a8233950e1 Merge pull request 'Fixes issue related to use of Cython' (!21) from EPOSDEV-68 into master
Reviewed-on: #21
v2.66 v2.66.1
2025-08-12 12:56:15 +02:00
ftong 86da5c3246 Update src/seismic_hazard_forecasting.py 2025-08-08 18:28:34 +02:00
asia 9e75e0e768 Merge pull request 'upload Lasocki2013 ground motion model' (!20) from lasocki2013_gmm into master
Reviewed-on: #20
2025-07-11 11:28:58 +02:00
ftong a73f17fc35 upload Lasocki2013 ground motion model 2025-07-10 11:05:36 +02:00
asia 2fbca21917 Merge pull request 'enable cython' (!19) from ftong-patch-cython into master
Reviewed-on: #19
Reviewed-by: asia <asia@noreply.example.org>
2025-07-10 09:36:22 +02:00
asia 910d933467 Merge branch 'master' into ftong-patch-cython 2025-07-10 08:55:13 +02:00
ftong e06f4a5a05 edit error message for clarity 2025-07-09 15:23:42 +02:00
ftong 2906af6918 improve error message when user provides magnitude file incompatible with ground motion model 2025-07-09 15:09:44 +02:00
ftong dd84829b6d define m_max when magnitude distribution estimation is not enabled; take from user's m_file 2025-07-09 13:27:44 +02:00
ftong 5b25b93090 convert custom activity rate from list to numpy array of type 'double' to satisfy cython input 2025-07-09 13:15:04 +02:00
asia 9fd7de6124 Merge pull request 'Update src/seismic_hazard_forecasting.py' (!18) from ftong-patch-mc into master
Reviewed-on: #18
Reviewed-by: asia <asia@noreply.example.org>
2025-07-09 12:05:59 +02:00
ftong d56aaeef39 Update src/seismic_hazard_forecasting.py 2025-07-09 11:25:55 +02:00
ftong b4ef228a03 Update src/seismic_hazard_forecasting.py 2025-07-09 11:08:04 +02:00
asia fc2e8b53c7 Merge pull request 'July2025updates' (!17) from July2025updates into master
Reviewed-on: #17
Reviewed-by: asia <asia@noreply.example.org>
2025-07-08 14:49:31 +02:00
ftong 664ab1025b catch time_win_duration values that are too large 2025-07-07 16:42:57 +02:00
ftong 36378f4d6c Update src/seismic_hazard_forecasting.py 2025-07-07 16:36:40 +02:00
ftong 1244655a68 Update src/seismic_hazard_forecasting.py 2025-07-07 15:07:33 +02:00
ftong 70c08f47ab add info msg about m_max 2025-07-07 14:49:35 +02:00
ftong 60ae1c96cd raise exception for null magnitude values 2025-07-07 14:43:42 +02:00
ftong 1ea6c85ab2 Update src/seismic_hazard_forecasting.py 2025-07-07 13:45:17 +02:00
ftong 84440152eb Update src/seismic_hazard_forecasting.py 2025-07-07 13:40:02 +02:00
ftong a941939493 remove processing of depth as it is not used 2025-07-07 13:25:05 +02:00
ftong f4d2cfc3cd add check that m_max is not too large for the ground motion model 2025-07-02 15:43:05 +02:00
ftong bd1ad26693 change default m_max from 3 to 1 mag unit above max mag in catalog 2025-07-02 15:33:42 +02:00
ftong bc4d57a5ab catch null result from ground motion forecasting 2025-07-02 14:27:33 +02:00
ftong 921de3f423 fix - activity rate figure no longer cut off at the bottom 2025-07-01 16:24:59 +02:00
ftong b287715f44 use distances in km instead of m 2025-07-01 16:09:24 +02:00
ftong eb14b7d235 update package version logging, remove cpu tracking 2025-07-01 16:06:11 +02:00
asia 3ffcf2c4db Added licence 2025-06-23 14:51:08 +02:00
mieszkomakuch 6f3d95974e Merge pull request 'fixes' (#13) from fixes into master
Reviewed-on: #13
Reviewed-by: mieszkomakuch <mieszkomakuch@noreply.example.org>
v2.65 v2.65.1
2025-06-09 12:36:33 +02:00
ftong 4adfbb6a54 add 'g' as unit of colorbar for PGA and SA 2025-06-06 17:09:48 +02:00
ftong bd468927f3 Update src/seismic_hazard_forecasting.py 2025-06-06 16:40:46 +02:00
ftong bda00e225c Update src/seismic_hazard_forecasting.py 2025-06-06 14:08:24 +02:00
mieszkomakuch a0f29de47f Merge pull request 'ISEPOS-2373 Add coordinates to SVG overlay files' (#10) from ISEPOS-2373-add-coordinates-for-svg-overlay into master
Reviewed-on: #10
Reviewed-by: ftong <ftong@noreply.example.org>
2025-06-05 14:26:35 +02:00
ftong 86fb03c792 Merge branch 'master' into ISEPOS-2373-add-coordinates-for-svg-overlay 2025-06-05 14:09:06 +02:00
ftong 846078352b revert f1472bf250
revert add non-parallel processing and set as default; fix colourbar
2025-06-04 17:49:54 +02:00
ftong f1472bf250 add non-parallel processing and set as default; fix colourbar 2025-06-04 17:15:19 +02:00
asia d12e91d951 Merge pull request 'Fix to boolean parsing in shf_wrapper.py' (#7) from boolean_value_parsing_fiz into master
Reviewed-on: #7
Reviewed-by: h.siejkowski <h.siejkowski@noreply.example.org>
2025-05-27 19:56:30 +02:00
asia 7c484e3974 Fix to boolean parsing in shf_wrapper.py 2025-05-26 16:35:04 +02:00
ftong 7a39d5a07e Update src/seismic_hazard_forecasting.py 2025-05-23 16:43:15 +02:00
mieszkomakuch 9c58664770 ISEPOS-2373 Simplify code 2025-05-09 10:30:00 +02:00