-
Notifications
You must be signed in to change notification settings - Fork 238
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'HandleOutputIssue' into 'master'
Relax tolerance in fixed output times / fixed timestepping See merge request ogs/ogs!4981
- Loading branch information
Showing
17 changed files
with
462 additions
and
14 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
140 changes: 140 additions & 0 deletions
140
...on/FixedTimeSteppingFixedOutputTimes/square_1e1-fixed_timestepping-fixed_output_times.prj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,140 @@ | ||
<?xml version="1.0" encoding="ISO-8859-1"?> | ||
<OpenGeoSysProject> | ||
<mesh>square_1x1_quad_1e1.vtu</mesh> | ||
<geometry>square_1x1.gml</geometry> | ||
<processes> | ||
<process> | ||
<name>SteadyStateDiffusion</name> | ||
<type>STEADY_STATE_DIFFUSION</type> | ||
<integration_order>2</integration_order> | ||
<process_variables> | ||
<process_variable>pressure</process_variable> | ||
</process_variables> | ||
<secondary_variables> | ||
<secondary_variable internal_name="darcy_velocity" output_name="v"/> | ||
</secondary_variables> | ||
</process> | ||
</processes> | ||
<media> | ||
<medium id="0"> | ||
<phases/> | ||
<properties> | ||
<property> | ||
<name>diffusion</name> | ||
<type>Constant</type> | ||
<value>1</value> | ||
</property> | ||
<property> | ||
<name>reference_temperature</name> | ||
<type>Constant</type> | ||
<value>293.15</value> | ||
</property> | ||
</properties> | ||
</medium> | ||
</media> | ||
<time_loop> | ||
<processes> | ||
<process ref="SteadyStateDiffusion"> | ||
<nonlinear_solver>basic_picard</nonlinear_solver> | ||
<convergence_criterion> | ||
<type>DeltaX</type> | ||
<norm_type>NORM2</norm_type> | ||
<abstol>1.e-6</abstol> | ||
</convergence_criterion> | ||
<time_discretization> | ||
<type>BackwardEuler</type> | ||
</time_discretization> | ||
<time_stepping> | ||
<type>FixedTimeStepping</type> | ||
<t_initial>0</t_initial> | ||
<t_end>1</t_end> | ||
<timesteps> | ||
<pair> | ||
<repeat>100</repeat> | ||
<delta_t>1.e-2</delta_t> | ||
</pair> | ||
</timesteps> | ||
</time_stepping> | ||
</process> | ||
</processes> | ||
<output> | ||
<type>VTK</type> | ||
<prefix>square_1e1</prefix> | ||
<timesteps> | ||
<pair> | ||
<repeat>1</repeat> | ||
<each_steps>1000</each_steps> | ||
</pair> | ||
</timesteps> | ||
<fixed_output_times>.1 .2 .3 .4 .5 .6 .7 .8 .9 1</fixed_output_times> | ||
<variables> | ||
<variable> pressure </variable> | ||
<variable> v </variable> | ||
</variables> | ||
<suffix>_ts_{:0>3timestep}_t_{:time}</suffix> | ||
</output> | ||
</time_loop> | ||
<parameters> | ||
<parameter> | ||
<name>p0</name> | ||
<type>Constant</type> | ||
<value>0</value> | ||
</parameter> | ||
<parameter> | ||
<name>p_Dirichlet_left</name> | ||
<type>Constant</type> | ||
<value>1</value> | ||
</parameter> | ||
<parameter> | ||
<name>p_Dirichlet_right</name> | ||
<type>Constant</type> | ||
<value>-1</value> | ||
</parameter> | ||
</parameters> | ||
<process_variables> | ||
<process_variable> | ||
<name>pressure</name> | ||
<components>1</components> | ||
<order>1</order> | ||
<initial_condition>p0</initial_condition> | ||
<boundary_conditions> | ||
<boundary_condition> | ||
<geometrical_set>square_1x1_geometry</geometrical_set> | ||
<geometry>left</geometry> | ||
<type>Dirichlet</type> | ||
<parameter>p_Dirichlet_left</parameter> | ||
</boundary_condition> | ||
<boundary_condition> | ||
<geometrical_set>square_1x1_geometry</geometrical_set> | ||
<geometry>right</geometry> | ||
<type>Dirichlet</type> | ||
<parameter>p_Dirichlet_right</parameter> | ||
</boundary_condition> | ||
</boundary_conditions> | ||
</process_variable> | ||
</process_variables> | ||
<nonlinear_solvers> | ||
<nonlinear_solver> | ||
<name>basic_picard</name> | ||
<type>Picard</type> | ||
<max_iter>10</max_iter> | ||
<linear_solver>general_linear_solver</linear_solver> | ||
</nonlinear_solver> | ||
</nonlinear_solvers> | ||
<linear_solvers> | ||
<linear_solver> | ||
<name>general_linear_solver</name> | ||
<lis>-i cg -p jacobi -tol 1e-16 -maxiter 10000</lis> | ||
<eigen> | ||
<solver_type>CG</solver_type> | ||
<precon_type>DIAGONAL</precon_type> | ||
<max_iteration_step>10000</max_iteration_step> | ||
<error_tolerance>1e-16</error_tolerance> | ||
</eigen> | ||
<petsc> | ||
<prefix>gw</prefix> | ||
<parameters>-gw_ksp_type cg -gw_pc_type bjacobi -gw_ksp_rtol 1e-16 -gw_ksp_max_it 10000</parameters> | ||
</petsc> | ||
</linear_solver> | ||
</linear_solvers> | ||
</OpenGeoSysProject> |
27 changes: 27 additions & 0 deletions
27
...1_SteadyStateDiffusion/FixedTimeSteppingFixedOutputTimes/square_1e1_ts_000_t_0.000000.vtu
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<?xml version="1.0"?> | ||
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64" compressor="vtkZLibDataCompressor"> | ||
<UnstructuredGrid> | ||
<FieldData> | ||
<DataArray type="Int8" Name="OGS_VERSION" NumberOfTuples="19" format="appended" RangeMin="45" RangeMax="103" offset="0" /> | ||
</FieldData> | ||
<Piece NumberOfPoints="16" NumberOfCells="9" > | ||
<PointData> | ||
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="0" RangeMax="0" offset="80" /> | ||
<DataArray type="Float64" Name="v" NumberOfComponents="2" format="appended" RangeMin="0" RangeMax="0" offset="140" /> | ||
</PointData> | ||
<CellData> | ||
</CellData> | ||
<Points> | ||
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0" RangeMax="1.4142135624" offset="200" /> | ||
</Points> | ||
<Cells> | ||
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="344" /> | ||
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="480" /> | ||
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="568" /> | ||
</Cells> | ||
</Piece> | ||
</UnstructuredGrid> | ||
<AppendedData encoding="base64"> | ||
_AQAAAAAAAAAAgAAAAAAAABMAAAAAAAAAGwAAAAAAAAA=eF4z0zPVM9Q1NLLUTU81Mk41NkxKBgAp6wSuAQAAAAAAAAAAgAAAAAAAAIAAAAAAAAAADAAAAAAAAAA=eF5jYBhYAAAAgAABAQAAAAAAAAAAgAAAAAAAAAABAAAAAAAADAAAAAAAAAA=eF5jYBjZAAABAAABAQAAAAAAAAAAgAAAAAAAAIABAAAAAAAASQAAAAAAAAA=eF5jYMAO/ENB4Ko9ungEWPwphjgEfMAhjmkejI8uDjMfu/0fcIhjugumDl0cxsfujw84xBHyMBaqOz5gmI8ujspHiAMAt187AQ==AQAAAAAAAAAAgAAAAAAAACABAAAAAAAARQAAAAAAAAA=eF5djDkOwCAAw6AXbenx/98yEC/OYsmyUspcDfdwk1/CQx1+DZs6fuiv8JSnv9Xh+e3q+KF/w0ee/lOH5/dXNwBz+AEPAQAAAAAAAAAAgAAAAAAAAEgAAAAAAAAAIAAAAAAAAAA=eF5jYYAADijNA6UFoLQIlJaA0jJQWgFKq0BpABToALU=AQAAAAAAAAAAgAAAAAAAAAkAAAAAAAAACwAAAAAAAAA=eF7j5IQCAAGeAFI= | ||
</AppendedData> | ||
</VTKFile> |
27 changes: 27 additions & 0 deletions
27
...1_SteadyStateDiffusion/FixedTimeSteppingFixedOutputTimes/square_1e1_ts_010_t_0.100000.vtu
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<?xml version="1.0"?> | ||
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64" compressor="vtkZLibDataCompressor"> | ||
<UnstructuredGrid> | ||
<FieldData> | ||
<DataArray type="Int8" Name="OGS_VERSION" NumberOfTuples="19" format="appended" RangeMin="45" RangeMax="103" offset="0" /> | ||
</FieldData> | ||
<Piece NumberOfPoints="16" NumberOfCells="9" > | ||
<PointData> | ||
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="-1" RangeMax="1" offset="80" /> | ||
<DataArray type="Float64" Name="v" NumberOfComponents="2" format="appended" RangeMin="2" RangeMax="2" offset="176" /> | ||
</PointData> | ||
<CellData> | ||
</CellData> | ||
<Points> | ||
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0" RangeMax="1.4142135624" offset="424" /> | ||
</Points> | ||
<Cells> | ||
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="568" /> | ||
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="704" /> | ||
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="792" /> | ||
</Cells> | ||
</Piece> | ||
</UnstructuredGrid> | ||
<AppendedData encoding="base64"> | ||
_AQAAAAAAAAAAgAAAAAAAABMAAAAAAAAAGwAAAAAAAAA=eF4z0zPVM9Q1NLLUTU81Mk41NkxKBgAp6wSuAQAAAAAAAAAAgAAAAAAAAIAAAAAAAAAAJwAAAAAAAAA=eF5jYACBD/aJoSBw1T4JQu9ngIjDaLh8Ig75JAL6YfLo+gFhPyZtAQAAAAAAAAAAgAAAAAAAAAABAAAAAAAAmQAAAAAAAAA=eF5jZAADh5Cz8+JE1BptGKB8qdRDTtc318L5q3wiXlRtm72HEcr/+h8E5u/5B6b/20OEJ+z5D+WLOPt2r7ZfAdd/wihx4eubdXD5pWDzVsP1vwdT/XDzvxW1xOyYOBeuX0NYbNe8t/P2wPhX37x0TRTaCZcPgLofZl4G1P1/ofxwNZ0S29tL9/yC8uNmbrjwNWf6HgCRF3l6AQAAAAAAAAAAgAAAAAAAAIABAAAAAAAASQAAAAAAAAA=eF5jYMAO/ENB4Ko9ungEWPwphjgEfMAhjmkejI8uDjMfu/0fcIhjugumDl0cxsfujw84xBHyMBaqOz5gmI8ujspHiAMAt187AQ==AQAAAAAAAAAAgAAAAAAAACABAAAAAAAARQAAAAAAAAA=eF5djDkOwCAAw6AXbenx/98yEC/OYsmyUspcDfdwk1/CQx1+DZs6fuiv8JSnv9Xh+e3q+KF/w0ee/lOH5/dXNwBz+AEPAQAAAAAAAAAAgAAAAAAAAEgAAAAAAAAAIAAAAAAAAAA=eF5jYYAADijNA6UFoLQIlJaA0jJQWgFKq0BpABToALU=AQAAAAAAAAAAgAAAAAAAAAkAAAAAAAAACwAAAAAAAAA=eF7j5IQCAAGeAFI= | ||
</AppendedData> | ||
</VTKFile> |
27 changes: 27 additions & 0 deletions
27
...1_SteadyStateDiffusion/FixedTimeSteppingFixedOutputTimes/square_1e1_ts_020_t_0.200000.vtu
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<?xml version="1.0"?> | ||
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64" compressor="vtkZLibDataCompressor"> | ||
<UnstructuredGrid> | ||
<FieldData> | ||
<DataArray type="Int8" Name="OGS_VERSION" NumberOfTuples="19" format="appended" RangeMin="45" RangeMax="103" offset="0" /> | ||
</FieldData> | ||
<Piece NumberOfPoints="16" NumberOfCells="9" > | ||
<PointData> | ||
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="-1" RangeMax="1" offset="80" /> | ||
<DataArray type="Float64" Name="v" NumberOfComponents="2" format="appended" RangeMin="2" RangeMax="2" offset="176" /> | ||
</PointData> | ||
<CellData> | ||
</CellData> | ||
<Points> | ||
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0" RangeMax="1.4142135624" offset="424" /> | ||
</Points> | ||
<Cells> | ||
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="568" /> | ||
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="704" /> | ||
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="792" /> | ||
</Cells> | ||
</Piece> | ||
</UnstructuredGrid> | ||
<AppendedData encoding="base64"> | ||
_AQAAAAAAAAAAgAAAAAAAABMAAAAAAAAAGwAAAAAAAAA=eF4z0zPVM9Q1NLLUTU81Mk41NkxKBgAp6wSuAQAAAAAAAAAAgAAAAAAAAIAAAAAAAAAAJwAAAAAAAAA=eF5jYACBD/aJoSBw1T4JQu9ngIjDaLh8Ig75JAL6YfLo+gFhPyZtAQAAAAAAAAAAgAAAAAAAAAABAAAAAAAAmQAAAAAAAAA=eF5jZAADh5Cz8+JE1BptGKB8qdRDTtc318L5q3wiXlRtm72HEcr/+h8E5u/5B6b/20OEJ+z5D+WLOPt2r7ZfAdd/wihx4eubdXD5pWDzVsP1vwdT/XDzvxW1xOyYOBeuX0NYbNe8t/P2wPhX37x0TRTaCZcPgLofZl4G1P1/ofxwNZ0S29tL9/yC8uNmbrjwNWf6HgCRF3l6AQAAAAAAAAAAgAAAAAAAAIABAAAAAAAASQAAAAAAAAA=eF5jYMAO/ENB4Ko9ungEWPwphjgEfMAhjmkejI8uDjMfu/0fcIhjugumDl0cxsfujw84xBHyMBaqOz5gmI8ujspHiAMAt187AQ==AQAAAAAAAAAAgAAAAAAAACABAAAAAAAARQAAAAAAAAA=eF5djDkOwCAAw6AXbenx/98yEC/OYsmyUspcDfdwk1/CQx1+DZs6fuiv8JSnv9Xh+e3q+KF/w0ee/lOH5/dXNwBz+AEPAQAAAAAAAAAAgAAAAAAAAEgAAAAAAAAAIAAAAAAAAAA=eF5jYYAADijNA6UFoLQIlJaA0jJQWgFKq0BpABToALU=AQAAAAAAAAAAgAAAAAAAAAkAAAAAAAAACwAAAAAAAAA=eF7j5IQCAAGeAFI= | ||
</AppendedData> | ||
</VTKFile> |
27 changes: 27 additions & 0 deletions
27
...1_SteadyStateDiffusion/FixedTimeSteppingFixedOutputTimes/square_1e1_ts_030_t_0.300000.vtu
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
<?xml version="1.0"?> | ||
<VTKFile type="UnstructuredGrid" version="1.0" byte_order="LittleEndian" header_type="UInt64" compressor="vtkZLibDataCompressor"> | ||
<UnstructuredGrid> | ||
<FieldData> | ||
<DataArray type="Int8" Name="OGS_VERSION" NumberOfTuples="19" format="appended" RangeMin="45" RangeMax="103" offset="0" /> | ||
</FieldData> | ||
<Piece NumberOfPoints="16" NumberOfCells="9" > | ||
<PointData> | ||
<DataArray type="Float64" Name="pressure" format="appended" RangeMin="-1" RangeMax="1" offset="80" /> | ||
<DataArray type="Float64" Name="v" NumberOfComponents="2" format="appended" RangeMin="2" RangeMax="2" offset="176" /> | ||
</PointData> | ||
<CellData> | ||
</CellData> | ||
<Points> | ||
<DataArray type="Float64" Name="Points" NumberOfComponents="3" format="appended" RangeMin="0" RangeMax="1.4142135624" offset="424" /> | ||
</Points> | ||
<Cells> | ||
<DataArray type="Int64" Name="connectivity" format="appended" RangeMin="" RangeMax="" offset="568" /> | ||
<DataArray type="Int64" Name="offsets" format="appended" RangeMin="" RangeMax="" offset="704" /> | ||
<DataArray type="UInt8" Name="types" format="appended" RangeMin="" RangeMax="" offset="792" /> | ||
</Cells> | ||
</Piece> | ||
</UnstructuredGrid> | ||
<AppendedData encoding="base64"> | ||
_AQAAAAAAAAAAgAAAAAAAABMAAAAAAAAAGwAAAAAAAAA=eF4z0zPVM9Q1NLLUTU81Mk41NkxKBgAp6wSuAQAAAAAAAAAAgAAAAAAAAIAAAAAAAAAAJwAAAAAAAAA=eF5jYACBD/aJoSBw1T4JQu9ngIjDaLh8Ig75JAL6YfLo+gFhPyZtAQAAAAAAAAAAgAAAAAAAAAABAAAAAAAAmQAAAAAAAAA=eF5jZAADh5Cz8+JE1BptGKB8qdRDTtc318L5q3wiXlRtm72HEcr/+h8E5u/5B6b/20OEJ+z5D+WLOPt2r7ZfAdd/wihx4eubdXD5pWDzVsP1vwdT/XDzvxW1xOyYOBeuX0NYbNe8t/P2wPhX37x0TRTaCZcPgLofZl4G1P1/ofxwNZ0S29tL9/yC8uNmbrjwNWf6HgCRF3l6AQAAAAAAAAAAgAAAAAAAAIABAAAAAAAASQAAAAAAAAA=eF5jYMAO/ENB4Ko9ungEWPwphjgEfMAhjmkejI8uDjMfu/0fcIhjugumDl0cxsfujw84xBHyMBaqOz5gmI8ujspHiAMAt187AQ==AQAAAAAAAAAAgAAAAAAAACABAAAAAAAARQAAAAAAAAA=eF5djDkOwCAAw6AXbenx/98yEC/OYsmyUspcDfdwk1/CQx1+DZs6fuiv8JSnv9Xh+e3q+KF/w0ee/lOH5/dXNwBz+AEPAQAAAAAAAAAAgAAAAAAAAEgAAAAAAAAAIAAAAAAAAAA=eF5jYYAADijNA6UFoLQIlJaA0jJQWgFKq0BpABToALU=AQAAAAAAAAAAgAAAAAAAAAkAAAAAAAAACwAAAAAAAAA=eF7j5IQCAAGeAFI= | ||
</AppendedData> | ||
</VTKFile> |
Oops, something went wrong.