[cig-commits] [commit] master: Add tests (695c0ca)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Mon May 19 15:13:31 PDT 2014
Repository : https://github.com/geodynamics/aspect
On branch : master
Link : https://github.com/geodynamics/aspect/compare/ed4caebc0ab942d8c7bc1a6a3ba70e37f93accde...dbe66e1b6d25d5ff21653c48f14f343e10ae69f4
>---------------------------------------------------------------
commit 695c0ca0f41a08cdc9b8fa8af0ec05d2a97c57d4
Author: ian-r-rose <ian.r.rose at gmail.com>
Date: Mon May 19 12:59:51 2014 -0500
Add tests
>---------------------------------------------------------------
695c0ca0f41a08cdc9b8fa8af0ec05d2a97c57d4
.../multicomponent_arithmetic.prm | 72 ++++++++++++++--------
.../multicomponent_geometric.prm | 72 ++++++++++++++--------
.../multicomponent_harmonic.prm | 72 ++++++++++++++--------
.../multicomponent_max_composition.prm | 72 ++++++++++++++--------
4 files changed, 184 insertions(+), 104 deletions(-)
diff --git a/cookbooks/future/nettranslation.prm b/tests/multicomponent_arithmetic.prm
similarity index 50%
copy from cookbooks/future/nettranslation.prm
copy to tests/multicomponent_arithmetic.prm
index 5bca9f7..67f41e2 100644
--- a/cookbooks/future/nettranslation.prm
+++ b/tests/multicomponent_arithmetic.prm
@@ -1,13 +1,17 @@
+# Test the multicomponent material model using arithmetic
+# averaging for viscosity. Three blobs with different
+# densities and different viscosities move around...
+
set Dimension = 2
set CFL number = 1.0
-set End time = 1e9
-set Output directory = output
+set End time = 2e7
set Resume computation = false
set Start time = 0
set Adiabatic surface temperature = 0
set Surface pressure = 0
-set Pressure normalization = no
+set Pressure normalization = surface
set Linear solver tolerance = 1.e-7
+set Number of cheap Stokes solver steps = 30
set Use years in output instead of seconds = true
set Nonlinear solver scheme = IMPES
@@ -15,7 +19,7 @@ subsection Boundary temperature model
set Model name = box
subsection Box
set Top temperature = 0.0
- set Bottom temperature = 1000.0
+ set Bottom temperature = 0.0
end
end
@@ -35,10 +39,9 @@ end
subsection Geometry model
set Model name = box
subsection Box
- set X periodic = true
- set X extent = 1.e6
- set Y extent = 5.e5
- set Z extent = 5.e5
+ set X extent = 28.e5
+ set Y extent = 7.e5
+ set X repetitions = 4
end
end
@@ -55,32 +58,33 @@ subsection Initial conditions
set Model name = function
subsection Function
set Variable names = x,y
- set Function expression = if((sqrt((x-1.e5)^2+(y-4.0e5)^2)<5.0e4) | (sqrt((x-3.e5)^2+(y-2.e5)^2)<1.0e5) , 800.0, 0)
+ set Function expression = if( sqrt( (x-5.e5)^2 + (y-3.e5)^2 ) < 5.e4, 1, 0)
end
end
subsection Material model
- set Model name = simple
- subsection Simple model
- set Reference density = 3300
- set Reference specific heat = 1250
- set Reference temperature = 0.0
- set Thermal conductivity = 4.7
- set Thermal expansion coefficient = 4e-5
- set Viscosity = 1.e20
+ set Model name = multicomponent
+ subsection Multicomponent
+ set Reference temperature = 0.0
+ set Densities = 3300, 3200, 3600,3400
+ set Specific heats = 1250
+ set Thermal conductivities = 4.7
+ set Thermal expansivities = 4e-5
+ set Viscosities = 1.e21, 1.e20, 1.e23, 1.e22
+ set Viscosity averaging scheme = Arithmetic
end
end
subsection Mesh refinement
set Additional refinement times =
- set Initial adaptive refinement = 2 # default: 2
- set Initial global refinement = 6 # default: 2
+ set Initial adaptive refinement = 1
+ set Initial global refinement = 5
set Refinement fraction = 0.3
- set Coarsening fraction = 0.03
- set Strategy = thermal energy density
- set Time steps between mesh refinement = 10 # default: 10
+ set Coarsening fraction = 0.05
+ set Strategy = composition
+ set Time steps between mesh refinement = 5
end
@@ -89,17 +93,33 @@ subsection Model settings
set Include shear heating = false
set Fixed temperature boundary indicators = 2,3
set Prescribed velocity boundary indicators =
- set Tangential velocity boundary indicators = 2,3
+ set Tangential velocity boundary indicators = 0,1,2,3
set Zero velocity boundary indicators =
- set Remove nullspace = net translation
+end
+
+subsection Compositional fields
+ set Number of fields = 3
+end
+
+subsection Compositional initial conditions
+ set Model name = function
+ subsection Function
+ set Variable names = x,y
+ set Function expression = if( sqrt( (x-5.e5 )^2 + (y-3.e5)^2) < 5.e4 , 1,0); if( sqrt((x-12.e5)^2 + (y-3.e5)^2 ) < 5.e4, 1,0); if( sqrt((x-17.e5)^2 + (y-3.e5)^2) < 5.e4, 1, 0)
+ end
+end
+
+subsection Termination criteria
+ set Termination criteria = end step
+ set End step = 2
end
subsection Postprocess
set List of postprocessors = visualization
subsection Visualization
- set List of output variables =
+ set List of output variables = viscosity,density
set Number of grouped files = 1
set Output format = vtu
- set Time between graphical output = 1.e3
+ set Time between graphical output = 1e6
end
end
diff --git a/cookbooks/future/nettranslation.prm b/tests/multicomponent_geometric.prm
similarity index 50%
copy from cookbooks/future/nettranslation.prm
copy to tests/multicomponent_geometric.prm
index 5bca9f7..121fd65 100644
--- a/cookbooks/future/nettranslation.prm
+++ b/tests/multicomponent_geometric.prm
@@ -1,13 +1,17 @@
+# Test the multicomponent material model using geometric
+# averaging for viscosity. Three blobs with different
+# densities and different viscosities move around...
+
set Dimension = 2
set CFL number = 1.0
-set End time = 1e9
-set Output directory = output
+set End time = 2e7
set Resume computation = false
set Start time = 0
set Adiabatic surface temperature = 0
set Surface pressure = 0
-set Pressure normalization = no
+set Pressure normalization = surface
set Linear solver tolerance = 1.e-7
+set Number of cheap Stokes solver steps = 30
set Use years in output instead of seconds = true
set Nonlinear solver scheme = IMPES
@@ -15,7 +19,7 @@ subsection Boundary temperature model
set Model name = box
subsection Box
set Top temperature = 0.0
- set Bottom temperature = 1000.0
+ set Bottom temperature = 0.0
end
end
@@ -35,10 +39,9 @@ end
subsection Geometry model
set Model name = box
subsection Box
- set X periodic = true
- set X extent = 1.e6
- set Y extent = 5.e5
- set Z extent = 5.e5
+ set X extent = 28.e5
+ set Y extent = 7.e5
+ set X repetitions = 4
end
end
@@ -55,32 +58,33 @@ subsection Initial conditions
set Model name = function
subsection Function
set Variable names = x,y
- set Function expression = if((sqrt((x-1.e5)^2+(y-4.0e5)^2)<5.0e4) | (sqrt((x-3.e5)^2+(y-2.e5)^2)<1.0e5) , 800.0, 0)
+ set Function expression = if( sqrt( (x-5.e5)^2 + (y-3.e5)^2 ) < 5.e4, 1, 0)
end
end
subsection Material model
- set Model name = simple
- subsection Simple model
- set Reference density = 3300
- set Reference specific heat = 1250
- set Reference temperature = 0.0
- set Thermal conductivity = 4.7
- set Thermal expansion coefficient = 4e-5
- set Viscosity = 1.e20
+ set Model name = multicomponent
+ subsection Multicomponent
+ set Reference temperature = 0.0
+ set Densities = 3300, 3200, 3600,3400
+ set Specific heats = 1250
+ set Thermal conductivities = 4.7
+ set Thermal expansivities = 4e-5
+ set Viscosities = 1.e21, 1.e20, 1.e23, 1.e22
+ set Viscosity averaging scheme = Geometric
end
end
subsection Mesh refinement
set Additional refinement times =
- set Initial adaptive refinement = 2 # default: 2
- set Initial global refinement = 6 # default: 2
+ set Initial adaptive refinement = 1
+ set Initial global refinement = 5
set Refinement fraction = 0.3
- set Coarsening fraction = 0.03
- set Strategy = thermal energy density
- set Time steps between mesh refinement = 10 # default: 10
+ set Coarsening fraction = 0.05
+ set Strategy = composition
+ set Time steps between mesh refinement = 5
end
@@ -89,17 +93,33 @@ subsection Model settings
set Include shear heating = false
set Fixed temperature boundary indicators = 2,3
set Prescribed velocity boundary indicators =
- set Tangential velocity boundary indicators = 2,3
+ set Tangential velocity boundary indicators = 0,1,2,3
set Zero velocity boundary indicators =
- set Remove nullspace = net translation
+end
+
+subsection Compositional fields
+ set Number of fields = 3
+end
+
+subsection Compositional initial conditions
+ set Model name = function
+ subsection Function
+ set Variable names = x,y
+ set Function expression = if( sqrt( (x-5.e5 )^2 + (y-3.e5)^2) < 5.e4 , 1,0); if( sqrt((x-12.e5)^2 + (y-3.e5)^2 ) < 5.e4, 1,0); if( sqrt((x-17.e5)^2 + (y-3.e5)^2) < 5.e4, 1, 0)
+ end
+end
+
+subsection Termination criteria
+ set Termination criteria = end step
+ set End step = 2
end
subsection Postprocess
set List of postprocessors = visualization
subsection Visualization
- set List of output variables =
+ set List of output variables = viscosity,density
set Number of grouped files = 1
set Output format = vtu
- set Time between graphical output = 1.e3
+ set Time between graphical output = 1e6
end
end
diff --git a/cookbooks/future/nettranslation.prm b/tests/multicomponent_harmonic.prm
similarity index 50%
copy from cookbooks/future/nettranslation.prm
copy to tests/multicomponent_harmonic.prm
index 5bca9f7..3832900 100644
--- a/cookbooks/future/nettranslation.prm
+++ b/tests/multicomponent_harmonic.prm
@@ -1,13 +1,17 @@
+# Test the multicomponent material model using harmonic
+# averaging for viscosity. Three blobs with different
+# densities and different viscosities move around...
+
set Dimension = 2
set CFL number = 1.0
-set End time = 1e9
-set Output directory = output
+set End time = 2e7
set Resume computation = false
set Start time = 0
set Adiabatic surface temperature = 0
set Surface pressure = 0
-set Pressure normalization = no
+set Pressure normalization = surface
set Linear solver tolerance = 1.e-7
+set Number of cheap Stokes solver steps = 30
set Use years in output instead of seconds = true
set Nonlinear solver scheme = IMPES
@@ -15,7 +19,7 @@ subsection Boundary temperature model
set Model name = box
subsection Box
set Top temperature = 0.0
- set Bottom temperature = 1000.0
+ set Bottom temperature = 0.0
end
end
@@ -35,10 +39,9 @@ end
subsection Geometry model
set Model name = box
subsection Box
- set X periodic = true
- set X extent = 1.e6
- set Y extent = 5.e5
- set Z extent = 5.e5
+ set X extent = 28.e5
+ set Y extent = 7.e5
+ set X repetitions = 4
end
end
@@ -55,32 +58,33 @@ subsection Initial conditions
set Model name = function
subsection Function
set Variable names = x,y
- set Function expression = if((sqrt((x-1.e5)^2+(y-4.0e5)^2)<5.0e4) | (sqrt((x-3.e5)^2+(y-2.e5)^2)<1.0e5) , 800.0, 0)
+ set Function expression = if( sqrt( (x-5.e5)^2 + (y-3.e5)^2 ) < 5.e4, 1, 0)
end
end
subsection Material model
- set Model name = simple
- subsection Simple model
- set Reference density = 3300
- set Reference specific heat = 1250
- set Reference temperature = 0.0
- set Thermal conductivity = 4.7
- set Thermal expansion coefficient = 4e-5
- set Viscosity = 1.e20
+ set Model name = multicomponent
+ subsection Multicomponent
+ set Reference temperature = 0.0
+ set Densities = 3300, 3200, 3600,3400
+ set Specific heats = 1250
+ set Thermal conductivities = 4.7
+ set Thermal expansivities = 4e-5
+ set Viscosities = 1.e21, 1.e20, 1.e23, 1.e22
+ set Viscosity averaging scheme = Harmonic
end
end
subsection Mesh refinement
set Additional refinement times =
- set Initial adaptive refinement = 2 # default: 2
- set Initial global refinement = 6 # default: 2
+ set Initial adaptive refinement = 1
+ set Initial global refinement = 5
set Refinement fraction = 0.3
- set Coarsening fraction = 0.03
- set Strategy = thermal energy density
- set Time steps between mesh refinement = 10 # default: 10
+ set Coarsening fraction = 0.05
+ set Strategy = composition
+ set Time steps between mesh refinement = 5
end
@@ -89,17 +93,33 @@ subsection Model settings
set Include shear heating = false
set Fixed temperature boundary indicators = 2,3
set Prescribed velocity boundary indicators =
- set Tangential velocity boundary indicators = 2,3
+ set Tangential velocity boundary indicators = 0,1,2,3
set Zero velocity boundary indicators =
- set Remove nullspace = net translation
+end
+
+subsection Compositional fields
+ set Number of fields = 3
+end
+
+subsection Compositional initial conditions
+ set Model name = function
+ subsection Function
+ set Variable names = x,y
+ set Function expression = if( sqrt( (x-5.e5 )^2 + (y-3.e5)^2) < 5.e4 , 1,0); if( sqrt((x-12.e5)^2 + (y-3.e5)^2 ) < 5.e4, 1,0); if( sqrt((x-17.e5)^2 + (y-3.e5)^2) < 5.e4, 1, 0)
+ end
+end
+
+subsection Termination criteria
+ set Termination criteria = end step
+ set End step = 2
end
subsection Postprocess
set List of postprocessors = visualization
subsection Visualization
- set List of output variables =
+ set List of output variables = viscosity,density
set Number of grouped files = 1
set Output format = vtu
- set Time between graphical output = 1.e3
+ set Time between graphical output = 1e6
end
end
diff --git a/cookbooks/future/nettranslation.prm b/tests/multicomponent_max_composition.prm
similarity index 50%
copy from cookbooks/future/nettranslation.prm
copy to tests/multicomponent_max_composition.prm
index 5bca9f7..2744507 100644
--- a/cookbooks/future/nettranslation.prm
+++ b/tests/multicomponent_max_composition.prm
@@ -1,13 +1,17 @@
+# Test the multicomponent material model using maximum composition
+# averaging for viscosity. Three blobs with different
+# densities and different viscosities move around...
+
set Dimension = 2
set CFL number = 1.0
-set End time = 1e9
-set Output directory = output
+set End time = 2e7
set Resume computation = false
set Start time = 0
set Adiabatic surface temperature = 0
set Surface pressure = 0
-set Pressure normalization = no
+set Pressure normalization = surface
set Linear solver tolerance = 1.e-7
+set Number of cheap Stokes solver steps = 30
set Use years in output instead of seconds = true
set Nonlinear solver scheme = IMPES
@@ -15,7 +19,7 @@ subsection Boundary temperature model
set Model name = box
subsection Box
set Top temperature = 0.0
- set Bottom temperature = 1000.0
+ set Bottom temperature = 0.0
end
end
@@ -35,10 +39,9 @@ end
subsection Geometry model
set Model name = box
subsection Box
- set X periodic = true
- set X extent = 1.e6
- set Y extent = 5.e5
- set Z extent = 5.e5
+ set X extent = 28.e5
+ set Y extent = 7.e5
+ set X repetitions = 4
end
end
@@ -55,32 +58,33 @@ subsection Initial conditions
set Model name = function
subsection Function
set Variable names = x,y
- set Function expression = if((sqrt((x-1.e5)^2+(y-4.0e5)^2)<5.0e4) | (sqrt((x-3.e5)^2+(y-2.e5)^2)<1.0e5) , 800.0, 0)
+ set Function expression = if( sqrt( (x-5.e5)^2 + (y-3.e5)^2 ) < 5.e4, 1, 0)
end
end
subsection Material model
- set Model name = simple
- subsection Simple model
- set Reference density = 3300
- set Reference specific heat = 1250
- set Reference temperature = 0.0
- set Thermal conductivity = 4.7
- set Thermal expansion coefficient = 4e-5
- set Viscosity = 1.e20
+ set Model name = multicomponent
+ subsection Multicomponent
+ set Reference temperature = 0.0
+ set Densities = 3300, 3200, 3600,3400
+ set Specific heats = 1250
+ set Thermal conductivities = 4.7
+ set Thermal expansivities = 4e-5
+ set Viscosities = 1.e21, 1.e20, 1.e23, 1.e22
+ set Viscosity averaging scheme = Maximum composition
end
end
subsection Mesh refinement
set Additional refinement times =
- set Initial adaptive refinement = 2 # default: 2
- set Initial global refinement = 6 # default: 2
+ set Initial adaptive refinement = 1
+ set Initial global refinement = 5
set Refinement fraction = 0.3
- set Coarsening fraction = 0.03
- set Strategy = thermal energy density
- set Time steps between mesh refinement = 10 # default: 10
+ set Coarsening fraction = 0.05
+ set Strategy = composition
+ set Time steps between mesh refinement = 5
end
@@ -89,17 +93,33 @@ subsection Model settings
set Include shear heating = false
set Fixed temperature boundary indicators = 2,3
set Prescribed velocity boundary indicators =
- set Tangential velocity boundary indicators = 2,3
+ set Tangential velocity boundary indicators = 0,1,2,3
set Zero velocity boundary indicators =
- set Remove nullspace = net translation
+end
+
+subsection Compositional fields
+ set Number of fields = 3
+end
+
+subsection Compositional initial conditions
+ set Model name = function
+ subsection Function
+ set Variable names = x,y
+ set Function expression = if( sqrt( (x-5.e5 )^2 + (y-3.e5)^2) < 5.e4 , 1,0); if( sqrt((x-12.e5)^2 + (y-3.e5)^2 ) < 5.e4, 1,0); if( sqrt((x-17.e5)^2 + (y-3.e5)^2) < 5.e4, 1, 0)
+ end
+end
+
+subsection Termination criteria
+ set Termination criteria = end step
+ set End step = 2
end
subsection Postprocess
set List of postprocessors = visualization
subsection Visualization
- set List of output variables =
+ set List of output variables = viscosity,density
set Number of grouped files = 1
set Output format = vtu
- set Time between graphical output = 1.e3
+ set Time between graphical output = 1e6
end
end
More information about the CIG-COMMITS
mailing list