irie 0.0.10__tar.gz → 0.0.12__tar.gz

{irie-0.0.10 → irie-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.10
+Version: 0.0.12
 Summary: Infrastructure Resilience Engine
 Author-email: wd <5018-006+wd@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab/irie

{irie-0.0.10 → irie-0.0.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "irie"
-version = "0.0.10"
+version = "0.0.12"
 authors = [
   {name="wd", email="5018-006+wd@users.noreply.github.com"},
 ]
@@ -106,6 +106,8 @@ where = ["src"]
     "apps/static/assets/css/**/*",
     "apps/static/assets/js/**/*",
 
+    "apps/prediction/runners/opensees/schemas/*.json",
+
     "init/data/nbi/*.tar", 
     "init/data/*.json", 
     "init/data/networks/*.json",

{irie-0.0.10 → irie-0.0.12}/src/irie/apps/inventory/views.py

@@ -134,6 +134,8 @@ def dashboard(request):
     except Exception as e:
         if "DEBUG" in os.environ and os.environ["DEBUG"]:
             raise e
+        else:
+            print(e)
         html_template = loader.get_template("site/page-500.html")
         return HttpResponse(html_template.render(context, request))
 
@@ -351,7 +353,7 @@ class AssetMap:
         if name is None:
             name = "Assets"
 
-        if colors is not None:
+        if colors is not None and len(assets)>0 and len(colors) > 0:
             cm = folium.branca.colormap.LinearColormap(colors=["green", "yellow", "orange", "red"], 
                                                        vmin=0, vmax=max(colors.values()),
                                                        caption=color_name)
@@ -359,6 +361,7 @@ class AssetMap:
                 k: cm.rgb_hex_str(v) for k,v in colors.items()
             }
         else:
+            colors = None
             cm = None 
 
         markers = self.add_bridges(assets, colors=colors)

irie-0.0.12/src/irie/apps/prediction/runners/opensees/schemas/hwd_analysis.schema.json

@@ -0,0 +1,75 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "title": "Analysis",
+  "type": "object",
+  "properties": {
+    "dynamic_on": {
+      "type": "boolean",
+      "default": true,
+      "description": "turn the dynamic analysis on (true) or off (false)"
+    },
+    "dynamic_truncated": {
+      "type": "boolean",
+      "default": false,
+      "description": "truncate the dynamic analysis to the first t timesteps"
+    },
+    "dynamic_timesteps": {
+      "type": "integer",
+      "default": 500,
+      "description": "the t timesteps to which the the dynamic analysis is truncated"
+    },
+    "input_location": {
+      "type": "string",
+      "default": "401",
+      "description": "locations (node numbers) corresponding to ground motion input, separated by comma, no space. 0 for multiple support excitation."
+    },
+      "dynamic_integrator": {
+      "type": "string",
+      "default": "Newmark",
+      "description": "numerical integration method"
+    },
+    "damping_type": {
+      "type": "string",
+      "enum": ["rayleigh", "modal"],
+      "default": "rayleigh",
+      "description": "damping strategy"
+    },
+    "damping_modes": {
+      "type": "string",
+      "default": "1,2",
+      "description": "modes for which to specify damping ratios, separated by comma, no space"
+    },
+    "damping_ratios": {
+      "type": "string",
+      "default": "0.015,0.015",
+      "description": "damping ratios for selected modes, separated by comma, no space"
+    },
+    "rayleigh_zerolength_on":{
+      "type": "boolean",
+      "default": true,
+      "description": "turn rayleigh damping on for zerolength elements (abutment, hinge, and column pin springs)"
+    },
+    "dynamic_scale_factor": {
+      "type": "number",
+      "default": 1.0,
+      "description": "scale factor applied to input ground motion"
+    },
+    "record_zip": {
+      "type": "string",
+      "default": "Records/58658_003_20210628_18.29.26.P_SanLo.zip",
+      "description": "path to zip file containing the recorded motions for ground motion input and sensor comparison"
+    }
+  },
+  "required": [
+    "dynamic_on",
+    "dynamic_truncated",
+    "input_location",
+    "dynamic_integrator",
+    "damping_type",
+    "damping_modes",
+    "damping_ratios",
+    "rayleigh_zerolength_on",
+    "dynamic_scale_factor",
+    "record_zip"
+  ]
+}

