Merge pull request #3054 from jsiirola/writers-improved-determinism

Improve writer determinism

Author: jsiirola

pyomo/core/base/enums.py

@@ -59,7 +59,7 @@ class SortComponents(enum.Flag, **strictEnum):
     alphabeticalOrder = alphaOrder
     alphabetical = alphaOrder
     # both alpha and decl orders are deterministic, so only must sort indices
-    deterministic = indices
+    deterministic = ORDERED_INDICES
     sortBoth = indices | alphabeticalOrder  # Same as True
     alphabetizeComponentAndIndex = sortBoth