From 52aee8e0e25c627d23a184765e7f92b9738b31ff Mon Sep 17 00:00:00 2001 From: Daniel Weschke Date: Sun, 10 Feb 2019 10:49:13 +0100 Subject: [PATCH] change to one material per file --- src/data/{aluminum.json => Al.json} | 40 ++--------------------------- src/data/AlMg4.5Mn0.7.json | 36 ++++++++++++++++++++++++++ src/materials.py | 2 +- 3 files changed, 39 insertions(+), 39 deletions(-) rename src/data/{aluminum.json => Al.json} (78%) create mode 100644 src/data/AlMg4.5Mn0.7.json diff --git a/src/data/aluminum.json b/src/data/Al.json similarity index 78% rename from src/data/aluminum.json rename to src/data/Al.json index c49afdd..4e35939 100644 --- a/src/data/aluminum.json +++ b/src/data/Al.json @@ -1,4 +1,4 @@ -[{ +{ "Name": "Aluminum", "Formula": "Al", "CAS Reg No.": "7429-90-5", @@ -150,40 +150,4 @@ "Title" : "", "Pages": [694, 758, 760, 764, 767, 781, 792, 978, 1017, 1035, 1122, 1179, 1182, 1207] } -}, -{ - "Name": "G.AL® C250 Aluminium Präzisionsplatte", - "Alloy": { - "Standard": "EN AW 5083", - "Type": "non heat-treatable" - }, - "Formula": "AlMg4.5Mn0.7", - "Heat treatment": { - "Temper": "homogenized and stress relieved, O3" - }, - "Electromagnetic Data": { - "sigma": ["16-18", "m/Ω/mm²"] - }, - "Mechanical Properties": { - "T": ["20-25", "°C"], - "rho": [2.66, "g/cm³"], - "E": [70, "GPa"], - "R_p02": ["110-130", "MPa"], - "R_m": ["230-290", "MPa"], - "Elongation": ["10-15", "%"], - "Hardness": { - "HBW": ["68-75", "2.5/62.5"] - } - }, - "Thermodynamic Properties": { - "Crystal": { - "alpha": [23.3, "m/µm/K"], - "k": ["110-130", "W/m/K"], - "cp": [900, "J/kg/K"] - } - }, - "Source": { - "Type": "Web", - "URL": "https://gleich.de/en/wp-content/uploads/sites/4/2016/10/en_g.al_c250.pdf" - } -}] +} diff --git a/src/data/AlMg4.5Mn0.7.json b/src/data/AlMg4.5Mn0.7.json new file mode 100644 index 0000000..852e98a --- /dev/null +++ b/src/data/AlMg4.5Mn0.7.json @@ -0,0 +1,36 @@ +{ + "Name": "G.AL® C250 Aluminium Präzisionsplatte", + "Alloy": { + "Standard": "EN AW 5083", + "Type": "non heat-treatable" + }, + "Formula": "AlMg4.5Mn0.7", + "Heat treatment": { + "Temper": "homogenized and stress relieved, O3" + }, + "Electromagnetic Data": { + "sigma": ["16-18", "m/Ω/mm²"] + }, + "Mechanical Properties": { + "T": ["20-25", "°C"], + "rho": [2.66, "g/cm³"], + "E": [70, "GPa"], + "R_p02": ["110-130", "MPa"], + "R_m": ["230-290", "MPa"], + "Elongation": ["10-15", "%"], + "Hardness": { + "HBW": ["68-75", "2.5/62.5"] + } + }, + "Thermodynamic Properties": { + "Crystal": { + "alpha": [23.3, "m/µm/K"], + "k": ["110-130", "W/m/K"], + "cp": [900, "J/kg/K"] + } + }, + "Source": { + "Type": "Web", + "URL": "https://gleich.de/en/wp-content/uploads/sites/4/2016/10/en_g.al_c250.pdf" + } +} diff --git a/src/materials.py b/src/materials.py index 412c57d..daa2fb9 100755 --- a/src/materials.py +++ b/src/materials.py @@ -165,7 +165,7 @@ def main(): file_list = read_dir(absolute_path("data"), "INFO.json", True) for filename in file_list: file, _ = os.path.splitext(os.path.basename(filename)) - print(file.title()) + print(file) data = read_file(filename) data_dict = search_keys(data, 'Name') print_dict(data_dict, False, 2)