Update examples to new format

This commit is contained in:
Magnus Ulimoen 2020-09-04 16:51:18 +02:00
parent f1cb01d47c
commit aa40eb7339
3 changed files with 146 additions and 138 deletions

View File

@ -4,26 +4,26 @@
"operators": { "operators": {
"xi": "upwind9", "xi": "upwind9",
"eta": "upwind9" "eta": "upwind9"
},
"boundary_conditions": {
"south": "vortex",
"north": "vortex",
"east": "vortex",
"west": "vortex"
} }
}, },
"grid0": { "grid0": {
"x": { "linspace": { "start": -5, "end": 5, "steps": 50 } }, "x": { "linspace": { "start": -5, "end": 5, "steps": 50 } },
"y": { "linspace": { "start": 0, "end": 5, "steps": 25 } }, "y": { "linspace": { "start": 0, "end": 5, "steps": 25 } },
"boundary_conditions": { "boundary_conditions": {
"south": {"interpolate": { "neighbour": "grid1", "operator": "9"}}, "south": {"interpolate": { "neighbour": "grid1", "operator": "9"}}
"north": "vortex",
"east": "vortex",
"west": "vortex"
} }
}, },
"grid1": { "grid1": {
"x": { "linspace": { "start": -5, "end": 5, "steps": 99 } }, "x": { "linspace": { "start": -5, "end": 5, "steps": 99 } },
"y": { "linspace": { "start": -5, "end": 0, "steps": 50 } }, "y": { "linspace": { "start": -5, "end": 0, "steps": 50 } },
"boundary_conditions": { "boundary_conditions": {
"south": "vortex", "north": {"interpolate": { "neighbour": "grid0", "operator": "9"}}
"north": {"interpolate": { "neighbour": "grid0", "operator": "9"}},
"east": "vortex",
"west": "vortex"
} }
} }
}, },

View File

@ -4,65 +4,65 @@
"operators": { "operators": {
"xi": "upwind9", "xi": "upwind9",
"eta": "upwind9" "eta": "upwind9"
},
"boundary_conditions": {
"south": "vortex",
"north": "vortex",
"east": "vortex",
"west": "vortex"
} }
}, },
"grid0": { "grid0": {
"x": "linspace:h2:-5:0:50", "x": { "linspace": { "start": -5, "end": 0, "steps": 50, "h2": true } },
"y": "linspace:h2:0:5:50", "y": { "linspace": { "start": 0, "end": 5, "steps": 50, "h2": true } },
"operators": { "operators": {
"xi": "upwind9h2", "xi": "upwind9h2",
"eta": "upwind9h2" "eta": "upwind9h2"
}, },
"boundary_conditions": { "boundary_conditions": {
"south": "interpolate:9h2:grid1", "south": { "interpolate": { "neighbour": "grid1", "operator": "9h2" } },
"north": "vortex", "east": { "neighbour": "grid3" }
"east": "grid3",
"west": "vortex"
} }
}, },
"grid1": { "grid1": {
"x": "linspace:h2:-5:0:98", "x": { "linspace": { "start": -5, "end": 0, "steps": 98, "h2": true } },
"y": "linspace:-5:0:100", "y": { "linspace": { "start": -5, "end": 0, "steps": 100 } },
"operators": { "operators": {
"xi": "upwind9h2" "xi": "upwind9h2"
}, },
"boundary_conditions": { "boundary_conditions": {
"south": "vortex", "north": { "interpolate": { "neighbour": "grid0", "operator": "9h2" } },
"north": "interpolate:9h2:grid0", "east": { "neighbour": "grid2" }
"east": "grid2",
"west": "vortex"
} }
}, },
"grid2": { "grid2": {
"x": "linspace:0:5:99", "x": { "linspace": { "start": 0, "end": 5, "steps": 99 } },
"y": "linspace:-5:0:100", "y": { "linspace": { "start": -5, "end": 0, "steps": 100 } },
"boundary_conditions": { "boundary_conditions": {
"south": "vortex", "north": { "interpolate": { "neighbour": "grid3", "operator": "9" } },
"north": "interpolate:9:grid3", "west": { "neighbour": "grid1" }
"east": "vortex",
"west": "grid1"
} }
}, },
"grid3": { "grid3": {
"x": "linspace:0:5:50", "x": { "linspace": { "start": 0, "end": 5, "steps": 50 } },
"y": "linspace:h2:0:5:50", "y": { "linspace": { "start": 0, "end": 5, "steps": 50, "h2": true } },
"operators": { "operators": {
"eta": "upwind9h2" "eta": "upwind9h2"
}, },
"boundary_conditions": { "boundary_conditions": {
"south": "interpolate:9:grid2", "south": { "interpolate": { "neighbour": "grid2", "operator": "9" } },
"north": "vortex", "west": { "neighbour": "grid0" }
"east": "vortex",
"west": "grid0"
} }
} }
}, },
"integration_time": 2.0, "integration_time": 2.0,
"vortex": { "vortex": {
"vortices": [{
"x0": -1.0, "x0": -1.0,
"y0": 0.0, "y0": 0.0,
"mach": 0.5,
"rstar": 0.5, "rstar": 0.5,
"eps": 1.0 "eps": 1.0
}],
"mach": 0.5
} }
} }

