Skip to content

EAMxx: expand regex to allow for names with dots #7552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 28, 2025
Merged

EAMxx: expand regex to allow for names with dots #7552

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions components/eamxx/src/share/io/eamxx_io_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down