use xbar for rescaling denom_bound

Author: bknueven

mpisppy/extensions/grad_rho.py

@@ -119,11 +119,12 @@ def _scen_indep_denom(self):
         denom_max = max(max(denom) for denom in global_denoms.values())
         scen_indep_denom = {}
         for ndn, global_denom in global_denoms.items():
-            for i, v in enumerate(global_denom):
-                if (scen_indep_denom[ndn, i]) <= self.denom_bound * v:
-                    scen_indep_denom[ndn, i] = max(denom_max, self.denom_bound * v)
+            for i, denom in enumerate(global_denom):
+                # xbar is for rescaling, e.g., if the variable value is "naturally" small
+                if denom <= self.denom_bound * xbars[ndn, i]._value:
+                    scen_indep_denom[ndn, i] = max(denom_max, self.denom_bound * xbars[ndn, i]._value)
                 else:
-                    scen_indep_denom[ndn, i] = v
+                    scen_indep_denom[ndn, i] = denom
 
         return scen_indep_denom