View File

@ -1,172 +1,180 @@
{ {
"grids": { "grids": {
"default": {
"operators": {
"xi": "upwind9",
"eta": "upwind9"
}
},
"grid00": { "grid00": {
"x": "linspace:-5:-2.5:128", "x": { "linspace": { "start": -5, "end": -2.5, "steps": 128 } },
"y": "linspace:2.5:5:128", "y": { "linspace": { "start": 2.5, "end": 5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid01", "south": {"neighbour": "grid01"},
"north": "grid11", "north": {"neighbour": "grid11"},
"east": "grid03", "east": {"neighbour": "grid03"},
"west": "grid33" "west": {"neighbour": "grid33"}
} }
}, },
"grid01": { "grid01": {
"x": "linspace:-5:-2.5:128", "x": { "linspace": { "start": -5, "end": -2.5, "steps": 128 } },
"y": "linspace:0:2.5:128", "y": { "linspace": { "start": 0, "end": 2.5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid10", "south": {"neighbour": "grid10"},
"north": "grid00", "north": {"neighbour": "grid00"},
"east": "grid02", "east": {"neighbour": "grid02"},
"west": "grid32" "west": {"neighbour": "grid32"}
} }
}, },
"grid02": { "grid02": {
"x": "linspace:-2.5:0:128", "x": { "linspace": { "start": -2.5, "end": 0, "steps": 128 } },
"y": "linspace:0:2.5:128", "y": { "linspace": { "start": 0, "end": 2.5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid13", "south": {"neighbour": "grid13"},
"north": "grid03", "north": {"neighbour": "grid03"},
"east": "grid31", "east": {"neighbour": "grid31"},
"west": "grid01" "west": {"neighbour": "grid01"}
} }
}, },
"grid03": { "grid03": {
"x": "linspace:-2.5:0:128", "x": { "linspace": { "start": -2.5, "end": 0, "steps": 128 } },
"y": "linspace:2.5:5:128", "y": { "linspace": { "start": 2.5, "end": 5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid02", "south": {"neighbour": "grid02"},
"north": "grid12", "north": {"neighbour": "grid12"},
"east": "grid30", "east": {"neighbour": "grid30"},
"west": "grid00" "west": {"neighbour": "grid00"}
} }
}, },
"grid10": { "grid10": {
"x": "linspace:-5:-2.5:128", "x": { "linspace": { "start": -5, "end": -2.5, "steps": 128 } },
"y": "linspace:-2.5:0:128", "y": { "linspace": { "start": -2.5, "end": 0, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid11", "south": {"neighbour": "grid11"},
"north": "grid01", "north": {"neighbour": "grid01"},
"east": "grid13", "east": {"neighbour": "grid13"},
"west": "grid23" "west": {"neighbour": "grid23"}
} }
}, },
"grid11": { "grid11": {
"x": "linspace:-5:-2.5:128", "x": { "linspace": { "start": -5, "end": -2.5, "steps": 128 } },
"y": "linspace:-5:-2.5:128", "y": { "linspace": { "start": -5, "end": -2.5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid00", "south": {"neighbour": "grid00"},
"north": "grid10", "north": {"neighbour": "grid10"},
"east": "grid12", "east": {"neighbour": "grid12"},
"west": "grid22" "west": {"neighbour": "grid22"}
} }
}, },
"grid12": { "grid12": {
"x": "linspace:-2.5:0:128", "x": { "linspace": { "start": -2.5, "end": 0, "steps": 128 } },
"y": "linspace:-5:-2.5:128", "y": { "linspace": { "start": -5, "end": -2.5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid03", "south": {"neighbour": "grid03"},
"north": "grid13", "north": {"neighbour": "grid13"},
"east": "grid21", "east": {"neighbour": "grid21"},
"west": "grid11" "west": {"neighbour": "grid11"}
} }
}, },
"grid13": { "grid13": {
"x": "linspace:-2.5:0:128", "x": { "linspace": { "start": -2.5, "end": 0, "steps": 128 } },
"y": "linspace:-2.5:0:128", "y": { "linspace": { "start": -2.5, "end": 0, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid12", "south": {"neighbour": "grid12"},
"north": "grid02", "north": {"neighbour": "grid02"},
"east": "grid20", "east": {"neighbour": "grid20"},
"west": "grid10" "west": {"neighbour": "grid10"}
} }
}, },
"grid20": { "grid20": {
"x": "linspace:0:2.5:128", "x": { "linspace": { "start": 0, "end": 2.5, "steps": 128 } },
"y": "linspace:-2.5:0:128", "y": { "linspace": { "start": -2.5, "end": 0, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid21", "south": {"neighbour": "grid21"},
"north": "grid31", "north": {"neighbour": "grid31"},
"east": "grid23", "east": {"neighbour": "grid23"},
"west": "grid13" "west": {"neighbour": "grid13"}
} }
}, },
"grid21": { "grid21": {
"x": "linspace:0:2.5:128", "x": { "linspace": { "start": 0, "end": 2.5, "steps": 128 } },
"y": "linspace:-5:-2.5:128", "y": { "linspace": { "start": -5, "end": -2.5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid30", "south": {"neighbour": "grid30"},
"north": "grid20", "north": {"neighbour": "grid20"},
"east": "grid22", "east": {"neighbour": "grid22"},
"west": "grid12" "west": {"neighbour": "grid12"}
} }
}, },
"grid22": { "grid22": {
"x": "linspace:2.5:5:128", "x": { "linspace": { "start": 2.5, "end": 5, "steps": 128 } },
"y": "linspace:-5:-2.5:128", "y": { "linspace": { "start": -5, "end": -2.5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid33", "south": {"neighbour": "grid33"},
"north": "grid23", "north": {"neighbour": "grid23"},
"east": "grid11", "east": {"neighbour": "grid11"},
"west": "grid21" "west": {"neighbour": "grid21"}
} }
}, },
"grid23": { "grid23": {
"x": "linspace:2.5:5:128", "x": { "linspace": { "start": 2.5, "end": 5, "steps": 128 } },
"y": "linspace:-2.5:0:128", "y": { "linspace": { "start": -2.5, "end": 0, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid22", "south": {"neighbour": "grid22"},
"north": "grid32", "north": {"neighbour": "grid32"},
"east": "grid10", "east": {"neighbour": "grid10"},
"west": "grid20" "west": {"neighbour": "grid20"}
} }
}, },
"grid30": { "grid30": {
"x": "linspace:0:2.5:128", "x": { "linspace": { "start": 0, "end": 2.5, "steps": 128 } },
"y": "linspace:2.5:5:128", "y": { "linspace": { "start": 2.5, "end": 5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid31", "south": {"neighbour": "grid31"},
"north": "grid21", "north": {"neighbour": "grid21"},
"east": "grid33", "east": {"neighbour": "grid33"},
"west": "grid03" "west": {"neighbour": "grid03"}
} }
}, },
"grid31": { "grid31": {
"x": "linspace:0:2.5:128", "x": { "linspace": { "start": 0, "end": 2.5, "steps": 128 } },
"y": "linspace:0:2.5:128", "y": { "linspace": { "start": 0, "end": 2.5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid20", "south": {"neighbour": "grid20"},
"north": "grid30", "north": {"neighbour": "grid30"},
"east": "grid32", "east": {"neighbour": "grid32"},
"west": "grid02" "west": {"neighbour": "grid02"}
} }
}, },
"grid32": { "grid32": {
"x": "linspace:2.5:5:128", "x": { "linspace": { "start": 2.5, "end": 5, "steps": 128 } },
"y": "linspace:0:2.5:128", "y": { "linspace": { "start": 0, "end": 2.5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid23", "south": {"neighbour": "grid23"},
"north": "grid33", "north": {"neighbour": "grid33"},
"east": "grid01", "east": {"neighbour": "grid01"},
"west": "grid31" "west": {"neighbour": "grid31"}
} }
}, },
"grid33": { "grid33": {
"x": "linspace:2.5:5:128", "x": { "linspace": { "start": 2.5, "end": 5, "steps": 128 } },
"y": "linspace:2.5:5:128", "y": { "linspace": { "start": 2.5, "end": 5, "steps": 128 } },
"boundary_conditions": { "boundary_conditions": {
"south": "grid32", "south": {"neighbour": "grid32"},
"north": "grid22", "north": {"neighbour": "grid22"},
"east": "grid00", "east": {"neighbour": "grid00"},
"west": "grid30" "west": {"neighbour": "grid30"}
} }
} }
}, },
"integration_time": 2.0, "integration_time": 2.0,
"vortex": { "vortex": {
"vortices": [{
"x0": -1.0, "x0": -1.0,
"y0": 0.0, "y0": 0.0,
"mach": 0.5,
"rstar": 0.5, "rstar": 0.5,
"eps": 1.0 "eps": 1.0
}],
"mach": 0.5
} }
} }