Skip to content

Commit

Permalink
Merge branch 'LiqudFlow' into 'master'
Browse files Browse the repository at this point in the history
Add JupyterNotebook for Blocking and Conducting Fractures.

See merge request ogs/ogs!4661
  • Loading branch information
endJunction committed Aug 5, 2023
2 parents 95ab096 + 4b8e8cb commit ac24fd2
Show file tree
Hide file tree
Showing 11 changed files with 798 additions and 0 deletions.
1 change: 1 addition & 0 deletions ProcessLib/LiquidFlow/Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -610,6 +610,7 @@ if (NOT (OGS_USE_MPI))
OgsTest(PROJECTFILE Parabolic/LiquidFlow/SimpleSynthetics/PrimaryVariableConstraintDirichletBC/cuboid_1x1x1_hex_1000_Dirichlet_Dirichlet_2.prj)
OgsTest(PROJECTFILE Parabolic/LiquidFlow/SimpleSynthetics/PrimaryVariableConstraintDirichletBC/cuboid_1x1x1_hex_1000_Dirichlet_Dirichlet_3.prj)
OgsTest(PROJECTFILE Parabolic/LiquidFlow/SimpleSynthetics/FunctionParameterTest.prj)
OgsTest(PROJECTFILE Parabolic/LiquidFlow/BlockingConductingFracture/block_conduct_frac.prj)
endif()

