From 68c16baee4e78d10bddb95df25da6b7e25fc3d85 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Fri, 7 Jun 2024 15:54:14 -0500 Subject: [PATCH 1/3] update changelog and release versions --- CHANGELOG.md | 2 +- manual_jb/content/_config.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4c378d58..b2c06dac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] +## [4.12.0] - 2024-06-12 ### Changed - Rename Building Portfolio Analysis to Building Cluster Recovery Analysis [#559](https://github.com/IN-CORE/pyincore/issues/559) diff --git a/manual_jb/content/_config.yml b/manual_jb/content/_config.yml index e613ae35..4d14ef38 100644 --- a/manual_jb/content/_config.yml +++ b/manual_jb/content/_config.yml @@ -3,7 +3,7 @@ project: "IN-CORE Manual" author: IN-CORE Community copyright: "2023" # Copyright year to be placed in the footer logo: images/resilience-logo.png -version: "4.11.0" # Version is not part of JB config, we use it for autobuild of incore-docs +version: "4.12.0" # Version is not part of JB config, we use it for autobuild of incore-docs exclude_patterns: [_build, .DS_Store, "**.ipynb_checkpoints"] repository: From 1d762525ff15eaa885c74f2fc0617cc773ac6532 Mon Sep 17 00:00:00 2001 From: Chris Navarro Date: Tue, 11 Jun 2024 11:42:04 -0500 Subject: [PATCH 2/3] Updated mean_dmg.ipynb notebook for building nonstructural damage changes (#407) --- notebooks/mean_dmg.ipynb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/notebooks/mean_dmg.ipynb b/notebooks/mean_dmg.ipynb index 68bb892c..03ceae14 100644 --- a/notebooks/mean_dmg.ipynb +++ b/notebooks/mean_dmg.ipynb @@ -330,7 +330,7 @@ "md.set_input_dataset(\"damage\", non_structural_building_damage_result)\n", "md.load_remote_input_dataset(\"dmg_ratios\", \"5a284f2ec7d30d13bc08207c\")\n", "md.set_parameter(\"result_name\", \"non_structural_mean_damage_AS\")\n", - "md.set_parameter(\"damage_interval_keys\", [\"AS_DS_0\", \"AS_DS_1\", \"AS_DS_2\", \"AS_DS_3\"])\n", + "md.set_parameter(\"damage_interval_keys\", [\"DS_0\", \"DS_1\", \"DS_2\", \"DS_3\"])\n", "md.set_parameter(\"num_cpu\", 1)\n", "md.run_analysis()\n" ] @@ -352,7 +352,7 @@ "md.set_input_dataset(\"damage\", non_structural_building_damage_result)\n", "md.load_remote_input_dataset(\"dmg_ratios\", \"5a284f2ec7d30d13bc082090\")\n", "md.set_parameter(\"result_name\", \"non_structural_mean_damage_DS\")\n", - "md.set_parameter(\"damage_interval_keys\", [\"DS_DS_0\", \"DS_DS_1\", \"DS_DS_2\", \"DS_DS_3\"])\n", + "md.set_parameter(\"damage_interval_keys\", [\"DS_0\", \"DS_1\", \"DS_2\", \"DS_3\"])\n", "md.set_parameter(\"num_cpu\", 1)\n", "md.run_analysis()\n" ] @@ -374,7 +374,7 @@ "md.set_input_dataset(\"damage\", non_structural_building_damage_result)\n", "md.load_remote_input_dataset(\"dmg_ratios\", \"5a284f2ec7d30d13bc082086\")\n", "md.set_parameter(\"result_name\", \"non_structural_mean_damage_Content\")\n", - "md.set_parameter(\"damage_interval_keys\", [\"AS_DS_0\", \"AS_DS_1\", \"AS_DS_2\", \"AS_DS_3\"])\n", + "md.set_parameter(\"damage_interval_keys\", [\"DS_0\", \"DS_1\", \"DS_2\", \"DS_3\"])\n", "md.set_parameter(\"num_cpu\", 1)\n", "md.run_analysis()\n" ] @@ -398,7 +398,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -412,9 +412,9 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.10" + "version": "3.9.19" } }, "nbformat": 4, "nbformat_minor": 4 -} \ No newline at end of file +} From 82a2db8ea2fb451f3a09c4ef95101af42782681c Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Tue, 11 Jun 2024 13:15:50 -0500 Subject: [PATCH 3/3] add missing types to markdowns (#408) --- .../analyses/joplin_empirical_building_restoration.md | 8 ++++---- manual_jb/content/analyses/mc_limit_state_prob.md | 6 +++--- manual_jb/content/analyses/mean_dmg.md | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manual_jb/content/analyses/joplin_empirical_building_restoration.md b/manual_jb/content/analyses/joplin_empirical_building_restoration.md index a4cc0ee3..e0db68cc 100644 --- a/manual_jb/content/analyses/joplin_empirical_building_restoration.md +++ b/manual_jb/content/analyses/joplin_empirical_building_restoration.md @@ -32,10 +32,10 @@ key name | type | name | description **Input datasets** -key name | type | name | description ---- | --- | --- | --- -`buildings` * | [`ergo:buildingInventoryVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingInventoryVer4)
[`ergo:buildingInventoryVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingInventoryVer5)
[`ergo:buildingInventoryVer6`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingInventoryVer6)
[`ergo:buildingInventoryVer7`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingInventoryVer7) | Building dataset | A building dataset. -`building_dmg` * | [`ergo:buildingDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer4)
[`ergo:buildingDamageVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer5)
[`ergo:nsBuildingInventoryDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamage)
[`ergo:nsBuildingInventoryDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer2) | Building damage | A building damage dataset. +key name | type | name | description +--- |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| --- | --- +`buildings` * | [`ergo:buildingInventoryVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingInventoryVer4)
[`ergo:buildingInventoryVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingInventoryVer5)
[`ergo:buildingInventoryVer6`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingInventoryVer6)
[`ergo:buildingInventoryVer7`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingInventoryVer7) | Building dataset | A building dataset. +`building_dmg` * | [`ergo:buildingDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer4)
[`ergo:buildingDamageVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer5)
[`ergo:nsBuildingInventoryDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamage)
[`ergo:nsBuildingInventoryDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer2)
[`ergo:nsBuildingInventoryDamageVer3`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer3)
[`ergo:nsBuildingInventoryDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer4) | Building damage | A building damage dataset. **Output datasets** diff --git a/manual_jb/content/analyses/mc_limit_state_prob.md b/manual_jb/content/analyses/mc_limit_state_prob.md index b1f2a36e..605e6fb3 100644 --- a/manual_jb/content/analyses/mc_limit_state_prob.md +++ b/manual_jb/content/analyses/mc_limit_state_prob.md @@ -23,9 +23,9 @@ key name | type | name | description **Input Datasets** -key name | type | name | description ---- | --- | --- | --- -`damage` * | [`ergo:buildingDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer4)
[`ergo:buildingDamageVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer5)
[`ergo:bridgeDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:bridgeDamage)
[`ergo:bridgeDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:bridgeDamageVer2)
[`incore:epfDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epfDamage)
[`incore:epfDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epfDamageVer2)
[`ergo:nsBuildingInventoryDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamage)
[`ergo:nsBuildingInventoryDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer2)
[`incore:pipelineDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:pipelineDamage)
[`incore:pipelineDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:pipelineDamageVer2)
[`ergo:roadDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:roadDamage)
[`ergo:roadDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:roadDamageVer2)
[`ergo:waterFacilityDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:waterFacilityDamageVer4)
[`ergo:waterFacilityDamageVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:waterFacilityDamageVer5) | Infrastructure damage | A file with infrastructure damage intervals. +key name | type | name | description +--- |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| --- | --- +`damage` * | [`ergo:buildingDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer4)
[`ergo:buildingDamageVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer5)
[`ergo:bridgeDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:bridgeDamage)
[`ergo:bridgeDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:bridgeDamageVer2)
[`incore:epfDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epfDamage)
[`incore:epfDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epfDamageVer2)
[`ergo:nsBuildingInventoryDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamage)
[`ergo:nsBuildingInventoryDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer2)
[`ergo:nsBuildingInventoryDamageVer3`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer3)
[`ergo:nsBuildingInventoryDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer4)
[`incore:pipelineDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:pipelineDamage)
[`incore:pipelineDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:pipelineDamageVer2)
[`ergo:roadDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:roadDamage)
[`ergo:roadDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:roadDamageVer2)
[`ergo:waterFacilityDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:waterFacilityDamageVer4)
[`ergo:waterFacilityDamageVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:waterFacilityDamageVer5) | Infrastructure damage | A file with infrastructure damage intervals. **Output Datasets** diff --git a/manual_jb/content/analyses/mean_dmg.md b/manual_jb/content/analyses/mean_dmg.md index 1520c3ea..14e32c5f 100644 --- a/manual_jb/content/analyses/mean_dmg.md +++ b/manual_jb/content/analyses/mean_dmg.md @@ -18,10 +18,10 @@ key name | type | name | description **Input datasets** -key name | type | name | description ---- | --- | --- | --- -`damage` * | [`ergo:buildingDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer4)
[`ergo:buildingDamageVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer5)
[`ergo:nsBuildingInventoryDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamage)
[`ergo:nsBuildingInventoryDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer2)
[`ergo:bridgeDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:bridgeDamage)
[`ergo:bridgeDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:bridgeDamageVer2)
[`ergo:waterFacilityDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:waterFacilityDamageVer4)
[`ergo:waterFacilityDamageVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:waterFacilityDamageVer5)
[`ergo:roadDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:roadDamage)
[`ergo:roadDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:roadDamageVer2)
[`incore:epfDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epfDamage)
[`incore:epfDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epfDamageVer2)
[`incore:pipelineDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:pipelineDamage)
[`incore:pipelineDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:pipelineDamageVer2)| Infrastructure dataset | An infrastructure dataset. -`dmg_ratios` * | [`ergo:buildingDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageRatios)
[`ergo:bridgeDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:bridgeDamageRatios)
[`ergo:buildingContentDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingContentDamageRatios)
[`ergo:buildingASDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingASDamageRatios)
[`ergo:buildingDSDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDSDamageRatios)
[`ergo:roadDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:roadDamageRatios) | Damage ratios | A damage ratios dataset. +key name | type | name | description +--- |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| --- | --- +`damage` * | [`ergo:buildingDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer4)
[`ergo:buildingDamageVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageVer5)
[`ergo:nsBuildingInventoryDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamage)
[`ergo:nsBuildingInventoryDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer2)
[`ergo:nsBuildingInventoryDamageVer3`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer3)
[`ergo:nsBuildingInventoryDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:nsBuildingInventoryDamageVer4)
[`ergo:bridgeDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:bridgeDamage)
[`ergo:bridgeDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:bridgeDamageVer2)
[`ergo:waterFacilityDamageVer4`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:waterFacilityDamageVer4)
[`ergo:waterFacilityDamageVer5`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:waterFacilityDamageVer5)
[`ergo:roadDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:roadDamage)
[`ergo:roadDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:roadDamageVer2)
[`incore:epfDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epfDamage)
[`incore:epfDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:epfDamageVer2)
[`incore:pipelineDamage`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:pipelineDamage)
[`incore:pipelineDamageVer2`](https://incore.ncsa.illinois.edu/semantics/api/types/incore:pipelineDamageVer2) | Infrastructure dataset | An infrastructure dataset. +`dmg_ratios` * | [`ergo:buildingDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDamageRatios)
[`ergo:bridgeDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:bridgeDamageRatios)
[`ergo:buildingContentDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingContentDamageRatios)
[`ergo:buildingASDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingASDamageRatios)
[`ergo:buildingDSDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:buildingDSDamageRatios)
[`ergo:roadDamageRatios`](https://incore.ncsa.illinois.edu/semantics/api/types/ergo:roadDamageRatios) | Damage ratios | A damage ratios dataset. **Output datasets** @@ -55,4 +55,4 @@ code snippet: md.run_analysis() ``` -full analysis: [mean_dmg.ipynb](https://github.com/IN-CORE/incore-docs/blob/main/notebooks/mean_dmg.ipynb) \ No newline at end of file +full analysis: [mean_dmg.ipynb](https://github.com/IN-CORE/incore-docs/blob/main/notebooks/mean_dmg.ipynb)