Skip to content

Commit 074838a

Browse files
authored
Merge pull request #424 from zsarnoczay/master
feat(ATC138): align wrapper with new atc138 input parser
2 parents a942afc + 3891f61 commit 074838a

1 file changed

Lines changed: 1 addition & 10 deletions

File tree

modules/performanceAssessment/ATC138/ATC138Wrapper.py

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858

5959
# Pelicun output files required by the ATC-138 Pelicun converter.
6060
REQUIRED_PELICUN_FILES = (
61-
'AIM.json',
6261
'CMP_QNT.csv',
6362
'DL_summary.csv',
6463
'DMG_sample.csv',
@@ -303,21 +302,13 @@ def main(
303302
for filename in REQUIRED_PELICUN_FILES:
304303
_stage_pelicun_file(filename, work_dir, input_dir)
305304

306-
# --- Stage AIM as input.json (ATC-138 Pelicun converter expects this) ----
307-
308-
shutil.copy2(aim_path, input_dir / 'input.json')
309-
310305
# --- Stage tenant unit list (auto-generate if not provided) --------------
311306

312307
if not _copy_if_exists(
313308
str(tenant_unit_list_path),
314309
input_dir / 'tenant_unit_list.csv',
315310
):
316-
num_stories = (
317-
aim_data
318-
.get('GeneralInformation', {})
319-
.get('NumberOfStories', 1)
320-
)
311+
num_stories = int(general_inputs.get('number_of_stories', 1))
321312
generate_default_tenant_unit_list(
322313
general_inputs, num_stories, input_dir / 'tenant_unit_list.csv'
323314
)

0 commit comments

Comments
 (0)