Skip to content

Commit

Permalink
Merge branch 'development' of github.com:underworldcode/underworld2 i…
Browse files Browse the repository at this point in the history
…nto development
  • Loading branch information
rbeucher committed May 23, 2022
2 parents ff69c06 + 17cb0a5 commit eccc6a0
Show file tree
Hide file tree
Showing 18 changed files with 307 additions and 0 deletions.
Binary file added docs/examples/PressureSolution.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/examples/output/Mesh.h5
Binary file not shown.
Binary file added docs/examples/output/pressureField.0.h5
Binary file not shown.
45 changes: 45 additions & 0 deletions docs/examples/output/pressureField.0.xdmf
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" ?>
<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.0">
<Domain>
<Grid Name="FEM_Mesh_Mesh">

<Time Value="0.0" />

<Topology Type="Quadrilateral" NumberOfElements="1024">
<DataItem ItemType="Function" Dimensions="1024 4" Function="JOIN($0, $1, $3, $2)">
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C0">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C1">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C2">
<DataItem Dimensions="3 2" Format="XML"> 0 2 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C3">
<DataItem Dimensions="3 2" Format="XML"> 0 3 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
</DataItem>
</Topology>
<Geometry Type="XYZ">
<DataItem ItemType="Function" Dimensions="1089 3" Function="JOIN($0, $1, 0*$1)">
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="XCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="YCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
</DataItem>
</Geometry>
<Attribute Type="Scalar" Center="Cell" Name="pressure">
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1024 1">pressureField.0.h5:/data</DataItem>
</Attribute>
</Grid>
</Domain>
</Xdmf>
Binary file added docs/examples/output/pressureField.20.h5
Binary file not shown.
45 changes: 45 additions & 0 deletions docs/examples/output/pressureField.20.xdmf
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" ?>
<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.0">
<Domain>
<Grid Name="FEM_Mesh_Mesh">

<Time Value="180.46660625297983" />

<Topology Type="Quadrilateral" NumberOfElements="1024">
<DataItem ItemType="Function" Dimensions="1024 4" Function="JOIN($0, $1, $3, $2)">
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C0">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C1">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C2">
<DataItem Dimensions="3 2" Format="XML"> 0 2 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C3">
<DataItem Dimensions="3 2" Format="XML"> 0 3 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
</DataItem>
</Topology>
<Geometry Type="XYZ">
<DataItem ItemType="Function" Dimensions="1089 3" Function="JOIN($0, $1, 0*$1)">
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="XCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="YCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
</DataItem>
</Geometry>
<Attribute Type="Scalar" Center="Cell" Name="pressure">
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1024 1">pressureField.20.h5:/data</DataItem>
</Attribute>
</Grid>
</Domain>
</Xdmf>
Binary file added docs/examples/output/pressureField.40.h5
Binary file not shown.
45 changes: 45 additions & 0 deletions docs/examples/output/pressureField.40.xdmf
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?xml version="1.0" ?>
<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.0">
<Domain>
<Grid Name="FEM_Mesh_Mesh">

<Time Value="217.05250537539845" />

<Topology Type="Quadrilateral" NumberOfElements="1024">
<DataItem ItemType="Function" Dimensions="1024 4" Function="JOIN($0, $1, $3, $2)">
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C0">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C1">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C2">
<DataItem Dimensions="3 2" Format="XML"> 0 2 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C3">
<DataItem Dimensions="3 2" Format="XML"> 0 3 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
</DataItem>
</Topology>
<Geometry Type="XYZ">
<DataItem ItemType="Function" Dimensions="1089 3" Function="JOIN($0, $1, 0*$1)">
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="XCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="YCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
</DataItem>
</Geometry>
<Attribute Type="Scalar" Center="Cell" Name="pressure">
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1024 1">pressureField.40.h5:/data</DataItem>
</Attribute>
</Grid>
</Domain>
</Xdmf>
Binary file added docs/examples/output/subduction.gldb
Binary file not shown.
3 changes: 3 additions & 0 deletions docs/examples/output/summary.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
1.000000000000000000e+00
2.275291406954708009e+02
3.144743487920790767e-03
Binary file added docs/examples/output/velocityField.0.h5
Binary file not shown.
54 changes: 54 additions & 0 deletions docs/examples/output/velocityField.0.xdmf
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" ?>
<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.0">
<Domain>
<Grid Name="FEM_Mesh_Mesh">

<Time Value="0.0" />

