Merge pull request #4336 from jwpeterson/drop_deprecated_public_qoi

Drop deprecated public System::qoi, qoi_error_estimates members

Author: jwpeterson

include/systems/system.h

@@ -1630,27 +1630,7 @@ class System : public ReferenceCountedObject<System>,
    */
   unsigned int n_qois() const;
 
-#ifndef LIBMESH_ENABLE_DEPRECATED // We use accessors for these now
-private:
-#endif
-  /**
-   * Values of the quantities of interest.  This vector needs
-   * to be both resized and filled by the user before any quantity of
-   * interest assembly is done and before any sensitivities are
-   * calculated.
-   */
-  std::vector<Number> qoi;
-
-  /**
-   * Vector to hold error estimates for qois, either from a steady
-   * state calculation, or from a single unsteady solver timestep. Used
-   * by the library after resizing to match the size of the qoi vector.
-   * User code can use this for accumulating error estimates for example.
-   */
-  std::vector<Number> qoi_error_estimates;
-#ifndef LIBMESH_ENABLE_DEPRECATED
 public:
-#endif
 
   /**
    * Accessors for qoi and qoi_error_estimates vectors
@@ -2321,6 +2301,25 @@ class System : public ReferenceCountedObject<System>,
    * Whether we are name prefixing solver options
    */
   bool _prefix_with_name;
+
+  /**
+   * Values of the quantities of interest.  This vector needs to be
+   * both resized and filled by the user before any quantity of
+   * interest assembly is done and before any sensitivities are
+   * calculated. Use the get_qoi_values() accessor to get these
+   * values.
+   */
+  std::vector<Number> _qoi;
+
+  /**
+   * Vector to hold error estimates for qois, either from a steady
+   * state calculation, or from a single unsteady solver timestep. Used
+   * by the library after resizing to match the size of the qoi vector.
+   * User code can use this for accumulating error estimates for example.
+   * Use the set_qoi_error_estimate()/get_qoi_error_estimate_value()
+   * accessors to set/get these values.
+   */
+  std::vector<Number> _qoi_error_estimates;
 };
 
 
@@ -2507,11 +2506,9 @@ void System::disable_cache () { assemble_before_solve = true; }
 inline
 unsigned int System::n_qois() const
 {
-#ifndef LIBMESH_ENABLE_DEPRECATED
-  libmesh_assert_equal_to(this->qoi.size(), this->qoi_error_estimates.size());
-#endif
+  libmesh_assert_equal_to(this->_qoi.size(), this->_qoi_error_estimates.size());
 
-  return cast_int<unsigned int>(this->qoi.size());
+  return cast_int<unsigned int>(this->_qoi.size());
 }
 
 inline

src/systems/system.C

@@ -71,8 +71,6 @@ System::System (EquationSystems & es,
   solution                          (NumericVector<Number>::build(this->comm())),
   current_local_solution            (NumericVector<Number>::build(this->comm())),
   time                              (0.),
-  qoi                               (0),
-  qoi_error_estimates               (0),
   _init_system_function             (nullptr),
   _init_system_object               (nullptr),
   _assemble_system_function         (nullptr),
@@ -2148,50 +2146,50 @@ void System::user_QOI_derivative(const QoISet & qoi_indices,
 
 void System::init_qois(unsigned int n_qois)
 {
-  qoi.resize(n_qois);
-  qoi_error_estimates.resize(n_qois);
+  _qoi.resize(n_qois);
+  _qoi_error_estimates.resize(n_qois);
 }
 
 
 void System::set_qoi(unsigned int qoi_index, Number qoi_value)
 {
-  libmesh_assert(qoi_index < qoi.size());
+  libmesh_assert(qoi_index < _qoi.size());
 
-  qoi[qoi_index] = qoi_value;
+  _qoi[qoi_index] = qoi_value;
 }
 
 
 Number System::get_qoi_value(unsigned int qoi_index) const
 {
-  libmesh_assert(qoi_index < qoi.size());
-  return qoi[qoi_index];
+  libmesh_assert(qoi_index < _qoi.size());
+  return _qoi[qoi_index];
 }
 
 
 std::vector<Number> System::get_qoi_values() const
 {
-  return this->qoi;
+  return this->_qoi;
 }
 
 
 void System::set_qoi(std::vector<Number> new_qoi)
 {
-  libmesh_assert_equal_to(this->qoi.size(), new_qoi.size());
-  this->qoi = std::move(new_qoi);
+  libmesh_assert_equal_to(this->_qoi.size(), new_qoi.size());
+  this->_qoi = std::move(new_qoi);
 }
 
 
 void System::set_qoi_error_estimate(unsigned int qoi_index, Number qoi_error_estimate)
 {
-  libmesh_assert(qoi_index < qoi_error_estimates.size());
+  libmesh_assert(qoi_index < _qoi_error_estimates.size());
 
-  qoi_error_estimates[qoi_index] = qoi_error_estimate;
+  _qoi_error_estimates[qoi_index] = qoi_error_estimate;
 }
 
 Number System::get_qoi_error_estimate_value(unsigned int qoi_index) const
 {
-  libmesh_assert(qoi_index < qoi_error_estimates.size());
-  return qoi_error_estimates[qoi_index];
+  libmesh_assert(qoi_index < _qoi_error_estimates.size());
+  return _qoi_error_estimates[qoi_index];
 }