From f827ca6a2cc35fe353af392bf1fde470abd9d971 Mon Sep 17 00:00:00 2001 From: strahlw Date: Fri, 28 Jul 2023 09:46:11 -0400 Subject: [PATCH] global search and replace pyomo.core.expr.current -> pyomo.core.expr --- idaes/apps/uncertainty_propagation/sens.py | 2 +- idaes/core/util/model_statistics.py | 2 +- idaes/models_extra/gas_distribution/properties/natural_gas.py | 2 +- idaes/models_extra/gas_distribution/unit_models/pipeline.py | 2 +- idaes/models_extra/power_generation/unit_models/steamheater.py | 2 +- .../power_generation/unit_models/waterwall_section.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/idaes/apps/uncertainty_propagation/sens.py b/idaes/apps/uncertainty_propagation/sens.py index f3bbde860b..8e46163c18 100644 --- a/idaes/apps/uncertainty_propagation/sens.py +++ b/idaes/apps/uncertainty_propagation/sens.py @@ -33,7 +33,7 @@ check_optimal_termination, ) from pyomo.common.sorting import sorted_robust -from pyomo.core.expr.current import ExpressionReplacementVisitor +from pyomo.core.expr import ExpressionReplacementVisitor from pyomo.common.modeling import unique_component_name from pyomo.opt import SolverFactory, SolverStatus diff --git a/idaes/core/util/model_statistics.py b/idaes/core/util/model_statistics.py index 32b1bd5ad6..c0ac0b1d5c 100644 --- a/idaes/core/util/model_statistics.py +++ b/idaes/core/util/model_statistics.py @@ -22,7 +22,7 @@ from pyomo.environ import Block, Constraint, Expression, Objective, Var, value from pyomo.dae import DerivativeVar -from pyomo.core.expr.current import identify_variables +from pyomo.core.expr import identify_variables from pyomo.common.collections import ComponentSet diff --git a/idaes/models_extra/gas_distribution/properties/natural_gas.py b/idaes/models_extra/gas_distribution/properties/natural_gas.py index c0b1c569be..b972d431cc 100644 --- a/idaes/models_extra/gas_distribution/properties/natural_gas.py +++ b/idaes/models_extra/gas_distribution/properties/natural_gas.py @@ -27,7 +27,7 @@ from pyomo.core.base.constraint import Constraint from pyomo.core.base.expression import Expression from pyomo.core.base.param import Param -from pyomo.core.expr.current import sqrt +from pyomo.core.expr import sqrt # Import IDAES cores from idaes.core import ( diff --git a/idaes/models_extra/gas_distribution/unit_models/pipeline.py b/idaes/models_extra/gas_distribution/unit_models/pipeline.py index 14a145f654..9e046c0bb6 100644 --- a/idaes/models_extra/gas_distribution/unit_models/pipeline.py +++ b/idaes/models_extra/gas_distribution/unit_models/pipeline.py @@ -31,7 +31,7 @@ from pyomo.core.base.units_container import units as pyunits from pyomo.core.base.reference import Reference from pyomo.dae.diffvar import DerivativeVar -from pyomo.core.expr.current import log10 +from pyomo.core.expr import log10 from pyomo.core.expr.numvalue import value as pyo_value from idaes.core import ( diff --git a/idaes/models_extra/power_generation/unit_models/steamheater.py b/idaes/models_extra/power_generation/unit_models/steamheater.py index 5380766388..a8c633a9f4 100644 --- a/idaes/models_extra/power_generation/unit_models/steamheater.py +++ b/idaes/models_extra/power_generation/unit_models/steamheater.py @@ -26,7 +26,7 @@ # Import Pyomo libraries from pyomo.common.config import ConfigBlock, ConfigValue, In, Bool from pyomo.environ import value, Var, Param, asin, cos, Reference -from pyomo.core.expr.current import Expr_if +from pyomo.core.expr import Expr_if from pyomo.dae import DerivativeVar # Import IDAES cores diff --git a/idaes/models_extra/power_generation/unit_models/waterwall_section.py b/idaes/models_extra/power_generation/unit_models/waterwall_section.py index d112602afa..d0ccfb93f2 100644 --- a/idaes/models_extra/power_generation/unit_models/waterwall_section.py +++ b/idaes/models_extra/power_generation/unit_models/waterwall_section.py @@ -37,7 +37,7 @@ ) from pyomo.dae import DerivativeVar from pyomo.common.config import ConfigBlock, ConfigValue, In, Bool -from pyomo.core.expr.current import Expr_if +from pyomo.core.expr import Expr_if # Import IDAES cores from idaes.core import (