better asserts I think

Exawind · Sep 19, 2024 · 8e3f3f9 · 8e3f3f9
1 parent fd05e86
commit 8e3f3f9
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 7 deletions.
diff --git a/amr-wind/utilities/sampling/DTUSpinnerSampler.cpp b/amr-wind/utilities/sampling/DTUSpinnerSampler.cpp
@@ -157,8 +157,7 @@ void DTUSpinnerSampler::sampling_locations(SampleLocType& sample_locs) const
         }
     }
 
-    AMREX_ALWAYS_ASSERT(
-        sample_locs.locations().size() == m_beam_points * m_ntotal);
+    AMREX_ALWAYS_ASSERT(sample_locs.locations().size() == num_points());
 }
 
 #ifdef AMR_WIND_USE_OPENFAST

diff --git a/amr-wind/utilities/sampling/FreeSurfaceSampler.cpp b/amr-wind/utilities/sampling/FreeSurfaceSampler.cpp
@@ -348,7 +348,7 @@ void FreeSurfaceSampler::sampling_locations(SampleLocType& sample_locs) const
             ++idx;
         }
     }
-    AMREX_ALWAYS_ASSERT(sample_locs.locations().size() == num_output_points());
+    AMREX_ALWAYS_ASSERT(sample_locs.locations().size() == num_points());
 }
 
 bool FreeSurfaceSampler::update_sampling_locations()

diff --git a/amr-wind/utilities/sampling/LineSampler.cpp b/amr-wind/utilities/sampling/LineSampler.cpp
@@ -71,7 +71,7 @@ void LineSampler::sampling_locations(SampleLocType& sample_locs) const
         sample_locs.push_back(loc, i);
     }
 
-    AMREX_ALWAYS_ASSERT(sample_locs.locations().size() == m_npts);
+    AMREX_ALWAYS_ASSERT(sample_locs.locations().size() == num_points());
 }
 
 #ifdef AMR_WIND_USE_NETCDF

diff --git a/amr-wind/utilities/sampling/PlaneSampler.cpp b/amr-wind/utilities/sampling/PlaneSampler.cpp
@@ -77,7 +77,7 @@ void PlaneSampler::sampling_locations(SampleLocType& sample_locs) const
         }
     }
 
-    AMREX_ALWAYS_ASSERT(sample_locs.locations().size() == m_npts);
+    AMREX_ALWAYS_ASSERT(sample_locs.locations().size() == num_points());
 }
 
 #ifdef AMR_WIND_USE_NETCDF

diff --git a/amr-wind/utilities/sampling/ProbeSampler.cpp b/amr-wind/utilities/sampling/ProbeSampler.cpp
@@ -41,7 +41,7 @@ void ProbeSampler::sampling_locations(SampleLocType& sample_locs) const
             sample_locs.push_back(loc, i);
         }
     }
-    AMREX_ALWAYS_ASSERT(sample_locs.locations().size() == m_npts);
+    AMREX_ALWAYS_ASSERT(sample_locs.locations().size() == num_points());
 }
 
 #ifdef AMR_WIND_USE_NETCDF

diff --git a/amr-wind/utilities/sampling/VolumeSampler.cpp b/amr-wind/utilities/sampling/VolumeSampler.cpp
@@ -54,7 +54,7 @@ void VolumeSampler::sampling_locations(SampleLocType& sample_locs) const
             }
         }
     }
-    AMREX_ALWAYS_ASSERT(sample_locs.locations().size() == m_npts);
+    AMREX_ALWAYS_ASSERT(sample_locs.locations().size() == num_points());
 }
 
 #ifdef AMR_WIND_USE_NETCDF