<Topology Type="Quadrilateral" NumberOfElements="1024">
<DataItem ItemType="Function" Dimensions="1024 4" Function="JOIN($0, $1, $3, $2)">
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C0">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C1">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C2">
<DataItem Dimensions="3 2" Format="XML"> 0 2 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C3">
<DataItem Dimensions="3 2" Format="XML"> 0 3 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
</DataItem>
</Topology>
<Geometry Type="XYZ">
<DataItem ItemType="Function" Dimensions="1089 3" Function="JOIN($0, $1, 0*$1)">
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="XCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="YCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
</DataItem>
</Geometry>
<Attribute Type="Vector" Center="Node" Name="velocity">
<DataItem ItemType="Function" Dimensions="1089 3" Function="JOIN($0, $1, 0*$1)">
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="XValue">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">velocityField.0.h5:/data</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="YValue">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">velocityField.0.h5:/data</DataItem>
</DataItem>
</DataItem>
</Attribute>
</Grid>
</Domain>
</Xdmf>
Binary file added docs/examples/output/velocityField.20.h5
Binary file not shown.
54 changes: 54 additions & 0 deletions docs/examples/output/velocityField.20.xdmf
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" ?>
<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.0">
<Domain>
<Grid Name="FEM_Mesh_Mesh">

<Time Value="180.46660625297983" />

<Topology Type="Quadrilateral" NumberOfElements="1024">
<DataItem ItemType="Function" Dimensions="1024 4" Function="JOIN($0, $1, $3, $2)">
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C0">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C1">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C2">
<DataItem Dimensions="3 2" Format="XML"> 0 2 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C3">
<DataItem Dimensions="3 2" Format="XML"> 0 3 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
</DataItem>
</Topology>
<Geometry Type="XYZ">
<DataItem ItemType="Function" Dimensions="1089 3" Function="JOIN($0, $1, 0*$1)">
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="XCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="YCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
</DataItem>
</Geometry>
<Attribute Type="Vector" Center="Node" Name="velocity">
<DataItem ItemType="Function" Dimensions="1089 3" Function="JOIN($0, $1, 0*$1)">
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="XValue">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">velocityField.20.h5:/data</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="YValue">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">velocityField.20.h5:/data</DataItem>
</DataItem>
</DataItem>
</Attribute>
</Grid>
</Domain>
</Xdmf>
Binary file added docs/examples/output/velocityField.40.h5
Binary file not shown.
54 changes: 54 additions & 0 deletions docs/examples/output/velocityField.40.xdmf
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<?xml version="1.0" ?>
<Xdmf xmlns:xi="http://www.w3.org/2001/XInclude" Version="2.0">
<Domain>
<Grid Name="FEM_Mesh_Mesh">

<Time Value="217.05250537539845" />

<Topology Type="Quadrilateral" NumberOfElements="1024">
<DataItem ItemType="Function" Dimensions="1024 4" Function="JOIN($0, $1, $3, $2)">
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C0">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C1">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C2">
<DataItem Dimensions="3 2" Format="XML"> 0 2 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1024 1" Name="C3">
<DataItem Dimensions="3 2" Format="XML"> 0 3 1 1 1024 1 </DataItem>
<DataItem Format="HDF" NumberType="Int" Dimensions="1024 1">Mesh.h5:/en_map</DataItem>
</DataItem>
</DataItem>
</Topology>
<Geometry Type="XYZ">
<DataItem ItemType="Function" Dimensions="1089 3" Function="JOIN($0, $1, 0*$1)">
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="XCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="YCoords">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">Mesh.h5:/vertices</DataItem>
</DataItem>
</DataItem>
</Geometry>
<Attribute Type="Vector" Center="Node" Name="velocity">
<DataItem ItemType="Function" Dimensions="1089 3" Function="JOIN($0, $1, 0*$1)">
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="XValue">
<DataItem Dimensions="3 2" Format="XML"> 0 0 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">velocityField.40.h5:/data</DataItem>
</DataItem>
<DataItem ItemType="HyperSlab" Dimensions="1089 1" Name="YValue">
<DataItem Dimensions="3 2" Format="XML"> 0 1 1 1 1089 1 </DataItem>
<DataItem Format="HDF" NumberType="Float" Precision="8" Dimensions="1089 2">velocityField.40.h5:/data</DataItem>
</DataItem>
</DataItem>
</Attribute>
</Grid>
</Domain>
</Xdmf>
3 changes: 3 additions & 0 deletions docs/examples/output/vrms.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Time, VRMS
0.000000000000000000e+00 4.286857206457312230e+01
3.051757812500000000e-05 4.286863405685355133e+01
4 changes: 4 additions & 0 deletions docs/examples/uplift/buildMount.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
steps, timestep, vrms, peak height
0, 8.309e+01 kiloyear, 2.607e-01 centimeter / year, 3.015e+02 meter
1, 8.309e+01 kiloyear, 2.386e-01 centimeter / year, 2.719e+02 meter
2, 8.309e+01 kiloyear, 2.210e-01 centimeter / year, 2.426e+02 meter

0 comments on commit eccc6a0

Please sign in to comment.