Merge branch 'main' into add-prescient

.github/actions/setup-idaes/action.yml

@@ -17,7 +17,7 @@ runs:
       shell: bash -l {0}
       run: |
         echo '::group::Output of "conda install" command'
-        conda install --yes --quiet pip=21.1 setuptools wheel
+        conda install --yes --quiet pip setuptools wheel
         conda list
         echo '::endgroup::'
     - name: Install idaes and dependencies

.github/workflows/core.yml

@@ -48,6 +48,7 @@ jobs:
           - '3.7'
           - '3.8'
           - '3.9'
+          - '3.10'
         os:
           - ubuntu-18.04
           - windows-latest

.github/workflows/integration.yml

@@ -129,6 +129,7 @@ jobs:
           - '3.7'
           - '3.8'
           - '3.9'
+          - '3.10'
         os:
           - ubuntu-18.04
           - windows-latest
@@ -161,10 +162,10 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-          # TODO restore all Python versions once tests pass
           - '3.7'
           - '3.8'
           - '3.9'
+          - '3.10'
         os:
           - ubuntu-18.04
           - windows-latest

README.md

@@ -80,6 +80,7 @@ for Python 3. The following sub-versions are supported:
 * Python 3.7
 * Python 3.8
 * Python 3.9
+* Python 3.10
 
 Note that Python 3.6 is *not* supported.
 

data/config.yaml

@@ -0,0 +1,8 @@
+_id: d779730c7cc94155877a24e2e8be2ad1
+created: '2022-02-09T14:59:17.579871'
+description: Built-in IDAES workspace
+htmldocs:
+- https://idaes-pse.readthedocs.io/en/stable
+- '{dmf_root}/docs/build/html'
+modified: '2022-02-09T14:59:17.579871'
+name: IDAES

data/files/14b83b0763c5424b8a056f5b0821dc32/pitzer_4.csv