irie-0.0.12/src/irie/apps/prediction/runners/opensees/schemas/hwd_analysis_default.json

@@ -0,0 +1,14 @@
+{
+    "$schema": "./hwd_analysis.schema.json",
+    "dynamic_on": true,
+    "dynamic_truncated": false,
+    "dynamic_timesteps": 500,
+    "input_location": "401",
+    "dynamic_integrator": "Newmark",
+    "damping_type": "rayleigh",
+    "damping_modes": "1,2",
+    "damping_ratios": "0.015,0.015",
+    "rayleigh_zerolength_on": true,
+    "dynamic_scale_factor": 1.0,
+    "record_zip": "Records/58658_003_20210628_18.29.26.P_SanLo.zip"
+}

irie-0.0.12/src/irie/apps/prediction/runners/opensees/schemas/hwd_conf.schema.json

@@ -0,0 +1,92 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "title": "Model",
+  "properties": {
+    "transformation": {
+      "type": "string",
+      "enum": ["Linear", "PDelta"],
+      "default": "Linear",
+      "description": "geometric transformation linearity for element deformations"
+    },
+    "column_linearity": {
+      "title": "Column Model",
+      "type": "string",
+      "enum": ["elastic", "nonlinear"],
+      "default": "elastic",
+      "description": "column element material linearity"
+    },
+    "column_pins": {
+      "title": "Column Pins",
+      "type": "string",
+      "enum": ["1", "2", "3", "4", "5"],
+      "default": "3",
+      "options": {
+          "enum_titles": [
+            "All rigid",
+            "All pinned",
+            "Mixed rigid/pinned",
+            "All zerolength fiber sections",
+            "All integration point fiber sections"
+          ]
+      },
+      "description": "column pin model"
+    },
+    "column_capbeam_joint":{
+      "type": "string",
+      "enum": ["none", "rigidlink", "jointoffset"],
+      "default": "none",
+      "description": "offsets between tops of columns and column-cap beam joints"
+    },
+    "abutment_model": {
+      "type": "string",
+      "enum": ["none", "linear", "simplified", "complex"],
+      "default": "linear",
+      "description": "abutment model"
+    },
+    "hinge_model": {
+      "type": "string",
+      "enum": ["none", "linear", "simplified", "complex"],
+      "default": "linear",
+      "description": "in-span hinge model"
+    },
+    "Ec": {
+      "type": "number",
+      "default": 3530.5,
+      "description": "concrete modulus of elasticity (ksi)"
+    },
+    "Ecol": {
+      "type": "number",
+      "default": 3530.5,
+      "description": "column concrete modulus of elasticity (ksi)"
+    },
+    "Es": {
+      "type": "number",
+      "default": 29000.0,
+      "description": "steel tensile modulus of elasticity (initial elastic tangent, ksi)"
+    },
+    "CGa": {
+      "type": "number",
+      "default": 50.0,
+      "description": "abutment shear stiffness coefficient"
+    },
+    "CGh": {
+      "type": "number",
+      "default": 60.0,
+      "description": "in-span hinge shear stiffness coefficient"
+    }
+  },
+  "required": [
+    "transformation",
+    "column_linearity",
+    "column_pins",
+    "column_capbeam_joint",
+    "abutment_model",
+    "hinge_model",
+    "Ec",
+    "Ecol",
+    "Es",
+    "CGa",
+    "CGh"
+  ]
+}

irie-0.0.12/src/irie/apps/prediction/runners/opensees/schemas/hwd_conf_default.json

@@ -0,0 +1,14 @@
+{
+    "$schema": "./hwd_conf.schema.json",
+    "transformation": "Linear",
+    "column_linearity": "elastic",
+    "column_pins": "3",
+    "column_capbeam_joint": "none",
+    "abutment_model": "linear",
+    "hinge_model": "linear",
+    "Ec": 3530.5,
+    "Ecol": 3530.5,
+    "Es": 29000.0,
+    "CGa": 50.0,
+    "CGh": 60.0
+}

