Condense input and cleanup#21
Merged
Merged
Conversation
- Removed input.json. Users are now asked to migrate their settings manually to general_inputs.json. This currently amounts to about 3-4 fields. - input_builder.py now points to general_inputs.json only
This file contained legacy plotting usage superseded by main_plot_functionality.py. There are no dependencies to this file.
This was referenced Mar 25, 2026
4 tasks
Merged
2 tasks
- Changed input parameter `typ_struct_bay_area_ft` to `typ_struct_bay_length_ft`. Original MATLAB repo documentation suggests that this is "length of the typical structural bay, centerline to centerline" - Changed the RCSW_4story_pelicun input to reflect this - Supports legacy field `typ_struct_bay_area_ft` with warning
- DMG_sample.csv and DV_repair_sample.csv must contain the metatag in the index column. For DMG, at least 'cmp-loc-dir-ds' is required. For DV, loc-dir-ds is required along with one of cmp, loss, or dmg.
The demo.ipynb in the root folder is deprecated (was based on pre-restructured repo) and is removed. Examples within are now adequately presented in main README.md, including input explanation, sample run, and basic plotting.
zsarnoczay
added a commit
to zsarnoczay/PBE
that referenced
this pull request
Apr 1, 2026
The upstream atc138 package (PR OpenPBEE/Functional-Recovery-Python#21) consolidated input.json into general_inputs.json. Update ATC138Widget and supporting classes to match. - Add number_of_stories, replacement_cost_median, and plan_area_ft2 to the general_inputs.json output - Add editable Replacement Cost field with bidirectional sync to the Pelicun Loss tab via a new singleton accessor and signal on PelicunLossRepairContainer - Add read-only Plan Area display derived from side lengths - Rename typ_struct_bay_area_ft to typ_struct_bay_length_ft (default changed from 169 to 30.0) with backward-compatible JSON reading - Add LossModel to INCLUDEPATH in PBE.pro - Update pbdl-0004 example general_inputs.json with new fields
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Small PR to address #16 and #15 before March 31 deadline. Several other cursory fixes/assertions are added:
typ_struct_bay_area_ftnomenclatureCloses #16, closes #15, documents #13
Changes:
general_inputs.jsonand documented these inREADME.mdplotModel_PBEErecovery.pyas it is superseded byplotters/functionstyp_struct_bay_area_fttotyp_struct_bay_length_ftto match description found in Matlab repository. UpdatedRCSW_4story_pelicunexample with this nomenclature and warned user iftyp_struct_bay_area_ftis used.index_label=damage_sample.columns.namewhen saving their damage samples to CSV.Notes
Tested that this does not conflict with #19 and #20 .