From 06caf1d7901e85bf76a05a3d04add41c882db566 Mon Sep 17 00:00:00 2001
From: Norbert Grunwald <norbert.grunwald@ufz.de>
Date: Mon, 24 Oct 2022 14:22:58 +0200
Subject: [PATCH] [T] Renames the test to the correct name of the creator.
---
ProcessLib/TH2M/Tests.cmake | 4 +-
.../boundary_left.vtu | 0
.../H2/{mcWorther => mcWhorter}/domain.vtu | 0
.../mcWhorter_h2.prj} | 54 +++++++++----------
.../TH2M/H2/mcWhorter/mcWhorter_h2_newton.xml | 6 +++
.../mcWhorter_h2_newton_ts_0_t_0.000000.vtu} | 0
...horter_h2_newton_ts_110_t_1000.000000.vtu} | 0
.../result_McWhorter_H2_ts_0_t_0.000000.vtu} | 0
...ult_McWhorter_H2_ts_110_t_1000.000000.vtu} | 0
.../TH2M/H2/mcWorther/mcWorther_h2_newton.xml | 6 ---
10 files changed, 35 insertions(+), 35 deletions(-)
rename Tests/Data/TH2M/H2/{mcWorther => mcWhorter}/boundary_left.vtu (100%)
rename Tests/Data/TH2M/H2/{mcWorther => mcWhorter}/domain.vtu (100%)
rename Tests/Data/TH2M/H2/{mcWorther/mcWorther_h2.prj => mcWhorter/mcWhorter_h2.prj} (95%)
create mode 100644 Tests/Data/TH2M/H2/mcWhorter/mcWhorter_h2_newton.xml
rename Tests/Data/TH2M/H2/{mcWorther/mcWorther_h2_newton_ts_0_t_0.000000.vtu => mcWhorter/mcWhorter_h2_newton_ts_0_t_0.000000.vtu} (100%)
rename Tests/Data/TH2M/H2/{mcWorther/mcWorther_h2_newton_ts_110_t_1000.000000.vtu => mcWhorter/mcWhorter_h2_newton_ts_110_t_1000.000000.vtu} (100%)
rename Tests/Data/TH2M/H2/{mcWorther/result_McWorther_H2_ts_0_t_0.000000.vtu => mcWhorter/result_McWhorter_H2_ts_0_t_0.000000.vtu} (100%)
rename Tests/Data/TH2M/H2/{mcWorther/result_McWorther_H2_ts_110_t_1000.000000.vtu => mcWhorter/result_McWhorter_H2_ts_110_t_1000.000000.vtu} (100%)
delete mode 100644 Tests/Data/TH2M/H2/mcWorther/mcWorther_h2_newton.xml
diff --git a/ProcessLib/TH2M/Tests.cmake b/ProcessLib/TH2M/Tests.cmake
index 5aa778bcabe..e1956e27ee3 100644
--- a/ProcessLib/TH2M/Tests.cmake
+++ b/ProcessLib/TH2M/Tests.cmake
@@ -11,8 +11,8 @@ if (NOT OGS_USE_MPI)
OgsTest(PROJECTFILE TH2M/H2M/Liakopoulos/liakopoulos_TH2M.prj RUNTIME 15)
OgsTest(PROJECTFILE TH2M/H2M/Liakopoulos/liakopoulos_newton.xml RUNTIME 5)
OgsTest(PROJECTFILE TH2M/H2M/OrthotropicSwelling/square.prj RUNTIME 1)
- OgsTest(PROJECTFILE TH2M/H2/mcWorther/mcWorther_h2.prj RUNTIME 55)
- OgsTest(PROJECTFILE TH2M/H2/mcWorther/mcWorther_h2_newton.xml RUNTIME 20)
+ OgsTest(PROJECTFILE TH2M/H2/mcWhorter/mcWhorter_h2.prj RUNTIME 55)
+ OgsTest(PROJECTFILE TH2M/H2/mcWhorter/mcWhorter_h2_newton.xml RUNTIME 20)
OgsTest(PROJECTFILE TH2M/TH2/unicube/unicube.prj RUNTIME 25)
OgsTest(PROJECTFILE TH2M/TH2/heatpipe/heat_pipe_rough.prj RUNTIME 220)
OgsTest(PROJECTFILE TH2M/TH2/heatpipe/heat_pipe_strict.prj RUNTIME 80)
diff --git a/Tests/Data/TH2M/H2/mcWorther/boundary_left.vtu b/Tests/Data/TH2M/H2/mcWhorter/boundary_left.vtu
similarity index 100%
rename from Tests/Data/TH2M/H2/mcWorther/boundary_left.vtu
rename to Tests/Data/TH2M/H2/mcWhorter/boundary_left.vtu
diff --git a/Tests/Data/TH2M/H2/mcWorther/domain.vtu b/Tests/Data/TH2M/H2/mcWhorter/domain.vtu
similarity index 100%
rename from Tests/Data/TH2M/H2/mcWorther/domain.vtu
rename to Tests/Data/TH2M/H2/mcWhorter/domain.vtu
diff --git a/Tests/Data/TH2M/H2/mcWorther/mcWorther_h2.prj b/Tests/Data/TH2M/H2/mcWhorter/mcWhorter_h2.prj
similarity index 95%
rename from Tests/Data/TH2M/H2/mcWorther/mcWorther_h2.prj
rename to Tests/Data/TH2M/H2/mcWhorter/mcWhorter_h2.prj
index 201f815725c..613873ec238 100644
--- a/Tests/Data/TH2M/H2/mcWorther/mcWorther_h2.prj
+++ b/Tests/Data/TH2M/H2/mcWhorter/mcWhorter_h2.prj
@@ -39,19 +39,19 @@
<displacement>displacement</displacement>
</process_variables>
<secondary_variables>
- <secondary_variable internal_name="velocity_gas" output_name="velocity_gas"/>
- <secondary_variable internal_name="velocity_liquid" output_name="velocity_liquid"/>
- <secondary_variable internal_name="sigma" output_name="sigma"/>
- <secondary_variable internal_name="epsilon" output_name="epsilon"/>
- <secondary_variable internal_name="liquid_density" output_name="liquid_density"/>
- <secondary_variable internal_name="gas_density" output_name="gas_density"/>
- <secondary_variable internal_name="porosity" output_name="porosity"/>
- <secondary_variable internal_name="saturation" output_name="saturation"/>
- <secondary_variable internal_name="mole_fraction_gas" output_name="xnCG"/>
- <secondary_variable internal_name="mass_fraction_gas" output_name="xmCG"/>
- <secondary_variable internal_name="mass_fraction_liquid" output_name="xmWL"/>
- <secondary_variable internal_name="relative_permeability_gas" output_name="k_rel_G"/>
- <secondary_variable internal_name="relative_permeability_liquid" output_name="k_rel_L"/>
+ <secondary_variable internal_name="velocity_gas" output_name="velocity_gas" />
+ <secondary_variable internal_name="velocity_liquid" output_name="velocity_liquid" />
+ <secondary_variable internal_name="sigma" output_name="sigma" />
+ <secondary_variable internal_name="epsilon" output_name="epsilon" />
+ <secondary_variable internal_name="liquid_density" output_name="liquid_density" />
+ <secondary_variable internal_name="gas_density" output_name="gas_density" />
+ <secondary_variable internal_name="porosity" output_name="porosity" />
+ <secondary_variable internal_name="saturation" output_name="saturation" />
+ <secondary_variable internal_name="mole_fraction_gas" output_name="xnCG" />
+ <secondary_variable internal_name="mass_fraction_gas" output_name="xmCG" />
+ <secondary_variable internal_name="mass_fraction_liquid" output_name="xmWL" />
+ <secondary_variable internal_name="relative_permeability_gas" output_name="k_rel_G" />
+ <secondary_variable internal_name="relative_permeability_liquid" output_name="k_rel_L" />
</secondary_variables>
<specific_body_force>0 0</specific_body_force>
<mass_lumping>false</mass_lumping>
@@ -298,7 +298,7 @@
</processes>
<output>
<type>VTK</type>
- <prefix>result_McWorther_H2</prefix>
+ <prefix>result_McWhorter_H2</prefix>
<timesteps>
<pair>
<repeat>1</repeat>
@@ -446,7 +446,7 @@
<parameter>temperature_ic</parameter>
</boundary_condition>
</boundary_conditions>
- <source_terms/>
+ <source_terms />
</process_variable>
</process_variables>
<nonlinear_solvers>
@@ -473,70 +473,70 @@
</linear_solvers>
<test_definition>
<vtkdiff>
- <regex>result_McWorther_H2_ts_.*.vtu</regex>
+ <regex>result_McWhorter_H2_ts_.*.vtu</regex>
<field>displacement</field>
<absolute_tolerance>1e-07</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
- <regex>result_McWorther_H2_ts_.*.vtu</regex>
+ <regex>result_McWhorter_H2_ts_.*.vtu</regex>
<field>gas_pressure_interpolated</field>
<absolute_tolerance>1e-07</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
- <regex>result_McWorther_H2_ts_.*.vtu</regex>
+ <regex>result_McWhorter_H2_ts_.*.vtu</regex>
<field>capillary_pressure_interpolated</field>
<absolute_tolerance>1e-06</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
- <regex>result_McWorther_H2_ts_.*.vtu</regex>
+ <regex>result_McWhorter_H2_ts_.*.vtu</regex>
<field>temperature_interpolated</field>
<absolute_tolerance>1e-07</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
- <regex>result_McWorther_H2_ts_.*.vtu</regex>
+ <regex>result_McWhorter_H2_ts_.*.vtu</regex>
<field>xnCG</field>
<absolute_tolerance>1e-07</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
- <regex>result_McWorther_H2_ts_.*.vtu</regex>
+ <regex>result_McWhorter_H2_ts_.*.vtu</regex>
<field>xmCG</field>
<absolute_tolerance>1e-07</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
- <regex>result_McWorther_H2_ts_.*.vtu</regex>
+ <regex>result_McWhorter_H2_ts_.*.vtu</regex>
<field>xmWL</field>
<absolute_tolerance>1e-07</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
- <regex>result_McWorther_H2_ts_.*.vtu</regex>
+ <regex>result_McWhorter_H2_ts_.*.vtu</regex>
<field>saturation</field>
<absolute_tolerance>1e-07</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
- <regex>result_McWorther_H2_ts_.*.vtu</regex>
+ <regex>result_McWhorter_H2_ts_.*.vtu</regex>
<field>sigma</field>
<absolute_tolerance>1e-07</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
- <regex>result_McWorther_H2_ts_.*.vtu</regex>
+ <regex>result_McWhorter_H2_ts_.*.vtu</regex>
<field>liquid_density</field>
<absolute_tolerance>1e-07</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
- <regex>result_McWorther_H2_ts_.*.vtu</regex>
+ <regex>result_McWhorter_H2_ts_.*.vtu</regex>
<field>gas_density</field>
<absolute_tolerance>1e-07</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
</test_definition>
-</OpenGeoSysProject>
+</OpenGeoSysProject>
\ No newline at end of file
diff --git a/Tests/Data/TH2M/H2/mcWhorter/mcWhorter_h2_newton.xml b/Tests/Data/TH2M/H2/mcWhorter/mcWhorter_h2_newton.xml
new file mode 100644
index 00000000000..f19a4769367
--- /dev/null
+++ b/Tests/Data/TH2M/H2/mcWhorter/mcWhorter_h2_newton.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<OpenGeoSysProjectDiff base_file="mcWhorter_h2.prj">
+ <remove msel="/*/*/process/jacobian_assembler" />
+ <replace sel="/*/time_loop/output/prefix/text()">mcWhorter_h2_newton</replace>
+ <replace msel="/*/test_definition/vtkdiff/regex/text()">mcWhorter_h2_newton_.*.vtu</replace>
+</OpenGeoSysProjectDiff>
\ No newline at end of file
diff --git a/Tests/Data/TH2M/H2/mcWorther/mcWorther_h2_newton_ts_0_t_0.000000.vtu b/Tests/Data/TH2M/H2/mcWhorter/mcWhorter_h2_newton_ts_0_t_0.000000.vtu
similarity index 100%
rename from Tests/Data/TH2M/H2/mcWorther/mcWorther_h2_newton_ts_0_t_0.000000.vtu
rename to Tests/Data/TH2M/H2/mcWhorter/mcWhorter_h2_newton_ts_0_t_0.000000.vtu
diff --git a/Tests/Data/TH2M/H2/mcWorther/mcWorther_h2_newton_ts_110_t_1000.000000.vtu b/Tests/Data/TH2M/H2/mcWhorter/mcWhorter_h2_newton_ts_110_t_1000.000000.vtu
similarity index 100%
rename from Tests/Data/TH2M/H2/mcWorther/mcWorther_h2_newton_ts_110_t_1000.000000.vtu
rename to Tests/Data/TH2M/H2/mcWhorter/mcWhorter_h2_newton_ts_110_t_1000.000000.vtu
diff --git a/Tests/Data/TH2M/H2/mcWorther/result_McWorther_H2_ts_0_t_0.000000.vtu b/Tests/Data/TH2M/H2/mcWhorter/result_McWhorter_H2_ts_0_t_0.000000.vtu
similarity index 100%
rename from Tests/Data/TH2M/H2/mcWorther/result_McWorther_H2_ts_0_t_0.000000.vtu
rename to Tests/Data/TH2M/H2/mcWhorter/result_McWhorter_H2_ts_0_t_0.000000.vtu
diff --git a/Tests/Data/TH2M/H2/mcWorther/result_McWorther_H2_ts_110_t_1000.000000.vtu b/Tests/Data/TH2M/H2/mcWhorter/result_McWhorter_H2_ts_110_t_1000.000000.vtu
similarity index 100%
rename from Tests/Data/TH2M/H2/mcWorther/result_McWorther_H2_ts_110_t_1000.000000.vtu
rename to Tests/Data/TH2M/H2/mcWhorter/result_McWhorter_H2_ts_110_t_1000.000000.vtu
diff --git a/Tests/Data/TH2M/H2/mcWorther/mcWorther_h2_newton.xml b/Tests/Data/TH2M/H2/mcWorther/mcWorther_h2_newton.xml
deleted file mode 100644
index 1186b7ff950..00000000000
--- a/Tests/Data/TH2M/H2/mcWorther/mcWorther_h2_newton.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<OpenGeoSysProjectDiff base_file="mcWorther_h2.prj">
- <remove msel="/*/*/process/jacobian_assembler"/>
- <replace sel="/*/time_loop/output/prefix/text()">mcWorther_h2_newton</replace>
- <replace msel="/*/test_definition/vtkdiff/regex/text()">mcWorther_h2_newton_.*.vtu</replace>
-</OpenGeoSysProjectDiff>
--
GitLab