irie-0.0.12/src/irie/apps/prediction/runners/opensees/schemas/hwd_results.schema.json

@@ -0,0 +1,44 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "object",
+  "properties": {
+    "model_name": {
+      "type": "string",
+      "default": "hwd_model",
+      "description": "specify the model name"
+    },
+    "modeling_matrix": {
+      "type": "boolean",
+      "default": true,
+      "description": "report the modeling configuration and analysis settings info and compare to other models"
+    },
+    "runtime": {
+        "type": "boolean",
+        "default": true,
+        "description": "report the runtime of the model with breakdown of model definition and analysis"
+    },
+    "eigen_modal_tracking": {
+      "type": "boolean",
+      "default": true,
+      "description": "report period and mode shape information for fundamental modes of vibration calculated by eigen analysis; \ncompare to the assumed baseline"
+    },
+    "ssid_modal_tracking": {
+        "type": "boolean",
+        "default": false,
+        "description": "report period and mode shape information for fundamental modes of vibration calculated by system identification methods; \ncompare to the assumed baseline"
+    },
+    "compare_response_history": {
+        "type": "boolean",
+        "default": true,
+        "description": "plot and report difference metrics between simulated and recorded responses"
+    }
+  },
+  "required": [
+    "model_name",
+    "modeling_matrix",
+    "runtime",
+    "eigen_modal_tracking",
+    "ssid_modal_tracking",
+    "compare_response_history"
+  ]
+}

irie-0.0.12/src/irie/apps/prediction/runners/opensees/schemas/hwd_results_default.json

@@ -0,0 +1,9 @@
+{
+    "$schema": "./hwd_results.schema.json",
+    "model_name": "hwd_model",
+    "modeling_matrix": true,
+    "runtime": true,
+    "eigen_modal_tracking": true,
+    "ssid_modal_tracking": false,
+    "compare_response_history": true
+}

{irie-0.0.10 → irie-0.0.12}/src/irie/apps/templates/inventory/asset-profile.html

@@ -117,7 +117,7 @@
               <li class="breadcrumb-item active"><code>{{ asset.calid }}</code></li>
             </ol>
           </nav>
-          <h2 class="h4">{{ asset.name }}</h2>
+          <h2 class="h4">{{ asset.id }} - {{ asset.name }}</h2>
       </div>
       <div class="btn-toolbar mb-2 mb-md-0">
         <a role="button" 

{irie-0.0.10 → irie-0.0.12}/src/irie.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: irie
-Version: 0.0.10
+Version: 0.0.12
 Summary: Infrastructure Resilience Engine
 Author-email: wd <5018-006+wd@users.noreply.github.com>
 Project-URL: Repository, https://github.com/STAIRLab/irie

{irie-0.0.10 → irie-0.0.12}/src/irie.egg-info/SOURCES.txt

@@ -100,6 +100,12 @@ src/irie/apps/prediction/runners/opensees/utilities.py
 src/irie/apps/prediction/runners/opensees/xmlutils.py
 src/irie/apps/prediction/runners/opensees/zipped.py
 src/irie/apps/prediction/runners/opensees/schemas/__init__.py
+src/irie/apps/prediction/runners/opensees/schemas/hwd_analysis.schema.json
+src/irie/apps/prediction/runners/opensees/schemas/hwd_analysis_default.json
+src/irie/apps/prediction/runners/opensees/schemas/hwd_conf.schema.json
+src/irie/apps/prediction/runners/opensees/schemas/hwd_conf_default.json
+src/irie/apps/prediction/runners/opensees/schemas/hwd_results.schema.json
+src/irie/apps/prediction/runners/opensees/schemas/hwd_results_default.json
 src/irie/apps/prediction/templatetags/__init__.py
 src/irie/apps/prediction/templatetags/predictor.py
 src/irie/apps/site/__init__.py