[cig-commits] commit: Remove erroneously added backup files
Mercurial
hg at geodynamics.org
Tue Nov 22 12:54:21 PST 2011
changeset: 424:99f81b632532
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Tue Nov 22 12:54:01 2011 -0800
files: json_input/benchmarks/thermal_diffusion.json~ json_input/benchmarks/thermal_eulerian.json~ json_input/benchmarks/thermal_lagrangian.json~
description:
Remove erroneously added backup files
diff -r a15903a28f5c -r 99f81b632532 json_input/benchmarks/thermal_diffusion.json~
--- a/json_input/benchmarks/thermal_diffusion.json~ Tue Nov 22 12:53:25 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-{
- "components":
- {
- "boxShape":
- {
- "Type": "Box",
- "startX": "minX",
- "endX": "maxX",
- "startY": "minY",
- "endY": "maxY",
- "startZ": "minZ",
- "endZ": "maxZ"
- },
- "sphereShape":
- {
- "Type": "EquationShape",
- "equation": ".1^2 - ((x-.5)^2 + (y-.5)^2)"
- },
- "nonsphereShape":
- {
- "Type": "Intersection",
- "shapes":
- [
- "boxShape",
- "!sphereShape"
- ]
- },
- "backgroundViscosity":
- {
- "Type": "MaterialViscosity",
- "eta0": "1.0"
- },
- "viscous":
- {
- "Type": "RheologyMaterial",
- "Shape": "nonsphereShape",
- "density": "1.0",
- "alpha": "1.0",
- "diffusivity": "1.0",
- "heatingElements": [
- {
- "Q": "0.0",
- "lambda": "1.0"
- }
- ],
- "Rheology": [
- "backgroundViscosity"
- ]
- },
- "sphereViscosity":
- {
- "Type": "MaterialViscosity",
- "eta0": "10.0"
- },
- "sphereViscous":
- {
- "Type": "RheologyMaterial",
- "Shape": "sphereShape",
- "density": "1.0",
- "alpha": "10.0",
- "diffusivity": "10.0",
- "heatingElements": [
- {
- "Q": "0.0",
- "lambda": "10.0"
- }
- ],
- "Rheology": [
- "sphereViscosity"
- ]
- },
- "predictorMulticorrector":
- {
- "Type": "AdvDiffMulticorrector",
- "multiCorrectorIterations": "2"
- }
- },
- "velocityICs":
- {
- "type": "CompositeVC",
- "vcList": [
- {
- "type": "AllNodesVC",
- "variables":[
- {
- "name": "vx",
- "value": "0.0"
- },
- {
- "name": "vy",
- "value": "0.0"
- }
- ]
- }
- ]
- },
- "temperatureICs":
- {
- "type": "CompositeVC",
- "vcList": [
- {
- "type": "AllNodesVC",
- "variables":[
- {
- "name": "temperature",
- // "value": "1.0"
- "value": "(x<.375 || x>.625 || y<.375 || y>.625) ? 1 : 2"
- // "value": ".1^2 > ((x-.5)^2 + (y-.5)^2) ? 2 : 1"
- }
- ]
- }
- ]
- },
-
- "FieldVariablesToCheckpoint": [
- "TemperatureField",
- "VelocityField"
- ],
- "enable-stokes": false,
- "enable-thermal": true,
- "timeIntegratorOrder": "1",
- "maxTimeSteps": "1",
- "outputPath": "./output",
- "dim": "2",
- "minX": "0",
- "minY": "0",
- "minZ": "0",
- "maxX": "1",
- "maxY": "1",
- "maxZ": "0.3",
- "nx": "8",
- "ny": "8",
- "nz": "4",
- "particlesPerCell": "40",
- "seed": "13",
- "checkpointEvery": "1",
- "gravity": "1.0"
-}
\ No newline at end of file
diff -r a15903a28f5c -r 99f81b632532 json_input/benchmarks/thermal_eulerian.json~
--- a/json_input/benchmarks/thermal_eulerian.json~ Tue Nov 22 12:53:25 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-{
- "plugins":
- [
- {
- "Type": "Underworld_EulerDeform",
- "Context":"context"
- }
- ],
- "EulerDeform":
- {
- "systems": [
- {
- "mesh": "v-T-mesh",
- "innerMesh": "pressure-mesh",
- "remesher": "velocityRemesher",
- "velocityField": "VelocityField"
- }
- ]
- },
- "components":
- {
- "boxShape":
- {
- "Type": "Box",
- "startX": "minX",
- "endX": "maxX",
- "startY": "minY",
- "endY": "maxY",
- "startZ": "minZ",
- "endZ": "maxZ"
- },
- "backgroundViscosity":
- {
- "Type": "MaterialViscosity",
- "eta0": "1.0"
- },
- "viscous":
- {
- "Type": "RheologyMaterial",
- "Shape": "boxShape",
- "density": "1.0",
- "alpha": "1.0",
- "diffusivity": "0.0",
- "heatingElements": [
- {
- "Q": "0.0",
- "lambda": "1.0"
- }
- ],
- "Rheology": [
- "backgroundViscosity"
- ]
- }
- },
- "velocityICs":
- {
- "type": "CompositeVC",
- "vcList": [
- {
- "type": "AllNodesVC",
- "variables":[
- {
- "name": "vx",
- "value": "1.0"
- },
- {
- "name": "vy",
- "value": "0.0"
- }
- ]
- }
- ]
- },
- "temperatureICs":
- {
- "type": "CompositeVC",
- "vcList": [
- {
- "type": "AllNodesVC",
- "variables":[
- {
- "name": "temperature",
- "value": "(x<.375 || x>.625 || y<.375 || y>.625) ? 1 : 2"
- // "value": ".1^2 > ((x-.5)^2 + (y-.5)^2) ? 2 : 1"
- }
- ]
- }
- ]
- },
-
- "FieldVariablesToCheckpoint": [
- "TemperatureField",
- "VelocityField"
- ],
- "enable-stokes": false,
- "enable-thermal": true,
- "timeIntegratorOrder": "1",
- "maxTimeSteps": "1",
- "outputPath": "./output",
- "dim": "2",
- "minX": "0",
- "minY": "0",
- "minZ": "0",
- "maxX": "4",
- "maxY": "1",
- "maxZ": "0.3",
- "nx": "32",
- "ny": "8",
- "nz": "4",
- "particlesPerCell": "40",
- "seed": "13",
- "checkpointEvery": "1",
- "gravity": "1.0"
-}
\ No newline at end of file
diff -r a15903a28f5c -r 99f81b632532 json_input/benchmarks/thermal_lagrangian.json~
--- a/json_input/benchmarks/thermal_lagrangian.json~ Tue Nov 22 12:53:25 2011 -0800
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-{
- "components":
- {
- "boxShape":
- {
- "Type": "Box",
- "startX": "minX",
- "endX": "maxX",
- "startY": "minY",
- "endY": "maxY",
- "startZ": "minZ",
- "endZ": "maxZ"
- },
- "sphereShape":
- {
- "Type": "EquationShape",
- "equation": ".1^2 - ((x-.5)^2 + (y-.5)^2)"
- },
- "nonsphereShape":
- {
- "Type": "Intersection",
- "shapes":
- [
- "boxShape",
- "!sphereShape"
- ]
- },
- "backgroundViscosity":
- {
- "Type": "MaterialViscosity",
- "eta0": "1.0"
- },
- "viscous":
- {
- "Type": "RheologyMaterial",
- "Shape": "nonsphereShape",
- "density": "1.0",
- "alpha": "1.0",
- "diffusivity": "1.0",
- "heatingElements": [
- {
- "Q": "0.0",
- "lambda": "1.0"
- }
- ],
- "Rheology": [
- "backgroundViscosity"
- ]
- },
- "sphereViscosity":
- {
- "Type": "MaterialViscosity",
- "eta0": "10.0"
- },
- "sphereViscous":
- {
- "Type": "RheologyMaterial",
- "Shape": "sphereShape",
- "density": "1.0",
- "alpha": "10.0",
- "diffusivity": "10.0",
- "heatingElements": [
- {
- "Q": "0.0",
- "lambda": "10.0"
- }
- ],
- "Rheology": [
- "sphereViscosity"
- ]
- },
- "predictorMulticorrector":
- {
- "Type": "AdvDiffMulticorrector",
- "multiCorrectorIterations": "2"
- }
- },
- "velocityICs":
- {
- "type": "CompositeVC",
- "vcList": [
- {
- "type": "AllNodesVC",
- "variables":[
- {
- "name": "vx",
- "value": "0.0"
- },
- {
- "name": "vy",
- "value": "0.0"
- }
- ]
- }
- ]
- },
- "temperatureICs":
- {
- "type": "CompositeVC",
- "vcList": [
- {
- "type": "AllNodesVC",
- "variables":[
- {
- "name": "temperature",
- // "value": "1.0"
- "value": "(x<.375 || x>.625 || y<.375 || y>.625) ? 1 : 2"
- // "value": ".1^2 > ((x-.5)^2 + (y-.5)^2) ? 2 : 1"
- }
- ]
- }
- ]
- },
-
- "FieldVariablesToCheckpoint": [
- "TemperatureField",
- "VelocityField"
- ],
- "enable-stokes": false,
- "enable-thermal": true,
- "timeIntegratorOrder": "1",
- "maxTimeSteps": "1",
- "outputPath": "./output",
- "dim": "2",
- "minX": "0",
- "minY": "0",
- "minZ": "0",
- "maxX": "1",
- "maxY": "1",
- "maxZ": "0.3",
- "nx": "8",
- "ny": "8",
- "nz": "4",
- "particlesPerCell": "40",
- "seed": "13",
- "checkpointEvery": "1",
- "gravity": "1.0"
-}
\ No newline at end of file
More information about the CIG-COMMITS
mailing list