Skip to content
Snippets Groups Projects
  • Bernd Flemisch's avatar
    cd8191fb
    harmonize phase names · cd8191fb
    Bernd Flemisch authored and Kilian Weishaupt's avatar Kilian Weishaupt committed
    Implement decision made in !1137:
    - 1p gas: `gas`
    - 1p liquid: `liq`
    - 2p gas/liquid: `gas` and `liq`
    - 2p liquid/liquid: `aq` and `napl`
    - 3p: `gas`, `aq` and `napl`
    - solid: `s`
    
    Add `IsAqueous` to components to detect if a component is aqueous or not.
    Adapt reference solutions.
    Adjust `primaryVariableName` only where necessary to make the tests pass.
    Will be treated in general in !1212.
    cd8191fb
    History
    harmonize phase names
    Bernd Flemisch authored and Kilian Weishaupt's avatar Kilian Weishaupt committed
    Implement decision made in !1137:
    - 1p gas: `gas`
    - 1p liquid: `liq`
    - 2p gas/liquid: `gas` and `liq`
    - 2p liquid/liquid: `aq` and `napl`
    - 3p: `gas`, `aq` and `napl`
    - solid: `s`
    
    Add `IsAqueous` to components to detect if a component is aqueous or not.
    Adapt reference solutions.
    Adjust `primaryVariableName` only where necessary to make the tests pass.
    Will be treated in general in !1212.
