Merge branch 'main' into soc-fix

CITATION.cff

@@ -0,0 +1,45 @@
+cff-version: 1.2.0
+message: "If you use this software, please cite it as below."
+authors:
+  - name: "IDAES contributors"
+title: "Institute for Design of Advanced Energy Systems (IDAES): advanced computational algorithms to enable the design and optimization of complex, interacting energy and process systems from individual plant components to the entire electrical grid"
+url: "https://github.com/IDAES/idaes-pse"
+license-url: "https://github.com/IDAES/idaes-pse/blob/main/LICENSE.md"
+preferred-citation:
+  type: article
+  authors:
+    - family-names: "Lee"
+      given-names: "Andrew"
+    - family-names: "Ghouse"
+      given-names: "Jaffer H"
+    - family-names: "Eslick"
+      given-names: "John C"
+    - family-names: "Laird"
+      given-names: "Carl D"
+    - family-names: "Siirola"
+      given-names: "John D"
+    - family-names: "Zamarripa"
+      given-names: "Miguel A"
+    - family-names: "Gunter"
+      given-names: "Dan"
+    - family-names: "Shinn"
+      given-names: "John H"
+    - family-names: "Dowling"
+      given-names: "Alexander W"
+    - family-names: "Bhattacharyya"
+      given-names: "Debangsu"
+    - family-names: "Biegler"
+      given-names: "Lorenz T"
+    - family-names: "Burgard"
+      given-names: "Anthony P"
+    - family-names: "Miller"
+      given-names: "David C"
+  title: "The IDAES process modeling framework and model library—Flexibility for process simulation and optimization"
+  journal: "Journal of Advanced Manufacturing and Processing"
+  publisher: "Wiley Online Library"
+  volume: 3
+  number: 3
+  pages: e10095
+  year: 2021
+  doi: "doi/10.1002/amp2.10095"
+

docs/index.rst

@@ -74,6 +74,12 @@ The IDAES team is comprised of collaborators from the following institutions:
 * University of Notre Dame
 * Georgia Tech
 
+Citing IDAES
+------------
+If you use IDAES software for your research, please cite us:
+
+Lee, Andrew, Jaffer H. Ghouse, John C. Eslick, Carl D. Laird, John D. Siirola, Miguel A. Zamarripa, Dan Gunter et al. "The IDAES process modeling framework and model library—Flexibility for process simulation and optimization." Journal of Advanced Manufacturing and Processing 3, no. 3 (2021): e10095. https://doi.org/10.1002/amp2.10095
+
 Contact us
 -----------
 General, background and overview information is available at the `IDAES website`_.

idaes/core/util/tests/test_model_diagnostics.py

@@ -1847,6 +1847,7 @@ def test_solve_ids_milp(self, model):
             model.con5: -1,
         }
 
+    # TODO does this test function have the exact same name as the one above?
     @pytest.mark.solver
     @pytest.mark.component
     def test_solve_ids_milp(self, model, scip_solver):