1. PFLOTRAN
  2. code
  3. pflotran-dev

Commits

Glenn Hammond  committed 76034d3

Updated gold files for mixed_explicit tests to reflect solutions prior to PETSc changes in MatAdj

  • Participants
  • Parent commits 109da55
  • Branches default

Comments (0)

Files changed (2)

File regression_tests/default/discretization/mixed_explicit-np4.regression.gold

View file
  • Ignore whitespace
 -- PRESSURE: Liquid Pressure --
-      Max:   1.2336079647302E+05
-      Min:   8.4265105446952E+04
-     Mean:   1.0402429862075E+05
-        8:   1.1108755372434E+05
-       11:   8.8377152789007E+04
-        1:   8.4265105446952E+04
-        3:   8.7402814649208E+04
-        4:   8.7901848382129E+04
-       11:   8.8377152789007E+04
-        7:   1.1720005809917E+05
-       10:   1.1410031291485E+05
-        2:   9.5213155286807E+04
-       13:   1.1439419533096E+05
+      Max:   1.2247414020385E+05
+      Min:   8.3580926060960E+04
+     Mean:   1.0305891933359E+05
+        8:   1.1020542350383E+05
+       11:   8.7642140690427E+04
+        1:   8.3580926060960E+04
+        3:   8.6810649035506E+04
+        6:   8.7404485801837E+04
+        9:   1.0384240929712E+05
+        5:   1.1371916279650E+05
+       11:   8.7642140690427E+04
+        7:   1.1631786804849E+05
+       14:   1.1327104063169E+05
 -- SATURATION: Liquid Saturation --
       Max:   1.0000000000000E+00
-      Min:   8.6674262382294E-01
-     Mean:   9.7112958748318E-01
+      Min:   8.5775098205095E-01
+     Mean:   9.6737128704661E-01
         8:   1.0000000000000E+00
-       11:   9.3288154609168E-01
-        1:   8.6674262382294E-01
-        3:   9.1494872762301E-01
-        4:   9.2392211645446E-01
-       11:   9.3288154609168E-01
+       11:   9.1919907076047E-01
+        1:   8.5775098205095E-01
+        3:   9.0482827101018E-01
+        6:   9.1497807667873E-01
+        9:   1.0000000000000E+00
+        5:   1.0000000000000E+00
+       11:   9.1919907076047E-01
         7:   1.0000000000000E+00
-       10:   1.0000000000000E+00
-        2:   1.0000000000000E+00
-       13:   1.0000000000000E+00
+       14:   1.0000000000000E+00
 -- CONCENTRATION: Total Tracer --
-      Max:   6.0913976645452E-04
-      Min:   1.0000000000000E-10
-     Mean:   1.2481524188906E-04
-        8:   2.0952918104218E-04
-       11:   1.4447096577907E-04
-        1:   2.1330459406044E-07
-        3:   3.3881271834253E-06
-        4:   1.5863823113066E-05
-       11:   1.4447096577907E-04
-        7:   1.1318344566815E-05
-       10:   1.1965566861130E-05
-        2:   1.0000000000000E-10
-       13:   4.4221787273433E-04
+      Max:   6.0597592040167E-04
+      Min:   5.5424468285746E-08
+     Mean:   1.2306704236578E-04
+        8:   1.8328537057568E-04
+       11:   1.2249568728653E-04
+        1:   5.8400148490952E-07
+        3:   4.6568485903447E-06
+        6:   2.1051855278598E-05
+        9:   1.2822668555149E-04
+        5:   1.4944376990619E-04
+       11:   1.2249568728653E-04
+        7:   9.9670129575219E-06
+       14:   9.8465902540235E-05
 -- CONCENTRATION: Total Tracer2 --
-      Max:   3.7325891742121E-05
-      Min:   1.0000000000000E-10
-     Mean:   2.8439384077481E-06
-        8:   1.3966524840408E-07
-       11:   9.5442958532352E-09
-        1:   3.7325891742121E-05
-        3:   3.8851805527375E-06
-        4:   1.4371536553914E-09
-       11:   9.5442958532352E-09
-        7:   9.7735528122355E-08
-       10:   1.4489585895147E-07
-        2:   1.0000000000000E-10
-       13:   4.6182860446261E-08
+      Max:   3.2178611804028E-05
+      Min:   2.5784648569723E-08
+     Mean:   2.9784891911240E-06
+        8:   1.2698946862556E-07
+       11:   4.1688536196031E-08
+        1:   3.2178611804028E-05
+        3:   4.4908219779284E-06
+        6:   5.2716615421105E-07
+        9:   1.8695823257863E-07
+        5:   1.4459902247153E-07
+       11:   4.1688536196031E-08
+        7:   7.4438160167084E-08
+       14:   1.0610876529623E-07
 -- CONCENTRATION: Total Tracer3 --
