Merge pull request #10368 from gem/fix-plot

Fixed `oq plot?hcurves`

debian/changelog

@@ -1,4 +1,6 @@
   [Michele Simionato]
+  * Fixed `oq plot?hcurves`: the disaggregation PoEs were plotted in linear
+    scale and not in logarithmic scale
   * Internal: introduced parameter `config.memory.gmf_data_rows`
 
   [Marco Pagani, Michele Simionato]

openquake/commands/plot.py

@@ -100,12 +100,13 @@ def make_figure_hcurves(extractors, what):
         ax.set_xlabel('%s, site %s, inv_time=%dy' %
                       (imt, site, oq.investigation_time))
         ax.set_ylabel('PoE')
+        ax.set_xlabel('acceleration')
         for ck, arr in got.items():
             if (arr == 0).all():
                 logging.warning('There is a zero curve %s_%s', *ck)
             ax.loglog(imls, arr.flat, '-', label='%s_%s' % ck)
         for poe in oq.poes:
-            ax.plot(imls, [poe]*len(imls), label=f'{poe=}')
+            ax.loglog(imls, [poe]*len(imls), label=f'{poe=}')
         ax.grid(True)
         ax.legend()
     return plt

openquake/commonlib/tests/logictree_test.py

@@ -303,8 +303,9 @@ def test_branches_weight_wrong_sum(self):
         exc = self._assert_logic_tree_error(
             'lo', {'lo': lt, 'sm1': sm, 'sm2': sm}, logictree.LogicTreeError)
         self.assertEqual(exc.lineno, 4)
-        self.assertEqual(exc.message, "branchset weights don't sum up to 1.0",
-                         "wrong exception message: %s" % exc.message)
+        self.assertEqual(
+            exc.message, "branchset weights sum up to 1.1, not 1",
+            "wrong exception message: %s" % exc.message)
 
     def test_apply_to_nonexistent_branch(self):
         lt = _make_nrml("""\

openquake/hazardlib/logictree.py

@@ -640,7 +640,7 @@ def parse_branches(self, branchset_node, branchset):
         if abs(weight_sum - 1.0) > pmf.PRECISION:
             raise LogicTreeError(
                 branchset_node, self.filename,
-                "branchset weights don't sum up to 1.0")
+                f"branchset weights sum up to {weight_sum}, not 1")
         if ''.join(values) and len(set(values)) < len(values):
             raise LogicTreeError(
                 branchset_node, self.filename,

openquake/hazardlib/map_array.py

@@ -167,10 +167,6 @@ def check_hmaps(hcurves, imtls, poes):
                 if  rel_err > .05:
                     raise ValueError(f'The {imt} hazard curve for {site_id=} cannot '
                                      f'be inverted reliably around {poe=}')
-                elif rel_err > .01:
-                    logging.warning(
-                        f'The {imt} hazard curve for {site_id=} cannot be '
-                        f'inverted reliably around {poe=}: {iml=}, {iml99=}')
 
 
 # not used right now