@@ -0,0 +1,193 @@
+"T [C]","P [bar]","Cp0/R H2O","Cp0/R NaCl","A_J/R [(kg/mol)^0.5]","B0 [kg/mol/K^2]","B1 [kg/mol/K^2]","10^3xC [(kg/mol/K)^2]"
+0,1,9.163,-23.15,2.95,-36.07,-61.31,2.728
+10,1,9.075,-14.94,3.39,-22.46,-28.42,1.486
+20,1,9.064,-11.2,3.76,-15.57,-13.06,0.908
+25,1,9.065,-10.08,3.94,-13.34,-8.47,0.735
+30,1,9.064,-9.24,4.13,-11.61,-5.08,0.607
+40,1,9.062,-8.13,4.51,-9.11,-0.62,0.439
+50,1,9.061,-7.53,4.92,-7.42,2.01,0.34
+60,1,9.063,-7.32,5.37,-6.23,3.62,0.279
+70,1,9.072,-7.48,5.86,-5.32,4.62,0.224
+80,1,9.088,-7.85,6.4,-4.66,5.26,0.193
+90,1,9.11,-8.44,7,-4.14,5.65,0.172
+100,1,9.138,-9.22,7.66,-3.75,5.89,0.157
+110,1.4,9.17,-10.19,8.4,-3.43,6.03,0.146
+120,2,9.206,-11.34,9.24,-3.18,6.09,0.137
+130,2.7,9.247,-12.67,10.17,-2.97,6.11,0.131
+140,3.6,9.292,-14.2,11.23,-2.8,6.09,0.126
+150,4.8,9.343,-15.95,12.45,-2.65,6.05,0.122
+160,6.2,9.401,-17.95,13.84,-2.51,5.99,0.119
+170,7.9,9.466,-20.24,15.47,-2.37,5.92,0.116
+180,10,9.541,-22.88,17.38,-2.22,5.84,0.113
+190,12.5,9.627,-25.94,19.65,-2.04,5.76,0.11
+200,15.5,9.727,-29.53,22.38,-1.84,5.67,0.108
+210,19.1,9.842,-33.76,25.72,-1.59,5.59,0.105
+220,23.2,9.975,-38.83,29.85,-1.28,5.5,0.103
+230,28,10.13,-44.99,35.05,-0.88,5.41,0.1
+240,33.4,10.311,-52.62,41.73,-0.38,5.32,0.097
+250,39.7,10.523,-62.28,50.46,0.27,5.24,0.094
+260,46.9,10.775,-74.81,62.15,1.11,5.15,0.091
+270,55,11.075,-91.56,78.18,2.21,5.07,0.087
+280,64.1,11.438,-114.67,100.78,3.66,4.99,0.082
+290,74.4,11.885,-147.79,133.69,5.61,4.91,0.078
+300,85.8,12.449,-197.33,183.42,8.27,4.83,0.072
+0,200,8.95,-17.3,2.94,-28.78,-61.31,2.283
+10,200,8.919,-11.25,3.3,-18.46,-28.42,1.238
+20,200,8.939,-8.6,3.63,-13.12,-13.06,0.751
+25,200,8.949,-7.82,3.8,-11.36,-8.47,0.606
+30,200,8.956,-7.23,3.97,-9.97,-5.08,0.499
+40,200,8.964,-6.47,4.32,-7.94,-0.62,0.358
+50,200,8.968,-6.07,4.69,-6.54,2.01,0.274
+60,200,8.973,-5.97,5.1,-5.53,3.62,0.223
+70,200,8.983,-6.1,5.54,-4.79,4.62,0.193
+80,200,8.998,-6.47,6.02,-4.23,5.26,0.172
+90,200,9.019,-7.03,6.54,-3.81,5.65,0.159
+100,200,9.043,-7.76,7.12,-3.49,5.89,0.15
+110,200,9.072,-8.65,7.75,-3.25,6.03,0.144
+120,200,9.103,-9.69,8.45,-3.07,6.09,0.14
+130,200,9.137,-10.89,9.23,-2.94,6.11,0.138
+140,200,9.175,-12.25,10.09,-2.84,6.09,0.136
+150,200,9.217,-13.79,11.06,-2.77,6.05,0.135
+160,200,9.263,-15.52,12.15,-2.72,5.99,0.134
+170,200,9.315,-17.49,13.4,-2.68,5.92,0.134
+180,200,9.375,-19.71,14.83,-2.65,5.84,0.134
+190,200,9.442,-22.24,16.49,-2.61,5.76,0.134
+200,200,9.52,-25.14,18.44,-2.56,5.67,0.134
+210,200,9.609,-28.48,20.76,-2.48,5.59,0.134
+220,200,9.712,-32.36,23.58,-2.37,5.5,0.134
+230,200,9.831,-36.94,27.05,-2.2,5.41,0.134
+240,200,9.969,-42.42,31.4,-1.97,5.32,0.135
+250,200,10.128,-49.1,36.99,-1.64,5.24,0.135
+260,200,10.315,-57.45,44.35,-1.18,5.15,0.136
+270,200,10.535,-68.17,54.29,-0.52,5.07,0.136
+280,200,10.798,-82.47,68.16,0.41,4.99,0.137
+290,200,11.115,-102.37,88.26,1.74,4.91,0.139
+300,200,11.508,-131.58,118.71,3.66,4.83,0.141
+0,400,8.782,-12.51,2.91,-22.28,-61.31,1.835
+10,400,8.79,-8.16,3.21,-14.88,-28.42,0.987
+20,400,8.832,-6.38,3.51,-10.91,-13.06,0.593
+25,400,8.849,-5.88,3.66,-9.56,-8.47,0.476
+30,400,8.862,-5.5,3.82,-8.48,-5.08,0.389
+40,400,8.877,-5,4.14,-6.85,-0.62,0.276
+50,400,8.885,-4.76,4.49,-5.7,2.01,0.209
+60,400,8.892,-4.74,4.85,-4.85,3.62,0.167
+70,400,8.902,-4.84,5.25,-4.27,4.62,0.161
+80,400,8.917,-5.21,5.68,-3.82,5.26,0.151
+90,400,8.936,-5.74,6.15,-3.48,5.65,0.146
+100,400,8.959,-6.43,6.65,-3.23,5.89,0.143
+110,400,8.984,-7.26,7.2,-3.05,6.03,0.143
+120,400,9.011,-8.22,7.79,-2.93,6.09,0.143
+130,400,9.04,-9.31,8.44,-2.86,6.11,0.144
+140,400,9.072,-10.53,9.15,-2.83,6.09,0.146
+150,400,9.106,-11.9,9.93,-2.83,6.05,0.148
+160,400,9.143,-13.44,10.78,-2.86,5.99,0.15
+170,400,9.184,-15.15,11.73,-2.91,5.92,0.153
+180,400,9.231,-17.06,12.79,-2.97,5.84,0.155
+190,400,9.283,-19.21,13.98,-3.05,5.76,0.158
+200,400,9.342,-21.61,15.34,-3.13,5.67,0.162
+210,400,9.41,-24.32,16.89,-3.22,5.59,0.165
+220,400,9.487,-27.39,18.69,-3.31,5.5,0.169
+230,400,9.574,-30.88,20.81,-3.39,5.41,0.174
+240,400,9.673,-34.89,23.35,-3.46,5.32,0.179
+250,400,9.785,-39.52,26.43,-3.51,5.24,0.186
+260,400,9.912,-44.96,30.25,-3.54,5.15,0.194
+270,400,10.057,-51.42,35.1,-3.52,5.07,0.205
+280,400,10.223,-59.24,41.38,-3.43,4.99,0.218
+290,400,10.412,-68.9,49.75,-3.25,4.91,0.237
+300,400,10.629,-81.13,61.24,-2.92,4.83,0.262
+0,600,8.652,-8.7,2.85,-16.57,-61.31,1.387
+10,600,8.685,-5.65,3.12,-11.71,-28.42,0.737
+20,600,8.741,-4.54,3.4,-8.93,-13.06,0.436
+25,600,8.763,-4.24,3.54,-7.94,-8.47,0.346
+30,600,8.78,-4.02,3.68,-7.13,-5.08,0.28
+40,600,8.8,-3.72,3.98,-5.86,-0.62,0.194
+50,600,8.81,-3.59,4.3,-4.92,2.01,0.143
+60,600,8.819,-3.62,4.64,-4.2,3.62,0.112
+70,600,8.83,-3.71,5,-3.78,4.62,0.129
+80,600,8.844,-4.07,5.39,-3.42,5.26,0.13
+90,600,8.862,-4.59,5.81,-3.16,5.65,0.133
+100,600,8.883,-5.24,6.25,-2.98,5.89,0.137
+110,600,8.906,-6.02,6.73,-2.86,6.03,0.141
+120,600,8.93,-6.91,7.24,-2.79,6.09,0.146
+130,600,8.955,-7.92,7.79,-2.77,6.11,0.151
+140,600,8.982,-9.04,8.38,-2.79,6.09,0.156
+150,600,9.01,-10.29,9.01,-2.85,6.05,0.161
+160,600,9.04,-11.67,9.7,-2.94,5.99,0.166
+170,600,9.073,-13.21,10.43,-3.05,5.92,0.172
+180,600,9.11,-14.91,11.23,-3.19,5.84,0.177
+190,600,9.151,-16.8,12.11,-3.36,5.76,0.183
+200,600,9.197,-18.9,13.06,-3.55,5.67,0.19
+210,600,9.25,-21.24,14.12,-3.76,5.59,0.197
+220,600,9.309,-23.85,15.29,-4,5.5,0.205
+230,600,9.375,-26.78,16.62,-4.27,5.41,0.214
+240,600,9.45,-30.08,18.12,-4.57,5.32,0.224
+250,600,9.533,-33.82,19.85,-4.91,5.24,0.237
+260,600,9.627,-38.1,21.87,-5.3,5.15,0.253
+270,600,9.731,-43.03,24.28,-5.76,5.07,0.273
+280,600,9.847,-43.78,27.2,-6.31,4.99,0.299
+290,600,9.976,-55.57,30.82,-6.99,4.91,0.334
+300,600,10.12,-63.7,35.4,-7.87,4.83,0.382
+0,800,8.55,-5.76,2.78,-11.62,-61.31,0.939
+10,800,8.598,-3.66,3.02,-8.94,-28.42,0.487
+20,800,8.664,-3.02,3.28,-7.19,-13.06,0.278
+25,800,8.689,-2.87,3.42,-6.51,-8.47,0.216
+30,800,8.708,-2.76,3.55,-5.92,-5.08,0.171
+40,800,8.732,-2.61,3.83,-4.95,-0.62,0.112
+50,800,8.744,-2.55,4.13,-4.18,2.01,0.077
+60,800,8.753,-2.6,4.45,-3.57,3.62,0.056
+70,800,8.764,-2.7,4.78,-3.34,4.62,0.097
+80,800,8.778,-3.07,5.13,-3.07,5.26,0.109
+90,800,8.795,-3.57,5.51,-2.88,5.65,0.12
+100,800,8.814,-4.2,5.91,-2.76,5.89,0.13
+110,800,8.835,-4.93,6.33,-2.69,6.03,0.139
+120,800,8.857,-5.77,6.78,-2.66,6.09,0.149
+130,800,8.879,-6.71,7.25,-2.69,6.11,0.157
+140,800,8.902,-7.75,7.75,-2.75,6.09,0.166
+150,800,8.925,-8.9,8.27,-2.85,6.05,0.174
+160,800,8.95,-10.17,8.82,-2.98,5.99,0.182
+170,800,8.977,-11.57,9.41,-3.15,5.92,0.19
+180,800,9.006,-13.12,10.02,-3.35,5.84,0.199
+190,800,9.039,-14.83,10.67,-3.58,5.76,0.208
+200,800,9.076,-16.72,11.36,-3.85,5.67,0.218
+210,800,9.117,-18.82,12.09,-4.16,5.59,0.228
+220,800,9.163,-21.16,12.86,-4.51,5.5,0.24
+230,800,9.215,-23.77,13.69,-4.91,5.41,0.253
+240,800,9.273,-26.71,14.58,-5.38,5.32,0.269
+250,800,9.337,-30.03,15.54,-5.93,5.24,0.288
+260,800,9.409,-33.83,16.59,-6.59,5.15,0.312
+270,800,9.487,-38.23,17.75,-7.4,5.07,0.341
+280,800,9.574,-43.4,19.05,-8.41,4.99,0.38
+290,800,9.669,-49.58,20.52,-9.72,4.91,0.432
+300,800,9.772,-57.13,22.23,-11.47,4.83,0.503
+0,1000,8.472,-3.59,2.69,-7.38,-61.31,0.491
+10,1000,8.526,-2.12,2.92,-6.55,-28.42,0.237
+20,1000,8.599,-1.8,3.17,-5.66,-13.06,0.121
+25,1000,8.626,-1.75,3.3,-5.24,-8.47,0.086
+30,1000,8.646,-1.71,3.43,-4.83,-5.08,0.062
+40,1000,8.672,-1.64,3.7,-4.11,-0.62,0.03
+50,1000,8.685,-1.61,3.98,-3.49,2.01,0.011
+60,1000,8.694,-1.66,4.27,-2.97,3.62,0
+70,1000,8.704,-1.83,4.58,-2.96,4.62,0.066
+80,1000,8.718,-2.2,4.91,-2.78,5.26,0.088
+90,1000,8.734,-2.69,5.25,-2.66,5.65,0.107
+100,1000,8.752,-3.3,5.61,-2.58,5.89,0.123
+110,1000,8.771,-4,5.99,-2.55,6.03,0.138
+120,1000,8.791,-4.8,6.38,-2.57,6.09,0.151
+130,1000,8.81,-5.68,6.79,-2.63,6.11,0.164
+140,1000,8.83,-6.66,7.22,-2.73,6.09,0.176
+150,1000,8.85,-7.74,7.66,-2.86,6.05,0.187
+160,1000,8.871,-8.92,8.11,-3.03,5.99,0.198
+170,1000,8.892,-10.21,8.58,-3.24,5.92,0.209
+180,1000,8.916,-11.64,9.06,-3.48,5.84,0.221
+190,1000,8.942,-13.22,9.55,-3.77,5.76,0.233
+200,1000,8.972,-14.96,10.05,-4.09,5.67,0.245
+210,1000,9.004,-16.89,10.56,-4.47,5.59,0.259
+220,1000,9.041,-19.04,11.07,-4.9,5.5,0.275
+230,1000,9.082,-21.45,11.59,-5.4,5.41,0.293
+240,1000,9.128,-24.17,12.1,-5.99,5.32,0.314
+250,1000,9.179,-27.27,12.61,-6.69,5.24,0.339
+260,1000,9.235,-30.85,13.1,-7.53,5.15,0.37
+270,1000,9.296,-35.05,13.58,-8.59,5.07,0.41
+280,1000,9.363,-40.08,14.04,-9.92,4.99,0.461
+290,1000,9.436,-46.27,14.47,-11.67,4.91,0.529
+300,1000,9.515,-54.08,14.86,-14.04,4.83,0.624