[cig-commits] commit: Working versions of all of the input files
Mercurial
hg at geodynamics.org
Wed Nov 23 02:09:52 PST 2011
changeset: 428:4247acc82f99
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Wed Nov 23 02:09:36 2011 -0800
files: json_input/benchmarks/geomod2004_extension.json json_input/benchmarks/sinusoid.json json_input/benchmarks/thermal_eulerian.json json_input/benchmarks/thermal_lagrangian.json json_input/cookbook/deforming_bottom.json json_input/cookbook/extension.json json_input/cookbook/extension3D.json json_input/cookbook/file.json json_input/cookbook/fixed_bottom.json json_input/cookbook/inflow_outflow.json json_input/cookbook/multi_material.json json_input/cookbook/non_newtonian.json json_input/cookbook/normal_stress.json json_input/cookbook/sinusoid.json json_input/cookbook/split.json json_input/cookbook/template.json json_input/cookbook/thermal.json json_input/cookbook/thermal_file.json json_input/cookbook/thermal_only.json json_input/cookbook/tracers.json json_input/cookbook/viscous.json json_input/cookbook/yielding.json
description:
Working versions of all of the input files
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/benchmarks/geomod2004_extension.json
--- a/json_input/benchmarks/geomod2004_extension.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/benchmarks/geomod2004_extension.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/benchmarks/sinusoid.json
--- a/json_input/benchmarks/sinusoid.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/benchmarks/sinusoid.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/benchmarks/thermal_eulerian.json
--- a/json_input/benchmarks/thermal_eulerian.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/benchmarks/thermal_eulerian.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/benchmarks/thermal_lagrangian.json
--- a/json_input/benchmarks/thermal_lagrangian.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/benchmarks/thermal_lagrangian.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/deforming_bottom.json
--- a/json_input/cookbook/deforming_bottom.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/deforming_bottom.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -90,7 +83,7 @@
},
{
"name": "vy",
- "value": "0.0"
+ "value": "0"
}
]
}
@@ -106,12 +99,12 @@
"maxTimeSteps": "10",
"outputPath": "./output",
"dim": "2",
- "minX": "0.0f",
- "minY": "0.0f",
- "minZ": "0.0f",
- "maxX": "2.0f",
- "maxY": "0.35f",
- "maxZ": "0.3f",
+ "minX": "0",
+ "minY": "0",
+ "minZ": "0",
+ "maxX": "2",
+ "maxY": "0.35",
+ "maxZ": "0.3",
"nx": "16",
"ny": "4",
"nz": "4",
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/extension.json
--- a/json_input/cookbook/extension.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/extension.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -53,7 +46,6 @@
"storeStress"
]
}
-
},
"velocityBCs" :{
"type": "CompositeVC",
@@ -64,7 +56,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -84,7 +76,7 @@
"variables": [
{
"name": "vy",
- "value": "0.0"
+ "value": "0"
}
]
}
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/extension3D.json
--- a/json_input/cookbook/extension3D.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/extension3D.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/file.json
--- a/json_input/cookbook/file.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/file.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -53,7 +46,6 @@
"storeStress"
]
}
-
},
"velocityBCs" :{
"type": "CompositeVC",
@@ -64,7 +56,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -89,7 +81,7 @@
},
{
"name": "vy",
- "value": "0.0"
+ "value": "0"
}
]
}
@@ -105,12 +97,12 @@
"maxTimeSteps": "10",
"outputPath": "./output",
"dim": "2",
- "minX": "0.0f",
- "minY": "0.0f",
- "minZ": "0.0f",
- "maxX": "2.0f",
- "maxY": "0.35f",
- "maxZ": "0.3f",
+ "minX": "0",
+ "minY": "0",
+ "minZ": "0",
+ "maxX": "2",
+ "maxY": "0.35",
+ "maxZ": "0.3",
"nx": "16",
"ny": "4",
"nz": "4",
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/fixed_bottom.json
--- a/json_input/cookbook/fixed_bottom.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/fixed_bottom.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -113,12 +106,12 @@
"maxTimeSteps": "10",
"outputPath": "./output",
"dim": "2",
- "minX": "0.0f",
- "minY": "0.0f",
- "minZ": "0.0f",
- "maxX": "2.0f",
- "maxY": "0.35f",
- "maxZ": "0.3f",
+ "minX": "0",
+ "minY": "0",
+ "minZ": "0",
+ "maxX": "2",
+ "maxY": "0.35",
+ "maxZ": "0.3",
"nx": "16",
"ny": "4",
"nz": "4",
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/inflow_outflow.json
--- a/json_input/cookbook/inflow_outflow.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/inflow_outflow.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -55,7 +48,6 @@
"storeStress"
]
}
-
},
"velocityBCs" :{
"type": "CompositeVC",
@@ -76,7 +68,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -106,12 +98,12 @@
"maxTimeSteps": "10",
"outputPath": "./output",
"dim": "2",
- "minX": "0.0f",
- "minY": "0.0f",
- "minZ": "0.0f",
- "maxX": "2.0f",
- "maxY": "0.35f",
- "maxZ": "0.3f",
+ "minX": "0",
+ "minY": "0",
+ "minZ": "0",
+ "maxX": "2",
+ "maxY": "0.35",
+ "maxZ": "0.3",
"nx": "16",
"ny": "4",
"nz": "4",
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/multi_material.json
--- a/json_input/cookbook/multi_material.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/multi_material.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -93,7 +86,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -113,7 +106,7 @@
"variables": [
{
"name": "vy",
- "value": "0.0"
+ "value": "0"
}
]
}
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/non_newtonian.json
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/json_input/cookbook/non_newtonian.json Wed Nov 23 02:09:36 2011 -0800
@@ -0,0 +1,224 @@
+{
+ "EulerDeform":
+ {
+ "systems": [
+ {
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
+ "T-mesh": "T-mesh",
+ "displacementField": "DisplacementField",
+ "remesher": "velocityRemesher",
+ "velocityField": "VelocityField",
+ "wrapTop": "True"
+ }
+ ]
+ },
+ "components":
+ {
+ "buoyancyForceTerm":
+ {
+ "Type": "BuoyancyForceTerm",
+ "ForceVector": "mom_force",
+ "Swarm": "gaussSwarm",
+ "gravity": "gravity",
+ "TemperatureField": "TemperatureField"
+ },
+ "boxShape":
+ {
+ "Type": "Box",
+ "startX": "minX",
+ "endX": "maxX",
+ "startY": "minY",
+ "endY": "maxY",
+ "startZ": "minZ",
+ "endZ": "maxZ"
+ },
+ "sphereShape":
+ {
+ "Type": "EquationShape",
+ "equation": ".1^2 - ((x-1)^2 + (y-.15)^2)"
+ },
+ "nonsphereShape":
+ {
+ "Type": "Intersection",
+ "shapes":
+ [
+ "boxShape",
+ "!sphereShape"
+ ]
+ },
+ "nonNewtonian":
+ {
+ "Type": "NonNewtonian",
+ "StrainRateInvariantField": "StrainRateInvariantField",
+ "TemperatureField": "TemperatureField",
+ "n": "3.4",
+ "T_0": "1.0",
+ "A": "1.0",
+ "refStrainRate": "0.01"
+ },
+ "viscous":
+ {
+ "Type": "RheologyMaterial",
+ "Shape": "nonsphereShape",
+ "density": "1.0",
+ "alpha": "1.0",
+ "diffusivity": "1.0",
+ "heatingElements": [
+ {
+ "Q": "1.0",
+ "lambda": "1.0"
+ }
+ ],
+ "Rheology": [
+ "nonNewtonian",
+ "storeViscosity",
+ "storeStress"
+ ]
+ },
+ "sphereViscosity":
+ {
+ "Type": "MaterialViscosity",
+ "eta0": "10.0"
+ },
+ "sphereViscous":
+ {
+ "Type": "RheologyMaterial",
+ "Shape": "sphereShape",
+ "density": "1.0",
+ "alpha": "10.0",
+ "diffusivity": "10.0",
+ "heatingElements": [
+ {
+ "Q": "1000.0",
+ "lambda": "10.0"
+ }
+ ],
+ "Rheology": [
+ "sphereViscosity",
+ "storeViscosity",
+ "storeStress"
+ ]
+ }
+ },
+ "velocityBCs" :{
+ "type": "CompositeVC",
+ "vcList": [
+ {
+ "type": "WallVC",
+ "wall": "left",
+ "variables": [
+ {
+ "name": "vx",
+ "value": "0"
+ }
+ ]
+ },
+ {
+ "type": "WallVC",
+ "wall": "right",
+ "variables": [
+ {
+ "name": "vx",
+ "value": "0.01"
+ }
+ ]
+ },
+ {
+ "type": "WallVC",
+ "wall": "bottom",
+ "variables": [
+ {
+ "name": "vy",
+ "value": "0"
+ }
+ ]
+ }
+ ]
+ },
+ "temperatureBCs": {
+ "type": "CompositeVC",
+ "vcList": [
+ {
+ "type": "WallVC",
+ "wall": "left",
+ "variables": [
+ {
+ "name": "temperature",
+ "value": "1.0"
+ }
+ ]
+ },
+ {
+ "type": "WallVC",
+ "wall": "right",
+ "variables": [
+ {
+ "name": "temperature",
+ "value": "1.0"
+ }
+ ]
+ },
+ {
+ "type": "WallVC",
+ "wall": "top",
+ "variables": [
+ {
+ "name": "temperature",
+ "value": "1.0"
+ }
+ ]
+ },
+ {
+ "type": "WallVC",
+ "wall": "bottom",
+ "variables": [
+ {
+ "name": "temperature",
+ "value": "2.0"
+ }
+ ]
+ }
+ ]
+ },
+ "temperatureICs":
+ {
+ "type": "CompositeVC",
+ "vcList": [
+ {
+ "type": "AllNodesVC",
+ "variables":[
+ {
+ "name": "temperature",
+ "value": "1.0"
+ }
+ ]
+ }
+ ]
+ },
+
+ "FieldVariablesToCheckpoint": [
+ "StrainRateInvariantField",
+ "VelocityField",
+ "TemperatureField",
+ "PressureField"
+ ],
+ "enable-thermal": true,
+ "timeIntegratorOrder": "1",
+ "maxTimeSteps": "10",
+ "outputPath": "./output",
+ "dim": "2",
+ "minX": "0",
+ "minY": "0",
+ "minZ": "0",
+ "maxX": "2",
+ "maxY": "0.35",
+ "maxZ": "0.3",
+ "nx": "16",
+ "ny": "4",
+ "nz": "4",
+ "particlesPerCell": "40",
+ "seed": "13",
+ "checkpointEvery": "1",
+ "gravity": "1.0"
+}
\ No newline at end of file
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/normal_stress.json
--- a/json_input/cookbook/normal_stress.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/normal_stress.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -90,7 +83,7 @@
},
{
"name": "vy",
- "value": "0.0"
+ "value": "0"
}
]
}
@@ -106,12 +99,12 @@
"maxTimeSteps": "10",
"outputPath": "./output",
"dim": "2",
- "minX": "0.0f",
- "minY": "0.0f",
- "minZ": "0.0f",
- "maxX": "2.0f",
- "maxY": "0.35f",
- "maxZ": "0.3f",
+ "minX": "0",
+ "minY": "0",
+ "minZ": "0",
+ "maxX": "2",
+ "maxY": "0.35",
+ "maxZ": "0.3",
"nx": "16",
"ny": "4",
"nz": "4",
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/sinusoid.json
--- a/json_input/cookbook/sinusoid.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/sinusoid.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -64,7 +57,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -74,7 +67,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -84,7 +77,7 @@
"variables": [
{
"name": "vy",
- "value": "0.0"
+ "value": "0"
}
]
}
@@ -100,12 +93,12 @@
"maxTimeSteps": "10",
"outputPath": "./output",
"dim": "2",
- "minX": "0.0f",
- "minY": "0.0f",
- "minZ": "0.0f",
- "maxX": "2.0f",
- "maxY": "0.35f",
- "maxZ": "0.3f",
+ "minX": "0",
+ "minY": "0",
+ "minZ": "0",
+ "maxX": "2",
+ "maxY": "0.35",
+ "maxZ": "0.3",
"nx": "16",
"ny": "4",
"nz": "4",
@@ -113,4 +106,4 @@
"seed": "13",
"checkpointEvery": "1",
"gravity": "1.0"
-}
+}
\ No newline at end of file
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/split.json
--- a/json_input/cookbook/split.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/split.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -53,7 +46,6 @@
"storeStress"
]
}
-
},
"velocityBCs" :{
"type": "CompositeVC",
@@ -64,7 +56,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -88,7 +80,7 @@
},
{
"name": "vy",
- "value": "0.0"
+ "value": "0"
}
]
}
@@ -104,12 +96,12 @@
"maxTimeSteps": "10",
"outputPath": "./output",
"dim": "2",
- "minX": "0.0f",
- "minY": "0.0f",
- "minZ": "0.0f",
- "maxX": "2.0f",
- "maxY": "0.35f",
- "maxZ": "0.3f",
+ "minX": "0",
+ "minY": "0",
+ "minZ": "0",
+ "maxX": "2",
+ "maxY": "0.35",
+ "maxZ": "0.3",
"nx": "16",
"ny": "4",
"nz": "4",
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/template.json
--- a/json_input/cookbook/template.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/template.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -37,7 +30,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -47,7 +40,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -57,7 +50,7 @@
"variables": [
{
"name": "vy",
- "value": "0.0"
+ "value": "0"
}
]
}
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/thermal.json
--- a/json_input/cookbook/thermal.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/thermal.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -112,7 +105,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -132,7 +125,7 @@
"variables": [
{
"name": "vy",
- "value": "0.0"
+ "value": "0"
}
]
}
@@ -217,7 +210,7 @@
"maxY": "0.35",
"maxZ": "0.3",
"nx": "16",
- "ny": "8",
+ "ny": "4",
"nz": "4",
"particlesPerCell": "40",
"seed": "13",
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/thermal_file.json
--- a/json_input/cookbook/thermal_file.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/thermal_file.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -112,7 +105,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -132,7 +125,7 @@
"variables": [
{
"name": "vy",
- "value": "0.0"
+ "value": "0"
}
]
}
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/thermal_only.json
--- a/json_input/cookbook/thermal_only.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/thermal_only.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,4 +1,18 @@
{
+ "EulerDeform":
+ {
+ "systems": [
+ {
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
+ "T-mesh": "T-mesh",
+ "displacementField": "DisplacementField",
+ "remesher": "velocityRemesher",
+ "velocityField": "VelocityField",
+ "wrapTop": "True"
+ }
+ ]
+ },
"components":
{
"boxShape":
@@ -154,8 +168,8 @@
"VelocityField",
"TemperatureField"
],
+ "enable-thermal": true,
"enable-stokes": false,
- "enable-thermal": true,
"timeIntegratorOrder": "1",
"maxTimeSteps": "10",
"outputPath": "./output",
@@ -167,7 +181,7 @@
"maxY": "0.35",
"maxZ": "0.3",
"nx": "16",
- "ny": "8",
+ "ny": "4",
"nz": "4",
"particlesPerCell": "40",
"seed": "13",
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/tracers.json
--- a/json_input/cookbook/tracers.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/tracers.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -79,30 +72,6 @@
1.9, .2, .1
]
},
- "passiveSwarmMovementHandler":
- {
- "Type": "ParticleMovementHandler"
- },
- "passiveTracerSwarm":
- {
- "Type": "MaterialPointsSwarm",
- "CellLayout": "cellLayout",
- "ParticleLayout": "pLayout",
- "FeMesh": "v-mesh",
- "ParticleCommHandlers":
- [
- "passiveSwarmMovementHandler"
- ],
- "EscapedRoutine": "escapedRoutine"
- },
-
- "passiveTracerAdvect":
- {
- "Type": "SwarmAdvector",
- "Swarm": "passiveTracerSwarm",
- "TimeIntegrator": "timeIntegrator",
- "VelocityField": "VelocityField"
- },
"swarmOutput":
{
"Type": "TracerOutput",
@@ -158,16 +127,17 @@
"VelocityField",
"PressureField"
],
+ "enable-tracers": true,
"timeIntegratorOrder": "1",
"maxTimeSteps": "100",
"outputPath": "./output",
"dim": "2",
- "minX": "0.0f",
- "minY": "0.0f",
- "minZ": "0.0f",
- "maxX": "2.0f",
- "maxY": "0.35f",
- "maxZ": "0.3f",
+ "minX": "0",
+ "minY": "0",
+ "minZ": "0",
+ "maxX": "2",
+ "maxY": "0.35",
+ "maxZ": "0.3",
"nx": "16",
"ny": "4",
"nz": "4",
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/viscous.json
--- a/json_input/cookbook/viscous.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/viscous.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -53,7 +46,6 @@
"storeStress"
]
}
-
},
"velocityBCs" :{
"type": "CompositeVC",
diff -r 5b5eabbf2525 -r 4247acc82f99 json_input/cookbook/yielding.json
--- a/json_input/cookbook/yielding.json Wed Nov 23 02:08:57 2011 -0800
+++ b/json_input/cookbook/yielding.json Wed Nov 23 02:09:36 2011 -0800
@@ -1,11 +1,4 @@
{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
"EulerDeform":
{
"systems": [
@@ -56,7 +49,6 @@
"Type": "MaterialViscosity",
"eta0": "1.0"
},
-
"strainWeakening":
{
"Type": "StrainWeakening",
@@ -90,7 +82,7 @@
"density": "1.0",
"Rheology": [
"backgroundViscosity",
- "yielding",
+ "yielding",
"storeViscosity",
"storeStress"
]
@@ -121,7 +113,7 @@
"variables": [
{
"name": "vx",
- "value": "0.0"
+ "value": "0"
}
]
},
@@ -141,7 +133,7 @@
"variables": [
{
"name": "vy",
- "value": "0.0"
+ "value": "0"
}
]
}
More information about the CIG-COMMITS
mailing list