diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
index 5906070c02b7ad4b87f5e34c369730e6966dd3b4..a2a22e7b790c72f3cbcdaa8b1d9c1ca5945bae73 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d.prj
@@ -108,7 +108,7 @@
<processes>
<!-- convergence criterion for hydraulic equation -->
<process ref="hc">
- <nonlinear_solver>basic_picard</nonlinear_solver>
+ <nonlinear_solver>basic</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
<norm_type>NORM2</norm_type>
@@ -131,7 +131,7 @@
</process>
<!-- convergence criterion for component transport equation (Cs) -->
<process ref="hc">
- <nonlinear_solver>basic_picard</nonlinear_solver>
+ <nonlinear_solver>basic</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
<norm_type>NORM2</norm_type>
@@ -268,7 +268,7 @@
</process_variables>
<nonlinear_solvers>
<nonlinear_solver>
- <name>basic_picard</name>
+ <name>basic</name>
<type>Newton</type>
<max_iter>10</max_iter>
<linear_solver>general_linear_solver</linear_solver>
@@ -312,7 +312,7 @@
</vtkdiff>
<vtkdiff>
<regex>ConTracer_1d_ts_[0-9]*_t_[0-9]*.000000.vtu</regex>
- <field>MolarFlowRate</field>
+ <field>CsFlowRate</field>
<absolute_tolerance>1e-10</absolute_tolerance>
<relative_tolerance>1e-16</relative_tolerance>
</vtkdiff>
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_132_t_475200.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_132_t_475200.000000.vtu
index ef01f947dcc1a5ee8a6ca64ce152bc5820e080cd..5f3aeb7aac8f119ded683f92ef76e97f2585cc1a 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_132_t_475200.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_132_t_475200.000000.vtu
@@ -7,7 +7,7 @@
<Piece NumberOfPoints="95" NumberOfCells="94" >
<PointData>
<DataArray type="Float64" Name="Cs" format="appended" RangeMin="0" RangeMax="0.0016952074579" offset="84" />
- <DataArray type="Float64" Name="MolarFlowRate" format="appended" RangeMin="-7.5395603657e-07" RangeMax="7.4327141122e-20" offset="1156" />
+ <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-7.5395603657e-07" RangeMax="7.4327141122e-20" offset="1156" />
<DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06" RangeMax="6.5509300003e-06" offset="1512" />
<DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-2.9378619751e-10" RangeMax="1.1053831544e-08" offset="2064" />
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810" RangeMax="9813.0789371" offset="3136" />
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_165_t_594000.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_165_t_594000.000000.vtu
index 0be79b8b40bfbae91762e3df2306d830ae53b639..f642644e5a68e2e231b4097bbfbabacfb45cfef6 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_165_t_594000.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_165_t_594000.000000.vtu
@@ -7,7 +7,7 @@
<Piece NumberOfPoints="95" NumberOfCells="94" >
<PointData>
<DataArray type="Float64" Name="Cs" format="appended" RangeMin="0" RangeMax="0.0006181961386" offset="84" />
- <DataArray type="Float64" Name="MolarFlowRate" format="appended" RangeMin="-2.7362690253e-07" RangeMax="2.9857911391e-20" offset="1156" />
+ <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-2.7362690253e-07" RangeMax="2.9857911391e-20" offset="1156" />
<DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06" RangeMax="6.5509300003e-06" offset="1536" />
<DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-1.0662147579e-10" RangeMax="4.0309688576e-09" offset="2092" />
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810" RangeMax="9813.0789371" offset="3164" />
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_198_t_712800.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_198_t_712800.000000.vtu
index 4cfd35eeea380f4e8e706bab8f6657f08af3c852..f3c02c9ff49c3c9a45284cfb3793732991df8a3a 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_198_t_712800.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_198_t_712800.000000.vtu
@@ -7,7 +7,7 @@
<Piece NumberOfPoints="95" NumberOfCells="94" >
<PointData>
<DataArray type="Float64" Name="Cs" format="appended" RangeMin="0" RangeMax="0.00022510165765" offset="84" />
- <DataArray type="Float64" Name="MolarFlowRate" format="appended" RangeMin="-9.9557591071e-08" RangeMax="6.5909751208e-21" offset="1156" />
+ <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-9.9557591071e-08" RangeMax="6.5909751208e-21" offset="1156" />
<DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06" RangeMax="6.5509300003e-06" offset="1532" />
<DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-3.879362475e-11" RangeMax="1.467779272e-09" offset="2084" />
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810" RangeMax="9813.0789371" offset="3156" />
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_231_t_831600.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_231_t_831600.000000.vtu
index a84742d8981c30e2cdf17b6bd5bfcef65b3e11ce..6f84e64fd556d94f59d8176283bc3ae5f669573b 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_231_t_831600.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_231_t_831600.000000.vtu
@@ -7,7 +7,7 @@
<Piece NumberOfPoints="95" NumberOfCells="94" >
<PointData>
<DataArray type="Float64" Name="Cs" format="appended" RangeMin="0" RangeMax="8.1945746162e-05" offset="84" />
- <DataArray type="Float64" Name="MolarFlowRate" format="appended" RangeMin="-3.623830446e-08" RangeMax="2.5146290622e-21" offset="1156" />
+ <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-3.623830446e-08" RangeMax="2.5146290622e-21" offset="1156" />
<DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06" RangeMax="6.5509300003e-06" offset="1528" />
<DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-1.4120623192e-11" RangeMax="5.3432844507e-10" offset="2084" />
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810" RangeMax="9813.0789371" offset="3156" />
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_264_t_950400.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_264_t_950400.000000.vtu
index a2dab356a5c87352c4225073279c328fe6c96cb7..4278274efeef1d1f41dbdda5a2e6cf7b16033e7d 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_264_t_950400.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_264_t_950400.000000.vtu
@@ -7,7 +7,7 @@
<Piece NumberOfPoints="95" NumberOfCells="94" >
<PointData>
<DataArray type="Float64" Name="Cs" format="appended" RangeMin="0" RangeMax="2.9830276923e-05" offset="84" />
- <DataArray type="Float64" Name="MolarFlowRate" format="appended" RangeMin="-1.319137327e-08" RangeMax="1.2291903903e-21" offset="1156" />
+ <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-1.319137327e-08" RangeMax="1.2291903903e-21" offset="1156" />
<DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06" RangeMax="6.5509300003e-06" offset="1544" />
<DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-5.1401525281e-12" RangeMax="1.945087474e-10" offset="2096" />
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810" RangeMax="9813.0789371" offset="3168" />
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_297_t_1069200.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_297_t_1069200.000000.vtu
index 1d9ea6a9e88303bd345ff7106e589de57d01c06b..247cb9025f590c8bb2e8f35f075cb79ab12c9c8a 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_297_t_1069200.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_297_t_1069200.000000.vtu
@@ -7,7 +7,7 @@
<Piece NumberOfPoints="95" NumberOfCells="94" >
<PointData>
<DataArray type="Float64" Name="Cs" format="appended" RangeMin="0" RangeMax="1.0858890242e-05" offset="84" />
- <DataArray type="Float64" Name="MolarFlowRate" format="appended" RangeMin="-4.8019403654e-09" RangeMax="4.5164061445e-22" offset="1156" />
+ <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-4.8019403654e-09" RangeMax="4.5164061445e-22" offset="1156" />
<DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06" RangeMax="6.5509300003e-06" offset="1548" />
<DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-1.8711248195e-12" RangeMax="7.0805548412e-11" offset="2104" />
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810" RangeMax="9813.0789371" offset="3176" />
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_329_t_1184400.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_329_t_1184400.000000.vtu
index 404b31e21189ce85b4bc63977fdae63b01517954..a77b70fd4be2733536a622a96352d21861c7b6af 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_329_t_1184400.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_329_t_1184400.000000.vtu
@@ -7,7 +7,7 @@
<Piece NumberOfPoints="95" NumberOfCells="94" >
<PointData>
<DataArray type="Float64" Name="Cs" format="appended" RangeMin="0" RangeMax="4.0757949483e-06" offset="84" />
- <DataArray type="Float64" Name="MolarFlowRate" format="appended" RangeMin="-1.8023678075e-09" RangeMax="1.2407709188e-22" offset="1156" />
+ <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-1.8023678075e-09" RangeMax="1.2407709188e-22" offset="1156" />
<DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06" RangeMax="6.5509300003e-06" offset="1544" />
<DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-7.0231091649e-13" RangeMax="2.657627894e-11" offset="2100" />
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810" RangeMax="9813.0789371" offset="3172" />
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_33_t_118800.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_33_t_118800.000000.vtu
index f3bedf263e023c2c6acbf99fd521639ae2a93ef9..990309fc12be6779a2f50bd72e4e748d6e68ddeb 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_33_t_118800.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_33_t_118800.000000.vtu
@@ -7,7 +7,7 @@
<Piece NumberOfPoints="95" NumberOfCells="94" >
<PointData>
<DataArray type="Float64" Name="Cs" format="appended" RangeMin="0" RangeMax="0.019872219069" offset="84" />
- <DataArray type="Float64" Name="MolarFlowRate" format="appended" RangeMin="-3.0510869208e-05" RangeMax="8.1315162936e-19" offset="1148" />
+ <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-3.0510869208e-05" RangeMax="8.1315162936e-19" offset="1148" />
<DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06" RangeMax="6.5509300003e-06" offset="1576" />
<DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-1.1886071819e-08" RangeMax="1.3169399861e-07" offset="2132" />
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810" RangeMax="9813.0789371" offset="3204" />
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_66_t_237600.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_66_t_237600.000000.vtu
index 4af68c286c76bb05de466679d081f89fbb13f502..fa7f469b8f6af5a0b1e09dacf6270f1908fb3de2 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_66_t_237600.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_66_t_237600.000000.vtu
@@ -7,7 +7,7 @@
<Piece NumberOfPoints="95" NumberOfCells="94" >
<PointData>
<DataArray type="Float64" Name="Cs" format="appended" RangeMin="0" RangeMax="0.011771181282" offset="84" />
- <DataArray type="Float64" Name="MolarFlowRate" format="appended" RangeMin="-6.4634665781e-06" RangeMax="4.3368086899e-19" offset="1152" />
+ <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-6.4634665781e-06" RangeMax="4.3368086899e-19" offset="1152" />
<DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06" RangeMax="6.5509300003e-06" offset="1552" />
<DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-2.5184294297e-09" RangeMax="7.6814002898e-08" offset="2104" />
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810" RangeMax="9813.0789371" offset="3176" />
diff --git a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_99_t_356400.000000.vtu b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_99_t_356400.000000.vtu
index ac95e3b0d2ae3e34f8f52679b829fb756d1b8957..88d979eb8ac236670d4f993be681b64d5558e345 100644
--- a/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_99_t_356400.000000.vtu
+++ b/Tests/Data/Parabolic/ComponentTransport/ConTracer/ConTracer_1d_ts_99_t_356400.000000.vtu
@@ -7,7 +7,7 @@
<Piece NumberOfPoints="95" NumberOfCells="94" >
<PointData>
<DataArray type="Float64" Name="Cs" format="appended" RangeMin="0" RangeMax="0.0046051699035" offset="84" />
- <DataArray type="Float64" Name="MolarFlowRate" format="appended" RangeMin="-2.1100816265e-06" RangeMax="1.5839516114e-19" offset="1156" />
+ <DataArray type="Float64" Name="CsFlowRate" format="appended" RangeMin="-2.1100816265e-06" RangeMax="1.5839516114e-19" offset="1156" />
<DataArray type="Float64" Name="darcy_velocity" format="appended" RangeMin="6.5509299998e-06" RangeMax="6.5509300003e-06" offset="1548" />
<DataArray type="Float64" Name="molar_flux" format="appended" RangeMin="-8.2220743365e-10" RangeMax="3.0031610414e-08" offset="2104" />
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="9810" RangeMax="9813.0789371" offset="3176" />