[cig-commits] r12767 - in long/3D/Gale/trunk: . input/benchmarks
walter at geodynamics.org
walter at geodynamics.org
Mon Sep 1 00:07:22 PDT 2008
Author: walter
Date: 2008-09-01 00:07:22 -0700 (Mon, 01 Sep 2008)
New Revision: 12767
Modified:
long/3D/Gale/trunk/
long/3D/Gale/trunk/input/benchmarks/geomod_2008_brittle.xml
long/3D/Gale/trunk/input/benchmarks/geomod_2008_stable.xml
long/3D/Gale/trunk/input/benchmarks/geomod_2008_stable_kinetic.xml
long/3D/Gale/trunk/input/benchmarks/geomod_2008_unstable.xml
Log:
r2340 at earth: boo | 2008-09-01 00:04:03 -0700
Make clear in the input files which material is quartz and which is corundum
Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
- 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2339
+ 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2340
Modified: long/3D/Gale/trunk/input/benchmarks/geomod_2008_brittle.xml
===================================================================
--- long/3D/Gale/trunk/input/benchmarks/geomod_2008_brittle.xml 2008-09-01 07:07:18 UTC (rev 12766)
+++ long/3D/Gale/trunk/input/benchmarks/geomod_2008_brittle.xml 2008-09-01 07:07:22 UTC (rev 12767)
@@ -333,7 +333,7 @@
<struct name="backgroundShape">
<param name="Type">Everywhere</param>
</struct>
- <struct name="beadsShape">
+ <struct name="corundumShape">
<param name="Type">Box</param>
<param name="startX">minX</param>
<param name="endX">maxX</param>
@@ -342,15 +342,15 @@
<param name="startZ">minZ</param>
<param name="endZ">maxZ</param>
</struct>
- <struct name="sandShape">
+ <struct name="quartzShape">
<param name="Type">Intersection</param>
<list name="shapes">
<param>backgroundShape</param>
- <param>!beadsShape</param>
+ <param>!corundumShape</param>
</list>
</struct>
- <struct name="sandStrainWeakening">
+ <struct name="quartzStrainWeakening">
<param name="Type">StrainWeakening</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
@@ -361,13 +361,13 @@
<param name="initialDamageFactor">0.5</param>
<param name="healingRate">0.0</param>
</struct>
- <struct name="sandYielding">
+ <struct name="quartzYielding">
<param name="Type">MohrCoulomb</param>
<param name="PressureField">NodalPressureField</param>
<param name="VelocityGradientsField">VelocityGradientsField</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
<param name="Context">context</param>
- <param name="StrainWeakening">sandStrainWeakening</param>
+ <param name="StrainWeakening">quartzStrainWeakening</param>
<param name="cohesion">30.0</param>
<param name="cohesionAfterSoftening">30</param>
<!-- Angle of internal friction = 35 degrees -->
@@ -375,11 +375,11 @@
<param name="frictionCoefficientAfterSoftening">0.70020753821</param>
</struct>
- <struct name="sandViscosity">
+ <struct name="quartzViscosity">
<param name="Type">MaterialViscosity</param>
<param name="eta0">1.0e12</param>
</struct>
- <struct name="beadsStrainWeakening">
+ <struct name="corundumStrainWeakening">
<param name="Type">StrainWeakening</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
@@ -390,19 +390,19 @@
<param name="initialDamageFactor">0.5</param>
<param name="healingRate">0.0</param>
</struct>
- <struct name="beadsYielding">
+ <struct name="corundumYielding">
<param name="Type">MohrCoulomb</param>
<param name="PressureField">NodalPressureField</param>
<param name="VelocityGradientsField">VelocityGradientsField</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
<param name="Context">context</param>
- <param name="StrainWeakening">beadsStrainWeakening</param>
+ <param name="StrainWeakening">corundumStrainWeakening</param>
<param name="cohesion">30.0</param>
<param name="cohesionAfterSoftening">30</param>
<param name="frictionCoefficient">0.726542528005</param>
<param name="frictionCoefficientAfterSoftening">0.726542528005</param>
</struct>
- <struct name="beadsViscosity">
+ <struct name="corundumViscosity">
<param name="Type">MaterialViscosity</param>
<param name="eta0">1.0e12</param>
</struct>
@@ -414,24 +414,24 @@
<param name="Type">StoreStress</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
- <struct name="sand">
+ <struct name="quartz">
<param name="Type">RheologyMaterial</param>
- <param name="Shape">sandShape</param>
+ <param name="Shape">quartzShape</param>
<param name="density">1560</param>
<list name="Rheology">
- <param>sandViscosity</param>
- <param>sandYielding</param>
+ <param>quartzViscosity</param>
+ <param>quartzYielding</param>
<param>storeViscosity</param>
<param>storeStress</param>
</list>
</struct>
- <struct name="beads">
+ <struct name="corundum">
<param name="Type">RheologyMaterial</param>
- <param name="Shape">beadsShape</param>
+ <param name="Shape">corundumShape</param>
<param name="density">1890</param>
<list name="Rheology">
- <param>beadsViscosity</param>
- <param>beadsYielding</param>
+ <param>corundumViscosity</param>
+ <param>corundumYielding</param>
<param>storeViscosity</param>
<param>storeStress</param>
</list>
Modified: long/3D/Gale/trunk/input/benchmarks/geomod_2008_stable.xml
===================================================================
--- long/3D/Gale/trunk/input/benchmarks/geomod_2008_stable.xml 2008-09-01 07:07:18 UTC (rev 12766)
+++ long/3D/Gale/trunk/input/benchmarks/geomod_2008_stable.xml 2008-09-01 07:07:22 UTC (rev 12767)
@@ -334,7 +334,7 @@
<param name="Type">Everywhere</param>
</struct>
- <struct name="sandShape">
+ <struct name="quartzShape">
<param name="Type">PolygonShape</param>
<list name="verticies">
<asciidata>
@@ -351,12 +351,12 @@
<param name="Type">Intersection</param>
<list name="shapes">
<param>backgroundShape</param>
- <param>!sandShape</param>
+ <param>!quartzShape</param>
</list>
</struct>
- <struct name="sandStrainWeakening">
+ <struct name="quartzStrainWeakening">
<param name="Type">StrainWeakening</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
@@ -367,13 +367,13 @@
<param name="initialDamageFactor">0.5</param>
<param name="healingRate">0.0</param>
</struct>
- <struct name="sandYielding">
+ <struct name="quartzYielding">
<param name="Type">MohrCoulomb</param>
<param name="PressureField">NodalPressureField</param>
<param name="VelocityGradientsField">VelocityGradientsField</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
<param name="Context">context</param>
- <param name="StrainWeakening">sandStrainWeakening</param>
+ <param name="StrainWeakening">quartzStrainWeakening</param>
<param name="cohesion">30.0</param>
<param name="cohesionAfterSoftening">30</param>
<!-- Angle of internal friction = 35 degrees -->
@@ -381,7 +381,7 @@
<param name="frictionCoefficientAfterSoftening">0.70020753821</param>
</struct>
- <struct name="sandViscosity">
+ <struct name="quartzViscosity">
<param name="Type">MaterialViscosity</param>
<param name="eta0">1.0e12</param>
</struct>
@@ -397,13 +397,13 @@
<param name="Type">StoreStress</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
- <struct name="sand">
+ <struct name="quartz">
<param name="Type">RheologyMaterial</param>
- <param name="Shape">sandShape</param>
+ <param name="Shape">quartzShape</param>
<param name="density">1560</param>
<list name="Rheology">
- <param>sandViscosity</param>
- <param>sandYielding</param>
+ <param>quartzViscosity</param>
+ <param>quartzYielding</param>
<param>storeViscosity</param>
<param>storeStress</param>
</list>
Modified: long/3D/Gale/trunk/input/benchmarks/geomod_2008_stable_kinetic.xml
===================================================================
--- long/3D/Gale/trunk/input/benchmarks/geomod_2008_stable_kinetic.xml 2008-09-01 07:07:18 UTC (rev 12766)
+++ long/3D/Gale/trunk/input/benchmarks/geomod_2008_stable_kinetic.xml 2008-09-01 07:07:22 UTC (rev 12767)
@@ -334,7 +334,7 @@
<param name="Type">Everywhere</param>
</struct>
- <struct name="sandShape">
+ <struct name="quartzShape">
<param name="Type">PolygonShape</param>
<list name="verticies">
<asciidata>
@@ -351,12 +351,12 @@
<param name="Type">Intersection</param>
<list name="shapes">
<param>backgroundShape</param>
- <param>!sandShape</param>
+ <param>!quartzShape</param>
</list>
</struct>
- <struct name="sandStrainWeakening">
+ <struct name="quartzStrainWeakening">
<param name="Type">StrainWeakening</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
@@ -367,13 +367,13 @@
<param name="initialDamageFactor">0.5</param>
<param name="healingRate">0.0</param>
</struct>
- <struct name="sandYielding">
+ <struct name="quartzYielding">
<param name="Type">MohrCoulomb</param>
<param name="PressureField">NodalPressureField</param>
<param name="VelocityGradientsField">VelocityGradientsField</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
<param name="Context">context</param>
- <param name="StrainWeakening">sandStrainWeakening</param>
+ <param name="StrainWeakening">quartzStrainWeakening</param>
<param name="cohesion">30.0</param>
<param name="cohesionAfterSoftening">30</param>
<!-- Angle of internal friction = 35 degrees -->
@@ -381,7 +381,7 @@
<param name="frictionCoefficientAfterSoftening">0.70020753821</param>
</struct>
- <struct name="sandViscosity">
+ <struct name="quartzViscosity">
<param name="Type">MaterialViscosity</param>
<param name="eta0">1.0e12</param>
</struct>
@@ -397,13 +397,13 @@
<param name="Type">StoreStress</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
- <struct name="sand">
+ <struct name="quartz">
<param name="Type">RheologyMaterial</param>
- <param name="Shape">sandShape</param>
+ <param name="Shape">quartzShape</param>
<param name="density">1560</param>
<list name="Rheology">
- <param>sandViscosity</param>
- <param>sandYielding</param>
+ <param>quartzViscosity</param>
+ <param>quartzYielding</param>
<param>storeViscosity</param>
<param>storeStress</param>
</list>
Modified: long/3D/Gale/trunk/input/benchmarks/geomod_2008_unstable.xml
===================================================================
--- long/3D/Gale/trunk/input/benchmarks/geomod_2008_unstable.xml 2008-09-01 07:07:18 UTC (rev 12766)
+++ long/3D/Gale/trunk/input/benchmarks/geomod_2008_unstable.xml 2008-09-01 07:07:22 UTC (rev 12767)
@@ -333,7 +333,7 @@
<struct name="backgroundShape">
<param name="Type">Everywhere</param>
</struct>
- <struct name="beadsShape">
+ <struct name="corundumShape">
<param name="Type">Box</param>
<param name="startX">minX</param>
<param name="endX">maxX</param>
@@ -343,16 +343,16 @@
<param name="endZ">maxZ</param>
</struct>
- <struct name="sandShape">
+ <struct name="quartzShape">
<param name="Type">Intersection</param>
<list name="shapes">
<param>backgroundShape</param>
- <param>!beadsShape</param>
+ <param>!corundumShape</param>
</list>
</struct>
- <struct name="sandStrainWeakening">
+ <struct name="quartzStrainWeakening">
<param name="Type">StrainWeakening</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
@@ -363,13 +363,13 @@
<param name="initialDamageFactor">0.5</param>
<param name="healingRate">0.0</param>
</struct>
- <struct name="sandYielding">
+ <struct name="quartzYielding">
<param name="Type">MohrCoulomb</param>
<param name="PressureField">NodalPressureField</param>
<param name="VelocityGradientsField">VelocityGradientsField</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
<param name="Context">context</param>
- <param name="StrainWeakening">sandStrainWeakening</param>
+ <param name="StrainWeakening">quartzStrainWeakening</param>
<param name="cohesion">30.0</param>
<param name="cohesionAfterSoftening">30</param>
<!-- Angle of internal friction = 35 degrees -->
@@ -377,11 +377,11 @@
<param name="frictionCoefficientAfterSoftening">0.70020753821</param>
</struct>
- <struct name="sandViscosity">
+ <struct name="quartzViscosity">
<param name="Type">MaterialViscosity</param>
<param name="eta0">1.0e12</param>
</struct>
- <struct name="beadsStrainWeakening">
+ <struct name="corundumStrainWeakening">
<param name="Type">StrainWeakening</param>
<param name="TimeIntegrator">timeIntegrator</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
@@ -392,19 +392,19 @@
<param name="initialDamageFactor">0.5</param>
<param name="healingRate">0.0</param>
</struct>
- <struct name="beadsYielding">
+ <struct name="corundumYielding">
<param name="Type">MohrCoulomb</param>
<param name="PressureField">NodalPressureField</param>
<param name="VelocityGradientsField">VelocityGradientsField</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
<param name="Context">context</param>
- <param name="StrainWeakening">beadsStrainWeakening</param>
+ <param name="StrainWeakening">corundumStrainWeakening</param>
<param name="cohesion">30.0</param>
<param name="cohesionAfterSoftening">30</param>
<param name="frictionCoefficient">0.726542528005</param>
<param name="frictionCoefficientAfterSoftening">0.726542528005</param>
</struct>
- <struct name="beadsViscosity">
+ <struct name="corundumViscosity">
<param name="Type">MaterialViscosity</param>
<param name="eta0">1.0e12</param>
</struct>
@@ -416,24 +416,24 @@
<param name="Type">StoreStress</param>
<param name="MaterialPointsSwarm">materialSwarm</param>
</struct>
- <struct name="sand">
+ <struct name="quartz">
<param name="Type">RheologyMaterial</param>
- <param name="Shape">sandShape</param>
+ <param name="Shape">quartzShape</param>
<param name="density">1560</param>
<list name="Rheology">
- <param>sandViscosity</param>
- <param>sandYielding</param>
+ <param>quartzViscosity</param>
+ <param>quartzYielding</param>
<param>storeViscosity</param>
<param>storeStress</param>
</list>
</struct>
- <struct name="beads">
+ <struct name="corundum">
<param name="Type">RheologyMaterial</param>
- <param name="Shape">beadsShape</param>
+ <param name="Shape">corundumShape</param>
<param name="density">1890</param>
<list name="Rheology">
- <param>beadsViscosity</param>
- <param>beadsYielding</param>
+ <param>corundumViscosity</param>
+ <param>corundumYielding</param>
<param>storeViscosity</param>
<param>storeStress</param>
</list>
More information about the cig-commits
mailing list