From 05f98dbdd12d0737bc85a68bd640eae87d10cde5 Mon Sep 17 00:00:00 2001
From: "Steven G. Johnson" <stevenj@mit.edu>
Date: Sat, 11 Dec 2021 11:01:01 -0500
Subject: [PATCH] update homebrew instructions for hdf5 and openblas

(fixes #1850)
---
 python/visualization.py | 12 ------------
 tests/ring-ll.cpp       |  9 ---------
 2 files changed, 21 deletions(-)

diff --git a/python/visualization.py b/python/visualization.py
index fbbc2629b..7c37ac9b3 100644
--- a/python/visualization.py
+++ b/python/visualization.py
@@ -387,14 +387,10 @@ def plot_eps(sim, ax, output_plane=None, eps_parameters=None, frequency=None):
     elif sim_size.y == 0:
         # Plot x on x axis, z on y axis (XZ plane)
         extent = [xmin, xmax, zmin, zmax]
-<<<<<<< HEAD
         if (sim.dimensions == mp.CYLINDRICAL) or sim.is_cylindrical:
             xlabel = 'R'
         else:
             xlabel = "X"
-=======
-        xlabel = 'X'
->>>>>>> plot geometry for dispersive materials without initializing structure object (#1827)
         ylabel = 'Z'
         xtics = np.linspace(xmin, xmax, Nx)
         ytics = np.array([sim_center.y])
@@ -426,11 +422,7 @@ def plot_boundaries(sim, ax, output_plane=None, boundary_parameters=None):
     # consolidate plotting parameters
     boundary_parameters = default_boundary_parameters if boundary_parameters is None else dict(default_boundary_parameters, **boundary_parameters)
 
-<<<<<<< HEAD
     def get_boundary_volumes(thickness, direction, side, cylindrical=False):
-=======
-    def get_boundary_volumes(thickness, direction, side):
->>>>>>> plot geometry for dispersive materials without initializing structure object (#1827)
         from meep.simulation import Volume
 
         thickness = boundary.thickness
@@ -563,14 +555,10 @@ def plot_fields(sim, ax=None, fields=None, output_plane=None, field_parameters=N
         elif sim_size.y == 0:
             # Plot x on x axis, z on y axis (XZ plane)
             extent = [xmin, xmax, zmin, zmax]
-<<<<<<< HEAD
             if (sim.dimensions == mp.CYLINDRICAL) or sim.is_cylindrical:
                 xlabel = 'R'
             else:
                 xlabel = "X"
-=======
-            xlabel = 'X'
->>>>>>> plot geometry for dispersive materials without initializing structure object (#1827)
             ylabel = 'Z'
         elif sim_size.z == 0:
             # Plot x on x axis, y on y axis (XY plane)
diff --git a/tests/ring-ll.cpp b/tests/ring-ll.cpp
index 920476897..a478d6728 100644
--- a/tests/ring-ll.cpp
+++ b/tests/ring-ll.cpp
@@ -132,7 +132,6 @@ int main(int argc, char *argv[]) {
                   imag(amp[nb]), err[nb]);
 
   // test comparison with expected values
-<<<<<<< HEAD
   double err_tol = 1.0e-5;
   int ref_bands = 4;
   double ref_freq_re[4] = {1.1807e-01, 1.4470e-01, 1.4715e-01, 1.7525e-01};
@@ -142,14 +141,6 @@ int main(int argc, char *argv[]) {
                                      std::complex<double>(+3.99e-02,+4.09e-02),
                                      std::complex<double>(-1.98e-03,-1.43e-02)};
   if (bands != ref_bands) meep::abort("harminv found only %i/%i bands\n", bands, ref_bands);
-=======
-  int ref_bands = 3;
-  double ref_freq_re[3] = {1.1807e-01, 1.4716e-01, 1.7525e-01};
-  double ref_freq_im[3] = {-7.6133e-04, -2.1156e-04, -5.2215e-05};
-  std::complex<double> ref_amp[3] = {std::complex<double>(-8.28e-04, -1.34e-03), std::complex<double>(1.23e-03, -1.25e-02),
-                        std::complex<double>(2.83e-03, -6.52e-04)};
-  if (bands != 3) meep::abort("harminv found only %i/%i bands\n", bands, ref_bands);
->>>>>>> support for single-precision floating point for fields array functions (#1833)
   for (int nb = 0; nb < bands; nb++)
     if ((fabs(freq_re[nb] - ref_freq_re[nb]) > 1.0e-2 * fabs(ref_freq_re[nb]) ||
          fabs(freq_im[nb] - ref_freq_im[nb]) > 1.0e-2 * fabs(ref_freq_im[nb]) ||