From 0573dc3dadd33b47fffcf3dedeaf8b141c8119a3 Mon Sep 17 00:00:00 2001 From: Mitchell Tesch Date: Tue, 19 Mar 2024 16:45:37 +1000 Subject: [PATCH] update of interactive database example --- examples/PyTABS_LinkSpringProp/excel_index.py | 54 ++++++++++--------- examples/PyTABS_LinkSpringProp/main.py | 6 +-- 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/examples/PyTABS_LinkSpringProp/excel_index.py b/examples/PyTABS_LinkSpringProp/excel_index.py index 10887c8..99765d0 100644 --- a/examples/PyTABS_LinkSpringProp/excel_index.py +++ b/examples/PyTABS_LinkSpringProp/excel_index.py @@ -1,30 +1,32 @@ # Workbook indexing of multi-linear elastic links -WB_FILE = r"D:\dev\pytabs\examples\PyTABS_LinkSpringProp\XX-XX-CA-ST-Perimeter Wall P-Y Curves-240308.xlsx" +WB_FILE = r"C:\Users\mitchell.tesch\dev\projects\_gh\Northbrook\XX-XX-CA-ST-Perimeter Wall P-Y Curves-240308.xlsx" WB_SHEET = 'SUMMARY' -TABLE_RANGES = {'PW_GA_NESW_3.5|2.5': 'C62', - 'PW_HF_NESW_3.5|-3.5': 'C84', - 'PW_MS_NESW_3.5|-4.5': 'C107', - 'PW_MS_W_3.5|-2': 'C130', - 'PW_TA_NE_-2.5|-4': 'C153', - 'PW_TA_NE_-4|-6': 'C175', - 'PW_TA_NE_-8|-9': 'C197', - 'PW_TA_NE_-9|-10': 'C219', - 'PW_TA_NE_-10|-11': 'C241', - 'PW_TA_NE_-12|': 'C263', - 'PW_TA_S_-5.5|-6': 'C286', - 'PW_TA_S_-8|-9': 'C309', - 'PW_TA_S_-9|-10': 'C332', - 'PW_TA_S_-10|-11': 'C355', - 'PW_TA_S_-11|-12': 'C377', - 'PW_TA_S_-12|-13': 'C399', - 'PW_TA_S_-13|': 'C421', - 'PW_TA_W_-2.5|-3.5': 'C444', - 'PW_TA_W_-3.5|-4.5': 'C467', - 'PW_TA_W_-4.5|-6': 'C490', - 'PW_TA_W_-8|-9': 'C512', - 'PW_TA_W_-9|-10': 'C534', - 'PW_TA_W_-10|-11.5': 'C556', - 'PW_TA_NEW_-6|-8': 'C577', - 'PW_TA_S_-6|-8': 'C598', +TABLE_RANGES = {'PW_GF_NESW_3.5|2': 'F62', + 'PW_HF_NESW_3.5|-3.5': 'F84', + 'PW_MS_NESW_3.5|-5.5': 'F107', + 'PW_TA_NE_-2.5|-4': 'F153', + 'PW_TA_NE_-4|-6': 'F175', + 'PW_TA_NE_-8|-9': 'F197', + 'PW_TA_NE_-9|-10': 'F219', + 'PW_TA_NE_-10|-11.5': 'F241', + 'PW_TA_NE_-11.5|': 'F263', + 'PW_TA_S_-5.5|-6': 'F286', + 'PW_TA_S_-8|-9': 'F309', + 'PW_TA_S_-9|-10': 'F332', + 'PW_TA_S_-10|-11': 'F355', + 'PW_TA_S_-11|-12': 'F377', + 'PW_TA_S_-12|-13': 'F399', + 'PW_TA_S_-13|': 'F421', + 'PW_TA_W_-2.5|-3.5': 'F444', + 'PW_TA_W_-3.5|-4.5': 'F467', + 'PW_TA_W_-4.5|-6': 'F490', + 'PW_TA_W_-8|-9': 'F512', + 'PW_TA_W_-9|-10': 'F534', + 'PW_TA_W_-10|-11.5': 'F556', + 'PW_TA_NEW_-6|-8': 'F577', + 'PW_TA_S_-6|-8': 'F598', + 'PW_ECBF_NESW_0|1': 'F621', + 'PW_ECBF_NESW_1|2': 'F644', + 'PW_ECBF_NESW_2|': 'F668', } diff --git a/examples/PyTABS_LinkSpringProp/main.py b/examples/PyTABS_LinkSpringProp/main.py index 421a216..65a3d51 100644 --- a/examples/PyTABS_LinkSpringProp/main.py +++ b/examples/PyTABS_LinkSpringProp/main.py @@ -25,7 +25,7 @@ def main(): 'dof': [False, False, True, False, False, False], 'ml_axes': [etabs_model.property.link.eLinkDof.U3], 'force_values': [0.] + prop_data['force_values'], - 'delta_values': [-.0001] + prop_data['delta_values'], + 'delta_values': [-.1] + prop_data['delta_values'], }, {'name': f'{prop_base_name}_{BIDIRECTIONAL_SUFFIX}', 'dof': [False, False, True, False, False, False], @@ -38,7 +38,7 @@ def main(): 'ml_axes': [etabs_model.property.link.eLinkDof.U2, etabs_model.property.link.eLinkDof.U3], 'force_values': [0.] + prop_data['force_values'], - 'delta_values': [-.0001] + prop_data['delta_values'], + 'delta_values': [-.1] + prop_data['delta_values'], }, {'name': f'{prop_base_name}_{BIDIRECTIONAL_SUFFIX}_{CORNER_SUFFIX}', 'dof': [False, True, True, False, False, False], @@ -87,7 +87,7 @@ def main(): for record in table_array.table_data: new_record = list(record) if record[0].startswith('PW'): - new_record[1] = 'Link' + new_record[1] = 'Link' new_record[8] = record[0] new_table_data.append(new_record)