[cig-commits] commit: Fix name of sphere benchmark
Mercurial
hg at geodynamics.org
Mon Nov 21 16:14:16 PST 2011
changeset: 417:d803f3388e8b
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Mon Nov 21 16:14:05 2011 -0800
files: json_input/benchmarks/sphere_in_cylider.json json_input/benchmarks/sphere_in_cylinder.json
description:
Fix name of sphere benchmark
diff -r 4408cf6c9f69 -r d803f3388e8b json_input/benchmarks/sphere_in_cylider.json
--- a/json_input/benchmarks/sphere_in_cylider.json Mon Nov 21 13:17:22 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-{
- "components":
- {
- "buoyancyForceTerm":
- {
- "Type": "BuoyancyForceTerm",
- "ForceVector": "mom_force",
- "Swarm": "gaussSwarm",
- "gravity": "gravity"
- },
- "boxShape":
- {
- "Type": "Box",
- "startX": "minX",
- "endX": "maxX",
- "startY": "minY",
- "endY": "maxY",
- "startZ": "minZ",
- "endZ": "maxZ"
- },
- "cylinderShape":
- {
- "Type": "EquationShape",
- "equation": "4-hypot(x,z)"
- },
- "sphereShape":
- {
- "Type": "EquationShape",
- "equation": "1-(x*x + (y-4)*(y-4) + z*z)"
- },
- "backgroundShape":
- {
- "Type": "Intersection",
- "shapes":[
- "cylinderShape",
- "!sphereShape"
- ]
- },
- "backgroundViscosity":
- {
- "Type": "MaterialViscosity",
- "eta0": "1.0"
- },
- "viscous":
- {
- "Type": "RheologyMaterial",
- "Shape": "backgroundShape",
- "density": "0.0",
- "Rheology": [
- "backgroundViscosity",
- "storeViscosity",
- "storeStress"
- ]
- },
- "nonbackgroundShape":
- {
- "Type": "Intersection",
- "shapes":[
- "!backgroundShape"
- ]
- },
- "highViscosity":
- {
- "Type": "MaterialViscosity",
- "eta0": "100.0"
- },
- "sphere":
- {
- "Type": "RheologyMaterial",
- "Shape": "nonbackgroundShape",
- "density": "1.0",
- "Rheology": [
- "highViscosity",
- "storeViscosity",
- "storeStress"
- ]
- }
-
- },
- "velocityBCs" :{
- "type": "CompositeVC",
- "vcList": [
- {
- "type": "WallVC",
- "wall": "front",
- "variables": [
- {
- "name": "vz",
- "value": "0.0"
- }
- ]
- },
- {
- "type": "WallVC",
- "wall": "back",
- "variables": [
- {
- "name": "vz",
- "value": "0.0"
- }
- ]
- },
- {
- "type": "WallVC",
- "wall": "left",
- "variables": [
- {
- "name": "vx",
- "value": "0.0"
- }
- ]
- },
- {
- "type": "WallVC",
- "wall": "right",
- "variables": [
- {
- "name": "vx",
- "value": "0.0"
- }
- ]
- },
- {
- "type": "WallVC",
- "wall": "top",
- "variables": [
- {
- "name": "vy",
- "value": "0.0"
- }
- ]
- },
- {
- "type": "WallVC",
- "wall": "bottom",
- "variables": [
- {
- "name": "vy",
- "value": "0.0"
- }
- ]
- }
- ]
- },
-
- "FieldVariablesToCheckpoint": [
- "StrainRateInvariantField",
- "VelocityField",
- "PressureField"
- ],
- "timeIntegratorOrder": "1",
- "maxTimeSteps": "0",
- "outputPath": "./output",
- "dim": "3",
- "minX": "0",
- "minY": "0",
- "minZ": "0",
- "maxX": "4",
- "maxY": "8",
- "maxZ": "4",
- "nx": "8",
- "ny": "16",
- "nz": "8",
- "particlesPerCell": "40",
- "seed": "13",
- "checkpointEvery": "1",
- "gravity": "1.0"
-}
\ No newline at end of file
diff -r 4408cf6c9f69 -r d803f3388e8b json_input/benchmarks/sphere_in_cylinder.json
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/json_input/benchmarks/sphere_in_cylinder.json Mon Nov 21 16:14:05 2011 -0800
@@ -0,0 +1,168 @@
+{
+ "components":
+ {
+ "buoyancyForceTerm":
+ {
+ "Type": "BuoyancyForceTerm",
+ "ForceVector": "mom_force",
+ "Swarm": "gaussSwarm",
+ "gravity": "gravity"
+ },
+ "boxShape":
+ {
+ "Type": "Box",
+ "startX": "minX",
+ "endX": "maxX",
+ "startY": "minY",
+ "endY": "maxY",
+ "startZ": "minZ",
+ "endZ": "maxZ"
+ },
+ "cylinderShape":
+ {
+ "Type": "EquationShape",
+ "equation": "4-hypot(x,z)"
+ },
+ "sphereShape":
+ {
+ "Type": "EquationShape",
+ "equation": "1-(x*x + (y-4)*(y-4) + z*z)"
+ },
+ "backgroundShape":
+ {
+ "Type": "Intersection",
+ "shapes":[
+ "cylinderShape",
+ "!sphereShape"
+ ]
+ },
+ "backgroundViscosity":
+ {
+ "Type": "MaterialViscosity",
+ "eta0": "1.0"
+ },
+ "viscous":
+ {
+ "Type": "RheologyMaterial",
+ "Shape": "backgroundShape",
+ "density": "0.0",
+ "Rheology": [
+ "backgroundViscosity",
+ "storeViscosity",
+ "storeStress"
+ ]
+ },
+ "nonbackgroundShape":
+ {
+ "Type": "Intersection",
+ "shapes":[
+ "!backgroundShape"
+ ]
+ },
+ "highViscosity":
+ {
+ "Type": "MaterialViscosity",
+ "eta0": "100.0"
+ },
+ "sphere":
+ {
+ "Type": "RheologyMaterial",
+ "Shape": "nonbackgroundShape",
+ "density": "1.0",
+ "Rheology": [
+ "highViscosity",
+ "storeViscosity",
+ "storeStress"
+ ]
+ }
+
+ },
+ "velocityBCs" :{
+ "type": "CompositeVC",
+ "vcList": [
+ {
+ "type": "WallVC",
+ "wall": "front",
+ "variables": [
+ {
+ "name": "vz",
+ "value": "0.0"
+ }
+ ]
+ },
+ {
+ "type": "WallVC",
+ "wall": "back",
+ "variables": [
+ {
+ "name": "vz",
+ "value": "0.0"
+ }
+ ]
+ },
+ {
+ "type": "WallVC",
+ "wall": "left",
+ "variables": [
+ {
+ "name": "vx",
+ "value": "0.0"
+ }
+ ]
+ },
+ {
+ "type": "WallVC",
+ "wall": "right",
+ "variables": [
+ {
+ "name": "vx",
+ "value": "0.0"
+ }
+ ]
+ },
+ {
+ "type": "WallVC",
+ "wall": "top",
+ "variables": [
+ {
+ "name": "vy",
+ "value": "0.0"
+ }
+ ]
+ },
+ {
+ "type": "WallVC",
+ "wall": "bottom",
+ "variables": [
+ {
+ "name": "vy",
+ "value": "0.0"
+ }
+ ]
+ }
+ ]
+ },
+
+ "FieldVariablesToCheckpoint": [
+ "StrainRateInvariantField",
+ "VelocityField",
+ "PressureField"
+ ],
+ "timeIntegratorOrder": "1",
+ "maxTimeSteps": "0",
+ "outputPath": "./output",
+ "dim": "3",
+ "minX": "0",
+ "minY": "0",
+ "minZ": "0",
+ "maxX": "4",
+ "maxY": "8",
+ "maxZ": "4",
+ "nx": "8",
+ "ny": "16",
+ "nz": "8",
+ "particlesPerCell": "40",
+ "seed": "13",
+ "checkpointEvery": "1",
+ "gravity": "1.0"
+}
\ No newline at end of file
More information about the CIG-COMMITS
mailing list