all compiled

Xiangyu-Hu · Jun 30, 2024 · a241082 · a241082
1 parent 720b3ad
commit a241082
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 39 deletions.
diff --git a/tests/optimization/test_2d_VP_heat_flux_steady/VP_heat_flux_steady.cpp b/tests/optimization/test_2d_VP_heat_flux_steady/VP_heat_flux_steady.cpp
@@ -136,27 +136,21 @@ class WallBoundaryInitialCondition : public LocalDynamics, public DataDelegateSi
     StdLargeVec<Vecd> &pos_;
     StdLargeVec<Real> &phi_, &heat_flux_;
 };
-//----------------------------------------------------------------------
-//	An observer body to measure temperature at given positions.
-//----------------------------------------------------------------------
-class TemperatureObserver;
-template <>
-class ParticleGenerator<TemperatureObserver> : public ParticleGenerator<ObserverParticles>
+
+StdVec<Vecd> createObservationPoints()
 {
-  public:
-    ParticleGenerator(SPHBody &sph_body, ObserverParticles &observer_particles) : ParticleGenerator<ObserverParticles>(sph_body, observer_particles)
-    {
-        /** A line of measuring points at the middle line. */
-        size_t number_of_observation_points = 11;
-        Real range_of_measure = L;
-        Real start_of_measure = 0;
+    StdVec<Vecd> observation_points;
+    /** A line of measuring points at the middle line. */
+    size_t number_of_observation_points = 11;
+    Real range_of_measure = L;
+    Real start_of_measure = 0;
 
-        for (size_t i = 0; i < number_of_observation_points; ++i)
-        {
-            Vec2d point_coordinate(0.5 * L, range_of_measure * Real(i) / Real(number_of_observation_points - 1) + start_of_measure);
-            positions_.push_back(point_coordinate);
-        }
+    for (size_t i = 0; i < number_of_observation_points; ++i)
+    {
+        Vec2d point_coordinate(0.5 * L, range_of_measure * Real(i) / Real(number_of_observation_points - 1) + start_of_measure);
+        observation_points.push_back(point_coordinate);
     }
+    return observation_points;
 };
 } // namespace SPH
 

diff --git a/tests/optimization/test_2d_VP_same_sink_steady/VP_same_sink_steady.cpp b/tests/optimization/test_2d_VP_same_sink_steady/VP_same_sink_steady.cpp
@@ -124,30 +124,23 @@ class WallBoundaryInitialCondition : public LocalDynamics, public DataDelegateSi
     StdLargeVec<Vecd> &pos_;
     StdLargeVec<Real> &phi_;
 };
-//----------------------------------------------------------------------
-//	An observer body to measure temperature at given positions.
-//----------------------------------------------------------------------
-class TemperatureObserver;
-template <>
-class ParticleGenerator<TemperatureObserver> : public ParticleGenerator<ObserverParticles>
+
+StdVec<Vecd> createObservationPoints()
 {
-  public:
-    ParticleGenerator(SPHBody &sph_body)
-        : ParticleGenerator<ObserverParticles>(sph_body, observer_particles)
-    {
-        /** A line of measuring points at the middle line. */
-        size_t number_of_observation_points = 10;
-        Real range_of_measure = L;
-        Real start_of_measure = 0;
+    StdVec<Vecd> observation_points;
+    /** A line of measuring points at the middle line. */
+    size_t number_of_observation_points = 10;
+    Real range_of_measure = L;
+    Real start_of_measure = 0;
 
-        for (size_t i = 0; i < number_of_observation_points; ++i)
-        {
-            Vec2d point_coordinate(0.5 * L, range_of_measure * (Real)i /
-                                                    (Real)(number_of_observation_points - 1) +
-                                                start_of_measure);
-            positions_.push_back(point_coordinate);
-        }
+    for (size_t i = 0; i < number_of_observation_points; ++i)
+    {
+        Vec2d point_coordinate(0.5 * L, range_of_measure * (Real)i /
+                                                (Real)(number_of_observation_points - 1) +
+                                            start_of_measure);
+        observation_points.push_back(point_coordinate);
     }
+    return observation_points;
 };
 } // namespace SPH
 //----------------------------------------------------------------------