EAMxx: switch check in IO avg count to match current master

Instead of filling where count<threshold we fill where count<=threshold

Change which version of compute_mask we do ETI for.

Author: bartgol

components/eamxx/src/share/CMakeLists.txt

@@ -82,9 +82,9 @@ list (APPEND SHARE_SRC
   field/eti/field_eti_update_impl_int_host.cpp
   field/eti/field_eti_update_int_device.cpp
   field/eti/field_eti_update_int_host.cpp
-  field/eti/field_utils_eti_compute_mask_lt_int.cpp
-  field/eti/field_utils_eti_compute_mask_lt_float.cpp
-  field/eti/field_utils_eti_compute_mask_lt_double.cpp
+  field/eti/field_utils_eti_compute_mask_le_int.cpp
+  field/eti/field_utils_eti_compute_mask_le_float.cpp
+  field/eti/field_utils_eti_compute_mask_le_double.cpp
   field/eti/field_utils_eti_compute_mask_ne_int.cpp
   field/eti/field_utils_eti_compute_mask_ne_float.cpp
   field/eti/field_utils_eti_compute_mask_ne_double.cpp

components/eamxx/src/share/field/eti/field_utils_eti_compute_mask_lt_double.cpp renamed to components/eamxx/src/share/field/eti/field_utils_eti_compute_mask_le_double.cpp

@@ -3,7 +3,7 @@
 namespace scream {
 namespace impl {
 
-template void compute_mask<Comparison::LT,double>(const Field&, double, Field&);
+template void compute_mask<Comparison::LE,double>(const Field&, double, Field&);
 
 } // namespace impl
 } // namespace scream

components/eamxx/src/share/field/eti/field_utils_eti_compute_mask_lt_float.cpp renamed to components/eamxx/src/share/field/eti/field_utils_eti_compute_mask_le_float.cpp

@@ -3,7 +3,7 @@
 namespace scream {
 namespace impl {
 
-template void compute_mask<Comparison::LT,float>(const Field&, float, Field&);
+template void compute_mask<Comparison::LE,float>(const Field&, float, Field&);
 
 } // namespace impl
 } // namespace scream

components/eamxx/src/share/field/eti/field_utils_eti_compute_mask_lt_int.cpp renamed to components/eamxx/src/share/field/eti/field_utils_eti_compute_mask_le_int.cpp

@@ -3,7 +3,7 @@
 namespace scream {
 namespace impl {
 
-template void compute_mask<Comparison::LT,int>(const Field&, int, Field&);
+template void compute_mask<Comparison::LE,int>(const Field&, int, Field&);
 
 } // namespace impl
 } // namespace scream

components/eamxx/src/share/field/field_utils_impl.hpp

@@ -1205,7 +1205,7 @@ extern template void impl::compute_mask<C, double>(const Field&, const double, F
 
 // Only these two, since they are the only ones used so far (in IO)
 EAMXX_FIELD_UTILS_ETI_DECL_COMPUTE_MASK(Comparison::NE);
-EAMXX_FIELD_UTILS_ETI_DECL_COMPUTE_MASK(Comparison::LT);
+EAMXX_FIELD_UTILS_ETI_DECL_COMPUTE_MASK(Comparison::LE);
 
 } // namespace impl
 

components/eamxx/src/share/io/scorpio_output.cpp

@@ -443,7 +443,7 @@ run (const std::string& filename,
           int min_count = static_cast<int>(std::ceil(m_avg_coeff_threshold*nsteps_since_last_output));
 
           // Recycle mask to find where count<thresh
-          compute_mask<Comparison::LT>(count,min_count,mask);
+          compute_mask<Comparison::LE>(count,min_count,mask);
 
           // Later, we divide fields by count. By setting count=1 where count<thresholt,
           // we can later do