From 300c538126b2a23ee33cdcab75d7f29edbadf53c Mon Sep 17 00:00:00 2001 From: Thomas Fischer <thomas.fischer@ufz.de> Date: Wed, 28 Oct 2020 19:50:54 +0100 Subject: [PATCH] [T/RichardsComponentTransport] Rm '_pcs_{:process_id}' pattern. --- .../Padilla/Padilla_NaCl1/Padilla_NaCl1.prj | 6 +++--- .../Padilla/Padilla_NaCl1/Padilla_NaCl1_quadratic.prj | 6 +++--- .../RichardsComponentTransport/Padilla/Padilla_state.pvsm | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.prj b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.prj index cfff09b8409..1f0bd189dc6 100644 --- a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.prj +++ b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1.prj @@ -97,7 +97,7 @@ </processes> <output> <type>VTK</type> - <prefix>Padilla_NaCl1_pcs_{:process_id}</prefix> + <prefix>Padilla_NaCl1</prefix> <timesteps> <pair> <repeat>1</repeat> @@ -263,13 +263,13 @@ </linear_solvers> <test_definition> <vtkdiff> - <regex>Padilla_NaCl1_pcs_0_ts_.*.vtu</regex> + <regex>Padilla_NaCl1_ts_.*.vtu</regex> <field>concentration</field> <absolute_tolerance>1e-12</absolute_tolerance> <relative_tolerance>0</relative_tolerance> </vtkdiff> <vtkdiff> - <regex>Padilla_NaCl1_pcs_0_ts_.*.vtu</regex> + <regex>Padilla_NaCl1_ts_.*.vtu</regex> <field>pressure</field> <absolute_tolerance>1e-10</absolute_tolerance> <relative_tolerance>0</relative_tolerance> diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1_quadratic.prj b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1_quadratic.prj index e1b55cd1a4c..b899df81235 100644 --- a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1_quadratic.prj +++ b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_NaCl1/Padilla_NaCl1_quadratic.prj @@ -97,7 +97,7 @@ </processes> <output> <type>VTK</type> - <prefix>Padilla_NaCl1_quadratic_pcs_{:process_id}</prefix> + <prefix>Padilla_NaCl1_quadratic</prefix> <timesteps> <pair> <repeat>1</repeat> @@ -263,13 +263,13 @@ </linear_solvers> <test_definition> <vtkdiff> - <regex>Padilla_NaCl1_quadratic_pcs_0_ts_.*.vtu</regex> + <regex>Padilla_NaCl1_quadratic_ts_.*.vtu</regex> <field>concentration</field> <absolute_tolerance>5e-8</absolute_tolerance> <relative_tolerance>0</relative_tolerance> </vtkdiff> <vtkdiff> - <regex>Padilla_NaCl1_quadratic_pcs_0_ts_.*.vtu</regex> + <regex>Padilla_NaCl1_quadratic_ts_.*.vtu</regex> <field>pressure</field> <absolute_tolerance>5e-7</absolute_tolerance> <relative_tolerance>0</relative_tolerance> diff --git a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_state.pvsm b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_state.pvsm index c6f9322d862..e37710445d0 100644 --- a/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_state.pvsm +++ b/Tests/Data/Parabolic/RichardsComponentTransport/Padilla/Padilla_state.pvsm @@ -18973,7 +18973,7 @@ </Proxy> <Proxy group="sources" type="PVDReader" id="15413" servers="1"> <Property name="FileName" id="15413.FileName" number_of_elements="1"> - <Element index="0" value="/home/waltherm/01_Bearbeitung/ogs5_vs_ogs6/RichardsComponentTransport/Padilla/RichardsHC_PadillaNaCl6/h_us_out_pcs_0.pvd"/> + <Element index="0" value="/home/waltherm/01_Bearbeitung/ogs5_vs_ogs6/RichardsComponentTransport/Padilla/RichardsHC_PadillaNaCl6/h_us_out.pvd"/> <Domain name="files" id="15413.FileName.files"/> </Property> <Property name="TimestepValues" id="15413.TimestepValues" number_of_elements="402"> @@ -19383,7 +19383,7 @@ </Proxy> <Proxy group="sources" type="PVDReader" id="15545" servers="1"> <Property name="FileName" id="15545.FileName" number_of_elements="1"> - <Element index="0" value="/home/waltherm/01_Bearbeitung/ogs5_vs_ogs6/RichardsComponentTransport/Padilla/RichardsHC/h_us_out_pcs_0.pvd"/> + <Element index="0" value="/home/waltherm/01_Bearbeitung/ogs5_vs_ogs6/RichardsComponentTransport/Padilla/RichardsHC/h_us_out.pvd"/> <Domain name="files" id="15545.FileName.files"/> </Property> <Property name="TimestepValues" id="15545.TimestepValues" number_of_elements="402"> -- GitLab