Integrate minor fixes to demos

README.md

@@ -202,7 +202,7 @@ OQ-VMTK is released under the **GNU Affero General Public License v3.0 (AGPL-3.0
 
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL_v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
 
-You are free to use, modify, and distribute this software under the terms of the AGPL v3. Any modifications made to the source code must also be released under the same licence. See the [LICENSE](./LICENSE) file for the full licence text.
+You are free to use, modify, and distribute this software under the terms of the AGPL v3. Any modifications made to the source code must also be released under the same licence. See the [LICENSE](./LICENSE.txt) file for the full licence text.
 
 ---
 
@@ -274,4 +274,4 @@ Contributions are welcome. Please read the [contributing guidelines](./contribut
 [issues-shield]: https://img.shields.io/github/issues/GEMScienceTools/oq-vmtk?style=for-the-badge
 [issues-url]: https://github.com/GEMScienceTools/oq-vmtk/issues
 [license-shield]: https://img.shields.io/github/license/GEMScienceTools/oq-vmtk?style=for-the-badge
-[license-url]: https://github.com/GEMScienceTools/oq-vmtk/blob/master/LICENSE.txt
+[license-url]: https://github.com/GEMScienceTools/oq-vmtk/blob/main/LICENSE.txt

demos/ModelCompilation/ModelCompilation.ipynb

@@ -290,7 +290,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 12,
+   "execution_count": 6,
    "id": "e897a0c1-47ed-469b-bdb6-61d7f23a14e9",
    "metadata": {},
    "outputs": [],
@@ -347,7 +347,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 7,
    "id": "0d683c4f",
    "metadata": {},
    "outputs": [
@@ -401,7 +401,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": 8,
    "id": "2dafd575-43ab-4dc8-b783-a689b2e4d8ef",
    "metadata": {},
    "outputs": [
@@ -470,7 +470,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.2"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

demos/NonlinearTimeHistoryAnalysis/NonlinearTimeHistoryAnalysis.ipynb

@@ -382,7 +382,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.12.2"
+   "version": "3.11.9"
   }
  },
  "nbformat": 4,

openquake/vmtk/modeller.py

@@ -1781,11 +1781,41 @@ def do_cpo_analysis(
                 # Data Recording (only if successful)
                 if ok == 0:
                     curr_disp = ops.nodeDisp(control_node, push_dir)
-                    cpo_top_disp.append(curr_disp)
-
                     current_floor_disps = [
                         ops.nodeDisp(node, push_dir) for node in pattern_nodes
                     ]
+
+                    # Direct nodal cross-check: once a spring's material
+                    # dies, the storeys above it can decouple into a
+                    # zero-stiffness mechanism that DisplacementControl
+                    # still reports as "converged", with the affected
+                    # floors jumping to wildly divergent displacements
+                    # even though eleResponse('deformation') below stays
+                    # frozen under the MinMax bound (it reflects the last
+                    # valid material state, not the true nodal motion).
+                    # Catch that case from the raw nodal displacements
+                    # *before* recording them, so no divergent step is
+                    # ever appended to the results.
+                    prev_disp = 0.0
+                    for s_idx, floor_disp in enumerate(current_floor_disps):
+                        storey_disp = abs(floor_disp - prev_disp)
+                        prev_disp = floor_disp
+                        if storey_disp >= minmax_limits[s_idx]:
+                            if pFlag:
+                                print(
+                                    f"Interstorey displacement at "
+                                    f"storey {s_idx + 1} reached "
+                                    f"ultimate limit ({storey_disp:.4f} "
+                                    f">= {minmax_limits[s_idx]:.4f}) "
+                                    f"— stopping CPO analysis."
+                                )
+                            minmax_failed = True
+                            break
+
+                    if minmax_failed:
+                        break
+
+                    cpo_top_disp.append(curr_disp)
                     cpo_disps.append(current_floor_disps)
 
                     ops.reactions()
@@ -1864,10 +1894,14 @@ def do_cpo_analysis(
         pseudo_steps = np.arange(len(energy_steps))
         cpo_energy = np.column_stack((pseudo_steps, energy_steps))
 
-        # Calculate Interstorey Drifts
+        # Calculate Interstorey Drift Ratios (IDR), consistent with
+        # do_spo_analysis: normalise interstorey displacements by storey
+        # height and express as a percentage.
         base_disps = np.zeros((cpo_disps.shape[0], 1))
         padded_disps = np.hstack((base_disps, cpo_disps))
-        cpo_drifts = np.diff(padded_disps, axis=1)
+        cpo_isd = np.diff(padded_disps, axis=1)
+        storey_heights = np.array(self.storey_heights)
+        cpo_drifts = (cpo_isd / storey_heights) * 100
         max_interstorey_drift = np.max(np.abs(cpo_drifts))
 
         ops.wipeAnalysis()

openquake/vmtk/plotter.py

@@ -854,7 +854,7 @@ def animate_cpo(self,
         ax_curve.tick_params(labelsize=_FS)
 
         # Governing Drift Hysteresis (Base Shear vs MIDR)
-        ax_drift.set_xlabel('Maximum Interstorey Drift [-]', fontsize=_FS)
+        ax_drift.set_xlabel('Maximum Interstorey Drift [%]', fontsize=_FS)
         ax_drift.set_ylabel('Base Shear [kN]', fontsize=_FS)
         ax_drift.set_title('Hysteretic Curve', fontsize=_FS, fontweight='bold')
         ax_drift.plot(governing_drift_history, cpo_rxn, 'gray', linewidth=2,
@@ -1455,10 +1455,10 @@ def plot_demand_profiles(self,
             ax.set_xlim([0, 5.0])
 
         # Add title
-        default_title = "Seismic Demand Profiles"
-        fig.suptitle(title if title else default_title,
-                     fontsize=self.font_sizes['title'],
-                     fontname=self.font_name)
+        if title:
+            fig.suptitle(title,
+                         fontsize=self.font_sizes['title'],
+                         fontname=self.font_name)
 
         # Save or Show
         if pFlag:
@@ -1722,8 +1722,8 @@ def plot_ida_analysis(self,
             (min, max) limits for the Y-axis (IML axis).
 
         title : str, optional, default=None
-            A custom title for the figure. If not provided, a default title
-            incorporating the Intensity Measure (IM) label is used.
+            A custom title for the figure. If not provided, no title is
+            displayed.
 
         pFlag : bool, optional, default=True
             If True, the plot is processed (saved/shown).
@@ -1879,7 +1879,7 @@ def plot_msa_analysis(self,
         ylims : tuple of float
             (min, max) for the IM (y) axis.
         title : str, optional
-            Figure title.  Defaults to a standard MSA title.
+            Figure title. If not provided, no title is displayed.
         pFlag : bool, default True
             Show/save the figure when True; close silently when False.
         export_path : str, optional
@@ -2049,8 +2049,7 @@ def plot_fragility_from_mca(self,
             ``(min, max)`` limits for the Y-axis.
 
         title : str, optional
-            Custom plot title. If ``None``, a method-specific default
-            is used.
+            Custom plot title. If ``None``, no title is displayed.
 
         cloud_method : {'bootstrap', 'classical'} or None, optional
             Selects the plotting style. When ``None`` (default), the
@@ -2138,10 +2137,6 @@ def plot_fragility_from_mca(self,
                         label=label,
                         zorder=3)
 
-            default_title = (
-                "Fragility Functions from Modified Cloud Analysis"
-                " (Bootstrap)")
-
         # -----------------------------------------------------------------
         # Classical (Bayesian MCMC) rendering
         # -----------------------------------------------------------------
@@ -2182,10 +2177,6 @@ def plot_fragility_from_mca(self,
                         label=label,
                         zorder=3)
 
-            default_title = (
-                "Robust Fragility Functions from Modified Cloud Analysis"
-                " (Classical / Jalayer et al. 2017)")
-
         else:
             raise ValueError(
                 f"Unknown cloud_method '{cloud_method}'. "
@@ -2194,10 +2185,11 @@ def plot_fragility_from_mca(self,
         # -----------------------------------------------------------------
         # Final formatting
         # -----------------------------------------------------------------
-        ax.set_title(
-            title if title else default_title,
-            fontsize=self.font_sizes['title'],
-            fontname=self.font_name)
+        if title:
+            ax.set_title(
+                title,
+                fontsize=self.font_sizes['title'],
+                fontname=self.font_name)
         ax.set_xlim([xlims[0], xlims[1]])
         ax.set_ylim([ylims[0], ylims[1]])
         ax.xaxis.set_minor_locator(AutoMinorLocator())
@@ -2292,6 +2284,7 @@ def plot_fragility_from_ida(self,
 
         self._set_plot_style(
             ax,
+            title=title,
             xlabel=imt_label,
             ylabel=r'Probability of Exceedance $P(DS \geq ds | IM)$')
 
@@ -2401,6 +2394,7 @@ def plot_fragility_from_msa(self,
         fig, ax = plt.subplots(figsize=self.figsize, constrained_layout=True)
         self._set_plot_style(
             ax,
+            title=title,
             xlabel=imt_label,
             ylabel=r'Probability of Exceedance $P(DS \geq ds | IM)$')
 
@@ -2561,7 +2555,7 @@ def plot_slf_model(self,
             ax.legend(fontsize=self.font_sizes['legend'])
 
         self._set_plot_style(ax,
-                             title=title or "Storey Loss Function",
+                             title=title,
                              xlabel=edp_label,
                              ylabel=loss_label)
 
@@ -2686,6 +2680,7 @@ def plot_vulnerability_function(self,
 
         # Set plot style
         self._set_plot_style(ax1,
+                             title=title,
                              xlabel=imt_label,
                              ylabel=loss_label)