2cnistokes2p2cni-ff-reference.vtu 11.47 KiB
<?xml version="1.0"?>
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
  <UnstructuredGrid>
    <Piece NumberOfCells="48" NumberOfPoints="63">
      <PointData Scalars="T" Vectors="v">
        <DataArray type="Float32" Name="T" NumberOfComponents="1" format="ascii">
          296.984 296.98 298.15 298.145 296.98 298.141 296.983 298.136 296.987 298.132 296.992 298.127
          297.002 298.124 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
          298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
          298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
          298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15 298.15
          298.15 298.15 298.15
        </DataArray>
        <DataArray type="Float32" Name="pg" NumberOfComponents="1" format="ascii">
          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
          100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000 100000
          100000 100000 100000
        </DataArray>
        <DataArray type="Float32" Name="delP" NumberOfComponents="1" format="ascii">
          0.0020393 0.00171177 0.0020294 0.00170187 0.00136737 0.00136179 0.00102534 0.00102286 0.000683545 0.000681516 0.000341781 0.000340884
          0 0 0.00204997 0.00170768 0.00136632 0.00102487 0.000683292 0.000341641 0 0.00204527 0.00170353 0.0013633
          0.00102245 0.000681706 0.000340823 0 0.00205014 0.00170815 0.00136656 0.00102482 0.000683241 0.000341611 0 0.0020472
          0.00170516 0.0013642 0.0010229 0.000681996 0.000340998 0 0.00204965 0.00170778 0.00136622 0.0010245 0.000683015 0.00034151
          0 0.00204753 0.00170585 0.00136463 0.00102326 0.000682204 0.000341101 0 0.00204834 0.00170667 0.00136529 0.00102376
          0.000682533 0.000341262 0
        </DataArray>
        <DataArray type="Float32" Name="x^H2O_gas" NumberOfComponents="1" format="ascii">
          0.0295603 0.0295517 0.0127981 0.0128639 0.0295518 0.0129291 0.0295586 0.0129942 0.0295655 0.0130591 0.0295729 0.0131238
          0.0295911 0.0131558 0.0127981 0.0127981 0.0127982 0.0127984 0.0127986 0.0127989 0.0127989 0.0127981 0.0127981 0.0127981
          0.0127981 0.0127981 0.0127981 0.012798 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981
          0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981 0.0127981
          0.0127982 0.0127981 0.0127981 0.0127982 0.0127984 0.0127986 0.0127987 0.0127989 0.0127981 0.0128152 0.0128285 0.0128378
          0.0128431 0.0128448 0.0127981
        </DataArray>
        <DataArray type="Float32" Name="X^H2O_gas" NumberOfComponents="1" format="ascii">
          0.0185964 0.0185909 0.008 0.00804133 0.018591 0.00808232 0.0185953 0.0081232 0.0185997 0.00816399 0.0186044 0.00820464
          0.018616 0.00822477 0.008 0.00800003 0.0080001 0.0080002 0.00800034 0.0080005 0.00800051 0.008 0.008 0.008
          0.008 0.008 0.008 0.00799996 0.008 0.008 0.008 0.008 0.008 0.008 0.00800002 0.008
          0.008 0.008 0.008 0.008 0.008 0.00800005 0.008 0.008 0.008 0.008 0.008 0.008
          0.00800007 0.008 0.00800004 0.00800011 0.00800021 0.00800032 0.00800041 0.00800052 0.008 0.00801073 0.00801909 0.00802495
          0.00802827 0.00802937 0.008
        </DataArray>
        <DataArray type="Float32" Name="x^Air_gas" NumberOfComponents="1" format="ascii">
          0.97044 0.970448 0.987202 0.987136 0.970448 0.987071 0.970441 0.987006 0.970434 0.986941 0.970427 0.986876
          0.970409 0.986844 0.987202 0.987202 0.987202 0.987202 0.987201 0.987201 0.987201 0.987202 0.987202 0.987202
          0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202
          0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202 0.987202
          0.987202 0.987202 0.987202 0.987202 0.987202 0.987201 0.987201 0.987201 0.987202 0.987185 0.987172 0.987162
          0.987157 0.987155 0.987202
        </DataArray>
        <DataArray type="Float32" Name="X^Air_gas" NumberOfComponents="1" format="ascii">
          0.981404 0.981409 0.992 0.991959 0.981409 0.991918 0.981405 0.991877 0.9814 0.991836 0.981396 0.991795
          0.981384 0.991775 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992
          0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992
          0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.992
          0.992 0.992 0.992 0.992 0.992 0.992 0.992 0.991999 0.992 0.991989 0.991981 0.991975
          0.991972 0.991971 0.992
        </DataArray>
        <DataArray type="Float32" Name="h" NumberOfComponents="1" format="ascii">
          69840.3 69821.7 44886.1 44983.4 69822 45080 69836.6 45176.3 69851.6 45272.4 69867.4 45368.2
          69906.8 45415.1 44886.1 44886.2 44886.3 44886.6 44886.9 44887.3 44887 44886.1 44886.1 44886.1
          44886.1 44886.1 44886.1 44885.9 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1 44886.2 44886.1
          44886.1 44886.1 44886.1 44886.1 44886.1 44886.4 44886.1 44886.1 44886.1 44886.1 44886.1 44886.1
          44886.5 44886.1 44886.2 44886.4 44886.6 44886.9 44887.1 44887.7 44886.1 44912.6 44933.3 44947.7
          44955.9 44958.6 44886.1
        </DataArray>
        <DataArray type="Float32" Name="rho" NumberOfComponents="1" format="ascii">
          1.15975 1.15977 1.16259 1.16258 1.15977 1.16257 1.15975 1.16255 1.15973 1.16254 1.15971 1.16253
          1.15967 1.16253 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259
          1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259
          1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259
          1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16259 1.16258 1.16257 1.16257
          1.16257 1.16257 1.16259
        </DataArray>
        <DataArray type="Float32" Name="mu" NumberOfComponents="1" format="ascii">
          1.79151e-05 1.7915e-05 1.81222e-05 1.81214e-05 1.7915e-05 1.81206e-05 1.79151e-05 1.81198e-05 1.79152e-05 1.8119e-05 1.79153e-05 1.81182e-05
          1.79157e-05 1.81178e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05
          1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05
          1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05
          1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81222e-05 1.81221e-05 1.8122e-05 1.81219e-05
          1.81218e-05 1.81218e-05 1.81222e-05
        </DataArray>
        <DataArray type="Float32" Name="v" NumberOfComponents="3" format="ascii">
          0.000887474 2.76339e-05 0 0.000890231 2.79241e-05 0 0.809861 0 0 0.811097 -0.000123193 0
          0.000893233 2.77062e-05 0 0.812565 -5.33404e-05 0 0.000893306 2.75732e-05 0 0.812863 1.08922e-05 0
          0.000893703 2.74848e-05 0 0.813108 1.49655e-05 0 0.000893724 2.74576e-05 0 0.813137 2.59821e-05 0
          0.000894115 2.71149e-05 0 0.813199 2.37812e-05 0 1.82383 0 0 1.8242 -0.00121824 0
          1.82497 -0.00067943 0 1.82548 -0.000171093 0 1.82577 -0.000111416 0 1.8259 -2.29404e-05 0
          1.82599 8.77861e-06 0 2.89743 0 0 2.89722 -0.000978873 0 2.89712 -0.000901782 0
          2.89739 -0.000477259 0 2.89759 -0.000247782 0 2.89772 -0.000110909 0 2.89779 -1.87226e-05 0
          3.50134 0 0 3.50116 -0.000906573 0 3.50082 -0.000906769 0 3.50064 -0.000634212 0
          3.50055 -0.000379795 0 3.50053 -0.000194965 0 3.50051 -3.85817e-05 0 2.89743 0 0
          2.89717 -0.000217599 0 2.89671 -0.000302776 0 2.89638 -0.000239358 0 2.89613 -0.000148648 0
          2.89603 -8.02158e-05 0 2.89595 -2.28829e-05 0 1.82383 0 0 1.82369 -0.000114409 0
          1.82341 -0.000124462 0 1.82317 -0.000107784 0 1.82297 -6.69901e-05 0 1.82288 -3.51844e-05 0
          1.82282 -5.47424e-06 0 0.809861 0 0 0.809783 0.000127831 0 0.809652 8.06325e-05 0
          0.809537 6.36733e-05 0 0.809436 4.16667e-05 0 0.809397 2.08893e-05 0 0.809364 6.70377e-07 0
          0.00134 0 0 0.00134 0 0 0.00134 -6.01355e-35 0 0.00134 0 0
          0.00134 0 0 0.00134 0 0 0.00134 0 0
        </DataArray>
      </PointData>
      <Points>
        <DataArray type="Float32" Name="Coordinates" NumberOfComponents="3" format="ascii">
          0 0.25 0 0.0416667 0.25 0 0 0.265385 0 0.0416667 0.265385 0
          0.0833333 0.25 0 0.0833333 0.265385 0 0.125 0.25 0 0.125 0.265385 0
          0.166667 0.25 0 0.166667 0.265385 0 0.208333 0.25 0 0.208333 0.265385 0
          0.25 0.25 0 0.25 0.265385 0 0 0.288462 0 0.0416667 0.288462 0
          0.0833333 0.288462 0 0.125 0.288462 0 0.166667 0.288462 0 0.208333 0.288462 0
          0.25 0.288462 0 0 0.323077 0 0.0416667 0.323077 0 0.0833333 0.323077 0
          0.125 0.323077 0 0.166667 0.323077 0 0.208333 0.323077 0 0.25 0.323077 0
          0 0.375 0 0.0416667 0.375 0 0.0833333 0.375 0 0.125 0.375 0
          0.166667 0.375 0 0.208333 0.375 0 0.25 0.375 0 0 0.426923 0
          0.0416667 0.426923 0 0.0833333 0.426923 0 0.125 0.426923 0 0.166667 0.426923 0
          0.208333 0.426923 0 0.25 0.426923 0 0 0.461538 0 0.0416667 0.461538 0
          0.0833333 0.461538 0 0.125 0.461538 0 0.166667 0.461538 0 0.208333 0.461538 0
          0.25 0.461538 0 0 0.484615 0 0.0416667 0.484615 0 0.0833333 0.484615 0
          0.125 0.484615 0 0.166667 0.484615 0 0.208333 0.484615 0 0.25 0.484615 0
          0 0.5 0 0.0416667 0.5 0 0.0833333 0.5 0 0.125 0.5 0
          0.166667 0.5 0 0.208333 0.5 0 0.25 0.5 0
        </DataArray>
      </Points>
      <Cells>
        <DataArray type="Int32" Name="connectivity" NumberOfComponents="1" format="ascii">
          0 1 3 2 1 4 5 3 4 6 7 5
          6 8 9 7 8 10 11 9 10 12 13 11
          2 3 15 14 3 5 16 15 5 7 17 16
          7 9 18 17 9 11 19 18 11 13 20 19
          14 15 22 21 15 16 23 22 16 17 24 23
          17 18 25 24 18 19 26 25 19 20 27 26
          21 22 29 28 22 23 30 29 23 24 31 30
          24 25 32 31 25 26 33 32 26 27 34 33
          28 29 36 35 29 30 37 36 30 31 38 37
          31 32 39 38 32 33 40 39 33 34 41 40
          35 36 43 42 36 37 44 43 37 38 45 44
          38 39 46 45 39 40 47 46 40 41 48 47
          42 43 50 49 43 44 51 50 44 45 52 51
          45 46 53 52 46 47 54 53 47 48 55 54
          49 50 57 56 50 51 58 57 51 52 59 58
          52 53 60 59 53 54 61 60 54 55 62 61
        </DataArray>
        <DataArray type="Int32" Name="offsets" NumberOfComponents="1" format="ascii">
          4 8 12 16 20 24 28 32 36 40 44 48
          52 56 60 64 68 72 76 80 84 88 92 96
          100 104 108 112 116 120 124 128 132 136 140 144
          148 152 156 160 164 168 172 176 180 184 188 192
        </DataArray>
        <DataArray type="UInt8" Name="types" NumberOfComponents="1" format="ascii">
          9 9 9 9 9 9 9 9 9 9 9 9
          9 9 9 9 9 9 9 9 9 9 9 9
          9 9 9 9 9 9 9 9 9 9 9 9
          9 9 9 9 9 9 9 9 9 9 9 9
        </DataArray>
      </Cells>
    </Piece>
  </UnstructuredGrid>
</VTKFile>