From 25c856ad944e1253f0cf959b3560e18cead6ca1a Mon Sep 17 00:00:00 2001
From: mloubout <mathias.louboutin@gmail.com>
Date: Mon, 21 Aug 2023 22:12:38 -0400
Subject: [PATCH] api: fix symbolic coefficient conservation at rebuild

---
 devito/mpatches/.__init__.py.swp      | Bin 12288 -> 0 bytes
 devito/mpatches/.rationaltools.py.swp | Bin 12288 -> 0 bytes
 devito/types/basic.py                 |   6 +++++-
 devito/types/dense.py                 |   2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)
 delete mode 100644 devito/mpatches/.__init__.py.swp
 delete mode 100644 devito/mpatches/.rationaltools.py.swp

diff --git a/devito/mpatches/.__init__.py.swp b/devito/mpatches/.__init__.py.swp
deleted file mode 100644
index 48f848b3e8678b2eef767d23fc7e5bf397b8c404..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI%K}*9h6u|K}@1p1zhz^7a>zWDTSMcC*9xd70VW4el8wOtVgYCL+;m-R8yW4i|
zScIK6_&*4b@RCRJyM;`{*XI}Y6pW>gOOe%P9ls6kWP2epPxYg23r(>*k}4T4bQtRH
zC2i$v*Kiak3+vrJWrgvx_oNy{k<G1-qM-Qvrx9fY5I8{KTpq?cY&Q09Z`AeG<bWP*
zK>z^+5I_I{1Q0*~fm0RmMNhu#!=L?Kpx2R4^?sZi0R#|0009ILKmY**5I_I{1Vl_M
zvaJ95f9lcv|L@=b?HnKk5I_I{1Q0*~0R#|0009ILICg<~=`t0R##@)0)H|0}%4UTt
Ny}DPbuX6Wc<QGStE*t;=

diff --git a/devito/mpatches/.rationaltools.py.swp b/devito/mpatches/.rationaltools.py.swp
deleted file mode 100644
index dcf601c091a5b75f2209d554057bebc6def5ba3d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
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

diff --git a/devito/types/basic.py b/devito/types/basic.py
index 51dbba181e..d7a422b39e 100644
--- a/devito/types/basic.py
+++ b/devito/types/basic.py
@@ -6,6 +6,7 @@
 
 import numpy as np
 import sympy
+
 from sympy.core.assumptions import _assume_rules
 from cached_property import cached_property
 
@@ -855,11 +856,14 @@ def __str__(self):
 
     __repr__ = __str__
 
-    def _sympystr(self, printer):
+    def _sympystr(self, printer, **kwargs):
         return str(self)
 
     _latex = _sympystr
 
+    def _pretty(self, printer, **kwargs):
+        return printer._print_Function(self, func_name=self.name)
+
     def __eq__(self, other):
         try:
             return (self.function is other.function and
diff --git a/devito/types/dense.py b/devito/types/dense.py
index 19f6aa4769..aec69bc1eb 100644
--- a/devito/types/dense.py
+++ b/devito/types/dense.py
@@ -57,7 +57,7 @@ class DiscreteFunction(AbstractFunction, ArgProvider, Differentiable):
     The type of the underlying data object.
     """
 
-    __rkwargs__ = AbstractFunction.__rkwargs__ + ('staggered',)
+    __rkwargs__ = AbstractFunction.__rkwargs__ + ('staggered', 'coefficients')
 
     def __init_finalize__(self, *args, function=None, **kwargs):
         # Staggering metadata