Skip to content

Commit

Permalink
:text: Update Network1a to new json model
Browse files Browse the repository at this point in the history
  • Loading branch information
@micheltakken
micheltakken committed Nov 14, 2023
1 parent fe10070 commit add3942
Showing 1 changed file with 209 additions and 155 deletions.
364 changes: 209 additions & 155 deletions examples/Hybrid/Network1a.JSON
View file
Original file line number Diff line number Diff line change
@@ -1,137 +1,175 @@
{
"Network":
{
"Nodes":
[
{
"iD": 0,
"x": 0.0,
"y": 0.0
},
{
"iD": 1,
"x": 1e-3,
"y": 2e-3
},
{
"iD": 2,
"x": 1e-3,
"y": 1e-3
},
{
"iD": 3,
"x": 1e-3,
"y": 0.0
},
{
"iD": 4,
"x": 2e-3,
"y": 2e-3
},
{
"iD": 5,
"x": 1.75e-3,
"y": 1e-3
},
{
"iD": 6,
"x": 2e-3,
"y": 0.0
},
{
"iD": 7,
"x": 2e-3,
"y": 1.25e-3
},
{
"iD": 8,
"x": 2e-3,
"y": 0.75e-3
},
{
"iD": 9,
"x": 2.25e-3,
"y": 1e-3
},
{
"iD": -1,
"x": 3e-3,
"y": 1e-3
}
],
"Channels":
[
{
"iD": 0,
"nA": 0,
"nB": 1,
"width": 1e-4,
"height": 1e-4
},
{
"iD": 1,
"nA": 0,
"nB": 2,
"width": 1e-4,
"height": 1e-4
},
{
"iD": 2,
"nA": 0,
"nB": 3,
"width": 1e-4,
"height": 1e-4
},
{
"iD": 3,
"nA": 1,
"nB": 4,
"width": 1e-4,
"height": 1e-4
},
{
"iD": 4,
"nA": 2,
"nB": 5,
"width": 1e-4,
"height": 1e-4
},
{
"iD": 5,
"nA": 3,
"nB": 6,
"width": 1e-4,
"height": 1e-4
},
{
"iD": 6,
"nA": 4,
"nB": 7,
"width": 1e-4,
"height": 1e-4
},
{
"iD": 7,
"nA": 6,
"nB": 8,
"width": 1e-4,
"height": 1e-4
},
{
"iD": 8,
"nA": 9,
"nB": -1,
"width": 1e-4,
"height": 1e-4
}
],
"Modules":
[
{
"iD": 0,
"Type":"LBM",
{
"network": {
"nodes": [
{
"x": 0.0,
"y": 0.0,
"z": 0.0,
"diameter": 0.02,
"ground": true
},
{
"x": 1e-3,
"y": 2e-3,
"z": 0.0,
"diameter": 0.02,
"ground": false
},
{
"x": 1e-3,
"y": 1e-3,
"z": 0.0,
"diameter": 0.02,
"ground": false
},
{
"x": 1e-3,
"y": 0.0,
"z": 0.0,
"diameter": 0.02,
"ground": false
},
{
"x": 2e-3,
"y": 2e-3,
"z": 0.0,
"diameter": 0.02,
"ground": false
},
{
"x": 1.75e-3,
"y": 1e-3,
"z": 0.0,
"diameter": 0.02,
"ground": false
},
{
"x": 2e-3,
"y": 0.0,
"z": 0.0,
"diameter": 0.02,
"ground": false
},
{
"x": 2e-3,
"y": 1.25e-3,
"z": 0.0,
"diameter": 0.02,
"ground": false
},
{
"x": 2e-3,
"y": 0.75e-3,
"z": 0.0,
"diameter": 0.02,
"ground": false
},
{
"x": 2.25e-3,
"y": 1e-3,
"z": 0.0,
"diameter": 0.02,
"ground": false
},
{
"x": 3e-3,
"y": 1e-3,
"z": 0.0,
"diameter": 0.02,
"ground": true
}
],
"channels": [
{
"node1": 0,
"node2": 1,
"width": 1e-4,
"height": 1e-4
},
{
"node1": 0,
"node2": 2,
"width": 1e-4,
"height": 1e-4
},
{
"node1": 0,
"node2": 3,
"width": 1e-4,
"height": 1e-4
},
{
"node1": 1,
"node2": 4,
"width": 1e-4,
"height": 1e-4
},
{
"node1": 2,
"node2": 5,
"width": 1e-4,
"height": 1e-4
},
{
"node1": 3,
"node2": 6,
"width": 1e-4,
"height": 1e-4
},
{
"node1": 4,
"node2": 7,
"width": 1e-4,
"height": 1e-4
},
{
"node1": 6,
"node2": 8,
"width": 1e-4,
"height": 1e-4
},
{
"node1": 9,
"node2": 10,
"width": 1e-4,
"height": 1e-4
}
]
},
"simulation": {
"platform": "continuous",
"type": "hybrid",
"fluids": [
{
"name": "Water",
"concentration": 1,
"density": 997,
"viscosity": 0.001
}
],
"pumps": [
{
"channel":0,
"type": "PumpPressure",
"deltaP": 1000
},
{
"channel":1,
"type": "PumpPressure",
"deltaP": 1000
},
{
"channel":2,
"type": "PumpPressure",
"deltaP": 1000
}
],
"settings": {
"simulators": [
{
"Type": "LBM",
"name": "Paper1a-cross-0",
"stlFile": "../examples/STL/cross.stl",
"stlFile": "/home/michel/Git/mmft-hybrid-simulator/examples/STL/cross.stl",
"charPhysLength": 1e-4,
"charPhysVelocity": 1e-1,
"alpha": 0.1,
Expand All @@ -142,34 +180,50 @@
"posY": 0.75e-3,
"sizeX": 5e-4,
"sizeY": 5e-4,
"Openings":
[
{
"nodeId": 5,
"normalX": 1.0,
"normalY": 0.0,
"width": 1e-4
"Openings": [
{
"node": 5,
"normal": {
"x": 1.0,
"y": 0.0,
"z": 0.0
},
"width": 1e-4,
"height": 1e-4
},
{
"nodeId": 7,
"normalX": 0.0,
"normalY": -1.0,
"width": 1e-4
{
"node": 7,
"normal": {
"x": 0.0,
"y": -1.0,
"z": 0.0
},
"width": 1e-4,
"height": 1e-4
},
{
"nodeId": 8,
"normalX": 0.0,
"normalY": 1.0,
"width": 1e-4
{
"node": 8,
"normal": {
"x": 0.0,
"y": 1.0,
"z": 0.0
},
"width": 1e-4,
"height": 1e-4
},
{
"nodeId": 9,
"normalX": -1.0,
"normalY": 0.0,
"width": 1e-4
{
"node": 9,
"normal": {
"x": -1.0,
"y": 0.0,
"z": 0.0
},
"width": 1e-4,
"height": 1e-4
}
]
}
]
}
}
}

0 comments on commit add3942

Please sign in to comment.