[cig-commits] commit: All of the json cookbooks seem to work
Mercurial
hg at geodynamics.org
Sun Nov 20 23:11:02 PST 2011
changeset: 412:4b084966b296
user: Walter Landry <wlandry at caltech.edu>
date: Sun Nov 20 13:30:55 2011 -0800
files: 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/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/tracers.json json_input/cookbook/viscous.json json_input/cookbook/yielding.json
description:
All of the json cookbooks seem to work
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/deforming_bottom.json
--- a/json_input/cookbook/deforming_bottom.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/deforming_bottom.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True",
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/extension.json
--- a/json_input/cookbook/extension.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/extension.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True"
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/extension3D.json
--- a/json_input/cookbook/extension3D.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/extension3D.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True"
@@ -50,8 +50,8 @@
"surfaceAdaptor":
{
"Type": "SurfaceAdaptor",
- "mesh":"v-T-mesh",
- "sourceGenerator": "v-T-mesh-generator",
+ "mesh":"v-mesh",
+ "sourceGenerator": "v-mesh-generator",
"topSurfaceType": "topo_data",
"topSurfaceName": "input/cookbook/test.topo",
"topNx": "32",
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/file.json
--- a/json_input/cookbook/file.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/file.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True"
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/fixed_bottom.json
--- a/json_input/cookbook/fixed_bottom.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/fixed_bottom.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True",
@@ -59,8 +59,8 @@
"surfaceAdaptor":
{
"Type": "SurfaceAdaptor",
- "mesh": "v-T-mesh",
- "sourceGenerator": "v-T-mesh-generator",
+ "mesh": "v-mesh",
+ "sourceGenerator": "v-mesh-generator",
"bottomEquation": "step(0.960468635615-x)*(-3 + sqrt(3.15*3.15 - x*x))"
}
},
@@ -125,9 +125,5 @@
"particlesPerCell": "40",
"seed": "13",
"checkpointEvery": "1",
- "gravity": "1.0",
- "journal.info": "True",
- "journal.debug": "True",
- "journal-level.info": "2",
- "journal-level.debug": "2"
+ "gravity": "1.0"
}
\ No newline at end of file
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/inflow_outflow.json
--- a/json_input/cookbook/inflow_outflow.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/inflow_outflow.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True",
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/multi_material.json
--- a/json_input/cookbook/multi_material.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/multi_material.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True"
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/normal_stress.json
--- a/json_input/cookbook/normal_stress.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/normal_stress.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True",
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/sinusoid.json
--- a/json_input/cookbook/sinusoid.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/sinusoid.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True"
@@ -50,8 +50,8 @@
"surfaceAdaptor":
{
"Type": "SurfaceAdaptor",
- "mesh":"v-T-mesh",
- "sourceGenerator": "v-T-mesh-generator",
+ "mesh":"v-mesh",
+ "sourceGenerator": "v-mesh-generator",
"topEquation": "0.1*sin(2*pi*x)"
}
},
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/split.json
--- a/json_input/cookbook/split.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/split.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True"
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/template.json
--- a/json_input/cookbook/template.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/template.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True"
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/thermal.json
--- a/json_input/cookbook/thermal.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/thermal.json Sun Nov 20 13:30:55 2011 -0800
@@ -3,6 +3,10 @@
[
{
"Type": "Underworld_EulerDeform",
+ "Context":"context"
+ },
+ {
+ "Type": "Underworld_MeshAdvectionCorrection",
"Context":"context"
}
],
@@ -10,8 +14,9 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
+ "T-mesh": "T-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True"
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/thermal_file.json
--- a/json_input/cookbook/thermal_file.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/thermal_file.json Sun Nov 20 13:30:55 2011 -0800
@@ -3,6 +3,10 @@
[
{
"Type": "Underworld_EulerDeform",
+ "Context":"context"
+ },
+ {
+ "Type": "Underworld_MeshAdvectionCorrection",
"Context":"context"
}
],
@@ -10,8 +14,9 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
+ "T-mesh": "T-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True"
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/tracers.json
--- a/json_input/cookbook/tracers.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/tracers.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True",
@@ -59,8 +59,8 @@
"surfaceAdaptor":
{
"Type": "SurfaceAdaptor",
- "mesh": "v-T-mesh",
- "sourceGenerator": "v-T-mesh-generator",
+ "mesh": "v-mesh",
+ "sourceGenerator": "v-mesh-generator",
"bottomEquation": "step(0.960468635615-x)*(-3 + sqrt(3.15*3.15 - x*x))"
},
@@ -68,53 +68,27 @@
{
"Type": "ManualParticleLayout",
"totalInitialParticles": "1",
- "manualParticlePositions":
- [
- {
- "asciidata": [
- {
- "columnDefinition" :
- {
- "name": "x",
- "type": "double"
- }
- },
- {
- "columnDefinition" :
- {
- "name": "x",
- "type": "double"
- }
- },
- {
- "columnDefinition" :
- {
- "name": "x",
- "type": "double"
- }
- },
- 1.0, .1, .1,
- 1.3, .1, .1,
- 1.6, .1, .1,
- 1.9, .1, .1,
- 1.0, .2, .1,
- 1.3, .2, .1,
- 1.6, .2, .1,
- 1.9, .2, .1
- ]
- }
+ "manualParticlePositions": [
+ 1.0, .1, .1,
+ 1.3, .1, .1,
+ 1.6, .1, .1,
+ 1.9, .1, .1,
+ 1.0, .2, .1,
+ 1.3, .2, .1,
+ 1.6, .2, .1,
+ 1.9, .2, .1
]
},
"passiveSwarmMovementHandler":
{
"Type": "ParticleMovementHandler"
},
- "passiveTracerSwarm":
+ "passiveTracerSwarm":
{
"Type": "MaterialPointsSwarm",
"CellLayout": "cellLayout",
"ParticleLayout": "pLayout",
- "FeMesh": "mesh-Q2",
+ "FeMesh": "v-mesh",
"ParticleCommHandlers":
[
"passiveSwarmMovementHandler"
@@ -124,7 +98,19 @@
"passiveTracerAdvect":
{
- "Type": "SwarmAdvector"
+ "Type": "SwarmAdvector",
+ "Swarm": "passiveTracerSwarm",
+ "TimeIntegrator": "timeIntegrator",
+ "VelocityField": "VelocityField"
+ },
+ "swarmOutput":
+ {
+ "Type": "TracerOutput",
+ "Swarm": "passiveTracerSwarm",
+ "Fields" : [
+ "PressureField",
+ "StrainRateInvariantField"
+ ]
}
},
"velocityBCs" :{
@@ -173,7 +159,7 @@
"PressureField"
],
"timeIntegratorOrder": "1",
- "maxTimeSteps": "10",
+ "maxTimeSteps": "100",
"outputPath": "./output",
"dim": "2",
"minX": "0.0f",
@@ -188,9 +174,5 @@
"particlesPerCell": "40",
"seed": "13",
"checkpointEvery": "1",
- "gravity": "1.0",
- "journal.info": "True",
- "journal.debug": "True",
- "journal-level.info": "2",
- "journal-level.debug": "2"
+ "gravity": "1.0"
}
\ No newline at end of file
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/viscous.json
--- a/json_input/cookbook/viscous.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/viscous.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True"
diff -r bf3845257573 -r 4b084966b296 json_input/cookbook/yielding.json
--- a/json_input/cookbook/yielding.json Sun Nov 20 13:12:45 2011 -0800
+++ b/json_input/cookbook/yielding.json Sun Nov 20 13:30:55 2011 -0800
@@ -10,8 +10,8 @@
{
"systems": [
{
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
+ "mesh": "v-mesh",
+ "p-mesh": "p-mesh",
"remesher": "velocityRemesher",
"velocityField": "VelocityField",
"wrapTop": "True"
More information about the CIG-COMMITS
mailing list