From c95448450316993b9a99efd53027e627a7a53fd4 Mon Sep 17 00:00:00 2001
From: Magnus Ulimoen <magnus@ulimoen.dev>
Date: Fri, 4 Sep 2020 00:05:25 +0200
Subject: [PATCH] translate some of the examples

---
 multigrid/examples/interpolation.json | 24 ++++++-----
 multigrid/examples/quad.json          | 60 ++++++++++++++-------------
 multigrid/src/parsing.rs              |  3 +-
 3 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/multigrid/examples/interpolation.json b/multigrid/examples/interpolation.json
index c747566..1162567 100644
--- a/multigrid/examples/interpolation.json
+++ b/multigrid/examples/interpolation.json
@@ -7,21 +7,21 @@
             }
         },
         "grid0": {
-            "x": "linspace:-5:5:50",
-            "y": "linspace:0:5:25",
+            "x": { "linspace": { "start": -5, "end": 5, "steps": 50 } },
+            "y": { "linspace": { "start": 0, "end": 5, "steps": 25 } },
             "boundary_conditions": {
-                "south": "interpolate:9:grid1",
+                "south": {"interpolate": { "neighbour": "grid1", "operator": "9"}},
                 "north": "vortex",
                 "east": "vortex",
                 "west": "vortex"
             }
         },
         "grid1": {
-            "x": "linspace:-5:5:99",
-            "y": "linspace:-5:0:50",
+            "x": { "linspace": { "start": -5, "end": 5, "steps": 99 } },
+            "y": { "linspace": { "start": -5, "end": 0, "steps": 50 } },
             "boundary_conditions": {
                 "south": "vortex",
-                "north": "interpolate:9:grid0",
+                "north": {"interpolate": { "neighbour": "grid0", "operator": "9"}},
                 "east": "vortex",
                 "west": "vortex"
             }
@@ -29,10 +29,12 @@
     },
     "integration_time": 2.0,
     "vortex": {
-        "x0": -1.0,
-        "y0": 0.0,
-        "mach": 0.5,
-        "rstar": 0.5,
-        "eps": 1.0
+        "vortices": [{
+            "x0": -1.0,
+            "y0": 0.0,
+            "rstar": 0.5,
+            "eps": 1.0
+        }],
+        "mach": 0.5
     }
 }
diff --git a/multigrid/examples/quad.json b/multigrid/examples/quad.json
index 5f75041..b9c6a73 100644
--- a/multigrid/examples/quad.json
+++ b/multigrid/examples/quad.json
@@ -7,52 +7,54 @@
             }
         },
         "grid0": {
-            "x": "linspace:-5:0:50",
-            "y": "linspace:0:5:50",
+            "x": { "linspace": { "start": -5, "end": 0, "steps": 50 } },
+            "y": { "linspace" : { "start":0, "end" :5, "steps" :50 } },
             "boundary_conditions": {
-                "south": "grid1",
-                "north": "grid1",
-                "east": "grid3",
-                "west": "grid3"
+                "south": { "neighbour": "grid1" },
+                "north": { "neighbour": "grid1" },
+                "east": { "neighbour": "grid3" },
+                "west": { "neighbour": "grid3" }
             }
         },
         "grid1": {
-            "x": "linspace:-5:0:50",
-            "y": "linspace:-5:0:50",
+            "x": { "linspace": { "start": -5, "end": 0, "steps": 50 } },
+            "y": { "linspace" : { "start":-5, "end": 0, "steps" :50 } },
             "boundary_conditions": {
-                "south": "grid0",
-                "north": "grid0",
-                "east": "grid2",
-                "west": "grid2"
+                "south": {"neighbour": "grid0"},
+                "north": {"neighbour": "grid0"},
+                "east": {"neighbour": "grid2"},
+                "west": {"neighbour": "grid2"}
             }
         },
         "grid2": {
-            "x": "linspace:0:5:50",
-            "y": "linspace:-5:0:50",
+            "x": {"linspace":{"start":0, "end":5, "steps":50}},
+            "y": {"linspace":{"start":-5, "end":0, "steps":50}},
             "boundary_conditions": {
-                "south": "grid3",
-                "north": "grid3",
-                "east": "grid1",
-                "west": "grid1"
+                "south": {"neighbour": "grid3"},
+                "north": {"neighbour": "grid3"},
+                "east": {"neighbour": "grid1"},
+                "west": {"neighbour": "grid1"}
             }
         },
         "grid3": {
-            "x": "linspace:0:5:50",
-            "y": "linspace:0:5:50",
+            "x": {"linspace":{"start":0, "end":5, "steps":50}},
+            "y": {"linspace":{"start":0, "end":5, "steps":50}},
             "boundary_conditions": {
-                "south": "grid2",
-                "north": "grid2",
-                "east": "grid0",
-                "west": "grid0"
+                "south": {"neighbour": "grid2"},
+                "north": {"neighbour": "grid2"},
+                "east": {"neighbour": "grid0"},
+                "west": {"neighbour": "grid0"}
             }
         }
     },
     "integration_time": 2.0,
     "vortex": {
-        "x0": -1.0,
-        "y0": 0.0,
-        "mach": 0.5,
-        "rstar": 0.5,
-        "eps": 1.0
+        "vortices": [{
+            "x0": -1.0,
+            "y0": 0.0,
+            "eps": 1.0,
+            "rstar": 0.5
+        }],
+        "mach": 0.5
     }
 }
diff --git a/multigrid/src/parsing.rs b/multigrid/src/parsing.rs
index 4e8dc29..347b250 100644
--- a/multigrid/src/parsing.rs
+++ b/multigrid/src/parsing.rs
@@ -273,8 +273,7 @@ impl Configuration {
             op,
             integration_time: self.integration_time,
             vortex: self.vortex,
-        };
-        todo!();
+        }
     }
 }