Commit fe251110 authored by Dmitry Yu. Naumov's avatar Dmitry Yu. Naumov

Merge branch 'FormatTestFiles' into 'master'

[T] Format files with xmlstarlet.

See merge request ogs/ogs!3275
parents 5e7dfeb1 5d75245f
......@@ -3,7 +3,7 @@
<mesh axially_symmetric="true">line_1_lines_1e1.vtu</mesh>
<geometry>circle_1_axi.gml</geometry>
<processes>
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml" />
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh axially_symmetric="true">line_1_lines_1e2.vtu</mesh>
<geometry>circle_1_axi.gml</geometry>
<processes>
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml" />
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh axially_symmetric="true">line_1_lines_1e3.vtu</mesh>
<geometry>circle_1_axi.gml</geometry>
<processes>
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml" />
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh axially_symmetric="true">line_1_lines_1e4.vtu</mesh>
<geometry>circle_1_axi.gml</geometry>
<processes>
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml" />
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh axially_symmetric="true">line_1_lines_1e5.vtu</mesh>
<geometry>circle_1_axi.gml</geometry>
<processes>
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml" />
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh axially_symmetric="true">line_1_lines_1e6.vtu</mesh>
<geometry>circle_1_axi.gml</geometry>
<processes>
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml" />
<include file="../cube_1x1x1_SteadyStateDiffusion/SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e0.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e0.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e1.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e1.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e2.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e2.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e3.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e3.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e3.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e3.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e4.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e4.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e5.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e5.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e6.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_1e6.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_2e4.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_2e4.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_3e4.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_3e4.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_4e4.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_4e4.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_5e4.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -3,7 +3,7 @@
<mesh>cube_1x1x1_hex_5e4.vtu</mesh>
<geometry>cube_1x1x1.gml</geometry>
<processes>
<include file="SteadyStateDiffusion.xml" />
<include file="SteadyStateDiffusion.xml"/>
</processes>
<media>
<medium id="0">
......
......@@ -44,7 +44,7 @@
</property>
<property>
<name>density</name>
<type>Parameter</type>
<type>Parameter</type>
<parameter_name>load-water</parameter_name>
</property>
</properties>
......@@ -191,7 +191,7 @@
<curve>time_ramp</curve>
<parameter>load_min</parameter>
</parameter>
<parameter>
<parameter>
<name>maximum_density</name>
<type>Constant</type>
<value>2600</value>
......@@ -202,7 +202,7 @@
<curve>material_ramp</curve>
<parameter>maximum_density</parameter>
</parameter>
<parameter>
<parameter>
<name>maximum_density_water</name>
<type>Constant</type>
<value>1000</value>
......
......@@ -111,8 +111,8 @@
<process ref="HM">
<!--For the equations of pressure-->
<nonlinear_solver>
basic_newton_pressure
</nonlinear_solver>
basic_newton_pressure
</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
<norm_type>NORM2</norm_type>
......@@ -136,8 +136,8 @@
<process ref="HM">
<!--For the equations of deformation-->
<nonlinear_solver>
basic_newton_displacement
</nonlinear_solver>
basic_newton_displacement
</nonlinear_solver>
<convergence_criterion>
<type>PerComponentDeltaX</type>
<norm_type>NORM2</norm_type>
......
......@@ -111,8 +111,8 @@
<process ref="HM">
<!--For the equations of pressure-->
<nonlinear_solver>
basic_newton_pressure
</nonlinear_solver>
basic_newton_pressure
</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
<norm_type>NORM2</norm_type>
......@@ -136,8 +136,8 @@
<process ref="HM">
<!--For the equations of deformation-->
<nonlinear_solver>
basic_newton_displacement
</nonlinear_solver>
basic_newton_displacement
</nonlinear_solver>
<convergence_criterion>
<type>PerComponentDeltaX</type>
<norm_type>NORM2</norm_type>
......
......@@ -111,8 +111,8 @@
<process ref="HM">
<!--For the equations of pressure-->
<nonlinear_solver>
basic_newton_pressure
</nonlinear_solver>
basic_newton_pressure
</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
<norm_type>NORM2</norm_type>
......@@ -136,8 +136,8 @@
<process ref="HM">
<!--For the equations of deformation-->
<nonlinear_solver>
basic_newton_displacement
</nonlinear_solver>
basic_newton_displacement
</nonlinear_solver>
<convergence_criterion>
<type>PerComponentDeltaX</type>
<norm_type>NORM2</norm_type>
......
......@@ -111,8 +111,8 @@
<process ref="HM">
<!--For the equations of pressure-->
<nonlinear_solver>
basic_newton_pressure
</nonlinear_solver>
basic_newton_pressure
</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
<norm_type>NORM2</norm_type>
......@@ -136,8 +136,8 @@
<process ref="HM">
<!--For the equations of deformation-->
<nonlinear_solver>
basic_newton_displacement
</nonlinear_solver>
basic_newton_displacement
</nonlinear_solver>
<convergence_criterion>
<type>PerComponentDeltaX</type>
<norm_type>NORM2</norm_type>
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -64,7 +64,7 @@
<time_discretization>
<type>BackwardEuler</type>
</time_discretization>
<time_stepping>
<time_stepping>
<type>FixedTimeStepping</type>
<t_initial>0</t_initial>
<t_end>10000</t_end>
......
......@@ -63,7 +63,7 @@
<time_discretization>
<type>BackwardEuler</type>
</time_discretization>
<time_stepping>
<time_stepping>
<type>FixedTimeStepping</type>
<t_initial>0</t_initial>
<t_end>10000</t_end>
......
......@@ -34,9 +34,9 @@
<initial_aperture>aperture0</initial_aperture>
</fracture_properties>
<secondary_variables>
<secondary_variable internal_name="sigma_xx" output_name="sigma_xx" />
<secondary_variable internal_name="sigma_yy" output_name="sigma_yy" />
<secondary_variable internal_name="sigma_xy" output_name="sigma_xy" />
<secondary_variable internal_name="sigma_xx" output_name="sigma_xx"/>
<secondary_variable internal_name="sigma_yy" output_name="sigma_yy"/>
<secondary_variable internal_name="sigma_xy" output_name="sigma_xy"/>
</secondary_variables>
</process>
</processes>
......
......@@ -286,7 +286,7 @@
<absolute_tolerance>1e-7</absolute_tolerance>
<relative_tolerance>1e-15</relative_tolerance>
</vtkdiff>
<vtkdiff>
<vtkdiff>
<regex>out_mohr_coulomb_load_path_nu0p3_ts_(.*)_t_0.500000.vtu</regex>
<field>stress_xy</field>
<absolute_tolerance>3e-4</absolute_tolerance>
......@@ -310,7 +310,7 @@
<absolute_tolerance>4e-4</absolute_tolerance>
<relative_tolerance>0</relative_tolerance>
</vtkdiff>
<vtkdiff>
<vtkdiff>
<regex>out_mohr_coulomb_load_path_nu0p3_ts_(.*)_t_0.500000.vtu</regex>
<field>displacement_jump1</field>
<absolute_tolerance>2e-14</absolute_tolerance>
......@@ -334,7 +334,7 @@
<absolute_tolerance>1e-7</absolute_tolerance>
<relative_tolerance>1e-15</relative_tolerance>
</vtkdiff>
<vtkdiff>
<vtkdiff>
<regex>out_mohr_coulomb_load_path_nu0p3_ts_(.*)_t_0.500000.vtu</regex>
<field>f_stress_s</field>
<absolute_tolerance>2e-14</absolute_tolerance>
......
......@@ -47,9 +47,9 @@
<process_variable>displacement</process_variable>
</process_variables>
<secondary_variables>
<secondary_variable internal_name="damage" output_name="damage" />
<secondary_variable internal_name="sigma" output_name="sigma" />
<secondary_variable internal_name="epsilon" output_name="epsilon" />
<secondary_variable internal_name="damage" output_name="damage"/>
<secondary_variable internal_name="sigma" output_name="sigma"/>
<secondary_variable internal_name="epsilon" output_name="epsilon"/>
</secondary_variables>
</process>
</processes>
......
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
File mode changed from 100755 to 100644
......@@ -103,7 +103,7 @@
</global_process_coupling>
<processes>
<!-- convergence criterion for hydraulic equation -->
<process ref="TemperatureField_transport">
<process ref="TemperatureField_transport">
<nonlinear_solver>basic_picard</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
......@@ -125,8 +125,8 @@
</timesteps>
</time_stepping>
</process>
<!-- convergence criterion for component transport equation (Cs) -->
<process ref="TemperatureField_transport">
<!-- convergence criterion for component transport equation (Cs) -->
<process ref="TemperatureField_transport">
<nonlinear_solver>basic_picard</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
......
......@@ -87,7 +87,6 @@
<type>Constant</type>
<value>0</value>
</property>
<property>
<name>permeability</name>
<type>Constant</type>
......
......@@ -67,19 +67,19 @@
</media>
<parameters>
<parameter>
<name>p_0</name>
<type>Function</type>
<expression>z</expression>
<name>p_0</name>
<type>Function</type>
<expression>z</expression>
</parameter>
<parameter>
<name>p_polyline_left</name>
<type>Function</type>
<expression>x+1</expression>
<name>p_polyline_left</name>
<type>Function</type>
<expression>x+1</expression>
</parameter>