diff --git a/.github/workflows/core.yml b/.github/workflows/core.yml index 509f962829..3032d847db 100644 --- a/.github/workflows/core.yml +++ b/.github/workflows/core.yml @@ -152,6 +152,9 @@ jobs: # but does require token for other workflows e.g. merge to `main` # see https://github.com/codecov/codecov-action/issues/1274#issuecomment-1934437359 token: ${{ secrets.CODECOV_TOKEN }} + # pinning version after v0.7.0 broke tokenless upload + # see codecov/codecov-action#1487 + version: v0.7.1 build-docs: name: Build Sphinx docs diff --git a/.github/workflows/typos.toml b/.github/workflows/typos.toml index b335b9a959..9fb50b7e97 100644 --- a/.github/workflows/typos.toml +++ b/.github/workflows/typos.toml @@ -8,6 +8,7 @@ idaes = "idaes" IDAE = "IDAE" # HELMET - HELMholtz HEL = "HEL" +gam = "gam" # Datas Datas = "Datas" # ba triggers in docs diff --git a/COPYRIGHT.md b/COPYRIGHT.md index 3cc6992525..d3f866d658 100644 --- a/COPYRIGHT.md +++ b/COPYRIGHT.md @@ -3,7 +3,7 @@ Copyright Institute for the Design of Advanced Energy Systems Process Systems Engineering Framework (IDAES PSE Framework) was produced under the DOE Institute for the -Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2023 by the +Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2024 by the software owners: The Regents of the University of California, through Lawrence Berkeley National Laboratory, National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University Research @@ -15,4 +15,4 @@ U.S. Government has been granted for itself and others acting on its behalf a paid-up, nonexclusive, irrevocable, worldwide license in the Software to reproduce, distribute copies to the public, prepare derivative works, and perform publicly and display publicly, and to permit other to do so. Copyright -(C) 2018-2023 IDAES - All Rights Reserved +(C) 2018-2024 IDAES - All Rights Reserved diff --git a/LICENSE.md b/LICENSE.md index f25b975a69..24b38963ad 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -2,7 +2,7 @@ License ======= Institute for the Design of Advanced Energy Systems Process Systems Engineering -Framework (IDAES PSE Framework) Copyright (c) 2018-2023, by the software owners: The +Framework (IDAES PSE Framework) Copyright (c) 2018-2024, by the software owners: The Regents of the University of California, through Lawrence Berkeley National Laboratory, National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University Research Corporation, et al. diff --git a/file_header.txt b/file_header.txt index 2a5d95aadb..2ff3d2bf82 100644 --- a/file_header.txt +++ b/file_header.txt @@ -2,7 +2,7 @@ The Institute for the Design of Advanced Energy Systems Integrated Platform Framework (IDAES IP) was produced under the DOE Institute for the Design of Advanced Energy Systems (IDAES). -Copyright (c) 2018-2023 by the software owners: The Regents of the +Copyright (c) 2018-2024 by the software owners: The Regents of the University of California, through Lawrence Berkeley National Laboratory, National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University Research Corporation, et al. diff --git a/idaes/__init__.py b/idaes/__init__.py index 790ce7c466..73711cb75b 100644 --- a/idaes/__init__.py +++ b/idaes/__init__.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/categorize.py b/idaes/apps/caprese/categorize.py index a977d4278f..701e2e2fc4 100644 --- a/idaes/apps/caprese/categorize.py +++ b/idaes/apps/caprese/categorize.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/common/config.py b/idaes/apps/caprese/common/config.py index 560d537945..a08d20a3c2 100644 --- a/idaes/apps/caprese/common/config.py +++ b/idaes/apps/caprese/common/config.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/controller.py b/idaes/apps/caprese/controller.py index aa08897117..669ea0b3e8 100644 --- a/idaes/apps/caprese/controller.py +++ b/idaes/apps/caprese/controller.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/dynamic_block.py b/idaes/apps/caprese/dynamic_block.py index 07ffb4120a..3053cf87f1 100644 --- a/idaes/apps/caprese/dynamic_block.py +++ b/idaes/apps/caprese/dynamic_block.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/examples/cstr_model.py b/idaes/apps/caprese/examples/cstr_model.py index 226dfe8d45..51f122398a 100644 --- a/idaes/apps/caprese/examples/cstr_model.py +++ b/idaes/apps/caprese/examples/cstr_model.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/examples/cstr_nmpc.py b/idaes/apps/caprese/examples/cstr_nmpc.py index c388d52036..0f1a3b3c2b 100644 --- a/idaes/apps/caprese/examples/cstr_nmpc.py +++ b/idaes/apps/caprese/examples/cstr_nmpc.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/examples/cstr_reduced.py b/idaes/apps/caprese/examples/cstr_reduced.py index 676073d4d5..4592725cec 100644 --- a/idaes/apps/caprese/examples/cstr_reduced.py +++ b/idaes/apps/caprese/examples/cstr_reduced.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/nmpc.py b/idaes/apps/caprese/nmpc.py index 3777774956..68fdbdcf19 100644 --- a/idaes/apps/caprese/nmpc.py +++ b/idaes/apps/caprese/nmpc.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/nmpc_var.py b/idaes/apps/caprese/nmpc_var.py index c019404469..1162014a5b 100644 --- a/idaes/apps/caprese/nmpc_var.py +++ b/idaes/apps/caprese/nmpc_var.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/rolling.py b/idaes/apps/caprese/rolling.py index 704dc29039..c354572543 100644 --- a/idaes/apps/caprese/rolling.py +++ b/idaes/apps/caprese/rolling.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/tests/test_categorize.py b/idaes/apps/caprese/tests/test_categorize.py index c6c314c302..62662b324a 100644 --- a/idaes/apps/caprese/tests/test_categorize.py +++ b/idaes/apps/caprese/tests/test_categorize.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/tests/test_categorize_cstr.py b/idaes/apps/caprese/tests/test_categorize_cstr.py index 923129a79d..2a602b1e4a 100644 --- a/idaes/apps/caprese/tests/test_categorize_cstr.py +++ b/idaes/apps/caprese/tests/test_categorize_cstr.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/tests/test_controller.py b/idaes/apps/caprese/tests/test_controller.py index 2eb118a087..1a3dd15cf1 100644 --- a/idaes/apps/caprese/tests/test_controller.py +++ b/idaes/apps/caprese/tests/test_controller.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/tests/test_dynamic_block.py b/idaes/apps/caprese/tests/test_dynamic_block.py index 227f6bfdf9..d686e603d9 100644 --- a/idaes/apps/caprese/tests/test_dynamic_block.py +++ b/idaes/apps/caprese/tests/test_dynamic_block.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/tests/test_nmpc_var.py b/idaes/apps/caprese/tests/test_nmpc_var.py index c28ff88a86..37f26369f6 100644 --- a/idaes/apps/caprese/tests/test_nmpc_var.py +++ b/idaes/apps/caprese/tests/test_nmpc_var.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/tests/test_rolling.py b/idaes/apps/caprese/tests/test_rolling.py index 7c55adc016..f6bd6497bc 100644 --- a/idaes/apps/caprese/tests/test_rolling.py +++ b/idaes/apps/caprese/tests/test_rolling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/tests/test_simple_model.py b/idaes/apps/caprese/tests/test_simple_model.py index 7b8e088d03..7ada1e93bb 100644 --- a/idaes/apps/caprese/tests/test_simple_model.py +++ b/idaes/apps/caprese/tests/test_simple_model.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/tests/test_util.py b/idaes/apps/caprese/tests/test_util.py index 04d7d2c5bc..1fea037e57 100644 --- a/idaes/apps/caprese/tests/test_util.py +++ b/idaes/apps/caprese/tests/test_util.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/caprese/util.py b/idaes/apps/caprese/util.py index cd991139ac..390888d37a 100644 --- a/idaes/apps/caprese/util.py +++ b/idaes/apps/caprese/util.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/__init__.py b/idaes/apps/grid_integration/__init__.py index 9c02a8b98a..5d8c6f802e 100644 --- a/idaes/apps/grid_integration/__init__.py +++ b/idaes/apps/grid_integration/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/bidder.py b/idaes/apps/grid_integration/bidder.py index ef40720c1e..36b616f78d 100644 --- a/idaes/apps/grid_integration/bidder.py +++ b/idaes/apps/grid_integration/bidder.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/coordinator.py b/idaes/apps/grid_integration/coordinator.py index 6c2bf6efd7..1e19a47051 100644 --- a/idaes/apps/grid_integration/coordinator.py +++ b/idaes/apps/grid_integration/coordinator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/examples/thermal_generator.py b/idaes/apps/grid_integration/examples/thermal_generator.py index 6cafe36464..4606ac4196 100644 --- a/idaes/apps/grid_integration/examples/thermal_generator.py +++ b/idaes/apps/grid_integration/examples/thermal_generator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/examples/thermal_generator_prescient_plugin.py b/idaes/apps/grid_integration/examples/thermal_generator_prescient_plugin.py index 212484af0a..d10b876a1f 100644 --- a/idaes/apps/grid_integration/examples/thermal_generator_prescient_plugin.py +++ b/idaes/apps/grid_integration/examples/thermal_generator_prescient_plugin.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/examples/utils.py b/idaes/apps/grid_integration/examples/utils.py index 6007d6d9e1..9aeb8f1fba 100644 --- a/idaes/apps/grid_integration/examples/utils.py +++ b/idaes/apps/grid_integration/examples/utils.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/forecaster.py b/idaes/apps/grid_integration/forecaster.py index 7dbc435d40..f2b87ce585 100644 --- a/idaes/apps/grid_integration/forecaster.py +++ b/idaes/apps/grid_integration/forecaster.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/model_data.py b/idaes/apps/grid_integration/model_data.py index d2a44c0218..307c7d63c5 100644 --- a/idaes/apps/grid_integration/model_data.py +++ b/idaes/apps/grid_integration/model_data.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/multiperiod/multiperiod.py b/idaes/apps/grid_integration/multiperiod/multiperiod.py index ef58cae064..e25944ff52 100644 --- a/idaes/apps/grid_integration/multiperiod/multiperiod.py +++ b/idaes/apps/grid_integration/multiperiod/multiperiod.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/multiperiod/tests/test_multiperiod.py b/idaes/apps/grid_integration/multiperiod/tests/test_multiperiod.py index 47f87677f3..b29fd617de 100644 --- a/idaes/apps/grid_integration/multiperiod/tests/test_multiperiod.py +++ b/idaes/apps/grid_integration/multiperiod/tests/test_multiperiod.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/tests/self_scheduler_integration_test_plugin.py b/idaes/apps/grid_integration/tests/self_scheduler_integration_test_plugin.py index c2a3e3f4f9..fcb84a2892 100644 --- a/idaes/apps/grid_integration/tests/self_scheduler_integration_test_plugin.py +++ b/idaes/apps/grid_integration/tests/self_scheduler_integration_test_plugin.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/tests/test_backcaster.py b/idaes/apps/grid_integration/tests/test_backcaster.py index 0b8368c7fe..bf7037dcef 100644 --- a/idaes/apps/grid_integration/tests/test_backcaster.py +++ b/idaes/apps/grid_integration/tests/test_backcaster.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/tests/test_bidder.py b/idaes/apps/grid_integration/tests/test_bidder.py index 480803aa34..591271afdc 100644 --- a/idaes/apps/grid_integration/tests/test_bidder.py +++ b/idaes/apps/grid_integration/tests/test_bidder.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/tests/test_coordinator.py b/idaes/apps/grid_integration/tests/test_coordinator.py index 0862fd4bb0..8a6e974e4d 100644 --- a/idaes/apps/grid_integration/tests/test_coordinator.py +++ b/idaes/apps/grid_integration/tests/test_coordinator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/tests/test_integration.py b/idaes/apps/grid_integration/tests/test_integration.py index 530a45b84d..808d50c5fa 100644 --- a/idaes/apps/grid_integration/tests/test_integration.py +++ b/idaes/apps/grid_integration/tests/test_integration.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/tests/test_model_data.py b/idaes/apps/grid_integration/tests/test_model_data.py index d8a403420d..cd3ae29028 100644 --- a/idaes/apps/grid_integration/tests/test_model_data.py +++ b/idaes/apps/grid_integration/tests/test_model_data.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/tests/test_tracker.py b/idaes/apps/grid_integration/tests/test_tracker.py index fb0c3c68d3..85c7d92f8c 100644 --- a/idaes/apps/grid_integration/tests/test_tracker.py +++ b/idaes/apps/grid_integration/tests/test_tracker.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/tests/util.py b/idaes/apps/grid_integration/tests/util.py index e130af66cb..0c1edda440 100644 --- a/idaes/apps/grid_integration/tests/util.py +++ b/idaes/apps/grid_integration/tests/util.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/tracker.py b/idaes/apps/grid_integration/tracker.py index 04d0ac1044..df5cb901d3 100644 --- a/idaes/apps/grid_integration/tracker.py +++ b/idaes/apps/grid_integration/tracker.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/grid_integration/utils.py b/idaes/apps/grid_integration/utils.py index 65a960484f..4bf89e90b1 100644 --- a/idaes/apps/grid_integration/utils.py +++ b/idaes/apps/grid_integration/utils.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/__init__.py b/idaes/apps/matopt/__init__.py index d2c3fff85d..dce4ab2480 100644 --- a/idaes/apps/matopt/__init__.py +++ b/idaes/apps/matopt/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/__init__.py b/idaes/apps/matopt/materials/__init__.py index a305fe5237..2a65b30b96 100644 --- a/idaes/apps/matopt/materials/__init__.py +++ b/idaes/apps/matopt/materials/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/atom.py b/idaes/apps/matopt/materials/atom.py index 555f8e3edf..5c62ce6d41 100644 --- a/idaes/apps/matopt/materials/atom.py +++ b/idaes/apps/matopt/materials/atom.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/bblock.py b/idaes/apps/matopt/materials/bblock.py index 38e39f1026..591c29545d 100644 --- a/idaes/apps/matopt/materials/bblock.py +++ b/idaes/apps/matopt/materials/bblock.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/canvas.py b/idaes/apps/matopt/materials/canvas.py index eb93b2e2a7..fd178c6e25 100644 --- a/idaes/apps/matopt/materials/canvas.py +++ b/idaes/apps/matopt/materials/canvas.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/design.py b/idaes/apps/matopt/materials/design.py index 1432ff0f88..532b81e319 100644 --- a/idaes/apps/matopt/materials/design.py +++ b/idaes/apps/matopt/materials/design.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/geometry.py b/idaes/apps/matopt/materials/geometry.py index 85188b8c98..a3c3b47e80 100644 --- a/idaes/apps/matopt/materials/geometry.py +++ b/idaes/apps/matopt/materials/geometry.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/lattices/__init__.py b/idaes/apps/matopt/materials/lattices/__init__.py index 732a1dbee9..74ac222d00 100644 --- a/idaes/apps/matopt/materials/lattices/__init__.py +++ b/idaes/apps/matopt/materials/lattices/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/lattices/cubic_lattice.py b/idaes/apps/matopt/materials/lattices/cubic_lattice.py index 1950ce490b..1b5ae1c988 100644 --- a/idaes/apps/matopt/materials/lattices/cubic_lattice.py +++ b/idaes/apps/matopt/materials/lattices/cubic_lattice.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/lattices/diamond_lattice.py b/idaes/apps/matopt/materials/lattices/diamond_lattice.py index 751c06ab2b..a0fa57ed2a 100644 --- a/idaes/apps/matopt/materials/lattices/diamond_lattice.py +++ b/idaes/apps/matopt/materials/lattices/diamond_lattice.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/lattices/fcc_lattice.py b/idaes/apps/matopt/materials/lattices/fcc_lattice.py index 774ef3f987..c6cf9fa46b 100644 --- a/idaes/apps/matopt/materials/lattices/fcc_lattice.py +++ b/idaes/apps/matopt/materials/lattices/fcc_lattice.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/lattices/lattice.py b/idaes/apps/matopt/materials/lattices/lattice.py index 1edb105ebf..3ae53c3b37 100644 --- a/idaes/apps/matopt/materials/lattices/lattice.py +++ b/idaes/apps/matopt/materials/lattices/lattice.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/lattices/perovskite_lattice.py b/idaes/apps/matopt/materials/lattices/perovskite_lattice.py index 18c66f6286..0ce995e3df 100644 --- a/idaes/apps/matopt/materials/lattices/perovskite_lattice.py +++ b/idaes/apps/matopt/materials/lattices/perovskite_lattice.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/lattices/unit_cell_lattice.py b/idaes/apps/matopt/materials/lattices/unit_cell_lattice.py index fd22c24526..7ccb31c600 100644 --- a/idaes/apps/matopt/materials/lattices/unit_cell_lattice.py +++ b/idaes/apps/matopt/materials/lattices/unit_cell_lattice.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/lattices/wurtzite_lattice.py b/idaes/apps/matopt/materials/lattices/wurtzite_lattice.py index 87e7c96a3a..e9758a3df1 100644 --- a/idaes/apps/matopt/materials/lattices/wurtzite_lattice.py +++ b/idaes/apps/matopt/materials/lattices/wurtzite_lattice.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/motifs.py b/idaes/apps/matopt/materials/motifs.py index 2373bf1c44..ac97e5b932 100644 --- a/idaes/apps/matopt/materials/motifs.py +++ b/idaes/apps/matopt/materials/motifs.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/parsers/CFG.py b/idaes/apps/matopt/materials/parsers/CFG.py index 221c579d8d..627e9927c0 100644 --- a/idaes/apps/matopt/materials/parsers/CFG.py +++ b/idaes/apps/matopt/materials/parsers/CFG.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/parsers/PDB.py b/idaes/apps/matopt/materials/parsers/PDB.py index 1f0ac2e119..eeef469059 100644 --- a/idaes/apps/matopt/materials/parsers/PDB.py +++ b/idaes/apps/matopt/materials/parsers/PDB.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/parsers/POSCAR.py b/idaes/apps/matopt/materials/parsers/POSCAR.py index 74b5aa3067..b3c5f4572d 100644 --- a/idaes/apps/matopt/materials/parsers/POSCAR.py +++ b/idaes/apps/matopt/materials/parsers/POSCAR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/parsers/XYZ.py b/idaes/apps/matopt/materials/parsers/XYZ.py index 156f52c02b..cbff5ddf06 100644 --- a/idaes/apps/matopt/materials/parsers/XYZ.py +++ b/idaes/apps/matopt/materials/parsers/XYZ.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/parsers/__init__.py b/idaes/apps/matopt/materials/parsers/__init__.py index f444101776..e5d51d4cea 100644 --- a/idaes/apps/matopt/materials/parsers/__init__.py +++ b/idaes/apps/matopt/materials/parsers/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/tiling.py b/idaes/apps/matopt/materials/tiling.py index 6be0563efb..066db28ddd 100644 --- a/idaes/apps/matopt/materials/tiling.py +++ b/idaes/apps/matopt/materials/tiling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/materials/transform_func.py b/idaes/apps/matopt/materials/transform_func.py index df355c4225..7de854a0a3 100644 --- a/idaes/apps/matopt/materials/transform_func.py +++ b/idaes/apps/matopt/materials/transform_func.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/opt/__init__.py b/idaes/apps/matopt/opt/__init__.py index 5ed982e1ab..a49338b01e 100644 --- a/idaes/apps/matopt/opt/__init__.py +++ b/idaes/apps/matopt/opt/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/opt/mat_modeling.py b/idaes/apps/matopt/opt/mat_modeling.py index 5a1ebf8612..6d21a40214 100644 --- a/idaes/apps/matopt/opt/mat_modeling.py +++ b/idaes/apps/matopt/opt/mat_modeling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/opt/pyomo_modeling.py b/idaes/apps/matopt/opt/pyomo_modeling.py index effedf0a54..46c9bc87ee 100644 --- a/idaes/apps/matopt/opt/pyomo_modeling.py +++ b/idaes/apps/matopt/opt/pyomo_modeling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/tests/test_matopt_expression_bounds.py b/idaes/apps/matopt/tests/test_matopt_expression_bounds.py index 97eddfbe0e..881aaa9bc1 100644 --- a/idaes/apps/matopt/tests/test_matopt_expression_bounds.py +++ b/idaes/apps/matopt/tests/test_matopt_expression_bounds.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/tests/test_matopt_objects_construction.py b/idaes/apps/matopt/tests/test_matopt_objects_construction.py index 5a5b3db049..8e66a7acd2 100644 --- a/idaes/apps/matopt/tests/test_matopt_objects_construction.py +++ b/idaes/apps/matopt/tests/test_matopt_objects_construction.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/tests/test_matopt_objects_functionality.py b/idaes/apps/matopt/tests/test_matopt_objects_functionality.py index 2c40e3d35d..cfae689d70 100644 --- a/idaes/apps/matopt/tests/test_matopt_objects_functionality.py +++ b/idaes/apps/matopt/tests/test_matopt_objects_functionality.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/tests/test_matopt_smoke.py b/idaes/apps/matopt/tests/test_matopt_smoke.py index 58ee28b70e..12e2b042ad 100644 --- a/idaes/apps/matopt/tests/test_matopt_smoke.py +++ b/idaes/apps/matopt/tests/test_matopt_smoke.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/util/__init__.py b/idaes/apps/matopt/util/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/apps/matopt/util/__init__.py +++ b/idaes/apps/matopt/util/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/matopt/util/util.py b/idaes/apps/matopt/util/util.py index 846696b15e..deeb8a0d0d 100644 --- a/idaes/apps/matopt/util/util.py +++ b/idaes/apps/matopt/util/util.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/nmpc/__init__.py b/idaes/apps/nmpc/__init__.py index 1c2d6aaf2a..d8c2e87de6 100644 --- a/idaes/apps/nmpc/__init__.py +++ b/idaes/apps/nmpc/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/nmpc/cost_expressions.py b/idaes/apps/nmpc/cost_expressions.py index ea19b4ddd8..b6e1e523ce 100644 --- a/idaes/apps/nmpc/cost_expressions.py +++ b/idaes/apps/nmpc/cost_expressions.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/nmpc/dynamic_data/__init__.py b/idaes/apps/nmpc/dynamic_data/__init__.py index a44510027a..56576981d9 100644 --- a/idaes/apps/nmpc/dynamic_data/__init__.py +++ b/idaes/apps/nmpc/dynamic_data/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/nmpc/dynamic_data/interval_data.py b/idaes/apps/nmpc/dynamic_data/interval_data.py index f1574fd09e..7a40207857 100644 --- a/idaes/apps/nmpc/dynamic_data/interval_data.py +++ b/idaes/apps/nmpc/dynamic_data/interval_data.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/nmpc/dynamic_data/tests/test_interval_data.py b/idaes/apps/nmpc/dynamic_data/tests/test_interval_data.py index 88c84ee3dd..5ddd30f55d 100644 --- a/idaes/apps/nmpc/dynamic_data/tests/test_interval_data.py +++ b/idaes/apps/nmpc/dynamic_data/tests/test_interval_data.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/nmpc/tests/test_cost_expressions.py b/idaes/apps/nmpc/tests/test_cost_expressions.py index 6246297baa..6a259789d5 100644 --- a/idaes/apps/nmpc/tests/test_cost_expressions.py +++ b/idaes/apps/nmpc/tests/test_cost_expressions.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/uncertainty_propagation/examples/NRTL_model_scripts.py b/idaes/apps/uncertainty_propagation/examples/NRTL_model_scripts.py index a76da846d5..84ddaecbb0 100644 --- a/idaes/apps/uncertainty_propagation/examples/NRTL_model_scripts.py +++ b/idaes/apps/uncertainty_propagation/examples/NRTL_model_scripts.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/uncertainty_propagation/examples/rooney_biegler.py b/idaes/apps/uncertainty_propagation/examples/rooney_biegler.py index 753970292f..b8db1240da 100644 --- a/idaes/apps/uncertainty_propagation/examples/rooney_biegler.py +++ b/idaes/apps/uncertainty_propagation/examples/rooney_biegler.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/uncertainty_propagation/examples/simple_opt_problem.py b/idaes/apps/uncertainty_propagation/examples/simple_opt_problem.py index 80c82198ec..cf2de6f2f1 100644 --- a/idaes/apps/uncertainty_propagation/examples/simple_opt_problem.py +++ b/idaes/apps/uncertainty_propagation/examples/simple_opt_problem.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/uncertainty_propagation/examples/uncertainty_propagation_NRTL.py b/idaes/apps/uncertainty_propagation/examples/uncertainty_propagation_NRTL.py index e86f7dda5e..614089c014 100644 --- a/idaes/apps/uncertainty_propagation/examples/uncertainty_propagation_NRTL.py +++ b/idaes/apps/uncertainty_propagation/examples/uncertainty_propagation_NRTL.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/uncertainty_propagation/examples/uncertainty_propagation_rooney.py b/idaes/apps/uncertainty_propagation/examples/uncertainty_propagation_rooney.py index 301249f35c..56d5b72ae3 100644 --- a/idaes/apps/uncertainty_propagation/examples/uncertainty_propagation_rooney.py +++ b/idaes/apps/uncertainty_propagation/examples/uncertainty_propagation_rooney.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/uncertainty_propagation/sens.py b/idaes/apps/uncertainty_propagation/sens.py index 8e46163c18..6242983edf 100644 --- a/idaes/apps/uncertainty_propagation/sens.py +++ b/idaes/apps/uncertainty_propagation/sens.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/uncertainty_propagation/tests/test_uncertainties.py b/idaes/apps/uncertainty_propagation/tests/test_uncertainties.py index 74b6eebe0c..c9ba5b02e4 100644 --- a/idaes/apps/uncertainty_propagation/tests/test_uncertainties.py +++ b/idaes/apps/uncertainty_propagation/tests/test_uncertainties.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/apps/uncertainty_propagation/uncertainties.py b/idaes/apps/uncertainty_propagation/uncertainties.py index c24548ef42..13b9346fac 100644 --- a/idaes/apps/uncertainty_propagation/uncertainties.py +++ b/idaes/apps/uncertainty_propagation/uncertainties.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/beta.py b/idaes/beta.py index 611aa84526..14661f32d4 100644 --- a/idaes/beta.py +++ b/idaes/beta.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/__init__.py b/idaes/commands/__init__.py index 410f93d7fa..b3c9cfb17d 100644 --- a/idaes/commands/__init__.py +++ b/idaes/commands/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/base.py b/idaes/commands/base.py index db0014136f..2e3bcf5d47 100644 --- a/idaes/commands/base.py +++ b/idaes/commands/base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/config.py b/idaes/commands/config.py index 711e90e93d..d551b2b0a9 100644 --- a/idaes/commands/config.py +++ b/idaes/commands/config.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/convergence.py b/idaes/commands/convergence.py index 6478a907ab..1bf6591920 100644 --- a/idaes/commands/convergence.py +++ b/idaes/commands/convergence.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/data_directory.py b/idaes/commands/data_directory.py index c393f7711f..1389627fc8 100644 --- a/idaes/commands/data_directory.py +++ b/idaes/commands/data_directory.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/env_info.py b/idaes/commands/env_info.py index 4359dcb425..e4203aa9bf 100644 --- a/idaes/commands/env_info.py +++ b/idaes/commands/env_info.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/examples.py b/idaes/commands/examples.py index 1752bc81cb..ba44afbb7e 100644 --- a/idaes/commands/examples.py +++ b/idaes/commands/examples.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/extensions.py b/idaes/commands/extensions.py index c2ceecdba4..35d364804b 100644 --- a/idaes/commands/extensions.py +++ b/idaes/commands/extensions.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/tests/__init__.py b/idaes/commands/tests/__init__.py index 1975423753..0516dba9ac 100644 --- a/idaes/commands/tests/__init__.py +++ b/idaes/commands/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/tests/test_commands.py b/idaes/commands/tests/test_commands.py index a2eac2d49b..e6190db08a 100644 --- a/idaes/commands/tests/test_commands.py +++ b/idaes/commands/tests/test_commands.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/tests/test_dmf_cli.py b/idaes/commands/tests/test_dmf_cli.py index e5d888cf0f..69a86fff8b 100644 --- a/idaes/commands/tests/test_dmf_cli.py +++ b/idaes/commands/tests/test_dmf_cli.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/util/download_bin.py b/idaes/commands/util/download_bin.py index 82b1c8d728..92bb8c6053 100644 --- a/idaes/commands/util/download_bin.py +++ b/idaes/commands/util/download_bin.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/commands/util/tests/test_download_bin.py b/idaes/commands/util/tests/test_download_bin.py index 95299934fb..2afbf2cb36 100644 --- a/idaes/commands/util/tests/test_download_bin.py +++ b/idaes/commands/util/tests/test_download_bin.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/config.py b/idaes/config.py index b59856e9ac..e3f1b31ab4 100644 --- a/idaes/config.py +++ b/idaes/config.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/conftest.py b/idaes/conftest.py index 4b9cd1a237..4442d17f2b 100644 --- a/idaes/conftest.py +++ b/idaes/conftest.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/__init__.py b/idaes/core/__init__.py index 7e4bb53b67..59b7b036c0 100644 --- a/idaes/core/__init__.py +++ b/idaes/core/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/components.py b/idaes/core/base/components.py index a57dc9b76f..18d5b03663 100644 --- a/idaes/core/base/components.py +++ b/idaes/core/base/components.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/control_volume0d.py b/idaes/core/base/control_volume0d.py index 0bda2fbb4e..ced97fdb33 100644 --- a/idaes/core/base/control_volume0d.py +++ b/idaes/core/base/control_volume0d.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/control_volume1d.py b/idaes/core/base/control_volume1d.py index 733d8943dd..ab98d373bb 100644 --- a/idaes/core/base/control_volume1d.py +++ b/idaes/core/base/control_volume1d.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/control_volume_base.py b/idaes/core/base/control_volume_base.py index cfcc66ac77..0b50fb6639 100644 --- a/idaes/core/base/control_volume_base.py +++ b/idaes/core/base/control_volume_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/costing_base.py b/idaes/core/base/costing_base.py index 1215694835..a7ad809ccd 100644 --- a/idaes/core/base/costing_base.py +++ b/idaes/core/base/costing_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -93,6 +93,7 @@ def register_idaes_currency_units(): "USD_2020 = 500/596.2 * USD_CE500", "USD_2021 = 500/708.0 * USD_CE500", "USD_2022 = 500/816.0 * USD_CE500", + "USD_2023 = 500/797.9 * USD_CE500", ] ) diff --git a/idaes/core/base/flowsheet_model.py b/idaes/core/base/flowsheet_model.py index d0775ac2b7..8684fd47bd 100644 --- a/idaes/core/base/flowsheet_model.py +++ b/idaes/core/base/flowsheet_model.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/phases.py b/idaes/core/base/phases.py index b818347f64..7d6ef624e2 100644 --- a/idaes/core/base/phases.py +++ b/idaes/core/base/phases.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/process_base.py b/idaes/core/base/process_base.py index f403dcb38f..422c7d6900 100644 --- a/idaes/core/base/process_base.py +++ b/idaes/core/base/process_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/process_block.py b/idaes/core/base/process_block.py index c25eae1470..80fb13193a 100644 --- a/idaes/core/base/process_block.py +++ b/idaes/core/base/process_block.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/property_base.py b/idaes/core/base/property_base.py index b82e2b0a2c..2e0743f994 100644 --- a/idaes/core/base/property_base.py +++ b/idaes/core/base/property_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/property_meta.py b/idaes/core/base/property_meta.py index 13886b0979..cdbd4540da 100644 --- a/idaes/core/base/property_meta.py +++ b/idaes/core/base/property_meta.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/property_set.py b/idaes/core/base/property_set.py index e9b8a41629..375a50287e 100644 --- a/idaes/core/base/property_set.py +++ b/idaes/core/base/property_set.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/reaction_base.py b/idaes/core/base/reaction_base.py index 467ab121db..7a42c36f0f 100644 --- a/idaes/core/base/reaction_base.py +++ b/idaes/core/base/reaction_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_components.py b/idaes/core/base/tests/test_components.py index 467cf6b365..43971956f3 100644 --- a/idaes/core/base/tests/test_components.py +++ b/idaes/core/base/tests/test_components.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_control_volume_0d.py b/idaes/core/base/tests/test_control_volume_0d.py index 98b51f9098..04dc635c2d 100644 --- a/idaes/core/base/tests/test_control_volume_0d.py +++ b/idaes/core/base/tests/test_control_volume_0d.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_control_volume_0d_scaling.py b/idaes/core/base/tests/test_control_volume_0d_scaling.py index 2e9132f50a..cca5953c8b 100644 --- a/idaes/core/base/tests/test_control_volume_0d_scaling.py +++ b/idaes/core/base/tests/test_control_volume_0d_scaling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_control_volume_1d.py b/idaes/core/base/tests/test_control_volume_1d.py index f24cf529a0..ef67f0acec 100644 --- a/idaes/core/base/tests/test_control_volume_1d.py +++ b/idaes/core/base/tests/test_control_volume_1d.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_control_volume_1d_scaling.py b/idaes/core/base/tests/test_control_volume_1d_scaling.py index 32481abc76..3dc384cf08 100644 --- a/idaes/core/base/tests/test_control_volume_1d_scaling.py +++ b/idaes/core/base/tests/test_control_volume_1d_scaling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_control_volume_base.py b/idaes/core/base/tests/test_control_volume_base.py index d1b034664e..7c282db1a1 100644 --- a/idaes/core/base/tests/test_control_volume_base.py +++ b/idaes/core/base/tests/test_control_volume_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_costing_base.py b/idaes/core/base/tests/test_costing_base.py index 0b1e72651e..ab4533e7e8 100644 --- a/idaes/core/base/tests/test_costing_base.py +++ b/idaes/core/base/tests/test_costing_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -73,6 +73,7 @@ def test_register_idaes_currency_units(): "USD_2020": 596.2, "USD_2021": 708.0, "USD_2022": 816.0, + "USD_2023": 797.9, } for c, conv in CEI.items(): diff --git a/idaes/core/base/tests/test_flowsheet_model.py b/idaes/core/base/tests/test_flowsheet_model.py index e6f6569397..dfbb581375 100644 --- a/idaes/core/base/tests/test_flowsheet_model.py +++ b/idaes/core/base/tests/test_flowsheet_model.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_phases.py b/idaes/core/base/tests/test_phases.py index 7d4d31da3f..7de8510a27 100644 --- a/idaes/core/base/tests/test_phases.py +++ b/idaes/core/base/tests/test_phases.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_process_base.py b/idaes/core/base/tests/test_process_base.py index 458ff5516f..fd43056151 100644 --- a/idaes/core/base/tests/test_process_base.py +++ b/idaes/core/base/tests/test_process_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_process_block.py b/idaes/core/base/tests/test_process_block.py index d6bd8be8ea..94fca2dae9 100644 --- a/idaes/core/base/tests/test_process_block.py +++ b/idaes/core/base/tests/test_process_block.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_property_base.py b/idaes/core/base/tests/test_property_base.py index 4b7951c82a..74e7882e0c 100644 --- a/idaes/core/base/tests/test_property_base.py +++ b/idaes/core/base/tests/test_property_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_property_meta.py b/idaes/core/base/tests/test_property_meta.py index 69d752b834..8f76832a8f 100644 --- a/idaes/core/base/tests/test_property_meta.py +++ b/idaes/core/base/tests/test_property_meta.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_property_set.py b/idaes/core/base/tests/test_property_set.py index 007eb54eec..b3989d57b6 100644 --- a/idaes/core/base/tests/test_property_set.py +++ b/idaes/core/base/tests/test_property_set.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_reaction_base.py b/idaes/core/base/tests/test_reaction_base.py index 513607e45d..38858119ec 100644 --- a/idaes/core/base/tests/test_reaction_base.py +++ b/idaes/core/base/tests/test_reaction_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_unit_model.py b/idaes/core/base/tests/test_unit_model.py index 018f6b6326..b74e3a58a0 100644 --- a/idaes/core/base/tests/test_unit_model.py +++ b/idaes/core/base/tests/test_unit_model.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/tests/test_var_like_expression.py b/idaes/core/base/tests/test_var_like_expression.py index f74ccd1e92..15e168a42a 100644 --- a/idaes/core/base/tests/test_var_like_expression.py +++ b/idaes/core/base/tests/test_var_like_expression.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/unit_model.py b/idaes/core/base/unit_model.py index 357c0787d0..22c0ae0adf 100644 --- a/idaes/core/base/unit_model.py +++ b/idaes/core/base/unit_model.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/util.py b/idaes/core/base/util.py index 82a7d6004a..3f84000977 100644 --- a/idaes/core/base/util.py +++ b/idaes/core/base/util.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/base/var_like_expression.py b/idaes/core/base/var_like_expression.py index 681d7f4924..55d3839625 100644 --- a/idaes/core/base/var_like_expression.py +++ b/idaes/core/base/var_like_expression.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/datasets.py b/idaes/core/datasets.py index 1395de3de1..119413be70 100644 --- a/idaes/core/datasets.py +++ b/idaes/core/datasets.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/__init__.py b/idaes/core/dmf/__init__.py index 4f35f4de3c..bb8032fbbc 100644 --- a/idaes/core/dmf/__init__.py +++ b/idaes/core/dmf/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/cli.py b/idaes/core/dmf/cli.py index a6d772911c..5f8c2d9087 100644 --- a/idaes/core/dmf/cli.py +++ b/idaes/core/dmf/cli.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/codesearch.py b/idaes/core/dmf/codesearch.py index fdc418e8df..0fa88fec76 100644 --- a/idaes/core/dmf/codesearch.py +++ b/idaes/core/dmf/codesearch.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/commands.py b/idaes/core/dmf/commands.py index c30a011ee5..893b60e3be 100644 --- a/idaes/core/dmf/commands.py +++ b/idaes/core/dmf/commands.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/datasets.py b/idaes/core/dmf/datasets.py index b499b79a35..16bfceb1bc 100644 --- a/idaes/core/dmf/datasets.py +++ b/idaes/core/dmf/datasets.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/dmfbase.py b/idaes/core/dmf/dmfbase.py index dfe75b8eda..cb129dbd83 100644 --- a/idaes/core/dmf/dmfbase.py +++ b/idaes/core/dmf/dmfbase.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/errors.py b/idaes/core/dmf/errors.py index 4c12fc6e0c..983256d2ec 100644 --- a/idaes/core/dmf/errors.py +++ b/idaes/core/dmf/errors.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/experiment.py b/idaes/core/dmf/experiment.py index a41004ac4b..5f1e243555 100644 --- a/idaes/core/dmf/experiment.py +++ b/idaes/core/dmf/experiment.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/getver.py b/idaes/core/dmf/getver.py index 107a0eb626..0f335b9f5c 100644 --- a/idaes/core/dmf/getver.py +++ b/idaes/core/dmf/getver.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/help.py b/idaes/core/dmf/help.py index ac7cdec20e..f42c3a30e6 100644 --- a/idaes/core/dmf/help.py +++ b/idaes/core/dmf/help.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/magics.py b/idaes/core/dmf/magics.py index cc02609f1d..b996e6e69d 100644 --- a/idaes/core/dmf/magics.py +++ b/idaes/core/dmf/magics.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/model_data.py b/idaes/core/dmf/model_data.py index 447b8fc7f0..0a1427d2c6 100644 --- a/idaes/core/dmf/model_data.py +++ b/idaes/core/dmf/model_data.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/resource.py b/idaes/core/dmf/resource.py index 683c8fa569..6f4c152d70 100644 --- a/idaes/core/dmf/resource.py +++ b/idaes/core/dmf/resource.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/resourcedb.py b/idaes/core/dmf/resourcedb.py index 485e71c5e6..8c97357874 100644 --- a/idaes/core/dmf/resourcedb.py +++ b/idaes/core/dmf/resourcedb.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tables.py b/idaes/core/dmf/tables.py index a4d456e27d..6e6c9586f7 100644 --- a/idaes/core/dmf/tables.py +++ b/idaes/core/dmf/tables.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/for_propindex.py b/idaes/core/dmf/tests/for_propindex.py index 92aed50a04..aa1177d6d9 100644 --- a/idaes/core/dmf/tests/for_propindex.py +++ b/idaes/core/dmf/tests/for_propindex.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_cli.py b/idaes/core/dmf/tests/test_cli.py index a64b34391c..27e7ff8579 100644 --- a/idaes/core/dmf/tests/test_cli.py +++ b/idaes/core/dmf/tests/test_cli.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_codesearch.py b/idaes/core/dmf/tests/test_codesearch.py index 8bf35b7cf3..fa36d8bb65 100644 --- a/idaes/core/dmf/tests/test_codesearch.py +++ b/idaes/core/dmf/tests/test_codesearch.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_commands.py b/idaes/core/dmf/tests/test_commands.py index 47770cfb37..928360f9d6 100644 --- a/idaes/core/dmf/tests/test_commands.py +++ b/idaes/core/dmf/tests/test_commands.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_datasets.py b/idaes/core/dmf/tests/test_datasets.py index fc4523793b..e32ae8b578 100644 --- a/idaes/core/dmf/tests/test_datasets.py +++ b/idaes/core/dmf/tests/test_datasets.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_dmfbase.py b/idaes/core/dmf/tests/test_dmfbase.py index 71fe67c758..f4baa20b02 100644 --- a/idaes/core/dmf/tests/test_dmfbase.py +++ b/idaes/core/dmf/tests/test_dmfbase.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_experiment.py b/idaes/core/dmf/tests/test_experiment.py index ac6c9d4ab1..ffe854deb1 100644 --- a/idaes/core/dmf/tests/test_experiment.py +++ b/idaes/core/dmf/tests/test_experiment.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_getver.py b/idaes/core/dmf/tests/test_getver.py index c2c1232cf6..baf09fb4b5 100644 --- a/idaes/core/dmf/tests/test_getver.py +++ b/idaes/core/dmf/tests/test_getver.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_help.py b/idaes/core/dmf/tests/test_help.py index 8593f08500..a2be41e69b 100644 --- a/idaes/core/dmf/tests/test_help.py +++ b/idaes/core/dmf/tests/test_help.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_magics.py b/idaes/core/dmf/tests/test_magics.py index 3ed11bed3e..64059472c6 100644 --- a/idaes/core/dmf/tests/test_magics.py +++ b/idaes/core/dmf/tests/test_magics.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_model_data.py b/idaes/core/dmf/tests/test_model_data.py index 2b91b60f50..8e07be3824 100644 --- a/idaes/core/dmf/tests/test_model_data.py +++ b/idaes/core/dmf/tests/test_model_data.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_relations.py b/idaes/core/dmf/tests/test_relations.py index 36952fb807..8a4eb02271 100644 --- a/idaes/core/dmf/tests/test_relations.py +++ b/idaes/core/dmf/tests/test_relations.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_resource.py b/idaes/core/dmf/tests/test_resource.py index d2f48a249f..ca027862b9 100644 --- a/idaes/core/dmf/tests/test_resource.py +++ b/idaes/core/dmf/tests/test_resource.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_tables.py b/idaes/core/dmf/tests/test_tables.py index 37ab018a6d..b0bd93af6b 100644 --- a/idaes/core/dmf/tests/test_tables.py +++ b/idaes/core/dmf/tests/test_tables.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_util.py b/idaes/core/dmf/tests/test_util.py index c9ea2bb4ea..0daaf13f00 100644 --- a/idaes/core/dmf/tests/test_util.py +++ b/idaes/core/dmf/tests/test_util.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/test_workspace.py b/idaes/core/dmf/tests/test_workspace.py index 7b705f6f12..11468a509e 100644 --- a/idaes/core/dmf/tests/test_workspace.py +++ b/idaes/core/dmf/tests/test_workspace.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/tests/util.py b/idaes/core/dmf/tests/util.py index 0c6c3396cf..f0f6a65283 100644 --- a/idaes/core/dmf/tests/util.py +++ b/idaes/core/dmf/tests/util.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/userapi.py b/idaes/core/dmf/userapi.py index bb6a3138f7..4c0329b770 100644 --- a/idaes/core/dmf/userapi.py +++ b/idaes/core/dmf/userapi.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/util.py b/idaes/core/dmf/util.py index 2a1512cf27..927121c997 100644 --- a/idaes/core/dmf/util.py +++ b/idaes/core/dmf/util.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/dmf/workspace.py b/idaes/core/dmf/workspace.py index afa81c23d3..4eecd9b60e 100644 --- a/idaes/core/dmf/workspace.py +++ b/idaes/core/dmf/workspace.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/initialization/__init__.py b/idaes/core/initialization/__init__.py index dd128a9f88..26a41f187b 100644 --- a/idaes/core/initialization/__init__.py +++ b/idaes/core/initialization/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/initialization/block_triangularization.py b/idaes/core/initialization/block_triangularization.py index 0230324ed9..9649243938 100644 --- a/idaes/core/initialization/block_triangularization.py +++ b/idaes/core/initialization/block_triangularization.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/initialization/general_hierarchical.py b/idaes/core/initialization/general_hierarchical.py index 2420250e73..bc9f69c6df 100644 --- a/idaes/core/initialization/general_hierarchical.py +++ b/idaes/core/initialization/general_hierarchical.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/initialization/initialize_from_data.py b/idaes/core/initialization/initialize_from_data.py index bd814d5cef..fbf9876e7d 100644 --- a/idaes/core/initialization/initialize_from_data.py +++ b/idaes/core/initialization/initialize_from_data.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/initialization/initializer_base.py b/idaes/core/initialization/initializer_base.py index 5ec8de7f75..6146d2ebc9 100644 --- a/idaes/core/initialization/initializer_base.py +++ b/idaes/core/initialization/initializer_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/initialization/tests/__init__.py b/idaes/core/initialization/tests/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/core/initialization/tests/__init__.py +++ b/idaes/core/initialization/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/initialization/tests/test_block_triangularization.py b/idaes/core/initialization/tests/test_block_triangularization.py index 44d3faa857..7bf703fc8f 100644 --- a/idaes/core/initialization/tests/test_block_triangularization.py +++ b/idaes/core/initialization/tests/test_block_triangularization.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/initialization/tests/test_general_hierarchical.py b/idaes/core/initialization/tests/test_general_hierarchical.py index cd6f9717da..60df7cf77b 100644 --- a/idaes/core/initialization/tests/test_general_hierarchical.py +++ b/idaes/core/initialization/tests/test_general_hierarchical.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/initialization/tests/test_initialize_from_data.py b/idaes/core/initialization/tests/test_initialize_from_data.py index e72d3699b1..eb3f93604e 100644 --- a/idaes/core/initialization/tests/test_initialize_from_data.py +++ b/idaes/core/initialization/tests/test_initialize_from_data.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/initialization/tests/test_initializer_base.py b/idaes/core/initialization/tests/test_initializer_base.py index 2310c13d91..50883a78c1 100644 --- a/idaes/core/initialization/tests/test_initializer_base.py +++ b/idaes/core/initialization/tests/test_initializer_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/plugins/__init__.py b/idaes/core/plugins/__init__.py index f9376c648d..1c0b2f35fb 100644 --- a/idaes/core/plugins/__init__.py +++ b/idaes/core/plugins/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/plugins/simple_equality_eliminator.py b/idaes/core/plugins/simple_equality_eliminator.py index a4159c2a11..13fa1935a6 100644 --- a/idaes/core/plugins/simple_equality_eliminator.py +++ b/idaes/core/plugins/simple_equality_eliminator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/plugins/tests/test_eq_elim.py b/idaes/core/plugins/tests/test_eq_elim.py index c735c84d7f..9f00506d8d 100644 --- a/idaes/core/plugins/tests/test_eq_elim.py +++ b/idaes/core/plugins/tests/test_eq_elim.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/plugins/tests/test_replace_vars.py b/idaes/core/plugins/tests/test_replace_vars.py index 84590c21b8..d6318e73e5 100644 --- a/idaes/core/plugins/tests/test_replace_vars.py +++ b/idaes/core/plugins/tests/test_replace_vars.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/plugins/variable_replace.py b/idaes/core/plugins/variable_replace.py index 77f656dac9..9fc4930a91 100644 --- a/idaes/core/plugins/variable_replace.py +++ b/idaes/core/plugins/variable_replace.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/__init__.py b/idaes/core/solvers/__init__.py index f0347281b5..b536660589 100644 --- a/idaes/core/solvers/__init__.py +++ b/idaes/core/solvers/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/config.py b/idaes/core/solvers/config.py index a2f68e2caa..e460c9eea5 100644 --- a/idaes/core/solvers/config.py +++ b/idaes/core/solvers/config.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/features.py b/idaes/core/solvers/features.py index 0b66ecd5ea..943e74608a 100644 --- a/idaes/core/solvers/features.py +++ b/idaes/core/solvers/features.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/get_solver.py b/idaes/core/solvers/get_solver.py index 9ff06da677..2ce1a0c71d 100644 --- a/idaes/core/solvers/get_solver.py +++ b/idaes/core/solvers/get_solver.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/homotopy.py b/idaes/core/solvers/homotopy.py index 0b653d6f10..a874d90932 100644 --- a/idaes/core/solvers/homotopy.py +++ b/idaes/core/solvers/homotopy.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/ipopt_l1.py b/idaes/core/solvers/ipopt_l1.py index b650e240ce..e3f394163c 100644 --- a/idaes/core/solvers/ipopt_l1.py +++ b/idaes/core/solvers/ipopt_l1.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/petsc.py b/idaes/core/solvers/petsc.py index 20252891e4..778147a8ac 100644 --- a/idaes/core/solvers/petsc.py +++ b/idaes/core/solvers/petsc.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/tests/test_have_pynumero.py b/idaes/core/solvers/tests/test_have_pynumero.py index 2f4858ca34..d985cae38a 100644 --- a/idaes/core/solvers/tests/test_have_pynumero.py +++ b/idaes/core/solvers/tests/test_have_pynumero.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/tests/test_homotopy.py b/idaes/core/solvers/tests/test_homotopy.py index fb7fa8e371..f7ef5fa537 100644 --- a/idaes/core/solvers/tests/test_homotopy.py +++ b/idaes/core/solvers/tests/test_homotopy.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/tests/test_petsc.py b/idaes/core/solvers/tests/test_petsc.py index f19f51acb8..6c543e8641 100644 --- a/idaes/core/solvers/tests/test_petsc.py +++ b/idaes/core/solvers/tests/test_petsc.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/tests/test_petsc_pid.py b/idaes/core/solvers/tests/test_petsc_pid.py index a2473388ff..ff62aa5521 100644 --- a/idaes/core/solvers/tests/test_petsc_pid.py +++ b/idaes/core/solvers/tests/test_petsc_pid.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/tests/test_solver_config.py b/idaes/core/solvers/tests/test_solver_config.py index d8bfdfad14..ea591b39fc 100644 --- a/idaes/core/solvers/tests/test_solver_config.py +++ b/idaes/core/solvers/tests/test_solver_config.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/solvers/tests/test_solvers.py b/idaes/core/solvers/tests/test_solvers.py index abd241cd01..15d43c77cf 100644 --- a/idaes/core/solvers/tests/test_solvers.py +++ b/idaes/core/solvers/tests/test_solvers.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/__init__.py b/idaes/core/surrogate/__init__.py index 691ac8521c..1c27566acd 100644 --- a/idaes/core/surrogate/__init__.py +++ b/idaes/core/surrogate/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/alamopy.py b/idaes/core/surrogate/alamopy.py index 78106a8109..d9487644c8 100644 --- a/idaes/core/surrogate/alamopy.py +++ b/idaes/core/surrogate/alamopy.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/base/surrogate_base.py b/idaes/core/surrogate/base/surrogate_base.py index 9bbcc24072..b74c842c77 100644 --- a/idaes/core/surrogate/base/surrogate_base.py +++ b/idaes/core/surrogate/base/surrogate_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/base/tests/test_surrogate_base.py b/idaes/core/surrogate/base/tests/test_surrogate_base.py index 319b308b7e..0bc6d7d85f 100644 --- a/idaes/core/surrogate/base/tests/test_surrogate_base.py +++ b/idaes/core/surrogate/base/tests/test_surrogate_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/keras_surrogate.py b/idaes/core/surrogate/keras_surrogate.py index 7c00a1d3b9..73adfe586b 100644 --- a/idaes/core/surrogate/keras_surrogate.py +++ b/idaes/core/surrogate/keras_surrogate.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/metrics.py b/idaes/core/surrogate/metrics.py index d53914ebb6..f6984c6f7b 100644 --- a/idaes/core/surrogate/metrics.py +++ b/idaes/core/surrogate/metrics.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/plotting/sm_plotter.py b/idaes/core/surrogate/plotting/sm_plotter.py index 02b1b64b15..ace857fcff 100644 --- a/idaes/core/surrogate/plotting/sm_plotter.py +++ b/idaes/core/surrogate/plotting/sm_plotter.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/plotting/tests/test_alamo_plotting.py b/idaes/core/surrogate/plotting/tests/test_alamo_plotting.py index f5db5840f2..962d91cefb 100644 --- a/idaes/core/surrogate/plotting/tests/test_alamo_plotting.py +++ b/idaes/core/surrogate/plotting/tests/test_alamo_plotting.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo/kriging.py b/idaes/core/surrogate/pysmo/kriging.py index ad04fffb0c..e93888362f 100644 --- a/idaes/core/surrogate/pysmo/kriging.py +++ b/idaes/core/surrogate/pysmo/kriging.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo/polynomial_regression.py b/idaes/core/surrogate/pysmo/polynomial_regression.py index 7d41719015..9587e71205 100644 --- a/idaes/core/surrogate/pysmo/polynomial_regression.py +++ b/idaes/core/surrogate/pysmo/polynomial_regression.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo/radial_basis_function.py b/idaes/core/surrogate/pysmo/radial_basis_function.py index 6d48a6a0af..f803727a08 100644 --- a/idaes/core/surrogate/pysmo/radial_basis_function.py +++ b/idaes/core/surrogate/pysmo/radial_basis_function.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo/sampling.py b/idaes/core/surrogate/pysmo/sampling.py index 5e6f5d1d95..bc72cc76e5 100644 --- a/idaes/core/surrogate/pysmo/sampling.py +++ b/idaes/core/surrogate/pysmo/sampling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo/tests/test_kriging.py b/idaes/core/surrogate/pysmo/tests/test_kriging.py index 87fcd4f17e..818c4ea21f 100644 --- a/idaes/core/surrogate/pysmo/tests/test_kriging.py +++ b/idaes/core/surrogate/pysmo/tests/test_kriging.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo/tests/test_polynomial_regression.py b/idaes/core/surrogate/pysmo/tests/test_polynomial_regression.py index b02733377f..f6f1c75b32 100644 --- a/idaes/core/surrogate/pysmo/tests/test_polynomial_regression.py +++ b/idaes/core/surrogate/pysmo/tests/test_polynomial_regression.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo/tests/test_radial_basis_function.py b/idaes/core/surrogate/pysmo/tests/test_radial_basis_function.py index 24e0dccfa0..05b6aa4228 100644 --- a/idaes/core/surrogate/pysmo/tests/test_radial_basis_function.py +++ b/idaes/core/surrogate/pysmo/tests/test_radial_basis_function.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo/tests/test_sampling.py b/idaes/core/surrogate/pysmo/tests/test_sampling.py index d34851d34c..55ee44528e 100644 --- a/idaes/core/surrogate/pysmo/tests/test_sampling.py +++ b/idaes/core/surrogate/pysmo/tests/test_sampling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo/tests/test_sampling_modified.py b/idaes/core/surrogate/pysmo/tests/test_sampling_modified.py index 5cfe908b50..b1ee3ef09a 100644 --- a/idaes/core/surrogate/pysmo/tests/test_sampling_modified.py +++ b/idaes/core/surrogate/pysmo/tests/test_sampling_modified.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo/tests/test_utils.py b/idaes/core/surrogate/pysmo/tests/test_utils.py index 89598a7f97..aa7a603872 100644 --- a/idaes/core/surrogate/pysmo/tests/test_utils.py +++ b/idaes/core/surrogate/pysmo/tests/test_utils.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo/utils.py b/idaes/core/surrogate/pysmo/utils.py index 422df31561..ae1322d8de 100644 --- a/idaes/core/surrogate/pysmo/utils.py +++ b/idaes/core/surrogate/pysmo/utils.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/pysmo_surrogate.py b/idaes/core/surrogate/pysmo_surrogate.py index a66e98eeca..a7e3785caa 100644 --- a/idaes/core/surrogate/pysmo_surrogate.py +++ b/idaes/core/surrogate/pysmo_surrogate.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/sampling/__init__.py b/idaes/core/surrogate/sampling/__init__.py index 99f0907ed1..b84346f5f6 100644 --- a/idaes/core/surrogate/sampling/__init__.py +++ b/idaes/core/surrogate/sampling/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/sampling/data_utils.py b/idaes/core/surrogate/sampling/data_utils.py index 00c43bad1b..4e35334be7 100644 --- a/idaes/core/surrogate/sampling/data_utils.py +++ b/idaes/core/surrogate/sampling/data_utils.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/sampling/scaling.py b/idaes/core/surrogate/sampling/scaling.py index dc4f561dc4..07997db4a7 100644 --- a/idaes/core/surrogate/sampling/scaling.py +++ b/idaes/core/surrogate/sampling/scaling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/sampling/tests/test_data_utils.py b/idaes/core/surrogate/sampling/tests/test_data_utils.py index e9c9d16ea8..dbb7ba21dd 100644 --- a/idaes/core/surrogate/sampling/tests/test_data_utils.py +++ b/idaes/core/surrogate/sampling/tests/test_data_utils.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/sampling/tests/test_scaling.py b/idaes/core/surrogate/sampling/tests/test_scaling.py index 14e1e16c62..7a71d3f485 100644 --- a/idaes/core/surrogate/sampling/tests/test_scaling.py +++ b/idaes/core/surrogate/sampling/tests/test_scaling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/surrogate_block.py b/idaes/core/surrogate/surrogate_block.py index 456fd59ecd..34316b8e36 100644 --- a/idaes/core/surrogate/surrogate_block.py +++ b/idaes/core/surrogate/surrogate_block.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/tests/data/create_keras_models.py b/idaes/core/surrogate/tests/data/create_keras_models.py index e2902a28e1..ef41d572a1 100644 --- a/idaes/core/surrogate/tests/data/create_keras_models.py +++ b/idaes/core/surrogate/tests/data/create_keras_models.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/tests/test_alamopy.py b/idaes/core/surrogate/tests/test_alamopy.py index 00b5e42894..002074a276 100644 --- a/idaes/core/surrogate/tests/test_alamopy.py +++ b/idaes/core/surrogate/tests/test_alamopy.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/tests/test_keras_surrogate.py b/idaes/core/surrogate/tests/test_keras_surrogate.py index 3fb0c6b28c..4ff61c16cf 100644 --- a/idaes/core/surrogate/tests/test_keras_surrogate.py +++ b/idaes/core/surrogate/tests/test_keras_surrogate.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/tests/test_metrics.py b/idaes/core/surrogate/tests/test_metrics.py index adef4ea3dd..843dce25b1 100644 --- a/idaes/core/surrogate/tests/test_metrics.py +++ b/idaes/core/surrogate/tests/test_metrics.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/tests/test_pysmo_surrogate.py b/idaes/core/surrogate/tests/test_pysmo_surrogate.py index f568fedf79..0bc603af31 100644 --- a/idaes/core/surrogate/tests/test_pysmo_surrogate.py +++ b/idaes/core/surrogate/tests/test_pysmo_surrogate.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/surrogate/tests/test_surrogate_block.py b/idaes/core/surrogate/tests/test_surrogate_block.py index 46028ff16a..665badaefc 100644 --- a/idaes/core/surrogate/tests/test_surrogate_block.py +++ b/idaes/core/surrogate/tests/test_surrogate_block.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/tests/test_datasets.py b/idaes/core/tests/test_datasets.py index 052be49f0b..84e99404ca 100644 --- a/idaes/core/tests/test_datasets.py +++ b/idaes/core/tests/test_datasets.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/__init__.py b/idaes/core/util/__init__.py index 4a12b0b2a9..fac84eb261 100644 --- a/idaes/core/util/__init__.py +++ b/idaes/core/util/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/config.py b/idaes/core/util/config.py index ee2cb7cf92..3f77e58e10 100644 --- a/idaes/core/util/config.py +++ b/idaes/core/util/config.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/constants.py b/idaes/core/util/constants.py index 47a9eecf9b..2485f16cb0 100644 --- a/idaes/core/util/constants.py +++ b/idaes/core/util/constants.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/convergence/__init__.py b/idaes/core/util/convergence/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/core/util/convergence/__init__.py +++ b/idaes/core/util/convergence/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/convergence/convergence_base.py b/idaes/core/util/convergence/convergence_base.py index a5f39cae3f..67c8c3f6d3 100644 --- a/idaes/core/util/convergence/convergence_base.py +++ b/idaes/core/util/convergence/convergence_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/convergence/mpi_utils.py b/idaes/core/util/convergence/mpi_utils.py index 869f38d6ba..0ab9fba37f 100644 --- a/idaes/core/util/convergence/mpi_utils.py +++ b/idaes/core/util/convergence/mpi_utils.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/convergence/tests/__init__.py b/idaes/core/util/convergence/tests/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/core/util/convergence/tests/__init__.py +++ b/idaes/core/util/convergence/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/convergence/tests/conv_eval_classes.py b/idaes/core/util/convergence/tests/conv_eval_classes.py index 2ba772782a..07f9777335 100644 --- a/idaes/core/util/convergence/tests/conv_eval_classes.py +++ b/idaes/core/util/convergence/tests/conv_eval_classes.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/convergence/tests/test_convergence.py b/idaes/core/util/convergence/tests/test_convergence.py index 7081e001f7..583590f1f8 100644 --- a/idaes/core/util/convergence/tests/test_convergence.py +++ b/idaes/core/util/convergence/tests/test_convergence.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/dyn_utils.py b/idaes/core/util/dyn_utils.py index 954f1ee41f..77491b39ae 100644 --- a/idaes/core/util/dyn_utils.py +++ b/idaes/core/util/dyn_utils.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/env_info.py b/idaes/core/util/env_info.py index 4bb7124a84..54eb4a34bd 100644 --- a/idaes/core/util/env_info.py +++ b/idaes/core/util/env_info.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/exceptions.py b/idaes/core/util/exceptions.py index 3b64f7e557..444ef26ed2 100644 --- a/idaes/core/util/exceptions.py +++ b/idaes/core/util/exceptions.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/expr_doc.py b/idaes/core/util/expr_doc.py index de70828d2e..2c8bfe4f40 100644 --- a/idaes/core/util/expr_doc.py +++ b/idaes/core/util/expr_doc.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/functions.py b/idaes/core/util/functions.py index 129ad2146a..e49e7c7779 100644 --- a/idaes/core/util/functions.py +++ b/idaes/core/util/functions.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/initialization.py b/idaes/core/util/initialization.py index 6adb195f01..30fec46f84 100644 --- a/idaes/core/util/initialization.py +++ b/idaes/core/util/initialization.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/math.py b/idaes/core/util/math.py index 09a1650eb1..3f5582eca4 100644 --- a/idaes/core/util/math.py +++ b/idaes/core/util/math.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/misc.py b/idaes/core/util/misc.py index 0902c8c8b5..5daa73676d 100644 --- a/idaes/core/util/misc.py +++ b/idaes/core/util/misc.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/model_diagnostics.py b/idaes/core/util/model_diagnostics.py index 3d54c5a091..528f832468 100644 --- a/idaes/core/util/model_diagnostics.py +++ b/idaes/core/util/model_diagnostics.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -3172,7 +3172,7 @@ def psweep_runner_validator(val): class IpoptConvergenceAnalysis: """ - Tool to performa a parameter sweep of model checking for numerical issues and + Tool to perform a parameter sweep of model checking for numerical issues and convergence characteristics. Users may specify an IDAES ParameterSweep class to perform the sweep (default is SequentialSweepRunner). """ diff --git a/idaes/core/util/model_serializer.py b/idaes/core/util/model_serializer.py index 03528a45bf..ba6edfab32 100644 --- a/idaes/core/util/model_serializer.py +++ b/idaes/core/util/model_serializer.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/model_statistics.py b/idaes/core/util/model_statistics.py index e67d766e07..d237be3a52 100644 --- a/idaes/core/util/model_statistics.py +++ b/idaes/core/util/model_statistics.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/parameter_sweep.py b/idaes/core/util/parameter_sweep.py index 40b4ff517d..b8bb6ce40e 100644 --- a/idaes/core/util/parameter_sweep.py +++ b/idaes/core/util/parameter_sweep.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/performance.py b/idaes/core/util/performance.py index 19c21c5511..93023bc8cf 100644 --- a/idaes/core/util/performance.py +++ b/idaes/core/util/performance.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/phase_equilibria.py b/idaes/core/util/phase_equilibria.py index 42b5d5ec5e..0ed4fadd54 100644 --- a/idaes/core/util/phase_equilibria.py +++ b/idaes/core/util/phase_equilibria.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/plot.py b/idaes/core/util/plot.py index 11ea68d2e6..70122d40e9 100644 --- a/idaes/core/util/plot.py +++ b/idaes/core/util/plot.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/scaling.py b/idaes/core/util/scaling.py index 5396f48610..5e03a2a9b8 100644 --- a/idaes/core/util/scaling.py +++ b/idaes/core/util/scaling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tables.py b/idaes/core/util/tables.py index 4e88567fec..5dcf2a2654 100644 --- a/idaes/core/util/tables.py +++ b/idaes/core/util/tables.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tags.py b/idaes/core/util/tags.py index 9c144b6247..61d50ff331 100644 --- a/idaes/core/util/tags.py +++ b/idaes/core/util/tags.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/testing.py b/idaes/core/util/testing.py index cd9bec0397..27a6a8ebac 100644 --- a/idaes/core/util/testing.py +++ b/idaes/core/util/testing.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_config.py b/idaes/core/util/tests/test_config.py index cf18c40b17..b7b67446a3 100644 --- a/idaes/core/util/tests/test_config.py +++ b/idaes/core/util/tests/test_config.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_dyn_utils.py b/idaes/core/util/tests/test_dyn_utils.py index 0d77cd8fb8..fc443da298 100644 --- a/idaes/core/util/tests/test_dyn_utils.py +++ b/idaes/core/util/tests/test_dyn_utils.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_env_info.py b/idaes/core/util/tests/test_env_info.py index 1e9233b96c..856d283b1a 100644 --- a/idaes/core/util/tests/test_env_info.py +++ b/idaes/core/util/tests/test_env_info.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_exceptions.py b/idaes/core/util/tests/test_exceptions.py index b112de8575..ee038261bb 100644 --- a/idaes/core/util/tests/test_exceptions.py +++ b/idaes/core/util/tests/test_exceptions.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_initialization.py b/idaes/core/util/tests/test_initialization.py index 7390b8f34e..6dfa52899e 100644 --- a/idaes/core/util/tests/test_initialization.py +++ b/idaes/core/util/tests/test_initialization.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_math.py b/idaes/core/util/tests/test_math.py index 6d6a7b42ab..688db4bbf4 100644 --- a/idaes/core/util/tests/test_math.py +++ b/idaes/core/util/tests/test_math.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_misc.py b/idaes/core/util/tests/test_misc.py index 9032c2d2a7..594b790e12 100644 --- a/idaes/core/util/tests/test_misc.py +++ b/idaes/core/util/tests/test_misc.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_model_diagnostics.py b/idaes/core/util/tests/test_model_diagnostics.py index 7c1587900b..4f504f3d8f 100644 --- a/idaes/core/util/tests/test_model_diagnostics.py +++ b/idaes/core/util/tests/test_model_diagnostics.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_model_serializer.py b/idaes/core/util/tests/test_model_serializer.py index 2b833e2986..c7bf1cabb9 100644 --- a/idaes/core/util/tests/test_model_serializer.py +++ b/idaes/core/util/tests/test_model_serializer.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_model_statistics.py b/idaes/core/util/tests/test_model_statistics.py index 3f45d08809..209ac4af1c 100644 --- a/idaes/core/util/tests/test_model_statistics.py +++ b/idaes/core/util/tests/test_model_statistics.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_parameter_sweep.py b/idaes/core/util/tests/test_parameter_sweep.py index 8d303361eb..1e6a0384af 100644 --- a/idaes/core/util/tests/test_parameter_sweep.py +++ b/idaes/core/util/tests/test_parameter_sweep.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_phase_equilibria.py b/idaes/core/util/tests/test_phase_equilibria.py index 19d944aa08..2f3fbc70f6 100644 --- a/idaes/core/util/tests/test_phase_equilibria.py +++ b/idaes/core/util/tests/test_phase_equilibria.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_pid_initialization.py b/idaes/core/util/tests/test_pid_initialization.py index 49ba7c4dd3..fcdbd55ca1 100644 --- a/idaes/core/util/tests/test_pid_initialization.py +++ b/idaes/core/util/tests/test_pid_initialization.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_scaling.py b/idaes/core/util/tests/test_scaling.py index e7816c6e59..e5ed63844d 100644 --- a/idaes/core/util/tests/test_scaling.py +++ b/idaes/core/util/tests/test_scaling.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_scip_for_testing.py b/idaes/core/util/tests/test_scip_for_testing.py index baa59878a3..619419d950 100644 --- a/idaes/core/util/tests/test_scip_for_testing.py +++ b/idaes/core/util/tests/test_scip_for_testing.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_tables.py b/idaes/core/util/tests/test_tables.py index f229f9c2d5..7267a465a3 100644 --- a/idaes/core/util/tests/test_tables.py +++ b/idaes/core/util/tests/test_tables.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_tags.py b/idaes/core/util/tests/test_tags.py index 4c4ceed989..fa14f73539 100644 --- a/idaes/core/util/tests/test_tags.py +++ b/idaes/core/util/tests/test_tags.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_units_of_measurement.py b/idaes/core/util/tests/test_units_of_measurement.py index 3818d53d28..76db66a882 100644 --- a/idaes/core/util/tests/test_units_of_measurement.py +++ b/idaes/core/util/tests/test_units_of_measurement.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/tests/test_utility_minimization.py b/idaes/core/util/tests/test_utility_minimization.py index 3404d618f7..bcc9b20379 100644 --- a/idaes/core/util/tests/test_utility_minimization.py +++ b/idaes/core/util/tests/test_utility_minimization.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/units_of_measurement.py b/idaes/core/util/units_of_measurement.py index feefa186d5..057078f6c7 100644 --- a/idaes/core/util/units_of_measurement.py +++ b/idaes/core/util/units_of_measurement.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/core/util/utility_minimization.py b/idaes/core/util/utility_minimization.py index 4fe060f0aa..8ea9e35bd8 100644 --- a/idaes/core/util/utility_minimization.py +++ b/idaes/core/util/utility_minimization.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/logger.py b/idaes/logger.py index 774736e94c..65268e320c 100644 --- a/idaes/logger.py +++ b/idaes/logger.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/control/__init__.py b/idaes/models/control/__init__.py index 3bfdf33be5..1480368958 100644 --- a/idaes/models/control/__init__.py +++ b/idaes/models/control/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/control/controller.py b/idaes/models/control/controller.py index 482ab383b4..e9253db742 100644 --- a/idaes/models/control/controller.py +++ b/idaes/models/control/controller.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/control/tests/test_antiwindup.py b/idaes/models/control/tests/test_antiwindup.py index f7afc7183a..23f8c9741c 100644 --- a/idaes/models/control/tests/test_antiwindup.py +++ b/idaes/models/control/tests/test_antiwindup.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/control/tests/test_controller.py b/idaes/models/control/tests/test_controller.py index 4d7d5ac692..78e5f26b77 100644 --- a/idaes/models/control/tests/test_controller.py +++ b/idaes/models/control/tests/test_controller.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/control/tests/test_pid_pump.py b/idaes/models/control/tests/test_pid_pump.py index 1307d7d76d..a79588f87b 100644 --- a/idaes/models/control/tests/test_pid_pump.py +++ b/idaes/models/control/tests/test_pid_pump.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/control/tests/test_steam_tank_pressure.py b/idaes/models/control/tests/test_steam_tank_pressure.py index 132c02211f..ac73bbcea7 100644 --- a/idaes/models/control/tests/test_steam_tank_pressure.py +++ b/idaes/models/control/tests/test_steam_tank_pressure.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/costing/SSLW.py b/idaes/models/costing/SSLW.py index 9397ef29dc..c26cdb8b32 100644 --- a/idaes/models/costing/SSLW.py +++ b/idaes/models/costing/SSLW.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/costing/tests/test_SSLW_costing.py b/idaes/models/costing/tests/test_SSLW_costing.py index 102297f71b..69384a37f1 100644 --- a/idaes/models/costing/tests/test_SSLW_costing.py +++ b/idaes/models/costing/tests/test_SSLW_costing.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/flowsheets/demo_flowsheet.py b/idaes/models/flowsheets/demo_flowsheet.py index b5bbbd2cc6..7e461bcbe9 100644 --- a/idaes/models/flowsheets/demo_flowsheet.py +++ b/idaes/models/flowsheets/demo_flowsheet.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/flowsheets/tests/test_demo_flowsheet.py b/idaes/models/flowsheets/tests/test_demo_flowsheet.py index c9ce6cbac1..cfa66851a7 100644 --- a/idaes/models/flowsheets/tests/test_demo_flowsheet.py +++ b/idaes/models/flowsheets/tests/test_demo_flowsheet.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/activity_coeff_models/BTX_activity_coeff_VLE.py b/idaes/models/properties/activity_coeff_models/BTX_activity_coeff_VLE.py index 7baf0a54f7..989627850a 100644 --- a/idaes/models/properties/activity_coeff_models/BTX_activity_coeff_VLE.py +++ b/idaes/models/properties/activity_coeff_models/BTX_activity_coeff_VLE.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/activity_coeff_models/activity_coeff_prop_pack.py b/idaes/models/properties/activity_coeff_models/activity_coeff_prop_pack.py index 449dd62777..b8c443523a 100644 --- a/idaes/models/properties/activity_coeff_models/activity_coeff_prop_pack.py +++ b/idaes/models/properties/activity_coeff_models/activity_coeff_prop_pack.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/activity_coeff_models/methane_combustion_ideal.py b/idaes/models/properties/activity_coeff_models/methane_combustion_ideal.py index 6e3cfdc276..8897571f11 100644 --- a/idaes/models/properties/activity_coeff_models/methane_combustion_ideal.py +++ b/idaes/models/properties/activity_coeff_models/methane_combustion_ideal.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/activity_coeff_models/tests/test_ideal_NRTL.py b/idaes/models/properties/activity_coeff_models/tests/test_ideal_NRTL.py index 76805d6604..0e5ea9eb1a 100644 --- a/idaes/models/properties/activity_coeff_models/tests/test_ideal_NRTL.py +++ b/idaes/models/properties/activity_coeff_models/tests/test_ideal_NRTL.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/activity_coeff_models/tests/test_ideal_Wilson.py b/idaes/models/properties/activity_coeff_models/tests/test_ideal_Wilson.py index 3e4d06db99..bf719f1844 100644 --- a/idaes/models/properties/activity_coeff_models/tests/test_ideal_Wilson.py +++ b/idaes/models/properties/activity_coeff_models/tests/test_ideal_Wilson.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/activity_coeff_models/tests/test_ideal_ideal_FTPz.py b/idaes/models/properties/activity_coeff_models/tests/test_ideal_ideal_FTPz.py index 7a691719ff..0731b4b406 100644 --- a/idaes/models/properties/activity_coeff_models/tests/test_ideal_ideal_FTPz.py +++ b/idaes/models/properties/activity_coeff_models/tests/test_ideal_ideal_FTPz.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/activity_coeff_models/tests/test_ideal_ideal_FcTP.py b/idaes/models/properties/activity_coeff_models/tests/test_ideal_ideal_FcTP.py index ad81694bb4..c4cc502cf3 100644 --- a/idaes/models/properties/activity_coeff_models/tests/test_ideal_ideal_FcTP.py +++ b/idaes/models/properties/activity_coeff_models/tests/test_ideal_ideal_FcTP.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/cubic_eos/BT_PR.py b/idaes/models/properties/cubic_eos/BT_PR.py index f00ce3e7c1..de2f504161 100644 --- a/idaes/models/properties/cubic_eos/BT_PR.py +++ b/idaes/models/properties/cubic_eos/BT_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/cubic_eos/cubic_prop_pack.py b/idaes/models/properties/cubic_eos/cubic_prop_pack.py index 97e3a89e28..42ca44340c 100644 --- a/idaes/models/properties/cubic_eos/cubic_prop_pack.py +++ b/idaes/models/properties/cubic_eos/cubic_prop_pack.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/cubic_eos/tests/test_BT_example.py b/idaes/models/properties/cubic_eos/tests/test_BT_example.py index 64af296ef2..b9b3a43ff1 100644 --- a/idaes/models/properties/cubic_eos/tests/test_BT_example.py +++ b/idaes/models/properties/cubic_eos/tests/test_BT_example.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/cubic_eos/tests/test_cubic_prop_pack.py b/idaes/models/properties/cubic_eos/tests/test_cubic_prop_pack.py index 7c5483084b..6bd4a945e0 100644 --- a/idaes/models/properties/cubic_eos/tests/test_cubic_prop_pack.py +++ b/idaes/models/properties/cubic_eos/tests/test_cubic_prop_pack.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/cubic_eos/tests/test_cubic_root.py b/idaes/models/properties/cubic_eos/tests/test_cubic_root.py index fe25476716..643d9eb3dd 100644 --- a/idaes/models/properties/cubic_eos/tests/test_cubic_root.py +++ b/idaes/models/properties/cubic_eos/tests/test_cubic_root.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/examples/saponification_reactions.py b/idaes/models/properties/examples/saponification_reactions.py index 36a48ffba5..a855868104 100644 --- a/idaes/models/properties/examples/saponification_reactions.py +++ b/idaes/models/properties/examples/saponification_reactions.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/examples/saponification_thermo.py b/idaes/models/properties/examples/saponification_thermo.py index 3436e67c76..e21ed6094d 100644 --- a/idaes/models/properties/examples/saponification_thermo.py +++ b/idaes/models/properties/examples/saponification_thermo.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/examples/tests/test_saponification_reaction.py b/idaes/models/properties/examples/tests/test_saponification_reaction.py index 80cc848911..1da9acbd77 100644 --- a/idaes/models/properties/examples/tests/test_saponification_reaction.py +++ b/idaes/models/properties/examples/tests/test_saponification_reaction.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/examples/tests/test_saponification_thermo.py b/idaes/models/properties/examples/tests/test_saponification_thermo.py index c26f19d0d0..a5d7b8ff00 100644 --- a/idaes/models/properties/examples/tests/test_saponification_thermo.py +++ b/idaes/models/properties/examples/tests/test_saponification_thermo.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/__init__.py b/idaes/models/properties/general_helmholtz/__init__.py index 30481d2a06..073d4e08a6 100644 --- a/idaes/models/properties/general_helmholtz/__init__.py +++ b/idaes/models/properties/general_helmholtz/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/components/__init__.py b/idaes/models/properties/general_helmholtz/components/__init__.py index cb9a901934..05d2344b0f 100644 --- a/idaes/models/properties/general_helmholtz/components/__init__.py +++ b/idaes/models/properties/general_helmholtz/components/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/components/parameters/__init__.py b/idaes/models/properties/general_helmholtz/components/parameters/__init__.py index c6124737bb..2432646679 100644 --- a/idaes/models/properties/general_helmholtz/components/parameters/__init__.py +++ b/idaes/models/properties/general_helmholtz/components/parameters/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/components/parameters/co2.py b/idaes/models/properties/general_helmholtz/components/parameters/co2.py index aa8feae3e3..50d385f9e4 100644 --- a/idaes/models/properties/general_helmholtz/components/parameters/co2.py +++ b/idaes/models/properties/general_helmholtz/components/parameters/co2.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/components/parameters/h2o.py b/idaes/models/properties/general_helmholtz/components/parameters/h2o.py index 645dffb269..d8bbdc1676 100644 --- a/idaes/models/properties/general_helmholtz/components/parameters/h2o.py +++ b/idaes/models/properties/general_helmholtz/components/parameters/h2o.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/components/parameters/propane.py b/idaes/models/properties/general_helmholtz/components/parameters/propane.py index 85ea9bbae4..b2bcd7bc83 100644 --- a/idaes/models/properties/general_helmholtz/components/parameters/propane.py +++ b/idaes/models/properties/general_helmholtz/components/parameters/propane.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/components/parameters/r1234ze.py b/idaes/models/properties/general_helmholtz/components/parameters/r1234ze.py index 3f90b63423..5f268fcc66 100644 --- a/idaes/models/properties/general_helmholtz/components/parameters/r1234ze.py +++ b/idaes/models/properties/general_helmholtz/components/parameters/r1234ze.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/components/parameters/r125.py b/idaes/models/properties/general_helmholtz/components/parameters/r125.py index 318a085357..c46472f533 100644 --- a/idaes/models/properties/general_helmholtz/components/parameters/r125.py +++ b/idaes/models/properties/general_helmholtz/components/parameters/r125.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/components/parameters/r134a.py b/idaes/models/properties/general_helmholtz/components/parameters/r134a.py index 1b4a9d41f3..1f0eeb9e86 100644 --- a/idaes/models/properties/general_helmholtz/components/parameters/r134a.py +++ b/idaes/models/properties/general_helmholtz/components/parameters/r134a.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/components/parameters/r227ea.py b/idaes/models/properties/general_helmholtz/components/parameters/r227ea.py index 30239789e7..dcc1311ab0 100644 --- a/idaes/models/properties/general_helmholtz/components/parameters/r227ea.py +++ b/idaes/models/properties/general_helmholtz/components/parameters/r227ea.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/components/parameters/r32.py b/idaes/models/properties/general_helmholtz/components/parameters/r32.py index 39c1795968..11e292c2e6 100644 --- a/idaes/models/properties/general_helmholtz/components/parameters/r32.py +++ b/idaes/models/properties/general_helmholtz/components/parameters/r32.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/components/registry.py b/idaes/models/properties/general_helmholtz/components/registry.py index 42dd70ae85..635cdea4ff 100644 --- a/idaes/models/properties/general_helmholtz/components/registry.py +++ b/idaes/models/properties/general_helmholtz/components/registry.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/expressions/__init__.py b/idaes/models/properties/general_helmholtz/expressions/__init__.py index 9dee719f8b..51e5ebcd32 100644 --- a/idaes/models/properties/general_helmholtz/expressions/__init__.py +++ b/idaes/models/properties/general_helmholtz/expressions/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type01.py b/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type01.py index 4004a71de1..b562fef40b 100644 --- a/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type01.py +++ b/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type01.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type02.py b/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type02.py index b801c81200..c57eeb5431 100644 --- a/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type02.py +++ b/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type02.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type03.py b/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type03.py index d599dc2677..ba90c35c11 100644 --- a/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type03.py +++ b/idaes/models/properties/general_helmholtz/expressions/phi_ideal_type03.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/expressions/phi_residual_type01.py b/idaes/models/properties/general_helmholtz/expressions/phi_residual_type01.py index af7bf0f030..6ea3e0ff0d 100644 --- a/idaes/models/properties/general_helmholtz/expressions/phi_residual_type01.py +++ b/idaes/models/properties/general_helmholtz/expressions/phi_residual_type01.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/expressions/phi_residual_type02.py b/idaes/models/properties/general_helmholtz/expressions/phi_residual_type02.py index 9a76edd365..efd8c93eb0 100644 --- a/idaes/models/properties/general_helmholtz/expressions/phi_residual_type02.py +++ b/idaes/models/properties/general_helmholtz/expressions/phi_residual_type02.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/expressions/phi_residual_type03.py b/idaes/models/properties/general_helmholtz/expressions/phi_residual_type03.py index 5c9f31a92a..c6ce67b592 100644 --- a/idaes/models/properties/general_helmholtz/expressions/phi_residual_type03.py +++ b/idaes/models/properties/general_helmholtz/expressions/phi_residual_type03.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/expressions/phi_residual_type04.py b/idaes/models/properties/general_helmholtz/expressions/phi_residual_type04.py index b760031c15..30790774dd 100644 --- a/idaes/models/properties/general_helmholtz/expressions/phi_residual_type04.py +++ b/idaes/models/properties/general_helmholtz/expressions/phi_residual_type04.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/expressions/sat_delta_approx.py b/idaes/models/properties/general_helmholtz/expressions/sat_delta_approx.py index 1ffcce13c9..4791682de1 100644 --- a/idaes/models/properties/general_helmholtz/expressions/sat_delta_approx.py +++ b/idaes/models/properties/general_helmholtz/expressions/sat_delta_approx.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/expressions/surface_tension_type01.py b/idaes/models/properties/general_helmholtz/expressions/surface_tension_type01.py index 90d9fe441a..711a347e39 100644 --- a/idaes/models/properties/general_helmholtz/expressions/surface_tension_type01.py +++ b/idaes/models/properties/general_helmholtz/expressions/surface_tension_type01.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/helmholtz_functions.py b/idaes/models/properties/general_helmholtz/helmholtz_functions.py index 19a298e3c1..515d860303 100644 --- a/idaes/models/properties/general_helmholtz/helmholtz_functions.py +++ b/idaes/models/properties/general_helmholtz/helmholtz_functions.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/helmholtz_functions_map.py b/idaes/models/properties/general_helmholtz/helmholtz_functions_map.py index 540d0fd9cd..71258601cc 100644 --- a/idaes/models/properties/general_helmholtz/helmholtz_functions_map.py +++ b/idaes/models/properties/general_helmholtz/helmholtz_functions_map.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/helmholtz_parameters.py b/idaes/models/properties/general_helmholtz/helmholtz_parameters.py index 75c36518fe..0338982605 100644 --- a/idaes/models/properties/general_helmholtz/helmholtz_parameters.py +++ b/idaes/models/properties/general_helmholtz/helmholtz_parameters.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/helmholtz_state.py b/idaes/models/properties/general_helmholtz/helmholtz_state.py index d00b2a1129..adecbd8c55 100644 --- a/idaes/models/properties/general_helmholtz/helmholtz_state.py +++ b/idaes/models/properties/general_helmholtz/helmholtz_state.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/tests/test_functions_unit.py b/idaes/models/properties/general_helmholtz/tests/test_functions_unit.py index 4b86b79b73..606b46d2d7 100644 --- a/idaes/models/properties/general_helmholtz/tests/test_functions_unit.py +++ b/idaes/models/properties/general_helmholtz/tests/test_functions_unit.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/tests/test_parameter_util.py b/idaes/models/properties/general_helmholtz/tests/test_parameter_util.py index 7a01c753c8..f4265df2fd 100644 --- a/idaes/models/properties/general_helmholtz/tests/test_parameter_util.py +++ b/idaes/models/properties/general_helmholtz/tests/test_parameter_util.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/tests/test_register.py b/idaes/models/properties/general_helmholtz/tests/test_register.py index f8fefc20c9..d27b33f131 100644 --- a/idaes/models/properties/general_helmholtz/tests/test_register.py +++ b/idaes/models/properties/general_helmholtz/tests/test_register.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/tests/test_stateblock.py b/idaes/models/properties/general_helmholtz/tests/test_stateblock.py index d159c981ed..a09dfebda9 100644 --- a/idaes/models/properties/general_helmholtz/tests/test_stateblock.py +++ b/idaes/models/properties/general_helmholtz/tests/test_stateblock.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/tests/test_with_harness.py b/idaes/models/properties/general_helmholtz/tests/test_with_harness.py index e49fb4b900..2c7f3f24d4 100644 --- a/idaes/models/properties/general_helmholtz/tests/test_with_harness.py +++ b/idaes/models/properties/general_helmholtz/tests/test_with_harness.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/general_helmholtz/tests/test_with_heater.py b/idaes/models/properties/general_helmholtz/tests/test_with_heater.py index 600fdc6547..3267d02f69 100644 --- a/idaes/models/properties/general_helmholtz/tests/test_with_heater.py +++ b/idaes/models/properties/general_helmholtz/tests/test_with_heater.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/helmholtz/helmholtz.py b/idaes/models/properties/helmholtz/helmholtz.py index b5a240cbe9..7f6b2120d5 100644 --- a/idaes/models/properties/helmholtz/helmholtz.py +++ b/idaes/models/properties/helmholtz/helmholtz.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/iapws95.py b/idaes/models/properties/iapws95.py index 44f1831e4d..9f50267727 100644 --- a/idaes/models/properties/iapws95.py +++ b/idaes/models/properties/iapws95.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/interrogator/__init__.py b/idaes/models/properties/interrogator/__init__.py index e9738aa8c2..980512a6ba 100644 --- a/idaes/models/properties/interrogator/__init__.py +++ b/idaes/models/properties/interrogator/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/interrogator/properties_interrogator.py b/idaes/models/properties/interrogator/properties_interrogator.py index 48a36c01c6..4dc9379705 100644 --- a/idaes/models/properties/interrogator/properties_interrogator.py +++ b/idaes/models/properties/interrogator/properties_interrogator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/interrogator/reactions_interrogator.py b/idaes/models/properties/interrogator/reactions_interrogator.py index 181f5b143f..ea9ec31adf 100644 --- a/idaes/models/properties/interrogator/reactions_interrogator.py +++ b/idaes/models/properties/interrogator/reactions_interrogator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/interrogator/tests/test_properties_interrogator.py b/idaes/models/properties/interrogator/tests/test_properties_interrogator.py index 473f95b185..41c92b2ffa 100644 --- a/idaes/models/properties/interrogator/tests/test_properties_interrogator.py +++ b/idaes/models/properties/interrogator/tests/test_properties_interrogator.py @@ -5,7 +5,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/interrogator/tests/test_reactions_interrogator.py b/idaes/models/properties/interrogator/tests/test_reactions_interrogator.py index 8194559123..c06797ada9 100644 --- a/idaes/models/properties/interrogator/tests/test_reactions_interrogator.py +++ b/idaes/models/properties/interrogator/tests/test_reactions_interrogator.py @@ -5,7 +5,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/__init__.py b/idaes/models/properties/modular_properties/__init__.py index 7ea36a9b56..fe0426caf0 100644 --- a/idaes/models/properties/modular_properties/__init__.py +++ b/idaes/models/properties/modular_properties/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/__init__.py b/idaes/models/properties/modular_properties/base/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/base/__init__.py +++ b/idaes/models/properties/modular_properties/base/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/generic_property.py b/idaes/models/properties/modular_properties/base/generic_property.py index 5650432603..43ffad3806 100644 --- a/idaes/models/properties/modular_properties/base/generic_property.py +++ b/idaes/models/properties/modular_properties/base/generic_property.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/generic_reaction.py b/idaes/models/properties/modular_properties/base/generic_reaction.py index edd04575ef..531a7bd06d 100644 --- a/idaes/models/properties/modular_properties/base/generic_reaction.py +++ b/idaes/models/properties/modular_properties/base/generic_reaction.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/__init__.py b/idaes/models/properties/modular_properties/base/tests/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/base/tests/__init__.py +++ b/idaes/models/properties/modular_properties/base/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/dummy_eos.py b/idaes/models/properties/modular_properties/base/tests/dummy_eos.py index 1564e5c18a..4da20f2500 100644 --- a/idaes/models/properties/modular_properties/base/tests/dummy_eos.py +++ b/idaes/models/properties/modular_properties/base/tests/dummy_eos.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/test_electrolyte_components.py b/idaes/models/properties/modular_properties/base/tests/test_electrolyte_components.py index 9acabd09f2..44773cc127 100644 --- a/idaes/models/properties/modular_properties/base/tests/test_electrolyte_components.py +++ b/idaes/models/properties/modular_properties/base/tests/test_electrolyte_components.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/test_generic_property.py b/idaes/models/properties/modular_properties/base/tests/test_generic_property.py index e43c34fd1e..716c824443 100644 --- a/idaes/models/properties/modular_properties/base/tests/test_generic_property.py +++ b/idaes/models/properties/modular_properties/base/tests/test_generic_property.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/test_generic_property_integration.py b/idaes/models/properties/modular_properties/base/tests/test_generic_property_integration.py index b5e5df8bea..2195efecdc 100644 --- a/idaes/models/properties/modular_properties/base/tests/test_generic_property_integration.py +++ b/idaes/models/properties/modular_properties/base/tests/test_generic_property_integration.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/test_generic_reaction.py b/idaes/models/properties/modular_properties/base/tests/test_generic_reaction.py index ff7c2525de..39f81c1921 100644 --- a/idaes/models/properties/modular_properties/base/tests/test_generic_reaction.py +++ b/idaes/models/properties/modular_properties/base/tests/test_generic_reaction.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/test_noncondense.py b/idaes/models/properties/modular_properties/base/tests/test_noncondense.py index cabbb48636..0b5227d122 100644 --- a/idaes/models/properties/modular_properties/base/tests/test_noncondense.py +++ b/idaes/models/properties/modular_properties/base/tests/test_noncondense.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/test_noncondense_PR.py b/idaes/models/properties/modular_properties/base/tests/test_noncondense_PR.py index 41653ad650..aa0df9301d 100644 --- a/idaes/models/properties/modular_properties/base/tests/test_noncondense_PR.py +++ b/idaes/models/properties/modular_properties/base/tests/test_noncondense_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/test_nonvap.py b/idaes/models/properties/modular_properties/base/tests/test_nonvap.py index 3c2d8643b7..04674b78f1 100644 --- a/idaes/models/properties/modular_properties/base/tests/test_nonvap.py +++ b/idaes/models/properties/modular_properties/base/tests/test_nonvap.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/test_nonvap_PR.py b/idaes/models/properties/modular_properties/base/tests/test_nonvap_PR.py index 2c6e54de8e..c6449bfda0 100644 --- a/idaes/models/properties/modular_properties/base/tests/test_nonvap_PR.py +++ b/idaes/models/properties/modular_properties/base/tests/test_nonvap_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/test_utility.py b/idaes/models/properties/modular_properties/base/tests/test_utility.py index 0bf11fd926..5ba2acee27 100644 --- a/idaes/models/properties/modular_properties/base/tests/test_utility.py +++ b/idaes/models/properties/modular_properties/base/tests/test_utility.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/tests/test_vle.py b/idaes/models/properties/modular_properties/base/tests/test_vle.py index 2beaf1ce6f..a4d7302155 100644 --- a/idaes/models/properties/modular_properties/base/tests/test_vle.py +++ b/idaes/models/properties/modular_properties/base/tests/test_vle.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/base/utility.py b/idaes/models/properties/modular_properties/base/utility.py index 5dcaf9eeae..c4e526dc09 100644 --- a/idaes/models/properties/modular_properties/base/utility.py +++ b/idaes/models/properties/modular_properties/base/utility.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/coolprop/__init__.py b/idaes/models/properties/modular_properties/coolprop/__init__.py index 76bf50f2de..9aa786dee6 100644 --- a/idaes/models/properties/modular_properties/coolprop/__init__.py +++ b/idaes/models/properties/modular_properties/coolprop/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/coolprop/coolprop_forms.py b/idaes/models/properties/modular_properties/coolprop/coolprop_forms.py index c6ea1f79fa..00b98df3ec 100644 --- a/idaes/models/properties/modular_properties/coolprop/coolprop_forms.py +++ b/idaes/models/properties/modular_properties/coolprop/coolprop_forms.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/coolprop/coolprop_wrapper.py b/idaes/models/properties/modular_properties/coolprop/coolprop_wrapper.py index ca3822fb6f..32a6cea97f 100644 --- a/idaes/models/properties/modular_properties/coolprop/coolprop_wrapper.py +++ b/idaes/models/properties/modular_properties/coolprop/coolprop_wrapper.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/coolprop/tests/test_coolprop_forms.py b/idaes/models/properties/modular_properties/coolprop/tests/test_coolprop_forms.py index dfbbe8e5e0..31d064ea7c 100644 --- a/idaes/models/properties/modular_properties/coolprop/tests/test_coolprop_forms.py +++ b/idaes/models/properties/modular_properties/coolprop/tests/test_coolprop_forms.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/coolprop/tests/test_coolprop_wrapper.py b/idaes/models/properties/modular_properties/coolprop/tests/test_coolprop_wrapper.py index 0d92cf4227..63fc235b6e 100644 --- a/idaes/models/properties/modular_properties/coolprop/tests/test_coolprop_wrapper.py +++ b/idaes/models/properties/modular_properties/coolprop/tests/test_coolprop_wrapper.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/__init__.py b/idaes/models/properties/modular_properties/eos/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/eos/__init__.py +++ b/idaes/models/properties/modular_properties/eos/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/ceos.py b/idaes/models/properties/modular_properties/eos/ceos.py index 4288fdc680..65351cb699 100644 --- a/idaes/models/properties/modular_properties/eos/ceos.py +++ b/idaes/models/properties/modular_properties/eos/ceos.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/ceos_common.py b/idaes/models/properties/modular_properties/eos/ceos_common.py index 27f976faf7..b861d22491 100644 --- a/idaes/models/properties/modular_properties/eos/ceos_common.py +++ b/idaes/models/properties/modular_properties/eos/ceos_common.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/enrtl.py b/idaes/models/properties/modular_properties/eos/enrtl.py index 93fae2192a..7ca4dd03b2 100644 --- a/idaes/models/properties/modular_properties/eos/enrtl.py +++ b/idaes/models/properties/modular_properties/eos/enrtl.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/enrtl_parameters.py b/idaes/models/properties/modular_properties/eos/enrtl_parameters.py index d38746db07..68b90f5a8e 100644 --- a/idaes/models/properties/modular_properties/eos/enrtl_parameters.py +++ b/idaes/models/properties/modular_properties/eos/enrtl_parameters.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/enrtl_reference_states.py b/idaes/models/properties/modular_properties/eos/enrtl_reference_states.py index c0e543d66d..a9d412f595 100644 --- a/idaes/models/properties/modular_properties/eos/enrtl_reference_states.py +++ b/idaes/models/properties/modular_properties/eos/enrtl_reference_states.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/eos_base.py b/idaes/models/properties/modular_properties/eos/eos_base.py index 37db8a1f40..643065aaf5 100644 --- a/idaes/models/properties/modular_properties/eos/eos_base.py +++ b/idaes/models/properties/modular_properties/eos/eos_base.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/ideal.py b/idaes/models/properties/modular_properties/eos/ideal.py index 8986e7286a..9373234c30 100644 --- a/idaes/models/properties/modular_properties/eos/ideal.py +++ b/idaes/models/properties/modular_properties/eos/ideal.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/tests/__init__.py b/idaes/models/properties/modular_properties/eos/tests/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/eos/tests/__init__.py +++ b/idaes/models/properties/modular_properties/eos/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/tests/test_ceos_PR.py b/idaes/models/properties/modular_properties/eos/tests/test_ceos_PR.py index 361fdc1dd4..c124d9354b 100644 --- a/idaes/models/properties/modular_properties/eos/tests/test_ceos_PR.py +++ b/idaes/models/properties/modular_properties/eos/tests/test_ceos_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/tests/test_enrtl.py b/idaes/models/properties/modular_properties/eos/tests/test_enrtl.py index 1f833ca715..34bdc04755 100644 --- a/idaes/models/properties/modular_properties/eos/tests/test_enrtl.py +++ b/idaes/models/properties/modular_properties/eos/tests/test_enrtl.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/eos/tests/test_ideal.py b/idaes/models/properties/modular_properties/eos/tests/test_ideal.py index 087f8a2b3b..13b27880e9 100644 --- a/idaes/models/properties/modular_properties/eos/tests/test_ideal.py +++ b/idaes/models/properties/modular_properties/eos/tests/test_ideal.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/ASU_PR.py b/idaes/models/properties/modular_properties/examples/ASU_PR.py index b1217c5b29..03033a9196 100644 --- a/idaes/models/properties/modular_properties/examples/ASU_PR.py +++ b/idaes/models/properties/modular_properties/examples/ASU_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/BT_PR.py b/idaes/models/properties/modular_properties/examples/BT_PR.py index 7341a3992e..a32db722b0 100644 --- a/idaes/models/properties/modular_properties/examples/BT_PR.py +++ b/idaes/models/properties/modular_properties/examples/BT_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/BT_ideal.py b/idaes/models/properties/modular_properties/examples/BT_ideal.py index 67e59e215c..24571ef64b 100644 --- a/idaes/models/properties/modular_properties/examples/BT_ideal.py +++ b/idaes/models/properties/modular_properties/examples/BT_ideal.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/CO2_H2O_Ideal_VLE.py b/idaes/models/properties/modular_properties/examples/CO2_H2O_Ideal_VLE.py index c6f59fc3d9..de3c32e10b 100644 --- a/idaes/models/properties/modular_properties/examples/CO2_H2O_Ideal_VLE.py +++ b/idaes/models/properties/modular_properties/examples/CO2_H2O_Ideal_VLE.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/CO2_bmimPF6_PR.py b/idaes/models/properties/modular_properties/examples/CO2_bmimPF6_PR.py index e688d6c4d2..8e5aba8719 100644 --- a/idaes/models/properties/modular_properties/examples/CO2_bmimPF6_PR.py +++ b/idaes/models/properties/modular_properties/examples/CO2_bmimPF6_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/HC_PR.py b/idaes/models/properties/modular_properties/examples/HC_PR.py index 7826a12f8b..0d76947d30 100644 --- a/idaes/models/properties/modular_properties/examples/HC_PR.py +++ b/idaes/models/properties/modular_properties/examples/HC_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/HC_PR_vap.py b/idaes/models/properties/modular_properties/examples/HC_PR_vap.py index 0774404eac..7146249769 100644 --- a/idaes/models/properties/modular_properties/examples/HC_PR_vap.py +++ b/idaes/models/properties/modular_properties/examples/HC_PR_vap.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/__init__.py b/idaes/models/properties/modular_properties/examples/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/examples/__init__.py +++ b/idaes/models/properties/modular_properties/examples/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/enrtl_H2O_NaCl_KCl.py b/idaes/models/properties/modular_properties/examples/enrtl_H2O_NaCl_KCl.py index fcadd70178..b5b0509f65 100644 --- a/idaes/models/properties/modular_properties/examples/enrtl_H2O_NaCl_KCl.py +++ b/idaes/models/properties/modular_properties/examples/enrtl_H2O_NaCl_KCl.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/enrtl_NaBr_mixed_solvent.py b/idaes/models/properties/modular_properties/examples/enrtl_NaBr_mixed_solvent.py index a42f04e480..ad9d7bed4b 100644 --- a/idaes/models/properties/modular_properties/examples/enrtl_NaBr_mixed_solvent.py +++ b/idaes/models/properties/modular_properties/examples/enrtl_NaBr_mixed_solvent.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/reactions/__init__.py b/idaes/models/properties/modular_properties/examples/reactions/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/examples/reactions/__init__.py +++ b/idaes/models/properties/modular_properties/examples/reactions/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/reactions/reaction_example.py b/idaes/models/properties/modular_properties/examples/reactions/reaction_example.py index 76d0188738..a2ca7452ea 100644 --- a/idaes/models/properties/modular_properties/examples/reactions/reaction_example.py +++ b/idaes/models/properties/modular_properties/examples/reactions/reaction_example.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/reactions/tests/__init__.py b/idaes/models/properties/modular_properties/examples/reactions/tests/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/examples/reactions/tests/__init__.py +++ b/idaes/models/properties/modular_properties/examples/reactions/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/reactions/tests/test_reaction_example.py b/idaes/models/properties/modular_properties/examples/reactions/tests/test_reaction_example.py index 6a6f160a20..6261454ca2 100644 --- a/idaes/models/properties/modular_properties/examples/reactions/tests/test_reaction_example.py +++ b/idaes/models/properties/modular_properties/examples/reactions/tests/test_reaction_example.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/__init__.py b/idaes/models/properties/modular_properties/examples/tests/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/examples/tests/__init__.py +++ b/idaes/models/properties/modular_properties/examples/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_ASU_PR.py b/idaes/models/properties/modular_properties/examples/tests/test_ASU_PR.py index 599cd58ea5..2a737492c2 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_ASU_PR.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_ASU_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_ASU_PR_Dowling_2015.py b/idaes/models/properties/modular_properties/examples/tests/test_ASU_PR_Dowling_2015.py index 9b208e2ac4..49fa64fdf8 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_ASU_PR_Dowling_2015.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_ASU_PR_Dowling_2015.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal.py b/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal.py index e5431202b5..e511e7e8c7 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FPhx.py b/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FPhx.py index b092f1e43c..2c4e396d1d 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FPhx.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FPhx.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FcPh.py b/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FcPh.py index 2230ac6f9c..75d5b02bce 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FcPh.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FcPh.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FcTP.py b/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FcTP.py index 5a72a2319c..51150a6014 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FcTP.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_BTIdeal_FcTP.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_BT_PR.py b/idaes/models/properties/modular_properties/examples/tests/test_BT_PR.py index e4da6fb0aa..1e35f039b4 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_BT_PR.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_BT_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_BT_PR_legacy_SmoothVLE.py b/idaes/models/properties/modular_properties/examples/tests/test_BT_PR_legacy_SmoothVLE.py index 7406ffb7ba..a7d6d7322c 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_BT_PR_legacy_SmoothVLE.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_BT_PR_legacy_SmoothVLE.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_CO2_H2O_Ideal_VLE.py b/idaes/models/properties/modular_properties/examples/tests/test_CO2_H2O_Ideal_VLE.py index cf609d0b78..7f241fcd0a 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_CO2_H2O_Ideal_VLE.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_CO2_H2O_Ideal_VLE.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_CO2_bmimPF6_PR.py b/idaes/models/properties/modular_properties/examples/tests/test_CO2_bmimPF6_PR.py index 5d9956b27f..e7a3a28078 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_CO2_bmimPF6_PR.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_CO2_bmimPF6_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_HC_PR.py b/idaes/models/properties/modular_properties/examples/tests/test_HC_PR.py index ce1c21d4de..e142fc59a0 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_HC_PR.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_HC_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_HC_PR_vap.py b/idaes/models/properties/modular_properties/examples/tests/test_HC_PR_vap.py index 8a24426b15..3550403807 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_HC_PR_vap.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_HC_PR_vap.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_enrtl_H2O_NaCl_KCl.py b/idaes/models/properties/modular_properties/examples/tests/test_enrtl_H2O_NaCl_KCl.py index e70496c02c..776d230a8c 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_enrtl_H2O_NaCl_KCl.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_enrtl_H2O_NaCl_KCl.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/examples/tests/test_entrl_NaBr_mixed_solvent.py b/idaes/models/properties/modular_properties/examples/tests/test_entrl_NaBr_mixed_solvent.py index a0905f2f0b..b136da5669 100644 --- a/idaes/models/properties/modular_properties/examples/tests/test_entrl_NaBr_mixed_solvent.py +++ b/idaes/models/properties/modular_properties/examples/tests/test_entrl_NaBr_mixed_solvent.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/__init__.py b/idaes/models/properties/modular_properties/phase_equil/__init__.py index b9a28fde2f..b08473e3cc 100644 --- a/idaes/models/properties/modular_properties/phase_equil/__init__.py +++ b/idaes/models/properties/modular_properties/phase_equil/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/bubble_dew.py b/idaes/models/properties/modular_properties/phase_equil/bubble_dew.py index f6d75d1931..0408ce5fed 100644 --- a/idaes/models/properties/modular_properties/phase_equil/bubble_dew.py +++ b/idaes/models/properties/modular_properties/phase_equil/bubble_dew.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/forms.py b/idaes/models/properties/modular_properties/phase_equil/forms.py index 78625f789a..72f59db665 100644 --- a/idaes/models/properties/modular_properties/phase_equil/forms.py +++ b/idaes/models/properties/modular_properties/phase_equil/forms.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/henry.py b/idaes/models/properties/modular_properties/phase_equil/henry.py index 06519bc2d4..ff56d3df5b 100644 --- a/idaes/models/properties/modular_properties/phase_equil/henry.py +++ b/idaes/models/properties/modular_properties/phase_equil/henry.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/smooth_VLE.py b/idaes/models/properties/modular_properties/phase_equil/smooth_VLE.py index 39eedbe205..9ee977c4b4 100644 --- a/idaes/models/properties/modular_properties/phase_equil/smooth_VLE.py +++ b/idaes/models/properties/modular_properties/phase_equil/smooth_VLE.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/smooth_VLE_2.py b/idaes/models/properties/modular_properties/phase_equil/smooth_VLE_2.py index 2f2bd30263..679e326d90 100644 --- a/idaes/models/properties/modular_properties/phase_equil/smooth_VLE_2.py +++ b/idaes/models/properties/modular_properties/phase_equil/smooth_VLE_2.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/tests/__init__.py b/idaes/models/properties/modular_properties/phase_equil/tests/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/phase_equil/tests/__init__.py +++ b/idaes/models/properties/modular_properties/phase_equil/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/tests/test_bubble_dew.py b/idaes/models/properties/modular_properties/phase_equil/tests/test_bubble_dew.py index 40c2f7e0e5..51e2ded9e5 100644 --- a/idaes/models/properties/modular_properties/phase_equil/tests/test_bubble_dew.py +++ b/idaes/models/properties/modular_properties/phase_equil/tests/test_bubble_dew.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/tests/test_forms.py b/idaes/models/properties/modular_properties/phase_equil/tests/test_forms.py index 880884aad0..26bcad2a29 100644 --- a/idaes/models/properties/modular_properties/phase_equil/tests/test_forms.py +++ b/idaes/models/properties/modular_properties/phase_equil/tests/test_forms.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/tests/test_henry.py b/idaes/models/properties/modular_properties/phase_equil/tests/test_henry.py index e6033ff58c..edc55901a2 100644 --- a/idaes/models/properties/modular_properties/phase_equil/tests/test_henry.py +++ b/idaes/models/properties/modular_properties/phase_equil/tests/test_henry.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/tests/test_smooth_VLE.py b/idaes/models/properties/modular_properties/phase_equil/tests/test_smooth_VLE.py index 8d42935baf..74f27cf377 100644 --- a/idaes/models/properties/modular_properties/phase_equil/tests/test_smooth_VLE.py +++ b/idaes/models/properties/modular_properties/phase_equil/tests/test_smooth_VLE.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/phase_equil/tests/test_smooth_VLE_2.py b/idaes/models/properties/modular_properties/phase_equil/tests/test_smooth_VLE_2.py index 5884aa3d6e..482c49fda8 100644 --- a/idaes/models/properties/modular_properties/phase_equil/tests/test_smooth_VLE_2.py +++ b/idaes/models/properties/modular_properties/phase_equil/tests/test_smooth_VLE_2.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/ChapmanEnskog.py b/idaes/models/properties/modular_properties/pure/ChapmanEnskog.py index 5ca34082a7..9d5f0cc5e9 100644 --- a/idaes/models/properties/modular_properties/pure/ChapmanEnskog.py +++ b/idaes/models/properties/modular_properties/pure/ChapmanEnskog.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Gas viscosity at low pressures from Chapman Enskog theory using Lennard Jones parameters. diff --git a/idaes/models/properties/modular_properties/pure/ChungPure.py b/idaes/models/properties/modular_properties/pure/ChungPure.py index 263e97c2ad..192eafb04c 100644 --- a/idaes/models/properties/modular_properties/pure/ChungPure.py +++ b/idaes/models/properties/modular_properties/pure/ChungPure.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Pure component gas viscosities at low pressures from critical properties, diff --git a/idaes/models/properties/modular_properties/pure/ConstantProperties.py b/idaes/models/properties/modular_properties/pure/ConstantProperties.py index 64143a1f9a..55c7e72761 100644 --- a/idaes/models/properties/modular_properties/pure/ConstantProperties.py +++ b/idaes/models/properties/modular_properties/pure/ConstantProperties.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/Eucken.py b/idaes/models/properties/modular_properties/pure/Eucken.py index b7d937eacf..7ca7166506 100644 --- a/idaes/models/properties/modular_properties/pure/Eucken.py +++ b/idaes/models/properties/modular_properties/pure/Eucken.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Eucken correlation to calculate low pressure pure component gas thermal conductivity, diff --git a/idaes/models/properties/modular_properties/pure/NIST.py b/idaes/models/properties/modular_properties/pure/NIST.py index 674382b148..953ddc66de 100644 --- a/idaes/models/properties/modular_properties/pure/NIST.py +++ b/idaes/models/properties/modular_properties/pure/NIST.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/Perrys.py b/idaes/models/properties/modular_properties/pure/Perrys.py index 3b42fca610..d711118456 100644 --- a/idaes/models/properties/modular_properties/pure/Perrys.py +++ b/idaes/models/properties/modular_properties/pure/Perrys.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/RPP3.py b/idaes/models/properties/modular_properties/pure/RPP3.py index dddd3e3313..076df03785 100644 --- a/idaes/models/properties/modular_properties/pure/RPP3.py +++ b/idaes/models/properties/modular_properties/pure/RPP3.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/RPP4.py b/idaes/models/properties/modular_properties/pure/RPP4.py index 6c9bf2403f..695455e9fb 100644 --- a/idaes/models/properties/modular_properties/pure/RPP4.py +++ b/idaes/models/properties/modular_properties/pure/RPP4.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/RPP5.py b/idaes/models/properties/modular_properties/pure/RPP5.py index 275b3bf832..3551041990 100644 --- a/idaes/models/properties/modular_properties/pure/RPP5.py +++ b/idaes/models/properties/modular_properties/pure/RPP5.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/__init__.py b/idaes/models/properties/modular_properties/pure/__init__.py index d05c32e920..5f4414b3a0 100644 --- a/idaes/models/properties/modular_properties/pure/__init__.py +++ b/idaes/models/properties/modular_properties/pure/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/electrolyte.py b/idaes/models/properties/modular_properties/pure/electrolyte.py index d4ba256835..ae179b574d 100644 --- a/idaes/models/properties/modular_properties/pure/electrolyte.py +++ b/idaes/models/properties/modular_properties/pure/electrolyte.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/tests/__init__.py b/idaes/models/properties/modular_properties/pure/tests/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/pure/tests/__init__.py +++ b/idaes/models/properties/modular_properties/pure/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/tests/test_ChapmanEnskog.py b/idaes/models/properties/modular_properties/pure/tests/test_ChapmanEnskog.py index 23623c7a6e..9794de53eb 100644 --- a/idaes/models/properties/modular_properties/pure/tests/test_ChapmanEnskog.py +++ b/idaes/models/properties/modular_properties/pure/tests/test_ChapmanEnskog.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Tests for Lennard-Jones implementation of Chapman Enskog viscosity from diff --git a/idaes/models/properties/modular_properties/pure/tests/test_ChungPure.py b/idaes/models/properties/modular_properties/pure/tests/test_ChungPure.py index 0246bdfd8f..7bfcd7a579 100644 --- a/idaes/models/properties/modular_properties/pure/tests/test_ChungPure.py +++ b/idaes/models/properties/modular_properties/pure/tests/test_ChungPure.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Tests for methods from Perry's diff --git a/idaes/models/properties/modular_properties/pure/tests/test_ConstantProperties.py b/idaes/models/properties/modular_properties/pure/tests/test_ConstantProperties.py index 8ca7b99970..2b890aec5b 100644 --- a/idaes/models/properties/modular_properties/pure/tests/test_ConstantProperties.py +++ b/idaes/models/properties/modular_properties/pure/tests/test_ConstantProperties.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/tests/test_Eucken.py b/idaes/models/properties/modular_properties/pure/tests/test_Eucken.py index 925f89d744..cf9c7574ea 100644 --- a/idaes/models/properties/modular_properties/pure/tests/test_Eucken.py +++ b/idaes/models/properties/modular_properties/pure/tests/test_Eucken.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Tests for Eucken equation for thermal conductivity from diff --git a/idaes/models/properties/modular_properties/pure/tests/test_NIST.py b/idaes/models/properties/modular_properties/pure/tests/test_NIST.py index d596e0552a..75b7af98ad 100644 --- a/idaes/models/properties/modular_properties/pure/tests/test_NIST.py +++ b/idaes/models/properties/modular_properties/pure/tests/test_NIST.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/tests/test_Perrys.py b/idaes/models/properties/modular_properties/pure/tests/test_Perrys.py index 13e180d868..c2584181af 100644 --- a/idaes/models/properties/modular_properties/pure/tests/test_Perrys.py +++ b/idaes/models/properties/modular_properties/pure/tests/test_Perrys.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/tests/test_RPP3.py b/idaes/models/properties/modular_properties/pure/tests/test_RPP3.py index f3c6cdef9a..16c5da5fa6 100644 --- a/idaes/models/properties/modular_properties/pure/tests/test_RPP3.py +++ b/idaes/models/properties/modular_properties/pure/tests/test_RPP3.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/tests/test_RPP4.py b/idaes/models/properties/modular_properties/pure/tests/test_RPP4.py index 66a2249069..171870584d 100644 --- a/idaes/models/properties/modular_properties/pure/tests/test_RPP4.py +++ b/idaes/models/properties/modular_properties/pure/tests/test_RPP4.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/tests/test_RPP5.py b/idaes/models/properties/modular_properties/pure/tests/test_RPP5.py index 357f1e035f..25a094e117 100644 --- a/idaes/models/properties/modular_properties/pure/tests/test_RPP5.py +++ b/idaes/models/properties/modular_properties/pure/tests/test_RPP5.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/pure/tests/test_electrolyte.py b/idaes/models/properties/modular_properties/pure/tests/test_electrolyte.py index c0fd9bcccc..36a7f27253 100644 --- a/idaes/models/properties/modular_properties/pure/tests/test_electrolyte.py +++ b/idaes/models/properties/modular_properties/pure/tests/test_electrolyte.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/__init__.py b/idaes/models/properties/modular_properties/reactions/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/reactions/__init__.py +++ b/idaes/models/properties/modular_properties/reactions/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/dh_rxn.py b/idaes/models/properties/modular_properties/reactions/dh_rxn.py index 41249fd7e3..07781594ca 100644 --- a/idaes/models/properties/modular_properties/reactions/dh_rxn.py +++ b/idaes/models/properties/modular_properties/reactions/dh_rxn.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/equilibrium_constant.py b/idaes/models/properties/modular_properties/reactions/equilibrium_constant.py index 55d0aa49b7..4013cc8ac2 100644 --- a/idaes/models/properties/modular_properties/reactions/equilibrium_constant.py +++ b/idaes/models/properties/modular_properties/reactions/equilibrium_constant.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/equilibrium_forms.py b/idaes/models/properties/modular_properties/reactions/equilibrium_forms.py index eeada80ed7..ba5ee6af1c 100644 --- a/idaes/models/properties/modular_properties/reactions/equilibrium_forms.py +++ b/idaes/models/properties/modular_properties/reactions/equilibrium_forms.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/rate_constant.py b/idaes/models/properties/modular_properties/reactions/rate_constant.py index 29e204f4a7..4cb9a47144 100644 --- a/idaes/models/properties/modular_properties/reactions/rate_constant.py +++ b/idaes/models/properties/modular_properties/reactions/rate_constant.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/rate_forms.py b/idaes/models/properties/modular_properties/reactions/rate_forms.py index 3f782d335a..913aafbb28 100644 --- a/idaes/models/properties/modular_properties/reactions/rate_forms.py +++ b/idaes/models/properties/modular_properties/reactions/rate_forms.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/tests/__init__.py b/idaes/models/properties/modular_properties/reactions/tests/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/reactions/tests/__init__.py +++ b/idaes/models/properties/modular_properties/reactions/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/tests/test_dh_rxn.py b/idaes/models/properties/modular_properties/reactions/tests/test_dh_rxn.py index 6b6e7761de..1b6775f2bd 100644 --- a/idaes/models/properties/modular_properties/reactions/tests/test_dh_rxn.py +++ b/idaes/models/properties/modular_properties/reactions/tests/test_dh_rxn.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/tests/test_equilibrium_constant.py b/idaes/models/properties/modular_properties/reactions/tests/test_equilibrium_constant.py index c2f1970e71..0e589981a7 100644 --- a/idaes/models/properties/modular_properties/reactions/tests/test_equilibrium_constant.py +++ b/idaes/models/properties/modular_properties/reactions/tests/test_equilibrium_constant.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/tests/test_equilibrium_forms.py b/idaes/models/properties/modular_properties/reactions/tests/test_equilibrium_forms.py index e0fe4a7db0..de75f09548 100644 --- a/idaes/models/properties/modular_properties/reactions/tests/test_equilibrium_forms.py +++ b/idaes/models/properties/modular_properties/reactions/tests/test_equilibrium_forms.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/tests/test_rate_constant.py b/idaes/models/properties/modular_properties/reactions/tests/test_rate_constant.py index c54d929f1b..bfbad4714b 100644 --- a/idaes/models/properties/modular_properties/reactions/tests/test_rate_constant.py +++ b/idaes/models/properties/modular_properties/reactions/tests/test_rate_constant.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/tests/test_rate_forms.py b/idaes/models/properties/modular_properties/reactions/tests/test_rate_forms.py index fc2b03b54c..41b1f8c278 100644 --- a/idaes/models/properties/modular_properties/reactions/tests/test_rate_forms.py +++ b/idaes/models/properties/modular_properties/reactions/tests/test_rate_forms.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/reactions/tests/test_solubility_product_verification.py b/idaes/models/properties/modular_properties/reactions/tests/test_solubility_product_verification.py index c82c5a69e9..5c5e6aa5cd 100644 --- a/idaes/models/properties/modular_properties/reactions/tests/test_solubility_product_verification.py +++ b/idaes/models/properties/modular_properties/reactions/tests/test_solubility_product_verification.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/FPhx.py b/idaes/models/properties/modular_properties/state_definitions/FPhx.py index 1365664076..9922d80332 100644 --- a/idaes/models/properties/modular_properties/state_definitions/FPhx.py +++ b/idaes/models/properties/modular_properties/state_definitions/FPhx.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/FTPx.py b/idaes/models/properties/modular_properties/state_definitions/FTPx.py index 8108928f7b..9369f2f227 100644 --- a/idaes/models/properties/modular_properties/state_definitions/FTPx.py +++ b/idaes/models/properties/modular_properties/state_definitions/FTPx.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/FcPh.py b/idaes/models/properties/modular_properties/state_definitions/FcPh.py index 1c91f7920d..d53b5ebb82 100644 --- a/idaes/models/properties/modular_properties/state_definitions/FcPh.py +++ b/idaes/models/properties/modular_properties/state_definitions/FcPh.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/FcTP.py b/idaes/models/properties/modular_properties/state_definitions/FcTP.py index 39b523c138..e9f0dc059b 100644 --- a/idaes/models/properties/modular_properties/state_definitions/FcTP.py +++ b/idaes/models/properties/modular_properties/state_definitions/FcTP.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/FpcTP.py b/idaes/models/properties/modular_properties/state_definitions/FpcTP.py index 6e0d22b4ab..fef9913e08 100644 --- a/idaes/models/properties/modular_properties/state_definitions/FpcTP.py +++ b/idaes/models/properties/modular_properties/state_definitions/FpcTP.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/__init__.py b/idaes/models/properties/modular_properties/state_definitions/__init__.py index 3c8d6d2b77..8f1d0b932a 100644 --- a/idaes/models/properties/modular_properties/state_definitions/__init__.py +++ b/idaes/models/properties/modular_properties/state_definitions/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/electrolyte_states.py b/idaes/models/properties/modular_properties/state_definitions/electrolyte_states.py index cdb048a433..ebd0ef46d5 100644 --- a/idaes/models/properties/modular_properties/state_definitions/electrolyte_states.py +++ b/idaes/models/properties/modular_properties/state_definitions/electrolyte_states.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/tests/__init__.py b/idaes/models/properties/modular_properties/state_definitions/tests/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models/properties/modular_properties/state_definitions/tests/__init__.py +++ b/idaes/models/properties/modular_properties/state_definitions/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/tests/test_FPhx.py b/idaes/models/properties/modular_properties/state_definitions/tests/test_FPhx.py index 02afc9f267..c3c4514411 100644 --- a/idaes/models/properties/modular_properties/state_definitions/tests/test_FPhx.py +++ b/idaes/models/properties/modular_properties/state_definitions/tests/test_FPhx.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/tests/test_FPhx_electrolyte.py b/idaes/models/properties/modular_properties/state_definitions/tests/test_FPhx_electrolyte.py index 6ccaa719bc..331575c701 100644 --- a/idaes/models/properties/modular_properties/state_definitions/tests/test_FPhx_electrolyte.py +++ b/idaes/models/properties/modular_properties/state_definitions/tests/test_FPhx_electrolyte.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/tests/test_FTPx.py b/idaes/models/properties/modular_properties/state_definitions/tests/test_FTPx.py index f3eeaca323..50e44b7a50 100644 --- a/idaes/models/properties/modular_properties/state_definitions/tests/test_FTPx.py +++ b/idaes/models/properties/modular_properties/state_definitions/tests/test_FTPx.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/tests/test_FTPx_electrolyte.py b/idaes/models/properties/modular_properties/state_definitions/tests/test_FTPx_electrolyte.py index 8da0d8a652..5375069967 100644 --- a/idaes/models/properties/modular_properties/state_definitions/tests/test_FTPx_electrolyte.py +++ b/idaes/models/properties/modular_properties/state_definitions/tests/test_FTPx_electrolyte.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/tests/test_FcPh.py b/idaes/models/properties/modular_properties/state_definitions/tests/test_FcPh.py index d95961dd18..f991791d34 100644 --- a/idaes/models/properties/modular_properties/state_definitions/tests/test_FcPh.py +++ b/idaes/models/properties/modular_properties/state_definitions/tests/test_FcPh.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/tests/test_FcPh_electrolyte.py b/idaes/models/properties/modular_properties/state_definitions/tests/test_FcPh_electrolyte.py index 761c2f54b5..ea924520e9 100644 --- a/idaes/models/properties/modular_properties/state_definitions/tests/test_FcPh_electrolyte.py +++ b/idaes/models/properties/modular_properties/state_definitions/tests/test_FcPh_electrolyte.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/tests/test_FcTP.py b/idaes/models/properties/modular_properties/state_definitions/tests/test_FcTP.py index 06c1cd1d1f..1c1d754fbd 100644 --- a/idaes/models/properties/modular_properties/state_definitions/tests/test_FcTP.py +++ b/idaes/models/properties/modular_properties/state_definitions/tests/test_FcTP.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/tests/test_FcTP_electrolyte.py b/idaes/models/properties/modular_properties/state_definitions/tests/test_FcTP_electrolyte.py index 2bc2e8c263..9631c8f813 100644 --- a/idaes/models/properties/modular_properties/state_definitions/tests/test_FcTP_electrolyte.py +++ b/idaes/models/properties/modular_properties/state_definitions/tests/test_FcTP_electrolyte.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/tests/test_FpcTP.py b/idaes/models/properties/modular_properties/state_definitions/tests/test_FpcTP.py index f0e85e0561..8c339ee86f 100644 --- a/idaes/models/properties/modular_properties/state_definitions/tests/test_FpcTP.py +++ b/idaes/models/properties/modular_properties/state_definitions/tests/test_FpcTP.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/state_definitions/tests/test_FpcTP_electrolyte.py b/idaes/models/properties/modular_properties/state_definitions/tests/test_FpcTP_electrolyte.py index 18ab7782b9..3f6d2f3d76 100644 --- a/idaes/models/properties/modular_properties/state_definitions/tests/test_FpcTP_electrolyte.py +++ b/idaes/models/properties/modular_properties/state_definitions/tests/test_FpcTP_electrolyte.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/modular_properties/transport_properties/__init__.py b/idaes/models/properties/modular_properties/transport_properties/__init__.py index 61dad9b343..751e977971 100644 --- a/idaes/models/properties/modular_properties/transport_properties/__init__.py +++ b/idaes/models/properties/modular_properties/transport_properties/__init__.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# from .thermal_conductivity_wms import ThermalConductivityWMS from .viscosity_wilke import ViscosityWilke diff --git a/idaes/models/properties/modular_properties/transport_properties/no_method.py b/idaes/models/properties/modular_properties/transport_properties/no_method.py index dcd83d0eec..69147dcedb 100644 --- a/idaes/models/properties/modular_properties/transport_properties/no_method.py +++ b/idaes/models/properties/modular_properties/transport_properties/no_method.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Class for users who deliberately do not want to assign a method of calculation for a property in a particular phase. diff --git a/idaes/models/properties/modular_properties/transport_properties/tests/test_no_method.py b/idaes/models/properties/modular_properties/transport_properties/tests/test_no_method.py index a6cf2739e5..b813813cc8 100644 --- a/idaes/models/properties/modular_properties/transport_properties/tests/test_no_method.py +++ b/idaes/models/properties/modular_properties/transport_properties/tests/test_no_method.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Test no_method method to specify that no method has been assigned to calculate diff --git a/idaes/models/properties/modular_properties/transport_properties/tests/test_shell_and_tube_1D_transport.py b/idaes/models/properties/modular_properties/transport_properties/tests/test_shell_and_tube_1D_transport.py index f51f95f38b..3836d252ad 100644 --- a/idaes/models/properties/modular_properties/transport_properties/tests/test_shell_and_tube_1D_transport.py +++ b/idaes/models/properties/modular_properties/transport_properties/tests/test_shell_and_tube_1D_transport.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Test in which viscosity and thermal conductivity are put to use in a heat transfer problem. diff --git a/idaes/models/properties/modular_properties/transport_properties/tests/test_thermal_conductivity_wms.py b/idaes/models/properties/modular_properties/transport_properties/tests/test_thermal_conductivity_wms.py index c611ec9a77..06c4c77d1f 100644 --- a/idaes/models/properties/modular_properties/transport_properties/tests/test_thermal_conductivity_wms.py +++ b/idaes/models/properties/modular_properties/transport_properties/tests/test_thermal_conductivity_wms.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Tests for Wassiljew-Mason-Saxena mixing rules for thermal conductivity. diff --git a/idaes/models/properties/modular_properties/transport_properties/tests/test_viscosity_wilke.py b/idaes/models/properties/modular_properties/transport_properties/tests/test_viscosity_wilke.py index 0ba9a9f0ca..68456b0a51 100644 --- a/idaes/models/properties/modular_properties/transport_properties/tests/test_viscosity_wilke.py +++ b/idaes/models/properties/modular_properties/transport_properties/tests/test_viscosity_wilke.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Test Wilke mixing rules for viscosity from Properties of Gases and Liquids, 5th Ed. diff --git a/idaes/models/properties/modular_properties/transport_properties/thermal_conductivity_wms.py b/idaes/models/properties/modular_properties/transport_properties/thermal_conductivity_wms.py index 96a960c5d5..361b28286c 100644 --- a/idaes/models/properties/modular_properties/transport_properties/thermal_conductivity_wms.py +++ b/idaes/models/properties/modular_properties/transport_properties/thermal_conductivity_wms.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Wassiljew-Mason-Saxena rules to obtain mixture thermal conductivity of a low pressure diff --git a/idaes/models/properties/modular_properties/transport_properties/viscosity_wilke.py b/idaes/models/properties/modular_properties/transport_properties/viscosity_wilke.py index 84c3c04c17..12864ca193 100644 --- a/idaes/models/properties/modular_properties/transport_properties/viscosity_wilke.py +++ b/idaes/models/properties/modular_properties/transport_properties/viscosity_wilke.py @@ -1,14 +1,14 @@ ################################################################################# # The Institute for the Design of Advanced Energy Systems Integrated Platform # Framework (IDAES IP) was produced under the DOE Institute for the -# Design of Advanced Energy Systems (IDAES), and is copyright (c) 2018-2021 -# by the software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia University -# Research Corporation, et al. All rights reserved. +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.md and LICENSE.md for full copyright and -# license information. +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. ################################################################################# """ Wilke rules to obtain mixture viscosity of a low pressure gas from pure component diff --git a/idaes/models/properties/swco2.py b/idaes/models/properties/swco2.py index 4f1ca1ae0e..42097ba84f 100644 --- a/idaes/models/properties/swco2.py +++ b/idaes/models/properties/swco2.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/tests/test_harness.py b/idaes/models/properties/tests/test_harness.py index 5a8279cdc8..3c1596f455 100644 --- a/idaes/models/properties/tests/test_harness.py +++ b/idaes/models/properties/tests/test_harness.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/tests/test_iapws95_with_harness.py b/idaes/models/properties/tests/test_iapws95_with_harness.py index b0df0739fc..c8da1238aa 100644 --- a/idaes/models/properties/tests/test_iapws95_with_harness.py +++ b/idaes/models/properties/tests/test_iapws95_with_harness.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/properties/tests/test_swco2_with_harness.py b/idaes/models/properties/tests/test_swco2_with_harness.py index de2a5f706c..dfe8ee1b29 100644 --- a/idaes/models/properties/tests/test_swco2_with_harness.py +++ b/idaes/models/properties/tests/test_swco2_with_harness.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/__init__.py b/idaes/models/unit_models/__init__.py index 385c612a78..7b5397d290 100644 --- a/idaes/models/unit_models/__init__.py +++ b/idaes/models/unit_models/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/cstr.py b/idaes/models/unit_models/cstr.py index 41a86c7ef7..a796d62888 100644 --- a/idaes/models/unit_models/cstr.py +++ b/idaes/models/unit_models/cstr.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/equilibrium_reactor.py b/idaes/models/unit_models/equilibrium_reactor.py index 86aa5235f5..4015e4ea76 100644 --- a/idaes/models/unit_models/equilibrium_reactor.py +++ b/idaes/models/unit_models/equilibrium_reactor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/feed.py b/idaes/models/unit_models/feed.py index 8b5e1f3627..04cbafb0ca 100644 --- a/idaes/models/unit_models/feed.py +++ b/idaes/models/unit_models/feed.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/feed_flash.py b/idaes/models/unit_models/feed_flash.py index 720d11c2b8..cc1dbfac8e 100644 --- a/idaes/models/unit_models/feed_flash.py +++ b/idaes/models/unit_models/feed_flash.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/flash.py b/idaes/models/unit_models/flash.py index 6f0064a4f0..85a1c034eb 100644 --- a/idaes/models/unit_models/flash.py +++ b/idaes/models/unit_models/flash.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/gibbs_reactor.py b/idaes/models/unit_models/gibbs_reactor.py index acac899b19..90ca226b55 100644 --- a/idaes/models/unit_models/gibbs_reactor.py +++ b/idaes/models/unit_models/gibbs_reactor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/heat_exchanger.py b/idaes/models/unit_models/heat_exchanger.py index 5b5763d519..bae86e5483 100644 --- a/idaes/models/unit_models/heat_exchanger.py +++ b/idaes/models/unit_models/heat_exchanger.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/heat_exchanger_1D.py b/idaes/models/unit_models/heat_exchanger_1D.py index 1ea52d4ed9..c696448f0e 100644 --- a/idaes/models/unit_models/heat_exchanger_1D.py +++ b/idaes/models/unit_models/heat_exchanger_1D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/heat_exchanger_lc.py b/idaes/models/unit_models/heat_exchanger_lc.py index b69a9d3359..717a3cfa6f 100644 --- a/idaes/models/unit_models/heat_exchanger_lc.py +++ b/idaes/models/unit_models/heat_exchanger_lc.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/heat_exchanger_ntu.py b/idaes/models/unit_models/heat_exchanger_ntu.py index c7a04f1935..c2d9914504 100644 --- a/idaes/models/unit_models/heat_exchanger_ntu.py +++ b/idaes/models/unit_models/heat_exchanger_ntu.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/heater.py b/idaes/models/unit_models/heater.py index 71755884a8..6ab2073935 100644 --- a/idaes/models/unit_models/heater.py +++ b/idaes/models/unit_models/heater.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/mixer.py b/idaes/models/unit_models/mixer.py index 05afcbc6ca..6cd057963b 100644 --- a/idaes/models/unit_models/mixer.py +++ b/idaes/models/unit_models/mixer.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/mscontactor.py b/idaes/models/unit_models/mscontactor.py index 59b64ed961..86dc18ba4e 100644 --- a/idaes/models/unit_models/mscontactor.py +++ b/idaes/models/unit_models/mscontactor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/plug_flow_reactor.py b/idaes/models/unit_models/plug_flow_reactor.py index a5b084d182..9ae6d7ddcb 100644 --- a/idaes/models/unit_models/plug_flow_reactor.py +++ b/idaes/models/unit_models/plug_flow_reactor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/pressure_changer.py b/idaes/models/unit_models/pressure_changer.py index c0b55e1af9..36adc479d0 100644 --- a/idaes/models/unit_models/pressure_changer.py +++ b/idaes/models/unit_models/pressure_changer.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/product.py b/idaes/models/unit_models/product.py index 6354636ec3..2afd49f8f1 100644 --- a/idaes/models/unit_models/product.py +++ b/idaes/models/unit_models/product.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/separator.py b/idaes/models/unit_models/separator.py index 25d30c927b..2b8bf5ec0b 100644 --- a/idaes/models/unit_models/separator.py +++ b/idaes/models/unit_models/separator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/shell_and_tube_1d.py b/idaes/models/unit_models/shell_and_tube_1d.py index d907e05e58..67f3779e0d 100644 --- a/idaes/models/unit_models/shell_and_tube_1d.py +++ b/idaes/models/unit_models/shell_and_tube_1d.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/skeleton_model.py b/idaes/models/unit_models/skeleton_model.py index fac1ebc39e..aa008ffefb 100644 --- a/idaes/models/unit_models/skeleton_model.py +++ b/idaes/models/unit_models/skeleton_model.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/solid_liquid/__init__.py b/idaes/models/unit_models/solid_liquid/__init__.py index 423af74d27..ae91bd13a2 100644 --- a/idaes/models/unit_models/solid_liquid/__init__.py +++ b/idaes/models/unit_models/solid_liquid/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/solid_liquid/sl_separator.py b/idaes/models/unit_models/solid_liquid/sl_separator.py index f16437fda2..642578feee 100644 --- a/idaes/models/unit_models/solid_liquid/sl_separator.py +++ b/idaes/models/unit_models/solid_liquid/sl_separator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/solid_liquid/tests/test_sl_separator.py b/idaes/models/unit_models/solid_liquid/tests/test_sl_separator.py index 5648ae54d3..4778e77308 100644 --- a/idaes/models/unit_models/solid_liquid/tests/test_sl_separator.py +++ b/idaes/models/unit_models/solid_liquid/tests/test_sl_separator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/solid_liquid/tests/test_thickener.py b/idaes/models/unit_models/solid_liquid/tests/test_thickener.py index b78448cca2..43c1a80233 100644 --- a/idaes/models/unit_models/solid_liquid/tests/test_thickener.py +++ b/idaes/models/unit_models/solid_liquid/tests/test_thickener.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/solid_liquid/thickener.py b/idaes/models/unit_models/solid_liquid/thickener.py index 3af0f24b1e..faee2f456e 100644 --- a/idaes/models/unit_models/solid_liquid/thickener.py +++ b/idaes/models/unit_models/solid_liquid/thickener.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/statejunction.py b/idaes/models/unit_models/statejunction.py index cbf427a9c2..0878e6d66d 100644 --- a/idaes/models/unit_models/statejunction.py +++ b/idaes/models/unit_models/statejunction.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/stoichiometric_reactor.py b/idaes/models/unit_models/stoichiometric_reactor.py index 22b5462e9a..92cf24aa81 100644 --- a/idaes/models/unit_models/stoichiometric_reactor.py +++ b/idaes/models/unit_models/stoichiometric_reactor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_cstr.py b/idaes/models/unit_models/tests/test_cstr.py index 29fd694cdf..e602ec7185 100644 --- a/idaes/models/unit_models/tests/test_cstr.py +++ b/idaes/models/unit_models/tests/test_cstr.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_equilibrium_reactor.py b/idaes/models/unit_models/tests/test_equilibrium_reactor.py index d87fa717fe..71fdb23ff8 100644 --- a/idaes/models/unit_models/tests/test_equilibrium_reactor.py +++ b/idaes/models/unit_models/tests/test_equilibrium_reactor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_feed.py b/idaes/models/unit_models/tests/test_feed.py index 9138858959..9bb7ad309c 100644 --- a/idaes/models/unit_models/tests/test_feed.py +++ b/idaes/models/unit_models/tests/test_feed.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_feed_flash.py b/idaes/models/unit_models/tests/test_feed_flash.py index 61772649a2..b623eb0880 100644 --- a/idaes/models/unit_models/tests/test_feed_flash.py +++ b/idaes/models/unit_models/tests/test_feed_flash.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_flash.py b/idaes/models/unit_models/tests/test_flash.py index d709328a48..cd7c4eda93 100644 --- a/idaes/models/unit_models/tests/test_flash.py +++ b/idaes/models/unit_models/tests/test_flash.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_gibbs.py b/idaes/models/unit_models/tests/test_gibbs.py index 638aa8e2a1..d571e83763 100644 --- a/idaes/models/unit_models/tests/test_gibbs.py +++ b/idaes/models/unit_models/tests/test_gibbs.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_heat_exchanger.py b/idaes/models/unit_models/tests/test_heat_exchanger.py index e7843dd42a..075d11808c 100644 --- a/idaes/models/unit_models/tests/test_heat_exchanger.py +++ b/idaes/models/unit_models/tests/test_heat_exchanger.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_heat_exchanger_1D.py b/idaes/models/unit_models/tests/test_heat_exchanger_1D.py index b29bef8dd6..24b5679f56 100644 --- a/idaes/models/unit_models/tests/test_heat_exchanger_1D.py +++ b/idaes/models/unit_models/tests/test_heat_exchanger_1D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_heat_exchanger_lc.py b/idaes/models/unit_models/tests/test_heat_exchanger_lc.py index 3e97624ff3..76360cae98 100644 --- a/idaes/models/unit_models/tests/test_heat_exchanger_lc.py +++ b/idaes/models/unit_models/tests/test_heat_exchanger_lc.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_heater.py b/idaes/models/unit_models/tests/test_heater.py index 01515fa486..beaf31c482 100644 --- a/idaes/models/unit_models/tests/test_heater.py +++ b/idaes/models/unit_models/tests/test_heater.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_hx_ntu.py b/idaes/models/unit_models/tests/test_hx_ntu.py index 7b9864566a..846d9c08a5 100644 --- a/idaes/models/unit_models/tests/test_hx_ntu.py +++ b/idaes/models/unit_models/tests/test_hx_ntu.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_mixer.py b/idaes/models/unit_models/tests/test_mixer.py index a07d9f1ac7..1d15826efd 100644 --- a/idaes/models/unit_models/tests/test_mixer.py +++ b/idaes/models/unit_models/tests/test_mixer.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_mscontactor.py b/idaes/models/unit_models/tests/test_mscontactor.py index e82606063c..3d63db8f88 100644 --- a/idaes/models/unit_models/tests/test_mscontactor.py +++ b/idaes/models/unit_models/tests/test_mscontactor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_pfr.py b/idaes/models/unit_models/tests/test_pfr.py index dba8462374..bf043819ae 100644 --- a/idaes/models/unit_models/tests/test_pfr.py +++ b/idaes/models/unit_models/tests/test_pfr.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_pressure_changer.py b/idaes/models/unit_models/tests/test_pressure_changer.py index 5506ceeac3..b5311466f1 100644 --- a/idaes/models/unit_models/tests/test_pressure_changer.py +++ b/idaes/models/unit_models/tests/test_pressure_changer.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_product.py b/idaes/models/unit_models/tests/test_product.py index 3c5908ce1c..184ad6d1be 100644 --- a/idaes/models/unit_models/tests/test_product.py +++ b/idaes/models/unit_models/tests/test_product.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_rstoic.py b/idaes/models/unit_models/tests/test_rstoic.py index 1cb7957957..70aa98a419 100644 --- a/idaes/models/unit_models/tests/test_rstoic.py +++ b/idaes/models/unit_models/tests/test_rstoic.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_separator.py b/idaes/models/unit_models/tests/test_separator.py index c1390fe0e2..5ef6472fb3 100644 --- a/idaes/models/unit_models/tests/test_separator.py +++ b/idaes/models/unit_models/tests/test_separator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_shell_and_tube_1D.py b/idaes/models/unit_models/tests/test_shell_and_tube_1D.py index c83ddb6d68..63bebe73a9 100644 --- a/idaes/models/unit_models/tests/test_shell_and_tube_1D.py +++ b/idaes/models/unit_models/tests/test_shell_and_tube_1D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_skeleton_unit_model.py b/idaes/models/unit_models/tests/test_skeleton_unit_model.py index a903fc9909..557f84d178 100644 --- a/idaes/models/unit_models/tests/test_skeleton_unit_model.py +++ b/idaes/models/unit_models/tests/test_skeleton_unit_model.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_statejunction.py b/idaes/models/unit_models/tests/test_statejunction.py index 36737f1fe8..38e48e58fc 100644 --- a/idaes/models/unit_models/tests/test_statejunction.py +++ b/idaes/models/unit_models/tests/test_statejunction.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_translator.py b/idaes/models/unit_models/tests/test_translator.py index 5100d34d79..bf65e9ce09 100644 --- a/idaes/models/unit_models/tests/test_translator.py +++ b/idaes/models/unit_models/tests/test_translator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/tests/test_valve.py b/idaes/models/unit_models/tests/test_valve.py index d19a830364..c166b2fa21 100644 --- a/idaes/models/unit_models/tests/test_valve.py +++ b/idaes/models/unit_models/tests/test_valve.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models/unit_models/translator.py b/idaes/models/unit_models/translator.py index e846f5c612..a0b6c519d4 100644 --- a/idaes/models/unit_models/translator.py +++ b/idaes/models/unit_models/translator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -73,7 +73,7 @@ class TranslatorData(UnitModelBlockData): **default** - True. **Valid values:** { **True** - outlet state will be fully defined, -**False** - outlet property package should enforce sumation and equilibrium +**False** - outlet property package should enforce summation and equilibrium constraints.}""", ), ) diff --git a/idaes/models/unit_models/valve.py b/idaes/models/unit_models/valve.py index 9e1ff34e7e..e771f301ba 100644 --- a/idaes/models/unit_models/valve.py +++ b/idaes/models/unit_models/valve.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/MEAsolvent_column.py b/idaes/models_extra/column_models/MEAsolvent_column.py index 548b37d11d..00647bbb4a 100644 --- a/idaes/models_extra/column_models/MEAsolvent_column.py +++ b/idaes/models_extra/column_models/MEAsolvent_column.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/__init__.py b/idaes/models_extra/column_models/__init__.py index ffeb7aaeb5..0cd47a446a 100644 --- a/idaes/models_extra/column_models/__init__.py +++ b/idaes/models_extra/column_models/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/condenser.py b/idaes/models_extra/column_models/condenser.py index 172c0e0818..0d978826c4 100644 --- a/idaes/models_extra/column_models/condenser.py +++ b/idaes/models_extra/column_models/condenser.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/plate_heat_exchanger.py b/idaes/models_extra/column_models/plate_heat_exchanger.py index 754d370c26..1c1ee1556b 100644 --- a/idaes/models_extra/column_models/plate_heat_exchanger.py +++ b/idaes/models_extra/column_models/plate_heat_exchanger.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/properties/MEA_solvent.py b/idaes/models_extra/column_models/properties/MEA_solvent.py index 2fd56b6d5c..a90b2148cf 100644 --- a/idaes/models_extra/column_models/properties/MEA_solvent.py +++ b/idaes/models_extra/column_models/properties/MEA_solvent.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/properties/MEA_vapor.py b/idaes/models_extra/column_models/properties/MEA_vapor.py index ca5399ff04..fef26e78c4 100644 --- a/idaes/models_extra/column_models/properties/MEA_vapor.py +++ b/idaes/models_extra/column_models/properties/MEA_vapor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/properties/tests/test_mea_solvent.py b/idaes/models_extra/column_models/properties/tests/test_mea_solvent.py index 0c97668ced..5e3c434f08 100644 --- a/idaes/models_extra/column_models/properties/tests/test_mea_solvent.py +++ b/idaes/models_extra/column_models/properties/tests/test_mea_solvent.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/properties/tests/test_mea_vapor.py b/idaes/models_extra/column_models/properties/tests/test_mea_vapor.py index fe3758fcf6..afdc5ae04f 100644 --- a/idaes/models_extra/column_models/properties/tests/test_mea_vapor.py +++ b/idaes/models_extra/column_models/properties/tests/test_mea_vapor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/reboiler.py b/idaes/models_extra/column_models/reboiler.py index 42bd0c405a..1bcee0e980 100644 --- a/idaes/models_extra/column_models/reboiler.py +++ b/idaes/models_extra/column_models/reboiler.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/solvent_column.py b/idaes/models_extra/column_models/solvent_column.py index e13c2111b5..ed607f7307 100644 --- a/idaes/models_extra/column_models/solvent_column.py +++ b/idaes/models_extra/column_models/solvent_column.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/solvent_condenser.py b/idaes/models_extra/column_models/solvent_condenser.py index 465c080793..a9d2ebe506 100644 --- a/idaes/models_extra/column_models/solvent_condenser.py +++ b/idaes/models_extra/column_models/solvent_condenser.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/solvent_reboiler.py b/idaes/models_extra/column_models/solvent_reboiler.py index 8ab541e1c4..33b9a4693b 100644 --- a/idaes/models_extra/column_models/solvent_reboiler.py +++ b/idaes/models_extra/column_models/solvent_reboiler.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_MEAsolvent_column.py b/idaes/models_extra/column_models/tests/test_MEAsolvent_column.py index 68ee1c84e5..cc7e7c5600 100644 --- a/idaes/models_extra/column_models/tests/test_MEAsolvent_column.py +++ b/idaes/models_extra/column_models/tests/test_MEAsolvent_column.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_conventional_tray.py b/idaes/models_extra/column_models/tests/test_conventional_tray.py index 38096e7ca1..c3d342bfa0 100644 --- a/idaes/models_extra/column_models/tests/test_conventional_tray.py +++ b/idaes/models_extra/column_models/tests/test_conventional_tray.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_feed_tray.py b/idaes/models_extra/column_models/tests/test_feed_tray.py index 262a40a371..07ef867fb5 100644 --- a/idaes/models_extra/column_models/tests/test_feed_tray.py +++ b/idaes/models_extra/column_models/tests/test_feed_tray.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_partial_condenser.py b/idaes/models_extra/column_models/tests/test_partial_condenser.py index 5595035fa9..2ca087e210 100644 --- a/idaes/models_extra/column_models/tests/test_partial_condenser.py +++ b/idaes/models_extra/column_models/tests/test_partial_condenser.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py b/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py index ce3983c753..cd08ffbb67 100644 --- a/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py +++ b/idaes/models_extra/column_models/tests/test_plate_heat_exchanger.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_reboiler.py b/idaes/models_extra/column_models/tests/test_reboiler.py index fac8567fcb..3f11408a8c 100644 --- a/idaes/models_extra/column_models/tests/test_reboiler.py +++ b/idaes/models_extra/column_models/tests/test_reboiler.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_solvent_column.py b/idaes/models_extra/column_models/tests/test_solvent_column.py index 7de351982f..4a39f9456a 100644 --- a/idaes/models_extra/column_models/tests/test_solvent_column.py +++ b/idaes/models_extra/column_models/tests/test_solvent_column.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_solvent_condenser.py b/idaes/models_extra/column_models/tests/test_solvent_condenser.py index b152e3bd4c..994a07d9a7 100644 --- a/idaes/models_extra/column_models/tests/test_solvent_condenser.py +++ b/idaes/models_extra/column_models/tests/test_solvent_condenser.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_solvent_reboiler.py b/idaes/models_extra/column_models/tests/test_solvent_reboiler.py index ba4f57b365..52b915aff4 100644 --- a/idaes/models_extra/column_models/tests/test_solvent_reboiler.py +++ b/idaes/models_extra/column_models/tests/test_solvent_reboiler.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_total_condenser.py b/idaes/models_extra/column_models/tests/test_total_condenser.py index 44fe14b2ee..5f0c57c554 100644 --- a/idaes/models_extra/column_models/tests/test_total_condenser.py +++ b/idaes/models_extra/column_models/tests/test_total_condenser.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_tray_column.py b/idaes/models_extra/column_models/tests/test_tray_column.py index ae1e71aef4..7b5272b86c 100644 --- a/idaes/models_extra/column_models/tests/test_tray_column.py +++ b/idaes/models_extra/column_models/tests/test_tray_column.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_tray_side_liq_draw.py b/idaes/models_extra/column_models/tests/test_tray_side_liq_draw.py index c8988d69f6..ff67df0b74 100644 --- a/idaes/models_extra/column_models/tests/test_tray_side_liq_draw.py +++ b/idaes/models_extra/column_models/tests/test_tray_side_liq_draw.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_tray_side_vap_draw.py b/idaes/models_extra/column_models/tests/test_tray_side_vap_draw.py index f980e99475..b04743a4b5 100644 --- a/idaes/models_extra/column_models/tests/test_tray_side_vap_draw.py +++ b/idaes/models_extra/column_models/tests/test_tray_side_vap_draw.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tests/test_utilities.py b/idaes/models_extra/column_models/tests/test_utilities.py index f8a404e78c..46bd332851 100644 --- a/idaes/models_extra/column_models/tests/test_utilities.py +++ b/idaes/models_extra/column_models/tests/test_utilities.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tray.py b/idaes/models_extra/column_models/tray.py index 58263bcaad..1c9a0fb80d 100644 --- a/idaes/models_extra/column_models/tray.py +++ b/idaes/models_extra/column_models/tray.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/tray_column.py b/idaes/models_extra/column_models/tray_column.py index 18a4c1313c..8ca60b06d5 100644 --- a/idaes/models_extra/column_models/tray_column.py +++ b/idaes/models_extra/column_models/tray_column.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/column_models/util.py b/idaes/models_extra/column_models/util.py index 1043abcb3a..259cb1d875 100644 --- a/idaes/models_extra/column_models/util.py +++ b/idaes/models_extra/column_models/util.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_distribution/properties/natural_gas.py b/idaes/models_extra/gas_distribution/properties/natural_gas.py index b972d431cc..fa0d6fb328 100644 --- a/idaes/models_extra/gas_distribution/properties/natural_gas.py +++ b/idaes/models_extra/gas_distribution/properties/natural_gas.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_distribution/properties/tests/test_natural_gas.py b/idaes/models_extra/gas_distribution/properties/tests/test_natural_gas.py index 91ddda751f..a854c33766 100644 --- a/idaes/models_extra/gas_distribution/properties/tests/test_natural_gas.py +++ b/idaes/models_extra/gas_distribution/properties/tests/test_natural_gas.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_distribution/unit_models/compressor.py b/idaes/models_extra/gas_distribution/unit_models/compressor.py index 4623fe0376..8708edf380 100644 --- a/idaes/models_extra/gas_distribution/unit_models/compressor.py +++ b/idaes/models_extra/gas_distribution/unit_models/compressor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_distribution/unit_models/node.py b/idaes/models_extra/gas_distribution/unit_models/node.py index 0d732ae889..8c93174f43 100644 --- a/idaes/models_extra/gas_distribution/unit_models/node.py +++ b/idaes/models_extra/gas_distribution/unit_models/node.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_distribution/unit_models/pipeline.py b/idaes/models_extra/gas_distribution/unit_models/pipeline.py index 9e046c0bb6..77a17e2e45 100644 --- a/idaes/models_extra/gas_distribution/unit_models/pipeline.py +++ b/idaes/models_extra/gas_distribution/unit_models/pipeline.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_distribution/unit_models/tests/test_compressor.py b/idaes/models_extra/gas_distribution/unit_models/tests/test_compressor.py index 332bf84c8b..e83145cc21 100644 --- a/idaes/models_extra/gas_distribution/unit_models/tests/test_compressor.py +++ b/idaes/models_extra/gas_distribution/unit_models/tests/test_compressor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_distribution/unit_models/tests/test_flowsheet.py b/idaes/models_extra/gas_distribution/unit_models/tests/test_flowsheet.py index f923af2b56..960bfc5770 100644 --- a/idaes/models_extra/gas_distribution/unit_models/tests/test_flowsheet.py +++ b/idaes/models_extra/gas_distribution/unit_models/tests/test_flowsheet.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_distribution/unit_models/tests/test_node.py b/idaes/models_extra/gas_distribution/unit_models/tests/test_node.py index adce42d271..5df16153e9 100644 --- a/idaes/models_extra/gas_distribution/unit_models/tests/test_node.py +++ b/idaes/models_extra/gas_distribution/unit_models/tests/test_node.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_distribution/unit_models/tests/test_pipeline.py b/idaes/models_extra/gas_distribution/unit_models/tests/test_pipeline.py index 7d629e3c6c..6fe45452ae 100644 --- a/idaes/models_extra/gas_distribution/unit_models/tests/test_pipeline.py +++ b/idaes/models_extra/gas_distribution/unit_models/tests/test_pipeline.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_distribution/unit_models/tests/test_pipeline_compressor.py b/idaes/models_extra/gas_distribution/unit_models/tests/test_pipeline_compressor.py index b625c8a484..2487cbcf48 100644 --- a/idaes/models_extra/gas_distribution/unit_models/tests/test_pipeline_compressor.py +++ b/idaes/models_extra/gas_distribution/unit_models/tests/test_pipeline_compressor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/flowsheets/dyn_TGA_example.py b/idaes/models_extra/gas_solid_contactors/flowsheets/dyn_TGA_example.py index ca46b8d3c1..38ae17dd61 100644 --- a/idaes/models_extra/gas_solid_contactors/flowsheets/dyn_TGA_example.py +++ b/idaes/models_extra/gas_solid_contactors/flowsheets/dyn_TGA_example.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/flowsheets/ss_BFB_OC_oxidation.py b/idaes/models_extra/gas_solid_contactors/flowsheets/ss_BFB_OC_oxidation.py index 359429f406..808bb6d406 100644 --- a/idaes/models_extra/gas_solid_contactors/flowsheets/ss_BFB_OC_oxidation.py +++ b/idaes/models_extra/gas_solid_contactors/flowsheets/ss_BFB_OC_oxidation.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/flowsheets/ss_BFB_methane_combustion.py b/idaes/models_extra/gas_solid_contactors/flowsheets/ss_BFB_methane_combustion.py index fdba02cb1f..dd0b079a53 100644 --- a/idaes/models_extra/gas_solid_contactors/flowsheets/ss_BFB_methane_combustion.py +++ b/idaes/models_extra/gas_solid_contactors/flowsheets/ss_BFB_methane_combustion.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/flowsheets/ss_MB_methane_combustion.py b/idaes/models_extra/gas_solid_contactors/flowsheets/ss_MB_methane_combustion.py index 5bdf3f80d5..07bf5ffd4e 100644 --- a/idaes/models_extra/gas_solid_contactors/flowsheets/ss_MB_methane_combustion.py +++ b/idaes/models_extra/gas_solid_contactors/flowsheets/ss_MB_methane_combustion.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/__init__.py b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/__init__.py index aad0e392e2..e9a000c4b2 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/__init__.py +++ b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/gas_phase_thermo.py b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/gas_phase_thermo.py index 8c0e675dae..f1e2778e38 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/gas_phase_thermo.py +++ b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/gas_phase_thermo.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/hetero_reactions.py b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/hetero_reactions.py index 2ce950d125..e851fd4f23 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/hetero_reactions.py +++ b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/hetero_reactions.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/solid_phase_thermo.py b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/solid_phase_thermo.py index 1f8f976151..c4fb7e1990 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/solid_phase_thermo.py +++ b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/solid_phase_thermo.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_gas_prop.py b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_gas_prop.py index b8963fdb7a..6c4b440b34 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_gas_prop.py +++ b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_gas_prop.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_rxn_prop.py b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_rxn_prop.py index e992a3cf58..5dac601ff2 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_rxn_prop.py +++ b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_rxn_prop.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_solid_prop.py b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_solid_prop.py index bee6b2db8c..c4fc9c732e 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_solid_prop.py +++ b/idaes/models_extra/gas_solid_contactors/properties/methane_iron_OC_reduction/tests/test_CLC_solid_prop.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/__init__.py b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/__init__.py index 7a15aa12b6..5b0e406be4 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/__init__.py +++ b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/gas_phase_thermo.py b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/gas_phase_thermo.py index 3129d92004..f7e35b61a0 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/gas_phase_thermo.py +++ b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/gas_phase_thermo.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/hetero_reactions.py b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/hetero_reactions.py index d5988f99d9..f3822c9ebc 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/hetero_reactions.py +++ b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/hetero_reactions.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/solid_phase_thermo.py b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/solid_phase_thermo.py index 6303b9834b..b4eebbc409 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/solid_phase_thermo.py +++ b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/solid_phase_thermo.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_gas_prop.py b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_gas_prop.py index c30b87cd45..7efd1dde9a 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_gas_prop.py +++ b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_gas_prop.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_rxn_prop.py b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_rxn_prop.py index af80f4b951..f8f496242e 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_rxn_prop.py +++ b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_rxn_prop.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_solid_prop.py b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_solid_prop.py index 25807e351b..65bd20143c 100644 --- a/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_solid_prop.py +++ b/idaes/models_extra/gas_solid_contactors/properties/oxygen_iron_OC_oxidation/tests/test_CLC_solid_prop.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/unit_models/__init__.py b/idaes/models_extra/gas_solid_contactors/unit_models/__init__.py index 5ae1bfe266..6f0a1d11c1 100644 --- a/idaes/models_extra/gas_solid_contactors/unit_models/__init__.py +++ b/idaes/models_extra/gas_solid_contactors/unit_models/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/unit_models/bubbling_fluidized_bed.py b/idaes/models_extra/gas_solid_contactors/unit_models/bubbling_fluidized_bed.py index bfed6430ae..003403c9f2 100644 --- a/idaes/models_extra/gas_solid_contactors/unit_models/bubbling_fluidized_bed.py +++ b/idaes/models_extra/gas_solid_contactors/unit_models/bubbling_fluidized_bed.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/unit_models/fixed_bed_0D.py b/idaes/models_extra/gas_solid_contactors/unit_models/fixed_bed_0D.py index cae7a07b70..75643d6fdb 100644 --- a/idaes/models_extra/gas_solid_contactors/unit_models/fixed_bed_0D.py +++ b/idaes/models_extra/gas_solid_contactors/unit_models/fixed_bed_0D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/unit_models/fixed_bed_1D.py b/idaes/models_extra/gas_solid_contactors/unit_models/fixed_bed_1D.py index 4d5d09c37f..ebe5da052c 100644 --- a/idaes/models_extra/gas_solid_contactors/unit_models/fixed_bed_1D.py +++ b/idaes/models_extra/gas_solid_contactors/unit_models/fixed_bed_1D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/unit_models/moving_bed.py b/idaes/models_extra/gas_solid_contactors/unit_models/moving_bed.py index 2939d54f0b..9380f42339 100644 --- a/idaes/models_extra/gas_solid_contactors/unit_models/moving_bed.py +++ b/idaes/models_extra/gas_solid_contactors/unit_models/moving_bed.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_BFB_methane_oc.py b/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_BFB_methane_oc.py index e0d1233d7d..f8964d8215 100644 --- a/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_BFB_methane_oc.py +++ b/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_BFB_methane_oc.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_BFB_oxygen_oc.py b/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_BFB_oxygen_oc.py index 087c80a960..de9892568e 100644 --- a/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_BFB_oxygen_oc.py +++ b/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_BFB_oxygen_oc.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_FB0D.py b/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_FB0D.py index bd8da34b34..eb278c14e0 100644 --- a/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_FB0D.py +++ b/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_FB0D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_FB1D.py b/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_FB1D.py index 282aac1f9b..7ed41ff355 100644 --- a/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_FB1D.py +++ b/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_FB1D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_MB.py b/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_MB.py index 3d6702197c..2f22e71ae5 100644 --- a/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_MB.py +++ b/idaes/models_extra/gas_solid_contactors/unit_models/tests/test_MB.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/costing/costing_dictionaries.py b/idaes/models_extra/power_generation/costing/costing_dictionaries.py index a32ec55d24..2fed915179 100644 --- a/idaes/models_extra/power_generation/costing/costing_dictionaries.py +++ b/idaes/models_extra/power_generation/costing/costing_dictionaries.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/costing/generic_ccs_capcost_custom_dict.py b/idaes/models_extra/power_generation/costing/generic_ccs_capcost_custom_dict.py index ee45f0ad5b..bacd8080a9 100644 --- a/idaes/models_extra/power_generation/costing/generic_ccs_capcost_custom_dict.py +++ b/idaes/models_extra/power_generation/costing/generic_ccs_capcost_custom_dict.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/costing/power_plant_capcost.py b/idaes/models_extra/power_generation/costing/power_plant_capcost.py index deacf2bc4f..30f8c5a283 100644 --- a/idaes/models_extra/power_generation/costing/power_plant_capcost.py +++ b/idaes/models_extra/power_generation/costing/power_plant_capcost.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -326,11 +326,15 @@ def build_process_costs( self.maintenance_material_cost / 12 # 1 month materials + self.non_fuel_and_waste_OC # 1 month nonfuel consumables + ( - self.waste_costs_OC if waste is not None else 0 * CE_index_units + self.waste_costs_OC + if waste is not None + else 0 * CE_index_units / pyunits.year ) # 1 month waste # inventory capital costs + ( - self.fuel_cost_OC if fuel is not None else 0 * CE_index_units + self.fuel_cost_OC + if fuel is not None + else 0 * CE_index_units / pyunits.year ) # 60 day fuel supply # Other costs + ( @@ -371,9 +375,10 @@ def build_process_costs( ) self.additional_cost_of_electricity = Var( - initialize=70.9e-6, + initialize=0, doc="additional cost to be added to the COE calculations" - + " in millions", + + " in millions; use 70.9e-6 for NGCC baseline report, " + + " use 43.3e-6 for NGCC without carbon capture.", units=CE_index_units / pyunits.MWh, ) @@ -399,7 +404,7 @@ def build_process_costs( if tonne_CO2_capture is not None: if not hasattr(self, "tonne_CO2_capture"): self.tonne_CO2_capture = Param( - initialize=tonne_CO2_capture, mutable=True, units=pyunits.ton + initialize=tonne_CO2_capture, mutable=True, units=pyunits.tonne ) self.cost_of_capture = Expression( expr=( @@ -413,18 +418,24 @@ def build_process_costs( ) if transport_cost is not None: - if isinstance(transport_cost, (Expression, ScalarExpression)) or ( - isinstance(transport_cost, (Param, Var)) - and transport_cost.get_units is None + if ( + isinstance(transport_cost, (Expression, ScalarExpression)) + or (isinstance(transport_cost, (Param, Var, float, int))) + ) and ( + pyunits.get_units(transport_cost) is None + or pyunits.get_units(transport_cost) == pyunits.dimensionless ): self.transport_cost = ( transport_cost * CE_index_units - / pyunits.ton + / pyunits.tonne * self.tonne_CO2_capture ) else: - self.transport_cost = transport_cost * self.tonne_CO2_capture + self.transport_cost = pyunits.convert( + transport_cost * self.tonne_CO2_capture, + to_units=CE_index_units, + ) else: # except the case where transport_cost is passed but tonne_CO2_capture is not passed if transport_cost is not None: diff --git a/idaes/models_extra/power_generation/costing/tests/test_CCS_capcost.py b/idaes/models_extra/power_generation/costing/tests/test_CCS_capcost.py index 5a30cc4731..a253c65058 100644 --- a/idaes/models_extra/power_generation/costing/tests/test_CCS_capcost.py +++ b/idaes/models_extra/power_generation/costing/tests/test_CCS_capcost.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/costing/tests/test_NGCC_capcost.py b/idaes/models_extra/power_generation/costing/tests/test_NGCC_capcost.py index 266635e24d..e0b1d0d77c 100644 --- a/idaes/models_extra/power_generation/costing/tests/test_NGCC_capcost.py +++ b/idaes/models_extra/power_generation/costing/tests/test_NGCC_capcost.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/costing/tests/test_power_plant_capcost.py b/idaes/models_extra/power_generation/costing/tests/test_power_plant_capcost.py index 2e587f5ba5..7e2b29a115 100644 --- a/idaes/models_extra/power_generation/costing/tests/test_power_plant_capcost.py +++ b/idaes/models_extra/power_generation/costing/tests/test_power_plant_capcost.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/generic_surrogate_dict.py b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/generic_surrogate_dict.py index 7d23bc5126..1648469d40 100644 --- a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/generic_surrogate_dict.py +++ b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/generic_surrogate_dict.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/steam_cycle_flowsheet.py b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/steam_cycle_flowsheet.py index 8ed413b4c1..a2af445897 100644 --- a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/steam_cycle_flowsheet.py +++ b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/steam_cycle_flowsheet.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -830,7 +830,7 @@ def set_inputs(m): fs.bfp.efficiency_isentropic.fix(0.8) fs.bfp.outlet.pressure.fix(1.45e7) - # Set input for spliter for main steam attemperator spray + # Set input for splitter for main steam attemperator spray fs.split_attemp.split_fraction[:, "Spray"].fix(0.0007) # Set inputs for water spray control valve diff --git a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_boiler.py b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_boiler.py index 31ac966ac1..e6eea8f725 100644 --- a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_boiler.py +++ b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_boiler.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_boiler_flowsheet.py b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_boiler_flowsheet.py index f4c80bbb6e..13d95a96d8 100644 --- a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_boiler_flowsheet.py +++ b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_boiler_flowsheet.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_power_plant.py b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_power_plant.py index 287cfe47ab..f7f00e6823 100644 --- a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_power_plant.py +++ b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/subcritical_power_plant.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/tests/test_subcritical_flowsheets.py b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/tests/test_subcritical_flowsheets.py index 1c5fc41b7c..90cab63c16 100644 --- a/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/tests/test_subcritical_flowsheets.py +++ b/idaes/models_extra/power_generation/flowsheets/subcritical_power_plant/tests/test_subcritical_flowsheets.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/flowsheets/supercritical_power_plant/SCPC_full_plant.py b/idaes/models_extra/power_generation/flowsheets/supercritical_power_plant/SCPC_full_plant.py index 42d1a05935..26ed0d5aaf 100644 --- a/idaes/models_extra/power_generation/flowsheets/supercritical_power_plant/SCPC_full_plant.py +++ b/idaes/models_extra/power_generation/flowsheets/supercritical_power_plant/SCPC_full_plant.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -105,7 +105,7 @@ def main(): # pylint: disable-next=import-outside-toplevel import idaes.models_extra.power_generation.flowsheets.supercritical_power_plant.boiler_subflowsheet_build as blr - # import the models (ECON, WW, PrSH, PlSH, FSH, Spliter, Mixer, Reheater) + # import the models (ECON, WW, PrSH, PlSH, FSH, Splitter, Mixer, Reheater) # see boiler_subflowhseet_build.py for a better description blr.build_boiler(m.fs) # initialize boiler network models (one by one) diff --git a/idaes/models_extra/power_generation/flowsheets/supercritical_power_plant/boiler_subflowsheet_build.py b/idaes/models_extra/power_generation/flowsheets/supercritical_power_plant/boiler_subflowsheet_build.py index f86280e53a..b0389b3478 100644 --- a/idaes/models_extra/power_generation/flowsheets/supercritical_power_plant/boiler_subflowsheet_build.py +++ b/idaes/models_extra/power_generation/flowsheets/supercritical_power_plant/boiler_subflowsheet_build.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/flowsheets/supercritical_steam_cycle/__init__.py b/idaes/models_extra/power_generation/flowsheets/supercritical_steam_cycle/__init__.py index f35626d0d4..1783e4cac7 100644 --- a/idaes/models_extra/power_generation/flowsheets/supercritical_steam_cycle/__init__.py +++ b/idaes/models_extra/power_generation/flowsheets/supercritical_steam_cycle/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/flowsheets/supercritical_steam_cycle/supercritical_steam_cycle.py b/idaes/models_extra/power_generation/flowsheets/supercritical_steam_cycle/supercritical_steam_cycle.py index c245927f61..60c03aa506 100644 --- a/idaes/models_extra/power_generation/flowsheets/supercritical_steam_cycle/supercritical_steam_cycle.py +++ b/idaes/models_extra/power_generation/flowsheets/supercritical_steam_cycle/supercritical_steam_cycle.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/flowsheets/test/test_scpc_plant.py b/idaes/models_extra/power_generation/flowsheets/test/test_scpc_plant.py index 5e4252d4f2..8eafdb8390 100644 --- a/idaes/models_extra/power_generation/flowsheets/test/test_scpc_plant.py +++ b/idaes/models_extra/power_generation/flowsheets/test/test_scpc_plant.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/flowsheets/test/test_scsc.py b/idaes/models_extra/power_generation/flowsheets/test/test_scsc.py index d4e390f7b9..18f0d94f89 100644 --- a/idaes/models_extra/power_generation/flowsheets/test/test_scsc.py +++ b/idaes/models_extra/power_generation/flowsheets/test/test_scsc.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/flowsheets/test/test_subcritical_boiler.py b/idaes/models_extra/power_generation/flowsheets/test/test_subcritical_boiler.py index dccbb859b6..9bfd3c8b77 100644 --- a/idaes/models_extra/power_generation/flowsheets/test/test_subcritical_boiler.py +++ b/idaes/models_extra/power_generation/flowsheets/test/test_subcritical_boiler.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/properties/__init__.py b/idaes/models_extra/power_generation/properties/__init__.py index aa78c618c0..3faa3366d9 100644 --- a/idaes/models_extra/power_generation/properties/__init__.py +++ b/idaes/models_extra/power_generation/properties/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/properties/flue_gas_ideal.py b/idaes/models_extra/power_generation/properties/flue_gas_ideal.py index f849686942..6f5e7b379d 100644 --- a/idaes/models_extra/power_generation/properties/flue_gas_ideal.py +++ b/idaes/models_extra/power_generation/properties/flue_gas_ideal.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/properties/natural_gas_PR.py b/idaes/models_extra/power_generation/properties/natural_gas_PR.py index 8c2a71a4d1..286463fb29 100644 --- a/idaes/models_extra/power_generation/properties/natural_gas_PR.py +++ b/idaes/models_extra/power_generation/properties/natural_gas_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/properties/sofc/sofc_keras_surrogate.py b/idaes/models_extra/power_generation/properties/sofc/sofc_keras_surrogate.py index c834d00431..1d59272eb9 100644 --- a/idaes/models_extra/power_generation/properties/sofc/sofc_keras_surrogate.py +++ b/idaes/models_extra/power_generation/properties/sofc/sofc_keras_surrogate.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/properties/tests/test_NG_PR.py b/idaes/models_extra/power_generation/properties/tests/test_NG_PR.py index 56ef371726..0947720472 100644 --- a/idaes/models_extra/power_generation/properties/tests/test_NG_PR.py +++ b/idaes/models_extra/power_generation/properties/tests/test_NG_PR.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/properties/tests/test_fg_prop.py b/idaes/models_extra/power_generation/properties/tests/test_fg_prop.py index 280e407648..860bb5dc8c 100644 --- a/idaes/models_extra/power_generation/properties/tests/test_fg_prop.py +++ b/idaes/models_extra/power_generation/properties/tests/test_fg_prop.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/properties/tests/test_flue_gas_integration.py b/idaes/models_extra/power_generation/properties/tests/test_flue_gas_integration.py index acdcd0e856..1c7371e28c 100644 --- a/idaes/models_extra/power_generation/properties/tests/test_flue_gas_integration.py +++ b/idaes/models_extra/power_generation/properties/tests/test_flue_gas_integration.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/properties/tests/test_sofc_surrogates.py b/idaes/models_extra/power_generation/properties/tests/test_sofc_surrogates.py index 2dd2ea04c0..1313e3a7b8 100644 --- a/idaes/models_extra/power_generation/properties/tests/test_sofc_surrogates.py +++ b/idaes/models_extra/power_generation/properties/tests/test_sofc_surrogates.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/__init__.py b/idaes/models_extra/power_generation/unit_models/__init__.py index 92cdde53a4..8e1b083eda 100644 --- a/idaes/models_extra/power_generation/unit_models/__init__.py +++ b/idaes/models_extra/power_generation/unit_models/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/balance.py b/idaes/models_extra/power_generation/unit_models/balance.py index db4c6f94a7..36ede3414a 100644 --- a/idaes/models_extra/power_generation/unit_models/balance.py +++ b/idaes/models_extra/power_generation/unit_models/balance.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/boiler_fireside.py b/idaes/models_extra/power_generation/unit_models/boiler_fireside.py index 2f016aed85..17061385a0 100644 --- a/idaes/models_extra/power_generation/unit_models/boiler_fireside.py +++ b/idaes/models_extra/power_generation/unit_models/boiler_fireside.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/boiler_heat_exchanger.py b/idaes/models_extra/power_generation/unit_models/boiler_heat_exchanger.py index 75c346fd80..a44c68be47 100644 --- a/idaes/models_extra/power_generation/unit_models/boiler_heat_exchanger.py +++ b/idaes/models_extra/power_generation/unit_models/boiler_heat_exchanger.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/boiler_heat_exchanger_2D.py b/idaes/models_extra/power_generation/unit_models/boiler_heat_exchanger_2D.py index c7c14329bb..bd64c52f52 100644 --- a/idaes/models_extra/power_generation/unit_models/boiler_heat_exchanger_2D.py +++ b/idaes/models_extra/power_generation/unit_models/boiler_heat_exchanger_2D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/cpu.py b/idaes/models_extra/power_generation/unit_models/cpu.py index 7d72cbe6f2..61cd0f7115 100644 --- a/idaes/models_extra/power_generation/unit_models/cpu.py +++ b/idaes/models_extra/power_generation/unit_models/cpu.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/cross_flow_heat_exchanger_1D.py b/idaes/models_extra/power_generation/unit_models/cross_flow_heat_exchanger_1D.py index d4615698d5..0f372bd427 100644 --- a/idaes/models_extra/power_generation/unit_models/cross_flow_heat_exchanger_1D.py +++ b/idaes/models_extra/power_generation/unit_models/cross_flow_heat_exchanger_1D.py @@ -1,15 +1,15 @@ -############################################################################## -# Institute for the Design of Advanced Energy Systems Process Systems -# Engineering Framework (IDAES PSE Framework) Copyright (c) 2018-2019, by the -# software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia -# University Research Corporation, et al. All rights reserved. +################################################################################# +# The Institute for the Design of Advanced Energy Systems Integrated Platform +# Framework (IDAES IP) was produced under the DOE Institute for the +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.txt and LICENSE.txt for full copyright and -# license information, respectively. Both files are also available online -# at the URL "https://github.com/IDAES/idaes-pse". -############################################################################## +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. +################################################################################# """ 1-D Cross Flow Heat Exchanger Model With Wall Temperatures diff --git a/idaes/models_extra/power_generation/unit_models/downcomer.py b/idaes/models_extra/power_generation/unit_models/downcomer.py index e2dd6a8841..17cdd22341 100644 --- a/idaes/models_extra/power_generation/unit_models/downcomer.py +++ b/idaes/models_extra/power_generation/unit_models/downcomer.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/drum.py b/idaes/models_extra/power_generation/unit_models/drum.py index f03865ba6e..8b7d1d94eb 100644 --- a/idaes/models_extra/power_generation/unit_models/drum.py +++ b/idaes/models_extra/power_generation/unit_models/drum.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/drum1D.py b/idaes/models_extra/power_generation/unit_models/drum1D.py index b8c36145f1..f4ba169ec8 100644 --- a/idaes/models_extra/power_generation/unit_models/drum1D.py +++ b/idaes/models_extra/power_generation/unit_models/drum1D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/feedwater_heater_0D.py b/idaes/models_extra/power_generation/unit_models/feedwater_heater_0D.py index cf6f5777e3..f265aa4f90 100644 --- a/idaes/models_extra/power_generation/unit_models/feedwater_heater_0D.py +++ b/idaes/models_extra/power_generation/unit_models/feedwater_heater_0D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/feedwater_heater_0D_dynamic.py b/idaes/models_extra/power_generation/unit_models/feedwater_heater_0D_dynamic.py index aabb1b9fcf..d5454e5890 100644 --- a/idaes/models_extra/power_generation/unit_models/feedwater_heater_0D_dynamic.py +++ b/idaes/models_extra/power_generation/unit_models/feedwater_heater_0D_dynamic.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/heat_exchanger_3streams.py b/idaes/models_extra/power_generation/unit_models/heat_exchanger_3streams.py index 32e6e97736..7ad19811a6 100644 --- a/idaes/models_extra/power_generation/unit_models/heat_exchanger_3streams.py +++ b/idaes/models_extra/power_generation/unit_models/heat_exchanger_3streams.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/heat_exchanger_common.py b/idaes/models_extra/power_generation/unit_models/heat_exchanger_common.py index fd2932853b..81441e68ff 100644 --- a/idaes/models_extra/power_generation/unit_models/heat_exchanger_common.py +++ b/idaes/models_extra/power_generation/unit_models/heat_exchanger_common.py @@ -1,15 +1,15 @@ -############################################################################## -# Institute for the Design of Advanced Energy Systems Process Systems -# Engineering Framework (IDAES PSE Framework) Copyright (c) 2018-2019, by the -# software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia -# University Research Corporation, et al. All rights reserved. +################################################################################# +# The Institute for the Design of Advanced Energy Systems Integrated Platform +# Framework (IDAES IP) was produced under the DOE Institute for the +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.txt and LICENSE.txt for full copyright and -# license information, respectively. Both files are also available online -# at the URL "https://github.com/IDAES/idaes-pse". -############################################################################## +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. +################################################################################# """ Methods shared by the CrossFlowHeatExchanger1D and Heater1D models. """ diff --git a/idaes/models_extra/power_generation/unit_models/heater_1D.py b/idaes/models_extra/power_generation/unit_models/heater_1D.py index e52d5d3d7c..4312722722 100644 --- a/idaes/models_extra/power_generation/unit_models/heater_1D.py +++ b/idaes/models_extra/power_generation/unit_models/heater_1D.py @@ -1,15 +1,15 @@ -############################################################################## -# Institute for the Design of Advanced Energy Systems Process Systems -# Engineering Framework (IDAES PSE Framework) Copyright (c) 2018-2019, by the -# software owners: The Regents of the University of California, through -# Lawrence Berkeley National Laboratory, National Technology & Engineering -# Solutions of Sandia, LLC, Carnegie Mellon University, West Virginia -# University Research Corporation, et al. All rights reserved. +################################################################################# +# The Institute for the Design of Advanced Energy Systems Integrated Platform +# Framework (IDAES IP) was produced under the DOE Institute for the +# Design of Advanced Energy Systems (IDAES). # -# Please see the files COPYRIGHT.txt and LICENSE.txt for full copyright and -# license information, respectively. Both files are also available online -# at the URL "https://github.com/IDAES/idaes-pse". -############################################################################## +# Copyright (c) 2018-2024 by the software owners: The Regents of the +# University of California, through Lawrence Berkeley National Laboratory, +# National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon +# University, West Virginia University Research Corporation, et al. +# All rights reserved. Please see the files COPYRIGHT.md and LICENSE.md +# for full copyright and license information. +################################################################################# """ 1-D Electric Trim Heater Model With Wall Temperatures diff --git a/idaes/models_extra/power_generation/unit_models/helm/__init__.py b/idaes/models_extra/power_generation/unit_models/helm/__init__.py index 866992f830..dfeebc960c 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/__init__.py +++ b/idaes/models_extra/power_generation/unit_models/helm/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/compressor.py b/idaes/models_extra/power_generation/unit_models/helm/compressor.py index 990bcb0a3d..2e083bd9e5 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/compressor.py +++ b/idaes/models_extra/power_generation/unit_models/helm/compressor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -180,7 +180,7 @@ def initialize_build( (self.control_volume.deltaP[t] + self.inlet.pressure[t]) / self.inlet.pressure[t] ) - # Fix the variables we base the initializtion on and free the rest. + # Fix the variables we base the initialization on and free the rest. # This requires good values to be provided for pressure, efficiency, # and inlet conditions, but it is simple and reliable. self.inlet.fix() diff --git a/idaes/models_extra/power_generation/unit_models/helm/condenser_ntu.py b/idaes/models_extra/power_generation/unit_models/helm/condenser_ntu.py index c4bae1ec86..d84e4f5232 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/condenser_ntu.py +++ b/idaes/models_extra/power_generation/unit_models/helm/condenser_ntu.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -298,7 +298,7 @@ def initialize_build( hot_side = getattr(self, self.config.hot_side_name) cold_side = getattr(self, self.config.cold_side_name) - # Store initial model specs, restored at the end of initializtion, so + # Store initial model specs, restored at the end of initialization, so # the problem is not altered. This can restore fixed/free vars, # active/inactive constraints, and fixed variable values. sp = StoreSpec.value_isfixed_isactive(only_fixed=True) diff --git a/idaes/models_extra/power_generation/unit_models/helm/mixer.py b/idaes/models_extra/power_generation/unit_models/helm/mixer.py index b88093d2d6..4f956a0ccf 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/mixer.py +++ b/idaes/models_extra/power_generation/unit_models/helm/mixer.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -385,7 +385,7 @@ def initialize_build(self, outlvl=idaeslog.NOTSET, optarg=None, solver=None): # Create solver opt = get_solver(solver, optarg) - # This shouldn't require too much initializtion, just fixing inlets + # This shouldn't require too much initialization, just fixing inlets # and solving should always work. # sp is what to save to make sure state after init is same as the start diff --git a/idaes/models_extra/power_generation/unit_models/helm/phase_separator.py b/idaes/models_extra/power_generation/unit_models/helm/phase_separator.py index 376226805b..55eb663842 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/phase_separator.py +++ b/idaes/models_extra/power_generation/unit_models/helm/phase_separator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/pump.py b/idaes/models_extra/power_generation/unit_models/helm/pump.py index 24b629ec14..5d5fca0c74 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/pump.py +++ b/idaes/models_extra/power_generation/unit_models/helm/pump.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -162,7 +162,7 @@ def initialize_build( (self.control_volume.deltaP[t] + self.inlet.pressure[t]) / self.inlet.pressure[t] ) - # Fix the variables we base the initializtion on and free the rest. + # Fix the variables we base the initialization on and free the rest. # This requires good values to be provided for pressure, efficiency, # and inlet conditions, but it is simple and reliable. self.inlet.fix() diff --git a/idaes/models_extra/power_generation/unit_models/helm/splitter.py b/idaes/models_extra/power_generation/unit_models/helm/splitter.py index a07d72e245..3171539c93 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/splitter.py +++ b/idaes/models_extra/power_generation/unit_models/helm/splitter.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/tests/__init__.py b/idaes/models_extra/power_generation/unit_models/helm/tests/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/tests/__init__.py +++ b/idaes/models_extra/power_generation/unit_models/helm/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/tests/test_compare_to_generic.py b/idaes/models_extra/power_generation/unit_models/helm/tests/test_compare_to_generic.py index 3482c71683..2ba577caf6 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/tests/test_compare_to_generic.py +++ b/idaes/models_extra/power_generation/unit_models/helm/tests/test_compare_to_generic.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/tests/test_condenser_ntu.py b/idaes/models_extra/power_generation/unit_models/helm/tests/test_condenser_ntu.py index 01bfec1567..6a56c5c5cb 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/tests/test_condenser_ntu.py +++ b/idaes/models_extra/power_generation/unit_models/helm/tests/test_condenser_ntu.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/tests/test_mixer.py b/idaes/models_extra/power_generation/unit_models/helm/tests/test_mixer.py index 13be9d302e..c8f6e6ba6a 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/tests/test_mixer.py +++ b/idaes/models_extra/power_generation/unit_models/helm/tests/test_mixer.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/tests/test_phase_separator.py b/idaes/models_extra/power_generation/unit_models/helm/tests/test_phase_separator.py index d9e8092ecb..bf4d72feb6 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/tests/test_phase_separator.py +++ b/idaes/models_extra/power_generation/unit_models/helm/tests/test_phase_separator.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/tests/test_splitter.py b/idaes/models_extra/power_generation/unit_models/helm/tests/test_splitter.py index 0a33aff937..bdd2768af4 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/tests/test_splitter.py +++ b/idaes/models_extra/power_generation/unit_models/helm/tests/test_splitter.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_inlet.py b/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_inlet.py index edd02b7c64..835898d0a2 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_inlet.py +++ b/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_inlet.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_multistage.py b/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_multistage.py index 9fc9c29342..22029deb6b 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_multistage.py +++ b/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_multistage.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_outlet.py b/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_outlet.py index f17b885c80..d8114e3463 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_outlet.py +++ b/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_outlet.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_stage.py b/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_stage.py index a2058b9a1b..a2a7758d2c 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_stage.py +++ b/idaes/models_extra/power_generation/unit_models/helm/tests/test_turbine_stage.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/turbine.py b/idaes/models_extra/power_generation/unit_models/helm/turbine.py index b38f286d6f..1736aaed6f 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/turbine.py +++ b/idaes/models_extra/power_generation/unit_models/helm/turbine.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -189,7 +189,7 @@ def initialize_build( (self.control_volume.deltaP[t] + self.inlet.pressure[t]) / self.inlet.pressure[t] ) - # Fix the variables we base the initializtion on and free the rest. + # Fix the variables we base the initialization on and free the rest. # This requires good values to be provided for pressure, efficiency, # and inlet conditions, but it is simple and reliable. self.inlet.fix() diff --git a/idaes/models_extra/power_generation/unit_models/helm/turbine_inlet.py b/idaes/models_extra/power_generation/unit_models/helm/turbine_inlet.py index 7d7c6b268f..c03330a45c 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/turbine_inlet.py +++ b/idaes/models_extra/power_generation/unit_models/helm/turbine_inlet.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -136,9 +136,9 @@ def initialize_build( """ Initialize the inlet turbine stage model. This deactivates the specialized constraints, then does the isentropic turbine initialization, - then reactivates the constraints and solves. This initializtion uses a + then reactivates the constraints and solves. This initialization uses a flow value guess, so some reasonable flow guess should be specified prior - to initializtion. + to initialization. Args: outlvl (int): Amount of output (0 to 3) 0 is lowest @@ -154,7 +154,7 @@ def initialize_build( sp = StoreSpec.value_isfixed_isactive(only_fixed=True) istate = to_json(self, return_dict=True, wts=sp) - # Setup for initializtion step 1 + # Setup for initialization step 1 self.inlet_flow_constraint.deactivate() self.efficiency_correlation.deactivate() self.eff_nozzle.fix() diff --git a/idaes/models_extra/power_generation/unit_models/helm/turbine_multistage.py b/idaes/models_extra/power_generation/unit_models/helm/turbine_multistage.py index 52b2500730..527adb54fa 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/turbine_multistage.py +++ b/idaes/models_extra/power_generation/unit_models/helm/turbine_multistage.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. @@ -356,7 +356,7 @@ def _inlet_to_rule(b, i): self.stream_inlet_mix_inlet = Arc(inlet_idx, rule=_inlet_to_rule) # There are three sections HP, IP, and LP which all have the same sort - # of internal connctions, so the functions below provide some generic + # of internal connections, so the functions below provide some generic # capcbilities for adding the internal Arcs (streams). def _arc_indexes(nstages, index_set, discon, splits): """ @@ -369,7 +369,7 @@ def _arc_indexes(nstages, index_set, discon, splits): nstages (int): Number of stages in section index_set (Set): Index set for arcs in the section discon (list): Disconnected stages in the section - splits (list): Spliter locations + splits (list): Splitter locations """ sr = set() # set of things to remove from the Arc index set for i in index_set: @@ -602,7 +602,7 @@ def _init_section( copy_disconnected_flow, copy_disconnected_pressure, ): - """Reuse the initializtion for HP, IP and, LP sections.""" + """Reuse the initialization for HP, IP and, LP sections.""" if 0 in splits: propagate_state(splits[0].inlet, prev_port) splits[0].initialize(outlvl=outlvl, solver=solver, optarg=optarg) @@ -671,7 +671,7 @@ def initialize_build( None """ # Setup loggers - # Store initial model specs, restored at the end of initializtion, so + # Store initial model specs, restored at the end of initialization, so # the problem is not altered. This can restore fixed/free vars, # active/inactive constraints, and fixed variable values. sp = StoreSpec.value_isfixed_isactive(only_fixed=True) diff --git a/idaes/models_extra/power_generation/unit_models/helm/turbine_outlet.py b/idaes/models_extra/power_generation/unit_models/helm/turbine_outlet.py index 4666572ca9..639e33a5e3 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/turbine_outlet.py +++ b/idaes/models_extra/power_generation/unit_models/helm/turbine_outlet.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/turbine_stage.py b/idaes/models_extra/power_generation/unit_models/helm/turbine_stage.py index 09dedc42e4..c73987488c 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/turbine_stage.py +++ b/idaes/models_extra/power_generation/unit_models/helm/turbine_stage.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/helm/valve_steam.py b/idaes/models_extra/power_generation/unit_models/helm/valve_steam.py index 1394953d32..7c5d7d8928 100644 --- a/idaes/models_extra/power_generation/unit_models/helm/valve_steam.py +++ b/idaes/models_extra/power_generation/unit_models/helm/valve_steam.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/__init__.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/__init__.py index bdac353924..8d2218b5ca 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/__init__.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/channel.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/channel.py index 2d49878c52..1798714622 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/channel.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/channel.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/common.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/common.py index af587915a4..2174ef4671 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/common.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/common.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/conductive_slab.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/conductive_slab.py index 4ddf59a1b9..465dd20734 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/conductive_slab.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/conductive_slab.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/contact_resistor.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/contact_resistor.py index 8dfbe41f27..770cf44749 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/contact_resistor.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/contact_resistor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/porous_conductive_slab.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/porous_conductive_slab.py index 733a9aba1f..30624b02fd 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/porous_conductive_slab.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/porous_conductive_slab.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/solid_oxide_cell.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/solid_oxide_cell.py index fb569fab3f..6adecc6538 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/solid_oxide_cell.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/solid_oxide_cell.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/solid_oxide_module_simple.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/solid_oxide_module_simple.py index b61f1ab810..785772383c 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/solid_oxide_module_simple.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/solid_oxide_module_simple.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/testing.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/testing.py index 4e676107ce..c4d9e8ad50 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/testing.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/testing.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_channel.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_channel.py index a6dcdef0f3..bfb07d8e1a 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_channel.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_channel.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_common.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_common.py index 7173c95a60..1f368a6fe5 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_common.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_common.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_conductive_slab.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_conductive_slab.py index 74f74ee49c..567f8b838e 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_conductive_slab.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_conductive_slab.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_contact_resistor.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_contact_resistor.py index d53fd4bc05..743b35ee7f 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_contact_resistor.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_contact_resistor.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication.py index 1d36c62784..7c816c6643 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication_interconnect.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication_interconnect.py index d89991e26e..a54fdd4127 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication_interconnect.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication_interconnect.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication_thin.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication_thin.py index a66bf6debe..232b449f04 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication_thin.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_herring_replication_thin.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_porous_conductive_slab.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_porous_conductive_slab.py index e85f6f2a76..d9c658daa7 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_porous_conductive_slab.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_porous_conductive_slab.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_solid_oxide_cell.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_solid_oxide_cell.py index cc2041f015..62ada07588 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_solid_oxide_cell.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_solid_oxide_cell.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_triple_phase_boundary.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_triple_phase_boundary.py index 6a00c43314..e591e3d329 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_triple_phase_boundary.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/tests/test_triple_phase_boundary.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soc_submodels/triple_phase_boundary.py b/idaes/models_extra/power_generation/unit_models/soc_submodels/triple_phase_boundary.py index 2a815b994c..1486d7342c 100644 --- a/idaes/models_extra/power_generation/unit_models/soc_submodels/triple_phase_boundary.py +++ b/idaes/models_extra/power_generation/unit_models/soc_submodels/triple_phase_boundary.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/soec_design.py b/idaes/models_extra/power_generation/unit_models/soec_design.py index 0f2aa897f3..d5b7083964 100644 --- a/idaes/models_extra/power_generation/unit_models/soec_design.py +++ b/idaes/models_extra/power_generation/unit_models/soec_design.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/steamheater.py b/idaes/models_extra/power_generation/unit_models/steamheater.py index a8c633a9f4..08456775e9 100644 --- a/idaes/models_extra/power_generation/unit_models/steamheater.py +++ b/idaes/models_extra/power_generation/unit_models/steamheater.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/datadictionary.py b/idaes/models_extra/power_generation/unit_models/tests/datadictionary.py index 3c5f259f2d..c2aed9455a 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/datadictionary.py +++ b/idaes/models_extra/power_generation/unit_models/tests/datadictionary.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_boiler_heat_exchanger.py b/idaes/models_extra/power_generation/unit_models/tests/test_boiler_heat_exchanger.py index ae0328e0d1..3dd86fda3d 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_boiler_heat_exchanger.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_boiler_heat_exchanger.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_boilerfireside.py b/idaes/models_extra/power_generation/unit_models/tests/test_boilerfireside.py index 048f74f06d..a7bfbbc049 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_boilerfireside.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_boilerfireside.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_cpu.py b/idaes/models_extra/power_generation/unit_models/tests/test_cpu.py index d1dc12f205..18be698799 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_cpu.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_cpu.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_cross_flow_heat_exchanger_1D.py b/idaes/models_extra/power_generation/unit_models/tests/test_cross_flow_heat_exchanger_1D.py index 9141f350e6..1ebac1b0e3 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_cross_flow_heat_exchanger_1D.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_cross_flow_heat_exchanger_1D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_downcomer.py b/idaes/models_extra/power_generation/unit_models/tests/test_downcomer.py index febe4ab1f6..8dfe45d61e 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_downcomer.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_downcomer.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_drum.py b/idaes/models_extra/power_generation/unit_models/tests/test_drum.py index 1ecff0e587..3017feee05 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_drum.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_drum.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_drum1D.py b/idaes/models_extra/power_generation/unit_models/tests/test_drum1D.py index fc4d06fdc4..b9449c0967 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_drum1D.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_drum1D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_feedwater_heater.py b/idaes/models_extra/power_generation/unit_models/tests/test_feedwater_heater.py index c8e6fe897d..2d98c0b6d3 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_feedwater_heater.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_feedwater_heater.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_feedwater_heater_dynamic.py b/idaes/models_extra/power_generation/unit_models/tests/test_feedwater_heater_dynamic.py index a39f5bae77..61e4d34f95 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_feedwater_heater_dynamic.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_feedwater_heater_dynamic.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_heat_exchanger2D.py b/idaes/models_extra/power_generation/unit_models/tests/test_heat_exchanger2D.py index 0da5290685..614e539cf0 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_heat_exchanger2D.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_heat_exchanger2D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_heat_exchanger_3streams.py b/idaes/models_extra/power_generation/unit_models/tests/test_heat_exchanger_3streams.py index 579ea2ffe2..5b9721df6a 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_heat_exchanger_3streams.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_heat_exchanger_3streams.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_heater_1D.py b/idaes/models_extra/power_generation/unit_models/tests/test_heater_1D.py index 91c34d2a26..d47b1bb3b5 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_heater_1D.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_heater_1D.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_soec_design.py b/idaes/models_extra/power_generation/unit_models/tests/test_soec_design.py index 5f139393e4..edee6f5f31 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_soec_design.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_soec_design.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_steamheater.py b/idaes/models_extra/power_generation/unit_models/tests/test_steamheater.py index 30b75aef4b..dd95704487 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_steamheater.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_steamheater.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_waterpipe.py b/idaes/models_extra/power_generation/unit_models/tests/test_waterpipe.py index 30208e95d4..da3057954f 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_waterpipe.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_waterpipe.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_watertank.py b/idaes/models_extra/power_generation/unit_models/tests/test_watertank.py index df8c410eea..bee30bffe6 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_watertank.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_watertank.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/tests/test_waterwall.py b/idaes/models_extra/power_generation/unit_models/tests/test_waterwall.py index e884046389..0191fb3492 100644 --- a/idaes/models_extra/power_generation/unit_models/tests/test_waterwall.py +++ b/idaes/models_extra/power_generation/unit_models/tests/test_waterwall.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/waterpipe.py b/idaes/models_extra/power_generation/unit_models/waterpipe.py index 652dc3f6a3..be4444d427 100644 --- a/idaes/models_extra/power_generation/unit_models/waterpipe.py +++ b/idaes/models_extra/power_generation/unit_models/waterpipe.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/power_generation/unit_models/watertank.py b/idaes/models_extra/power_generation/unit_models/watertank.py index 332fd663ae..dc2390b68e 100644 --- a/idaes/models_extra/power_generation/unit_models/watertank.py +++ b/idaes/models_extra/power_generation/unit_models/watertank.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. 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 6cb947efc3..54de35a68e 100644 --- a/idaes/models_extra/power_generation/unit_models/waterwall_section.py +++ b/idaes/models_extra/power_generation/unit_models/waterwall_section.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/temperature_swing_adsorption/__init__.py b/idaes/models_extra/temperature_swing_adsorption/__init__.py index b0025799b6..3e4fc463d9 100644 --- a/idaes/models_extra/temperature_swing_adsorption/__init__.py +++ b/idaes/models_extra/temperature_swing_adsorption/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/temperature_swing_adsorption/costing/dac_costing.py b/idaes/models_extra/temperature_swing_adsorption/costing/dac_costing.py index 317ef92439..fd2cd35401 100644 --- a/idaes/models_extra/temperature_swing_adsorption/costing/dac_costing.py +++ b/idaes/models_extra/temperature_swing_adsorption/costing/dac_costing.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/temperature_swing_adsorption/fixed_bed_tsa0d.py b/idaes/models_extra/temperature_swing_adsorption/fixed_bed_tsa0d.py index 77da5f6105..960c4f2722 100644 --- a/idaes/models_extra/temperature_swing_adsorption/fixed_bed_tsa0d.py +++ b/idaes/models_extra/temperature_swing_adsorption/fixed_bed_tsa0d.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/temperature_swing_adsorption/initializer.py b/idaes/models_extra/temperature_swing_adsorption/initializer.py index 96aed60d5d..3b13f13902 100644 --- a/idaes/models_extra/temperature_swing_adsorption/initializer.py +++ b/idaes/models_extra/temperature_swing_adsorption/initializer.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/temperature_swing_adsorption/tests/test_fixed_bed_tsa0d.py b/idaes/models_extra/temperature_swing_adsorption/tests/test_fixed_bed_tsa0d.py index 0ab6e37361..78aeed5649 100644 --- a/idaes/models_extra/temperature_swing_adsorption/tests/test_fixed_bed_tsa0d.py +++ b/idaes/models_extra/temperature_swing_adsorption/tests/test_fixed_bed_tsa0d.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/temperature_swing_adsorption/tests/test_fixed_bed_tsa0d_costing.py b/idaes/models_extra/temperature_swing_adsorption/tests/test_fixed_bed_tsa0d_costing.py index 88039a2f3e..e07861d4e6 100644 --- a/idaes/models_extra/temperature_swing_adsorption/tests/test_fixed_bed_tsa0d_costing.py +++ b/idaes/models_extra/temperature_swing_adsorption/tests/test_fixed_bed_tsa0d_costing.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/models_extra/temperature_swing_adsorption/util.py b/idaes/models_extra/temperature_swing_adsorption/util.py index 8e3d4d3b0e..d93ea3b1bd 100644 --- a/idaes/models_extra/temperature_swing_adsorption/util.py +++ b/idaes/models_extra/temperature_swing_adsorption/util.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/__init__.py b/idaes/tests/__init__.py index 246ee6fc9e..072253a7db 100644 --- a/idaes/tests/__init__.py +++ b/idaes/tests/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/beta_mod.py b/idaes/tests/beta_mod.py index b64cf3ad67..5a73ecaa05 100644 --- a/idaes/tests/beta_mod.py +++ b/idaes/tests/beta_mod.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/prescient/__init__.py b/idaes/tests/prescient/__init__.py index 84e162daa0..16cadc4fb9 100644 --- a/idaes/tests/prescient/__init__.py +++ b/idaes/tests/prescient/__init__.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/prescient/test_prescient.py b/idaes/tests/prescient/test_prescient.py index 3a0ffbef5d..881ecc717c 100644 --- a/idaes/tests/prescient/test_prescient.py +++ b/idaes/tests/prescient/test_prescient.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/test_beta.py b/idaes/tests/test_beta.py index 846907ce4e..0ee7149c9a 100644 --- a/idaes/tests/test_beta.py +++ b/idaes/tests/test_beta.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/test_cbrt.py b/idaes/tests/test_cbrt.py index af03dc1b71..a79e3a8dde 100644 --- a/idaes/tests/test_cbrt.py +++ b/idaes/tests/test_cbrt.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/test_clone_model.py b/idaes/tests/test_clone_model.py index 73b8ba2487..6963a599f9 100644 --- a/idaes/tests/test_clone_model.py +++ b/idaes/tests/test_clone_model.py @@ -5,7 +5,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/test_config.py b/idaes/tests/test_config.py index 338abc0ff0..498e8003c8 100644 --- a/idaes/tests/test_config.py +++ b/idaes/tests/test_config.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/test_docs.py b/idaes/tests/test_docs.py index 91ac8d6186..7685c1b467 100644 --- a/idaes/tests/test_docs.py +++ b/idaes/tests/test_docs.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/test_headers.py b/idaes/tests/test_headers.py index 577d870c0b..fd99c599ef 100644 --- a/idaes/tests/test_headers.py +++ b/idaes/tests/test_headers.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/test_import.py b/idaes/tests/test_import.py index 9bf7023f38..84885407c4 100644 --- a/idaes/tests/test_import.py +++ b/idaes/tests/test_import.py @@ -4,7 +4,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/test_logger.py b/idaes/tests/test_logger.py index c16d6e2d14..2892c47653 100644 --- a/idaes/tests/test_logger.py +++ b/idaes/tests/test_logger.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/test_style.py b/idaes/tests/test_style.py index 11786f45a2..e36a1af3f6 100644 --- a/idaes/tests/test_style.py +++ b/idaes/tests/test_style.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/test_tests.py b/idaes/tests/test_tests.py index b14cbb1c95..b07541ab4e 100644 --- a/idaes/tests/test_tests.py +++ b/idaes/tests/test_tests.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/tests/test_version.py b/idaes/tests/test_version.py index 32c1965858..5b65932d5d 100644 --- a/idaes/tests/test_version.py +++ b/idaes/tests/test_version.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al. diff --git a/idaes/ver.py b/idaes/ver.py index 18d319b64a..1a392350c9 100644 --- a/idaes/ver.py +++ b/idaes/ver.py @@ -3,7 +3,7 @@ # Framework (IDAES IP) was produced under the DOE Institute for the # Design of Advanced Energy Systems (IDAES). # -# Copyright (c) 2018-2023 by the software owners: The Regents of the +# Copyright (c) 2018-2024 by the software owners: The Regents of the # University of California, through Lawrence Berkeley National Laboratory, # National Technology & Engineering Solutions of Sandia, LLC, Carnegie Mellon # University, West Virginia University Research Corporation, et al.