- "This script reproduces the results of the shear-compression tests, focusing on the structural behaviour of the walls. Part of the results that are reproduced by the script are contained in the journal article: \n",
+ "This script allows the results of the shear-compression tests to <b>visualized</b>, <b>modified</b> and <b>saved</b>. \n",
+ "\n",
+ "Part of the results that are reproduced by the script are contained in the journal article: \n",
"\n",
"Godio M., Vanin F., Zhang S. & Beyer K. (2019) \"Quasi-static shear-compression tests on stone masonry walls with plaster: Influence of load history and axial load ratio\". Engineering Structures. https://doi.org/10.1016/j.engstruct.2019.04.041"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
- "`Created by: M. Godio (EESD @ EPFL) on: August 3 2019 - \n",
- "Last modification by: M.Godio on: August 14 2019`"
+ "`Created by: M. Godio (EESD @ EPFL) on: August 23 2019 - \n",
+ "Last modification by: M.Godio on: August 30 2019`"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"#### Import libraries"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section imports the Python libraries needed to run this script"
]
},
{
"cell_type": "code",
- "execution_count": 13,
+ "execution_count": 1,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
" Libraries have been imported\n"
]
}
],
"source": [
"# libraries to import\n",
"import os\n",
"import numpy as np\n",
"import matplotlib.pyplot as plt\n",
"import scipy.io as sio\n",
"\n",
"from matplotlib import rc\n",
"from scipy.signal import find_peaks\n",
"from tabulate import tabulate\n",
"from scipy.interpolate import interp1d\n",
"\n",
"# to install a library from the anaconda prompt, run a command of the kind:\n",
"# pip install numpy\n",
"\n",
"print(\" Libraries have been imported\")\n"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"#### Define classes"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section defines the classes used in this script"
]
},
{
"cell_type": "code",
- "execution_count": 14,
+ "execution_count": 2,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
" Classes have been defined\n"
]
}
],
"source": [
"\"\"\" \n",
"These classe contain the test data from shear-compression tests:\n",
"F = horizontal force (kN)\n",
"u = horizontal displacement (mm)\n",
"N = vertical force (kN)\n",
"v = vertical displacement (mm)\n",
"ss = sampling step \n",
"\"\"\"\n",
"class Dataset_sc():\n",
" \"\"\"Import the dataset contained in the -mat file.\"\"\"\n",
"This section defines the geometry and material properties of the test wall units tested in shear-compression: SC1, SC2, SC4, SC5, SC6, SC7. The variable <b>test_number</b> gives the number of tests performed. The dictionary <b>wall</b> containing the following variables is created:\n",
"print(\" Wall properties have been imported for all test units\")\n"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"## <span style=\"color: red;\">1.2</span> Import test data"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section imports the dataset related to the structural behaviour of the walls. Tha data is contained in the corresponding <b>TESTS</b> MAT-file and is imported in the dictionary <b>test</b> which includes the following variables:\n",
"<ul>\n",
" <li><b>F</b> = horizontal - shear - force </li>\n",
"This section computes the <b>F-u envelope curves</b> starting from the experimental curves. The envelopes are save in the dictionary <b>envelope</b> having the following structure:\n",
"<ul>\n",
" <li><b>envelope.positive</b> = including the positive envelope </li>\n",
" <li><b>envelope.negative</b> = including the negative envelope </li>\n",
"</ul>\n",
"Inside the dictionaries <b>positive</b> and <b>negative</b> the following variables are contained:\n",
"This section computes the key parameters of the wall structural behaviour. The results contained in <b>Table 3</b> and <b>Table 4</b> of Godio et al. (2019) are reproduced. The parameters are appended to the <b>key</b> dictionary. Inside the dictionary the following variables are added:\n",
" <li> <b>delta_collapse</b> = drift at collapse, <b>$\\delta_\\text{c}$</b> </li>\n",
"</ul>\n",
"Each variable contains values for both the positive and the negative envelopes, e.g. <b>peak_force.positive</b> and <b>peak_force.pegative</b>, plus the average value <b>peak_force.average</b>\n"
- " print('Plots have been saved in ' + where_to_save)\n",
- " \n",
- " if what_to_save == \"Data\":\n",
+ " print(' Data have been saved in: \\n ' + where_to_save)\n",
+ " print('\\n If using Blender, files will be saved in the Home. To access it, go one level up by deleting the file name (01_DATAVIZTOOL.ipynb) in the adress bar')\n",
" data_t.to_csv(where_to_save + '\\Test_' + test + '_' + xaxis + '-' + yaxis + '.csv', index = False)\n",
- " print('Data have been saved in ' + where_to_save)\n",
+ " print(' Data have been saved in: \\n ' + where_to_save)\n",
+ " print('\\n If using Blender, files will be saved in the Home. To access it, go one level up by deleting the file name (01_DATAVIZTOOL.ipynb) in the adress bar')\n",
"This script reproduces the results of the shear-compression tests, focusing on the structural behaviour of the walls. Part of the results that are reproduced by the script are contained in the journal article: \n",
"\n",
"Godio M., Vanin F., Zhang S. & Beyer K. (2019) \"Quasi-static shear-compression tests on stone masonry walls with plaster: Influence of load history and axial load ratio\". Engineering Structures. https://doi.org/10.1016/j.engstruct.2019.04.041"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"`Created by: M. Godio (EESD @ EPFL) on: August 3 2019 - \n",
"Last modification by: M.Godio on: August 30 2019`"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"#### Import libraries"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section imports the Python libraries needed to run this script"
]
},
{
"cell_type": "code",
- "execution_count": 21,
+ "execution_count": 14,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
" Libraries have been imported\n"
]
}
],
"source": [
"# libraries to import\n",
"import os\n",
"import numpy as np\n",
"import matplotlib.pyplot as plt\n",
"import scipy.io as sio\n",
"\n",
"from matplotlib import rc\n",
"from scipy.signal import find_peaks\n",
"from tabulate import tabulate\n",
"from scipy.interpolate import interp1d\n",
"\n",
"# to install a library from the anaconda prompt, run a command of the kind:\n",
"# pip install numpy\n",
"\n",
"print(\" Libraries have been imported\")\n"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"#### Define classes"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section defines the classes used in this script"
]
},
{
"cell_type": "code",
- "execution_count": 22,
+ "execution_count": 2,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
" Classes have been defined\n"
]
}
],
"source": [
"\"\"\" \n",
"These classe contain the test data from shear-compression tests:\n",
"F = horizontal force (kN)\n",
"u = horizontal displacement (mm)\n",
"N = vertical force (kN)\n",
"v = vertical displacement (mm)\n",
"ss = sampling step \n",
"\"\"\"\n",
"class Dataset_sc():\n",
" \"\"\"Import the dataset contained in the -mat file.\"\"\"\n",
"This section defines the geometry and material properties of the test wall units tested in shear-compression: SC1, SC2, SC4, SC5, SC6, SC7. The variable <b>test_number</b> gives the number of tests performed. The dictionary <b>wall</b> containing the following variables is created:\n",
"print(\" Wall properties have been imported for all test units\")\n"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"## <span style=\"color: red;\">1.2</span> Import test data"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section imports the dataset related to the structural behaviour of the walls. Tha data is contained in the corresponding <b>TESTS</b> MAT-file and is imported in the dictionary <b>test</b> which includes the following variables:\n",
"<ul>\n",
" <li><b>F</b> = horizontal - shear - force </li>\n",
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
"This section computes the <b>F-u envelope curves</b> starting from the experimental curves. The envelopes are save in the dictionary <b>envelope</b> having the following structure:\n",
"<ul>\n",
" <li><b>envelope.positive</b> = including the positive envelope </li>\n",
" <li><b>envelope.negative</b> = including the negative envelope </li>\n",
"</ul>\n",
"Inside the dictionaries <b>positive</b> and <b>negative</b> the following variables are contained:\n",
"This section plots the <b>F-u envelope curves</b> for each test and for the two sets of tests investigated in the campaign. The plot of <b>Fig.5</b> and <b>Fig.8</b> in Godio et al. (2019) are reproduced"
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
"This section computes the key parameters of the wall structural behaviour. The results contained in <b>Table 3</b> and <b>Table 4</b> of Godio et al. (2019) are reproduced. The parameters are appended to the <b>key</b> dictionary. Inside the dictionary the following variables are added:\n",
" <li> <b>delta_collapse</b> = drift at collapse, <b>$\\delta_\\text{c}$</b> </li>\n",
"</ul>\n",
"Each variable contains values for both the positive and the negative envelopes, e.g. <b>peak_force.positive</b> and <b>peak_force.pegative</b>, plus the average value <b>peak_force.average</b>\n"
- "This script reproduces the results of the shear-compression tests, focusing on the structural behaviour of the walls. Part of the results that are reproduced by the script are contained in the journal article: \n",
+ "This script allows the results of the shear-compression tests to <b>visualized</b>, <b>modified</b> and <b>saved</b>. \n",
+ "\n",
+ "Part of the results that are reproduced by the script are contained in the journal article: \n",
"\n",
"Godio M., Vanin F., Zhang S. & Beyer K. (2019) \"Quasi-static shear-compression tests on stone masonry walls with plaster: Influence of load history and axial load ratio\". Engineering Structures. https://doi.org/10.1016/j.engstruct.2019.04.041"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
- "`Created by: M. Godio (EESD @ EPFL) on: August 3 2019 - \n",
- "Last modification by: M.Godio on: August 14 2019`"
+ "`Created by: M. Godio (EESD @ EPFL) on: August 23 2019 - \n",
+ "Last modification by: M.Godio on: August 30 2019`"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"#### Import libraries"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section imports the Python libraries needed to run this script"
]
},
{
"cell_type": "code",
- "execution_count": 13,
+ "execution_count": 1,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
" Libraries have been imported\n"
]
}
],
"source": [
"# libraries to import\n",
"import os\n",
"import numpy as np\n",
"import matplotlib.pyplot as plt\n",
"import scipy.io as sio\n",
"\n",
"from matplotlib import rc\n",
"from scipy.signal import find_peaks\n",
"from tabulate import tabulate\n",
"from scipy.interpolate import interp1d\n",
"\n",
"# to install a library from the anaconda prompt, run a command of the kind:\n",
"# pip install numpy\n",
"\n",
"print(\" Libraries have been imported\")\n"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"#### Define classes"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section defines the classes used in this script"
]
},
{
"cell_type": "code",
- "execution_count": 14,
+ "execution_count": 2,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
" Classes have been defined\n"
]
}
],
"source": [
"\"\"\" \n",
"These classe contain the test data from shear-compression tests:\n",
"F = horizontal force (kN)\n",
"u = horizontal displacement (mm)\n",
"N = vertical force (kN)\n",
"v = vertical displacement (mm)\n",
"ss = sampling step \n",
"\"\"\"\n",
"class Dataset_sc():\n",
" \"\"\"Import the dataset contained in the -mat file.\"\"\"\n",
"This section defines the geometry and material properties of the test wall units tested in shear-compression: SC1, SC2, SC4, SC5, SC6, SC7. The variable <b>test_number</b> gives the number of tests performed. The dictionary <b>wall</b> containing the following variables is created:\n",
"print(\" Wall properties have been imported for all test units\")\n"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"## <span style=\"color: red;\">1.2</span> Import test data"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section imports the dataset related to the structural behaviour of the walls. Tha data is contained in the corresponding <b>TESTS</b> MAT-file and is imported in the dictionary <b>test</b> which includes the following variables:\n",
"<ul>\n",
" <li><b>F</b> = horizontal - shear - force </li>\n",
"This section computes the <b>F-u envelope curves</b> starting from the experimental curves. The envelopes are save in the dictionary <b>envelope</b> having the following structure:\n",
"<ul>\n",
" <li><b>envelope.positive</b> = including the positive envelope </li>\n",
" <li><b>envelope.negative</b> = including the negative envelope </li>\n",
"</ul>\n",
"Inside the dictionaries <b>positive</b> and <b>negative</b> the following variables are contained:\n",
"This section computes the key parameters of the wall structural behaviour. The results contained in <b>Table 3</b> and <b>Table 4</b> of Godio et al. (2019) are reproduced. The parameters are appended to the <b>key</b> dictionary. Inside the dictionary the following variables are added:\n",
" <li> <b>delta_collapse</b> = drift at collapse, <b>$\\delta_\\text{c}$</b> </li>\n",
"</ul>\n",
"Each variable contains values for both the positive and the negative envelopes, e.g. <b>peak_force.positive</b> and <b>peak_force.pegative</b>, plus the average value <b>peak_force.average</b>\n"
- " print('Plots have been saved in ' + where_to_save)\n",
- " \n",
- " if what_to_save == \"Data\":\n",
+ " print(' Data have been saved in: \\n ' + where_to_save)\n",
+ " print('\\n If using Blender, files will be saved in the Home. To access it, go one level up by deleting the file name (01_DATAVIZTOOL.ipynb) in the adress bar')\n",
" data_t.to_csv(where_to_save + '\\Test_' + test + '_' + xaxis + '-' + yaxis + '.csv', index = False)\n",
- " print('Data have been saved in ' + where_to_save)\n",
+ " print(' Data have been saved in: \\n ' + where_to_save)\n",
+ " print('\\n If using Blender, files will be saved in the Home. To access it, go one level up by deleting the file name (01_DATAVIZTOOL.ipynb) in the adress bar')\n",
"This script reproduces the results of the shear-compression tests, focusing on the structural behaviour of the walls. Part of the results that are reproduced by the script are contained in the journal article: \n",
"\n",
"Godio M., Vanin F., Zhang S. & Beyer K. (2019) \"Quasi-static shear-compression tests on stone masonry walls with plaster: Influence of load history and axial load ratio\". Engineering Structures. https://doi.org/10.1016/j.engstruct.2019.04.041"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"`Created by: M. Godio (EESD @ EPFL) on: August 3 2019 - \n",
"Last modification by: M.Godio on: August 30 2019`"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"#### Import libraries"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section imports the Python libraries needed to run this script"
]
},
{
"cell_type": "code",
- "execution_count": 21,
+ "execution_count": 1,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
" Libraries have been imported\n"
]
}
],
"source": [
"# libraries to import\n",
"import os\n",
"import numpy as np\n",
"import matplotlib.pyplot as plt\n",
"import scipy.io as sio\n",
"\n",
"from matplotlib import rc\n",
"from scipy.signal import find_peaks\n",
"from tabulate import tabulate\n",
"from scipy.interpolate import interp1d\n",
"\n",
"# to install a library from the anaconda prompt, run a command of the kind:\n",
"# pip install numpy\n",
"\n",
"print(\" Libraries have been imported\")\n"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"#### Define classes"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section defines the classes used in this script"
]
},
{
"cell_type": "code",
- "execution_count": 22,
+ "execution_count": 2,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
" Classes have been defined\n"
]
}
],
"source": [
"\"\"\" \n",
"These classe contain the test data from shear-compression tests:\n",
"F = horizontal force (kN)\n",
"u = horizontal displacement (mm)\n",
"N = vertical force (kN)\n",
"v = vertical displacement (mm)\n",
"ss = sampling step \n",
"\"\"\"\n",
"class Dataset_sc():\n",
" \"\"\"Import the dataset contained in the -mat file.\"\"\"\n",
"This section defines the geometry and material properties of the test wall units tested in shear-compression: SC1, SC2, SC4, SC5, SC6, SC7. The variable <b>test_number</b> gives the number of tests performed. The dictionary <b>wall</b> containing the following variables is created:\n",
"print(\" Wall properties have been imported for all test units\")\n"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"## <span style=\"color: red;\">1.2</span> Import test data"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"This section imports the dataset related to the structural behaviour of the walls. Tha data is contained in the corresponding <b>TESTS</b> MAT-file and is imported in the dictionary <b>test</b> which includes the following variables:\n",
"<ul>\n",
" <li><b>F</b> = horizontal - shear - force </li>\n",
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
"This section computes the <b>F-u envelope curves</b> starting from the experimental curves. The envelopes are save in the dictionary <b>envelope</b> having the following structure:\n",
"<ul>\n",
" <li><b>envelope.positive</b> = including the positive envelope </li>\n",
" <li><b>envelope.negative</b> = including the negative envelope </li>\n",
"</ul>\n",
"Inside the dictionaries <b>positive</b> and <b>negative</b> the following variables are contained:\n",
"This section plots the <b>F-u envelope curves</b> for each test and for the two sets of tests investigated in the campaign. The plot of <b>Fig.5</b> and <b>Fig.8</b> in Godio et al. (2019) are reproduced"
" Figures have been saved in V:\\03_Projects\\04_Basel_Project\\13_Tests_on_Type_E_walls_with_plaster\\09_Zenodo\\02_TEST_DATA\\01_WALL_STRUCTURAL_BEHAVIOUR\\OUTPUT_PLOTS\n"
"This section computes the key parameters of the wall structural behaviour. The results contained in <b>Table 3</b> and <b>Table 4</b> of Godio et al. (2019) are reproduced. The parameters are appended to the <b>key</b> dictionary. Inside the dictionary the following variables are added:\n",
" <li> <b>delta_collapse</b> = drift at collapse, <b>$\\delta_\\text{c}$</b> </li>\n",
"</ul>\n",
"Each variable contains values for both the positive and the negative envelopes, e.g. <b>peak_force.positive</b> and <b>peak_force.pegative</b>, plus the average value <b>peak_force.average</b>\n"