Merge branch 'mahf708/eamxx/7509-eamxx-regex-limitations-in-io' into master (PR #7552)

EAMxx: expand regex to allow for names with dots

Fixes #7509

[BFB]

Author: jgfouca

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

@@ -127,20 +127,20 @@ create_diagnostic (const std::string& diag_field_name,
   //       of each group in the matches output var!
   // Note: use raw string syntax R"(<string>)" to avoid having to escape the \ character
   // Note: the number for field_at_p/h can match positive integer/floating-point numbers
-  std::regex field_at_l (R"(([A-Za-z0-9_]+)_at_(lev_(\d+)|model_(top|bot))$)");
-  std::regex field_at_p (R"(([A-Za-z0-9_]+)_at_(\d+(\.\d+)?)(hPa|mb|Pa)$)");
-  std::regex field_at_h (R"(([A-Za-z0-9_]+)_at_(\d+(\.\d+)?)(m)_above_(sealevel|surface)$)");
+  std::regex field_at_l (R"(([A-Za-z0-9_.]+)_at_(lev_(\d+)|model_(top|bot))$)");
+  std::regex field_at_p (R"(([A-Za-z0-9_.]+)_at_(\d+(\.\d+)?)(hPa|mb|Pa)$)");
+  std::regex field_at_h (R"(([A-Za-z0-9_.]+)_at_(\d+(\.\d+)?)(m)_above_(sealevel|surface)$)");
   std::regex surf_mass_flux ("precip_(liq|ice|total)_surf_mass_flux$");
   std::regex water_path ("(Ice|Liq|Rain|Rime|Vap)WaterPath$");
   std::regex number_path ("(Ice|Liq|Rain)NumberPath$");
   std::regex aerocom_cld ("AeroComCld(Top|Bot)$");
   std::regex vap_flux ("(Meridional|Zonal)VapFlux$");
-  std::regex backtend ("([A-Za-z0-9_]+)_atm_backtend$");
+  std::regex backtend ("([A-Za-z0-9_.]+)_atm_backtend$");
   std::regex pot_temp ("(Liq)?PotentialTemperature$");
   std::regex vert_layer ("(z|geopotential|height)_(mid|int)$");
-  std::regex horiz_avg ("([A-Za-z0-9_]+)_horiz_avg$");
-  std::regex vert_contract ("([A-Za-z0-9_]+)_vert_(avg|sum)(_((dp|dz)_weighted))?$");
-  std::regex zonal_avg (R"(([A-Za-z0-9_]+)_zonal_avg_(\d+)_bins$)");
+  std::regex horiz_avg ("([A-Za-z0-9_.]+)_horiz_avg$");
+  std::regex vert_contract ("([A-Za-z0-9_.]+)_vert_(avg|sum)(_((dp|dz)_weighted))?$");
+  std::regex zonal_avg (R"(([A-Za-z0-9_.]+)_zonal_avg_(\d+)_bins$)");
 
   std::string diag_name;
   std::smatch matches;