From 930961cfc8fbcab59e3d2e1720d56e9c27dcb6b0 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Wed, 8 Jul 2020 22:47:28 +0200
Subject: [PATCH] [T] HeatConduction; Renames and generalization.
No changes to the results.
---
ProcessLib/HeatConduction/Tests.cmake | 8 ++--
...{line_60_heat.gml => line_60_geometry.gml} | 0
.../line_60_heat_pcs_0_ts_0_t_0.000000.vtu | 42 -------------------
.../1D_neumann/{line_60_heat.vtu => mesh.vtu} | 0
.../{line_60_heat.prj => picard.prj} | 10 ++---
...ine_60_heat_pcs_0.pvd => picard_pcs_0.pvd} | 0
...tu => picard_ts_405_t_31640625.000000.vtu} | 0
...tu => picard_ts_500_t_39062500.000000.vtu} | 0
....vtu => picard_ts_65_t_5078125.000000.vtu} | 0
.../heatconduction-neumann.pandoc | 10 ++---
10 files changed, 14 insertions(+), 56 deletions(-)
rename Tests/Data/Parabolic/T/1D_neumann/{line_60_heat.gml => line_60_geometry.gml} (100%)
delete mode 100644 Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0_ts_0_t_0.000000.vtu
rename Tests/Data/Parabolic/T/1D_neumann/{line_60_heat.vtu => mesh.vtu} (100%)
rename Tests/Data/Parabolic/T/1D_neumann/{line_60_heat.prj => picard.prj} (94%)
rename Tests/Data/Parabolic/T/1D_neumann/{line_60_heat_pcs_0.pvd => picard_pcs_0.pvd} (100%)
rename Tests/Data/Parabolic/T/1D_neumann/{line_60_heat_pcs_0_ts_405_t_31640625.000000.vtu => picard_ts_405_t_31640625.000000.vtu} (100%)
rename Tests/Data/Parabolic/T/1D_neumann/{line_60_heat_pcs_0_ts_500_t_39062500.000000.vtu => picard_ts_500_t_39062500.000000.vtu} (100%)
rename Tests/Data/Parabolic/T/1D_neumann/{line_60_heat_pcs_0_ts_65_t_5078125.000000.vtu => picard_ts_65_t_5078125.000000.vtu} (100%)
diff --git a/ProcessLib/HeatConduction/Tests.cmake b/ProcessLib/HeatConduction/Tests.cmake
index 6b567194145..b21cd0f97fc 100644
--- a/ProcessLib/HeatConduction/Tests.cmake
+++ b/ProcessLib/HeatConduction/Tests.cmake
@@ -11,14 +11,14 @@ AddTest(
)
AddTest(
- NAME 1D_HeatConduction_neumann
+ NAME 1D_HeatConduction_neumann_picard
PATH Parabolic/T/1D_neumann
EXECUTABLE ogs
- EXECUTABLE_ARGS line_60_heat.prj
+ EXECUTABLE_ARGS picard.prj
TESTER vtkdiff
DIFF_DATA
- temperature_analytical.vtu line_60_heat_pcs_0_ts_65_t_5078125.000000.vtu Temperature_Analytical_2months temperature 1e-4 1e-4
- temperature_analytical.vtu line_60_heat_pcs_0_ts_405_t_31640625.000000.vtu Temperature_Analytical_1year temperature 1e-4 1e-4
+ temperature_analytical.vtu picard_ts_65_t_5078125.000000.vtu Temperature_Analytical_2months temperature 1e-4 1e-4
+ temperature_analytical.vtu picard_ts_405_t_31640625.000000.vtu Temperature_Analytical_1year temperature 1e-4 1e-4
REQUIREMENTS NOT OGS_USE_MPI
)
diff --git a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat.gml b/Tests/Data/Parabolic/T/1D_neumann/line_60_geometry.gml
similarity index 100%
rename from Tests/Data/Parabolic/T/1D_neumann/line_60_heat.gml
rename to Tests/Data/Parabolic/T/1D_neumann/line_60_geometry.gml
diff --git a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0_ts_0_t_0.000000.vtu b/Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0_ts_0_t_0.000000.vtu
deleted file mode 100644
index aa9f3663979..00000000000
--- a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0_ts_0_t_0.000000.vtu
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian" header_type="UInt32" compressor="vtkZLibDataCompressor">
- <UnstructuredGrid>
- <Piece NumberOfPoints="61" NumberOfCells="60">
- <PointData>
- <DataArray type="Float64" Name="heat_flux_x" format="binary" RangeMin="0" RangeMax="0">
- AQAAAACAAADoAQAADgAAAA==eJxjYBgFIwEAAAHoAAE=
- </DataArray>
- <DataArray type="Float64" Name="temperature" format="binary" RangeMin="273.15" RangeMax="273.15">
- AQAAAACAAADoAQAAEwAAAA==eJxLSwMCoUKHtFF6WNMAs5Sn/g==
- </DataArray>
- </PointData>
- <CellData>
- <DataArray type="Int32" Name="MaterialIDs" format="binary" RangeMin="0" RangeMax="0">
- AQAAAACAAADwAAAADAAAAA==eJxjYBhZAAAA8AAB
- </DataArray>
- </CellData>
- <Points>
- <DataArray type="Float64" Name="Points" NumberOfComponents="3" format="binary" RangeMin="0" RangeMax="60">
- AQAAAACAAAC4BQAAmQAAAA==eJx9yktuQQEAheEzNDQwMDCQRhoREepZyr0e9SrW1CVbggXwOcPv/Mm73Qsc5WuuwKvwGrwOb8Cb8A94C/4Jb8M78C68B+/DB/Av+BA+go/hE/gUPoN/w+fwBfwHvoSv4AW8fO3/8KzRw7NBD88WPTw79PD8oodnjx6eA3p4jujhOaGH54wenj/08FzQw3NFD8/tyR+zGCQE
- </DataArray>
- </Points>
- <Cells>
- <DataArray type="Int64" Name="connectivity" format="binary" RangeMin="0" RangeMax="60">
- AQAAAACAAADAAwAAcQAAAA==eJxdxbMBAwAAALDatm3b/9/VoZ2SJYHAT5BDHOYIRznGcU5wklOc5gxnOcd5LnCRS1zmCle5xnVucJNb3OYOd7nHfR7wkEc85glPecZzXvCSV7zmDW95x3s+8JFPfOYLX/nGd37wk1/85s//L9CvDhE=
- </DataArray>
- <DataArray type="Int64" Name="offsets" format="binary" RangeMin="2" RangeMax="120">
- AQAAAACAAADgAQAAeAAAAA==eJwtxcEKQQEAADBJkiRJkiRJkiRJkvSSJEmSJEmSJEmSJJ/vYLssHPqLOOqY40446ZTTzjjrnPMuuOiSy6646prrbrjpltvuuOue+x448NAjjz3x1DPPvfDSK6+98dY7733w0SefffHVN9/98NMvv/3x1z8+Jw5N
- </DataArray>
- <DataArray type="UInt8" Name="types" format="binary" RangeMin="3" RangeMax="3">
- AQAAAACAAAA8AAAADAAAAA==eJxjZiYfAAAVrgC1
- </DataArray>
- <DataArray type="Int64" Name="faces" format="binary" RangeMin="0" RangeMax="0">
- AQAAAACAAADgAQAADgAAAA==eJxjYBgFwxkAAAHgAAE=
- </DataArray>
- <DataArray type="Int64" Name="faceoffsets" format="binary" RangeMin="1" RangeMax="60">
- AQAAAACAAADgAQAAaAAAAA==eJwtxTMCAwEAALDatq+2rf+/q0OTJeHQX8RRxxx3wkmnnHbGWeecd8FFl1x2xVXXXHfDTbfcdsdd99z3wIGHHnnsiaeeee6Fl1557Y233nnvg48++eyLr7757oeffvntj7/+AZ/8Byc=
- </DataArray>
- </Cells>
- </Piece>
- </UnstructuredGrid>
-</VTKFile>
diff --git a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat.vtu b/Tests/Data/Parabolic/T/1D_neumann/mesh.vtu
similarity index 100%
rename from Tests/Data/Parabolic/T/1D_neumann/line_60_heat.vtu
rename to Tests/Data/Parabolic/T/1D_neumann/mesh.vtu
diff --git a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat.prj b/Tests/Data/Parabolic/T/1D_neumann/picard.prj
similarity index 94%
rename from Tests/Data/Parabolic/T/1D_neumann/line_60_heat.prj
rename to Tests/Data/Parabolic/T/1D_neumann/picard.prj
index 582a9026943..4db4bbd712a 100644
--- a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat.prj
+++ b/Tests/Data/Parabolic/T/1D_neumann/picard.prj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<OpenGeoSysProject>
- <mesh>line_60_heat.vtu</mesh>
- <geometry>line_60_heat.gml</geometry>
+ <mesh>mesh.vtu</mesh>
+ <geometry>line_60_geometry.gml</geometry>
<processes>
<process>
<name>HeatConduction</name>
@@ -21,7 +21,7 @@
<time_loop>
<processes>
<process ref="HeatConduction">
- <nonlinear_solver>basic_picard</nonlinear_solver>
+ <nonlinear_solver>nonlinear_solver</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
<norm_type>NORM2</norm_type>
@@ -45,7 +45,7 @@
</processes>
<output>
<type>VTK</type>
- <prefix>line_60_heat_pcs_{:process_id}</prefix>
+ <prefix>picard</prefix>
<timesteps>
<pair>
<repeat> 1 </repeat>
@@ -108,7 +108,7 @@
</process_variables>
<nonlinear_solvers>
<nonlinear_solver>
- <name>basic_picard</name>
+ <name>nonlinear_solver</name>
<type>Picard</type>
<max_iter>10</max_iter>
<linear_solver>general_linear_solver</linear_solver>
diff --git a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0.pvd b/Tests/Data/Parabolic/T/1D_neumann/picard_pcs_0.pvd
similarity index 100%
rename from Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0.pvd
rename to Tests/Data/Parabolic/T/1D_neumann/picard_pcs_0.pvd
diff --git a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0_ts_405_t_31640625.000000.vtu b/Tests/Data/Parabolic/T/1D_neumann/picard_ts_405_t_31640625.000000.vtu
similarity index 100%
rename from Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0_ts_405_t_31640625.000000.vtu
rename to Tests/Data/Parabolic/T/1D_neumann/picard_ts_405_t_31640625.000000.vtu
diff --git a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0_ts_500_t_39062500.000000.vtu b/Tests/Data/Parabolic/T/1D_neumann/picard_ts_500_t_39062500.000000.vtu
similarity index 100%
rename from Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0_ts_500_t_39062500.000000.vtu
rename to Tests/Data/Parabolic/T/1D_neumann/picard_ts_500_t_39062500.000000.vtu
diff --git a/Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0_ts_65_t_5078125.000000.vtu b/Tests/Data/Parabolic/T/1D_neumann/picard_ts_65_t_5078125.000000.vtu
similarity index 100%
rename from Tests/Data/Parabolic/T/1D_neumann/line_60_heat_pcs_0_ts_65_t_5078125.000000.vtu
rename to Tests/Data/Parabolic/T/1D_neumann/picard_ts_65_t_5078125.000000.vtu
diff --git a/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.pandoc b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.pandoc
index 570d50b144c..d6759c0ec2b 100644
--- a/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.pandoc
+++ b/web/content/docs/benchmarks/heatconduction/heatconduction-neumann.pandoc
@@ -2,7 +2,7 @@
date = "2017-02-15T14:54:12+01:00"
title = "Heatconduction (Neumann)"
weight = 122
-project = "Parabolic/T/1D_neumann/line_60_heat.prj"
+project = "Parabolic/T/1D_neumann/picard.prj"
author = "Tianyuan Zheng"
[menu]
@@ -51,7 +51,7 @@ where $T_\textrm{b}$ is the boundary temperature, $\textrm{erfc}$ is the complem
## Input files
-The main project file is `line_60_heat.prj`. It describes the processes to be solved and the related process variables together with their initial and boundary conditions. It also references the mesh and geometrical objects defined on the mesh.
+The main project file is `picard.prj`. It describes the processes to be solved and the related process variables together with their initial and boundary conditions. It also references the mesh and geometrical objects defined on the mesh.
As of now a small portion of possible inputs is implemented; one can change:
- the mesh file
@@ -59,14 +59,14 @@ As of now a small portion of possible inputs is implemented; one can change:
- introduce more/different Dirichlet boundary conditions (different geometry or other constant values)
- introduce more/different Neumann boundary conditions (different geometry or other constant values)
-The geometries used to specify the boundary conditions are given in the `line_60_heat.gml` file.
+The geometries used to specify the boundary conditions are given in the `line_60_geometry.gml` file.
-The input mesh `line_60_heat.vtu` is stored in the VTK file format and can be directly visualized in Paraview for example.
+The input mesh `mesh.vtu` is stored in the VTK file format and can be directly visualized in Paraview for example.
## Results and evaluation
The result, written in the `.vtu` file, can be visualized with Paraview, for example.
-Loading the `line_60_heat_pcs_0_ts_65_t_5078125.000000.vtu` file in Paraview and Plotting over line. Compared to the analytical solution 'temperature_analytical.vtu', the results are very good:
+Loading the `picard_ts_65_t_5078125.000000.vtu` file in Paraview and Plotting over line. Compared to the analytical solution 'temperature_analytical.vtu', the results are very good:
{{< img src="../validation_neumann-1.png" >}}
--
GitLab