-      Max:   1.0000041826058E-10
-      Min:   9.9999931391247E-11
-     Mean:   1.0000007514479E-10
-        8:   1.0000008168535E-10
-       11:   9.9999956703805E-11
-        1:   9.9999982664504E-11
-        3:   1.0000000494200E-10
-        4:   9.9999994512618E-11
-       11:   9.9999956703805E-11
-        7:   1.0000011822591E-10
-       10:   1.0000008624610E-10
-        2:   1.0000000000000E-10
-       13:   1.0000018336851E-10
+      Max:   1.0000038385279E-10
+      Min:   9.9999848942870E-11
+     Mean:   1.0000004967105E-10
+        8:   1.0000006909063E-10
+       11:   9.9999962942439E-11
+        1:   1.0000000535217E-10
+        3:   9.9999993602141E-11
+        6:   9.9999959241788E-11
+        9:   9.9999923700469E-11
+        5:   1.0000011832672E-10
+       11:   9.9999962942439E-11
+        7:   1.0000007099268E-10
+       14:   1.0000007282913E-10
 -- DISCRETE: Material ID --
       Max:         1
       Min:         1
        11:         1
         1:         1
         3:         1
-        4:         1
+        6:         1
+        9:         1
+        5:         1
        11:         1
         7:         1
-       10:         1
-        2:         1
-       13:         1
+       14:         1
 -- GENERIC: LIQUID VELOCITY [m/d] --
-        8:  -3.6277673347197E-05  1.6228945210845E-02  1.6309916107837E-02
-       11:   1.2552811397889E-02  5.7637873559455E-03  4.2830654506994E-02
-        1:   4.1789356310988E-03  4.1789356310988E-03  1.7907042022150E-03
-        3:   1.1637424454328E-02  5.1293179890119E-04  4.4422339927886E-03
-        4:   1.2552811397889E-02  1.2552811397889E-02  0.0000000000000E+00
-       11:   1.2552811397889E-02  5.7637873559455E-03  4.2830654506994E-02
-        7:   3.6458375817289E-05  2.8180805126236E-03  2.8991656718165E-03
-       10:  -2.2814756916052E-04 -3.4713042252918E-04  1.1487365010727E-02
-        2:   0.0000000000000E+00  0.0000000000000E+00  0.0000000000000E+00
-       13:   4.6070629852084E-03  3.3890021767681E-02  1.5499069897973E-02
+        8:  -3.2917871512987E-05  1.4745180370729E-02  1.4818696307849E-02
+       11:   6.9021938629307E-03  4.3875417077158E-03  3.8399793935169E-02
+        1:   7.2910684350055E-03  7.2910684350055E-03 -7.6177357766778E-04
+        3:   1.0661424817473E-02  8.2375037588233E-03  8.4182382720903E-03
+        6:   1.2850722288268E-02  1.1485882187324E-03  3.5965238949959E-02
+        9:  -5.3111699787815E-03  1.3143026170755E-02  3.0787927515329E-02
+        5:   1.8764179108331E-02  1.8764179108331E-02  3.7527468879249E-02
+       11:   6.9021938629307E-03  4.3875417077158E-03  3.8399793935169E-02
+        7:   3.3131186459437E-05  2.5605382311409E-03  2.6341799829924E-03
+       14:  -9.6255437212893E-08  1.3818083607271E-02  1.1492373836867E-02
 -- SOLUTION: Flow --
-   Time (seconds):   7.0687580108643E-01
-   Time Steps:           28
-   Newton Iterations:           88
-   Solver Iterations:          566
+   Time (seconds):   7.4142408370972E-01
+   Time Steps:           26
+   Newton Iterations:           78
+   Solver Iterations:          594
    Time Step Cuts:            0
-   Solution 2-Norm:   4.0616366923992E+05
-   Residual 2-Norm:   8.6607329092849E-18
+   Solution 2-Norm:   4.0243954058960E+05
+   Residual 2-Norm:   2.9791558413685E-16
 -- SOLUTION: Transport --
-   Time (seconds):   1.1223077774048E-01
-   Time Steps:           28
+   Time (seconds):   1.2504410743713E-01
+   Time Steps:           26
    Newton Iterations:           36
-   Solver Iterations:           61
+   Solver Iterations:           59
    Time Step Cuts:            0
-   Solution 2-Norm:   8.2588412931524E-04
-   Residual 2-Norm:   1.3121252838103E-15
+   Solution 2-Norm:   8.0416584263179E-04
+   Residual 2-Norm:   7.3419435739463E-20

File regression_tests/default/discretization/mixed_explicit.regression.gold

View file
  • Ignore whitespace
 -- PRESSURE: Liquid Pressure --
