Skip to content

Commit 689ef91

Browse files
authored
Merge branch 'NHERI-SimCenter:master' into master
2 parents 72d2681 + 8828e81 commit 689ef91

12 files changed

Lines changed: 103 additions & 6845 deletions

File tree

modules/performRegionalEventSimulation/regionalGroundMotion/GMSimulators.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,9 @@ def parse_correlation_info(self, correlation_info, im_info): # noqa: C901, D102
303303
# inter-event model
304304
if correlation_info.get('InterEvent', None):
305305
self.inter_cm = correlation_info['InterEvent']
306-
elif correlation_info.get('IntraEventCorr', None):
306+
elif correlation_info.get('InterEventCorr', None):
307307
# back compatibility
308-
self.inter_cm = correlation_info['IntraEventCorr']
308+
self.inter_cm = correlation_info['InterEventCorr']
309309
else:
310310
print( # noqa: T201
311311
'GM_Simulator: no inter-event correlation information not found - results will be uncorrelated motions.'

modules/performUQ/SimCenterUQ/notBeingUsed/CMakeLists.txt

Lines changed: 0 additions & 8 deletions
This file was deleted.

modules/performUQ/SimCenterUQ/notBeingUsed/SimCenterUQFEM.py

Lines changed: 0 additions & 104 deletions
This file was deleted.

0 commit comments

Comments
 (0)