From 3c58bacc7492266223b7735e17749fa6860703a7 Mon Sep 17 00:00:00 2001
From: Scott MacLachlan <smaclachlan@mun.ca>
Date: Fri, 14 Oct 2022 17:42:27 -0230
Subject: [PATCH] First stab at DIRK without dat's.  Not working for systems...

---
 irksome/dirk_stepper.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/irksome/dirk_stepper.py b/irksome/dirk_stepper.py
index 7d7c480..1923790 100644
--- a/irksome/dirk_stepper.py
+++ b/irksome/dirk_stepper.py
@@ -14,7 +14,7 @@ def __init__(self):
         pass
 
     def __call__(self, u):
-        return u.dat.data_ro
+        return u
 
 
 class BCCompOfNotMixedThingy:
@@ -22,7 +22,7 @@ def __init__(self, comp):
         self.comp = comp
 
     def __call__(self, u):
-        return u.dat.data_ro[:, self.comp]
+        return u[self.comp]
 
 
 class BCMixedBitThingy:
@@ -30,7 +30,7 @@ def __init__(self, sub):
         self.sub = sub
 
     def __call__(self, u):
-        return u.dat[self.sub].data_ro
+        return u.sub(self.sub)
 
 
 class BCCompOfMixedBitThingy:
@@ -39,7 +39,7 @@ def __init__(self, sub, comp):
         self.comp = comp
 
     def __call__(self, u):
-        return u.dat[self.sub].data_ro[:, self.comp]
+        return u.sub(self.sub)[self.comp]
 
 
 def getThingy(V, bc):
@@ -182,6 +182,7 @@ def advance(self):
         AA = bt.A
         CC = bt.c
         BB = bt.b
+        gsplit = g.split()
         for i in range(self.num_stages):
             # update a, c constants tucked into the variational problem
             # for the current stage
@@ -191,8 +192,9 @@ def advance(self):
             # variational form
             g.assign(u0)
             for j in range(i):
-                for (gd, kd) in zip(g.dat, ks[j].dat):
-                    gd.data[:] += dtc * AA[i, j] * kd.data_ro[:]
+                ksplit = ks[j].split()
+                for (gbit, kbit) in zip(gsplit, ksplit):
+                    gbit += dtc * float(AA[i, j]) * kbit
 
             # update BC's for the variational problem
             for (bc, (gdat, gcur, gmethod, dat4bc)) in zip(self.bcnew, self.gblah):
@@ -201,14 +203,14 @@ def advance(self):
 
                 # Now modify gdat based on the evolving solution
                 # subtract u0 from gdat
-                gdat.dat.data[:] -= dat4bc(u0)[:]
+                gdat -= dat4bc(u0)
 
                 # Subtract previous stage values
                 for j in range(i):
-                    gdat.dat.data[:] -= dtc * AA[i, j] * dat4bc(ks[j])[:]
+                    gdat -= dtc * float(AA[i, j]) * dat4bc(ks[j])
 
                 # Rescale gdat
-                gdat.dat.data[:] /= dtc * AA[i, i]
+                gdat /= dtc * float(AA[i, i])
 
             # solve new variational problem, stash the computed
             # stage value.
@@ -223,5 +225,5 @@ def advance(self):
 
         # update the solution with now-computed stage values.
         for i in range(self.num_stages):
-            for (u0d, kd) in zip(u0.dat, ks[i].dat):
-                u0d.data[:] += dtc * BB[i] * kd.data_ro[:]
+            for (u0bit, kbit) in zip(u0.split(), ks[i].split()):
+                u0bit += dtc * float(BB[i]) * kbit