# inclined mesh
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE OGS-GML-DOM>
<OpenGeoSysGLI xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ogs="http://www.opengeosys.org">
<name>LiquidFlow_2D_geometry</name>
<points>
<point x="0.000000" y="1.000000" z="0.000000" id="0"/>
<point x="0.500000" y="1.000000" z="0.000000" id="1"/>
<point x="1.000000" y="1.000000" z="0.000000" id="2"/>
<point x="0.000000" y="0.000000" z="0.000000" id="3"/>
<point x="0.500000" y="0.000000" z="0.000000" id="4"/>
<point x="1.000000" y="0.000000" z="0.000000" id="5"/>
</points>
<polylines>
<polyline id="0" name="TOP">
<pnt>0</pnt>
<pnt>1</pnt>
<pnt>2</pnt>
</polyline>
<polyline id="1" name="BOTTOM">
<pnt>3</pnt>
<pnt>4</pnt>
<pnt>5</pnt>
</polyline>
</polylines>
</OpenGeoSysGLI>
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<OpenGeoSysProject>
<mesh>block_conduct_frac.vtu</mesh>
<geometry>LiquidFlow_2D.gml</geometry>
<processes>
<process>
<name>LiquidFlow</name>
<type>LIQUID_FLOW</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>
<specific_body_force>0.0 0</specific_body_force>
</process>
</processes>
<media>
<medium id="0">
<phases>
<phase>
<type>AqueousLiquid</type>
<properties>
<property>
<name>viscosity</name>
<type>Constant</type>
<value> 1.e-3 </value>
</property>
<property>
<name>density</name>
<type>Constant</type>
<value> 1.e3 </value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>permeability</name>
<type>Constant</type>
<value>1.e-12</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
<value>293.15</value>
</property>
<property>
<name>porosity</name>
<type>Constant</type>
<value>0.2</value>
</property>
<property>
<name>storage</name>
<type>Constant</type>
<value> 0.0 </value>
</property>
</properties>
</medium>
<medium id="1">
<phases>
<phase>
<type>AqueousLiquid</type>
<properties>
<property>
<name>viscosity</name>
<type>Constant</type>
<value> 1.e-3 </value>
</property>
<property>
<name>density</name>
<type>Constant</type>
<value> 1.e3 </value>
</property>
</properties>
</phase>
</phases>
<properties>
<property>
<name>permeability</name>
<type>Constant</type>
<value>1.e-6</value>
</property>
<property>
<name>reference_temperature</name>
<type>Constant</type>
<value>293.15</value>
</property>
<property>
<name>porosity</name>
<type>Constant</type>
<value>1.0</value>
</property>
<property>
<name>storage</name>
<type>Constant</type>
<value> 0.0 </value>
</property>
</properties>
</medium>
</media>
<time_loop>
<processes>
<process ref="LiquidFlow">
<nonlinear_solver>basic_picard</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
<norm_type>NORM2</norm_type>
<abstol>1.e-14</abstol>
</convergence_criterion>
<time_discretization>
<type>BackwardEuler</type>
</time_discretization>
<time_stepping>
<type>FixedTimeStepping</type>
<t_initial> 0.0 </t_initial>
<t_end>1</t_end>
<timesteps>
<pair>
<repeat>1</repeat>
<delta_t>1</delta_t>
</pair>
</timesteps>
</time_stepping>
</process>
</processes>
<output>
<type>VTK</type>
<prefix>fracture_block_conduct</prefix>
<timesteps>
<pair>
<repeat> 1 </repeat>
<each_steps> 1 </each_steps>
</pair>
</timesteps>
<variables>
<variable> pressure </variable>
<variable> v </variable>
</variables>
<suffix>_ts_{:timestep}_t_{:time}</suffix>
</output>
</time_loop>
<parameters>
<parameter>
<name>p0</name>
<type>Constant</type>
<value>0</value>
</parameter>
<parameter>
<name>p_bc0</name>
<type>Constant</type>
<value>0</value>
</parameter>
<parameter>
<name>p_bc1</name>
<type>Constant</type>
<value>21000</value>
</parameter>
<parameter>
<name>constant_porosity_parameter</name>
<type>Constant</type>
<value>0.2</value>
</parameter>
<parameter>
<name>kappa1</name>
<type>Constant</type>
<values>1.e-12</values>
</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>LiquidFlow_2D_geometry</geometrical_set>
<geometry>TOP</geometry>
<type>Dirichlet</type>
<parameter>p_bc0</parameter>
</boundary_condition>
<boundary_condition>
<geometrical_set>LiquidFlow_2D_geometry</geometrical_set>
<geometry>BOTTOM</geometry>
<type>Dirichlet</type>
<parameter>p_bc1</parameter>
</boundary_condition>
</boundary_conditions>
</process_variable>
</process_variables>
<nonlinear_solvers>
<nonlinear_solver>
<name>basic_picard</name>
<type>Picard</type>
<max_iter>100</max_iter>
<linear_solver>general_linear_solver</linear_solver>
</nonlinear_solver>
</nonlinear_solvers>
<linear_solvers>
<linear_solver>
<name>general_linear_solver</name>
<eigen>
<solver_type>SparseLU</solver_type>
<scaling>true</scaling>
</eigen>
</linear_solver>
</linear_solvers>
<test_definition>
<vtkdiff>
<regex>fracture_block_conduct_ts_1_t_1.000000.vtu</regex>
<field>pressure</field>
<absolute_tolerance>1e-6</absolute_tolerance>
<relative_tolerance>1e-6</relative_tolerance>
</vtkdiff>
</test_definition>
</OpenGeoSysProject>

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<VTKFile type="Collection" version="0.1" byte_order="LittleEndian" compressor="vtkZLibDataCompressor">
<Collection>
<DataSet timestep="0" group="" part="0" file="fracture_block_conduct_ts_0_t_0.000000.vtu"/>
<DataSet timestep="1" group="" part="0" file="fracture_block_conduct_ts_1_t_1.000000.vtu"/>
</Collection>
</VTKFile>

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import matplotlib.pyplot as plt

# Some plot settings
plt.style.use("seaborn-deep")
plt.rcParams["lines.linewidth"] = 2.0
plt.rcParams["lines.color"] = "black"
plt.rcParams["legend.frameon"] = True
plt.rcParams["figure.figsize"] = (8, 6)
plt.rcParams["font.family"] = "serif"
plt.rcParams["legend.fontsize"] = 16
plt.rcParams["font.size"] = 16
plt.rcParams["axes.spines.right"] = False
plt.rcParams["axes.spines.top"] = False
plt.rcParams["axes.spines.left"] = True
plt.rcParams["axes.spines.bottom"] = True
plt.rcParams["axes.axisbelow"] = True
1 change: 1 addition & 0 deletions Tests/Data/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ git+https://github.com/joergbuchwald/ogs6py@71f49a896381152e64880174083345002211
pandas>=1.5
ipywidgets
pyvista[all,jupyter,trame]>=0.39
seaborn>=0.12
git+https://github.com/joergbuchwald/VTUinterface@05793c7be84fbcb7d9f8f740c3dc667089a61505#egg=vtuinterface
trame-vtk>=2.4
vtk-osmesa==9.2.6;platform_system=='Linux'

0 comments on commit ac24fd2

Please sign in to comment.