-      Max:   1.2393180168717E+05
-      Min:   8.4760042962527E+04
-     Mean:   1.0446369474272E+05
-        8:   1.1165450951130E+05
-       11:   8.8698706295254E+04
-        1:   8.4760042962527E+04
-        8:   1.1165450951130E+05
+      Max:   1.2304575409372E+05
+      Min:   8.4034692419147E+04
+     Mean:   1.0352745394746E+05
+        8:   1.1077272892711E+05
+       11:   8.7967219697710E+04
+        1:   8.4034692419147E+04
+        8:   1.1077272892711E+05
 -- SATURATION: Liquid Saturation --
       Max:   1.0000000000000E+00
-      Min:   8.7354470074010E-01
-     Mean:   9.7357996047599E-01
+      Min:   8.6366290234847E-01
+     Mean:   9.6958185371118E-01
         8:   1.0000000000000E+00
-       11:   9.3918892403292E-01
-        1:   8.7354470074010E-01
+       11:   9.2512970193340E-01
+        1:   8.6366290234847E-01
         8:   1.0000000000000E+00
 -- CONCENTRATION: Total Tracer --
-      Max:   4.2995764100109E-04
-      Min:   1.0000000000000E-10
-     Mean:   5.1682768176870E-05
-        8:   4.0580705820323E-05
-       11:   8.8897354521581E-05
-        1:   3.2488598310835E-08
-        8:   4.0580705820323E-05
+      Max:   4.3008383486629E-04
+      Min:   1.6894551368396E-08
+     Mean:   5.0256820300580E-05
+        8:   2.4009659243615E-05
+       11:   7.5549363182117E-05
+        1:   1.9255753484671E-07
+        8:   2.4009659243615E-05
 -- CONCENTRATION: Total Tracer2 --
-      Max:   3.7077410899838E-05
-      Min:   1.0000000000000E-10
-     Mean:   2.8157037225105E-06
-        8:   1.1221301377626E-07
-       11:   1.3273959184471E-08
-        1:   3.7077410899838E-05
-        8:   1.1221301377626E-07
+      Max:   3.2131911576002E-05
+      Min:   1.9506395036534E-08
+     Mean:   2.9519802577721E-06
+        8:   9.4517916458629E-08
+       11:   4.6025065279227E-08
+        1:   3.2131911576002E-05
+        8:   9.4517916458629E-08
 -- CONCENTRATION: Total Tracer3 --
-      Max:   7.2426922550974E-04
-      Min:   1.0000000000000E-10
-     Mean:   1.8968076034850E-04
-        8:   5.4054848597026E-04
-       11:   6.6045755942834E-05
-        1:   1.0993098988051E-06
-        8:   5.4054848597026E-04
+      Max:   7.8003619945479E-04
+      Min:   1.5695002212137E-07
+     Mean:   1.9566082832057E-04
+        8:   5.5233241421254E-04
+       11:   5.1505456629446E-05
+        1:   1.6357222777360E-06
+        8:   5.5233241421254E-04
 -- DISCRETE: Material ID --
       Max:         1
       Min:         1
         1:         1
         8:         1
 -- GENERIC: LIQUID VELOCITY [m/d] --
-        8:  -3.9476847253297E-05  1.7553916446328E-02  1.7642010580470E-02
-       11:   1.2918992137398E-02  4.0608390953689E-03  4.1800151796259E-02
-        1:   4.2691289586477E-03  4.2691289586477E-03  1.8339677936064E-03
-        8:  -3.9476847253297E-05  1.7553916446328E-02  1.7642010580470E-02
+        8:  -3.6292679366878E-05  1.6155842818365E-02  1.6236873271712E-02
+       11:   6.7653947957210E-03  3.0166362083793E-03  3.7398758617124E-02
+        1:   6.8699299719082E-03  6.8699299719082E-03 -4.7750491643731E-04
+        8:  -3.6292679366878E-05  1.6155842818365E-02  1.6236873271712E-02
 -- SOLUTION: Flow --
-   Time (seconds):   1.6896629333496E-01
-   Time Steps:           28
-   Newton Iterations:           87
-   Solver Iterations:          315
+   Time (seconds):   1.9875073432922E-01
+   Time Steps:           26
+   Newton Iterations:           79
+   Solver Iterations:          370
    Time Step Cuts:            0
-   Solution 2-Norm:   4.0787896791378E+05
-   Residual 2-Norm:   8.0236111474624E-18
+   Solution 2-Norm:   4.0426023005388E+05
+   Residual 2-Norm:   8.3508072638124E-17
 -- SOLUTION: Transport --
-   Time (seconds):   4.4517040252686E-02
-   Time Steps:           28
-   Newton Iterations:           29
-   Solver Iterations:           29
+   Time (seconds):   5.2684545516968E-02
+   Time Steps:           26
+   Newton Iterations:           27
+   Solver Iterations:           27
    Time Step Cuts:            0
-   Solution 2-Norm:   1.1999467741650E-03
-   Residual 2-Norm:   1.2002462458594E-17
+   Solution 2-Norm:   1.2407337203398E-03
+   Residual 2-Norm:   2.3583889175285E-17