From a5aec91cf445c5314bd476cb5e192a04a7f4c92b Mon Sep 17 00:00:00 2001
From: Peter Bogenschutz <bogenschutz1@llnlg.ov>
Date: Tue, 16 Jul 2024 10:28:54 -0700
Subject: [PATCH] change ekat::impl::max instances to std::max and remove
 unneeded m_helper_fields line

---
 .../eamxx/src/share/iop/intensive_observation_period.cpp     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/eamxx/src/share/iop/intensive_observation_period.cpp b/components/eamxx/src/share/iop/intensive_observation_period.cpp
index 42ea7d0ec03..cf20435fd2c 100644
--- a/components/eamxx/src/share/iop/intensive_observation_period.cpp
+++ b/components/eamxx/src/share/iop/intensive_observation_period.cpp
@@ -268,9 +268,9 @@ initialize_iop_file(const util::TimeStamp& run_t0,
   scorpio::read_var(iop_file,"lon",&iop_file_lon);
 
   const Real rel_lat_err = std::fabs(iop_file_lat - m_params.get<Real>("target_latitude"))/
-                             ekat::impl::max(m_params.get<Real>("target_latitude"),0.1);
+                             std::max(m_params.get<Real>("target_latitude"),0.1);
   const Real rel_lon_err = std::fabs(std::fmod(iop_file_lon + 360.0, 360.0)-m_params.get<Real>("target_longitude"))/
-                             ekat::impl::max(m_params.get<Real>("target_longitude"),0.1);
+                             std::max(m_params.get<Real>("target_longitude"),0.1);
   EKAT_REQUIRE_MSG(rel_lat_err < std::numeric_limits<float>::epsilon(),
                    "Error! IOP file variable \"lat\" does not match target_latitude from IOP parameters.\n");
   EKAT_REQUIRE_MSG(rel_lon_err < std::numeric_limits<float>::epsilon(),
@@ -548,7 +548,6 @@ read_iop_file_data (const util::TimeStamp& current_ts)
     // Convert to pressure to millibar (file gives pressure in Pa)
     for (int ilev=0; ilev<file_levs; ++ilev) data[ilev] /= 100;
     iop_file_pressure.sync_to_dev();
-    m_helper_fields.insert({"iop_file_pressure", iop_file_pressure});
 
     // Pre-process file pressures, store number of file levels
     // where the last level is the first level equal to surface pressure.