Merge branch 'main' into move-src/External

Author: bwoshea

Diff for: doc/source/devel/debugging.rst

@@ -24,6 +24,13 @@ This will cause charm++ to open an xterm window for each node and within each wi
 
    You generally don't need to worry about having symbols for other libraries (like charm++).
 
+.. note::
+
+   If you are on a modern version macOS, you might encounter some weird errors complaining about the ``DISPLAY`` variable when you pass ``++debug`` or ``++debug-no-pause``.
+   One way to work around this issue is to install XQuartz from `the official website <https://www.xquartz.org/>`_ and download xterm through homebrew.
+   Note: you probably need to restart your machine after installing both of these.
+
+
 .. note::
    TODO: add instructions for using GDB on a remote cluster using an MPI-based build of charm++
 

Diff for: src/Cello/data_Object.hpp

@@ -17,8 +17,7 @@ class Object : public PUP::able {
 public: // interface
 
   /// Constructor
-  Object() throw()
-  { }
+  Object() = default;
 
   /// Charm++ PUP::able declarations
   PUPable_abstract(Object);
@@ -28,16 +27,13 @@ class Object : public PUP::able {
   { }
 
   /// Copy constructor
-  Object(const Object & Object) throw()
-  { }
+  Object(const Object & Object) = default;
 
-  /// Assignment operator
-  Object & operator= (const Object & Object) throw()
-  { }
+  /// Copy assignment operator
+  Object & operator= (const Object & Object) = default;
 
   /// Destructor
-  virtual ~Object() throw()
-  { }
+  virtual ~Object() = default;
 
   /// CHARM++ Pack / Unpack function
   void pup (PUP::er &p)

Diff for: src/Enzo/enzo-core/EnzoUnits.hpp

@@ -37,7 +37,7 @@ class EnzoUnits : public Units {
   { }
 
   /// CHARM++ Pack / Unpack function
-  void pup (PUP::er &p);
+  void pup (PUP::er &p) override;
 
   /// Update current units for cosmological problems
   void set_current_time (double time);

Diff for: src/Enzo/gravity/EnzoPhysicsGravity.hpp

@@ -65,7 +65,7 @@ class EnzoPhysicsGravity : public Physics {
   { }
 
   /// CHARM++ Pack / Unpack function
-  void pup (PUP::er &p)
+  void pup (PUP::er &p) override
   {
     TRACEPUP;
     Physics::pup(p);

Diff for: src/Enzo/particle/formation/EnzoMethodStarMakerSTARSS.hpp

@@ -28,16 +28,16 @@ class EnzoMethodStarMakerSTARSS : public EnzoMethodStarMaker {
    {  }
 
   /// Charm++ Pack / Unpack function
-  void pup (PUP::er &p);
+  void pup (PUP::er &p) override;
 
   /// Apply method
-  virtual void compute ( Block * block) throw();
+  void compute ( Block * block) throw() override;
 
-  virtual std::string particle_type () throw()
+  std::string particle_type () throw() override
   { return "star";}
 
   /// Name
-  virtual std::string name () throw()
+  std::string name () throw() override
    { return "star_maker";}
 
   virtual ~EnzoMethodStarMakerSTARSS() throw() {};