diff --git a/src/access_nri_intake/source/builders.py b/src/access_nri_intake/source/builders.py index 99a2fc7..7640d7b 100644 --- a/src/access_nri_intake/source/builders.py +++ b/src/access_nri_intake/source/builders.py @@ -48,14 +48,7 @@ class BaseBuilder(Builder): # Base class carries an empty set PATTERNS = [ - # rf"^iceh.*\.({PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']})$", # ACCESS-ESM1.5/OM2/CM2 ice - # rf"^iceh.*\.({PATTERNS_HELPERS['ym']})-{PATTERNS_HELPERS['not_multi_digit']}.*", # ACCESS-CM2 ice - # rf"^iceh.*\.(\d{{3}})-{PATTERNS_HELPERS['not_multi_digit']}.*", # ACCESS-OM2 ice - # rf"^ocean.*[_,-](?:ymd|ym|y)_({PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']}|{PATTERNS_HELPERS['y']})(?:$|[_,-]{PATTERNS_HELPERS['not_multi_digit']}.*)", # ACCESS-OM2 ocean - # r"^ocean.*[^\d]_(\d{2})$", # A few wierd files in ACCESS-OM2 01deg_jra55v13_ryf9091 - # r"^.*\.p.(\d{6})_.*", # ACCESS-CM2 atmosphere - # r"^.*\.p.-(\d{6})_.*", # ACCESS-ESM1.5 atmosphere - # rf"[^\.]*\.{PATTERNS_HELPERS['om3_components']}\..*({PATTERNS_HELPERS['ymds']}|{PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']})$", # ACCESS-OM3 + ] def __init__( @@ -350,13 +343,9 @@ class AccessOm2Builder(BaseBuilder): PATTERNS = [ rf"^iceh.*\.({PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']})$", # ACCESS-ESM1.5/OM2/CM2 ice - # rf"^iceh.*\.({PATTERNS_HELPERS['ym']})-{PATTERNS_HELPERS['not_multi_digit']}.*", # ACCESS-CM2 ice rf"^iceh.*\.(\d{{3}})-{PATTERNS_HELPERS['not_multi_digit']}.*", # ACCESS-OM2 ice rf"^ocean.*[_,-](?:ymd|ym|y)_({PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']}|{PATTERNS_HELPERS['y']})(?:$|[_,-]{PATTERNS_HELPERS['not_multi_digit']}.*)", # ACCESS-OM2 ocean r"^ocean.*[^\d]_(\d{2})$", # A few wierd files in ACCESS-OM2 01deg_jra55v13_ryf9091 - # r"^.*\.p.(\d{6})_.*", # ACCESS-CM2 atmosphere - # r"^.*\.p.-(\d{6})_.*", # ACCESS-ESM1.5 atmosphere - # rf"[^\.]*\.{PATTERNS_HELPERS['om3_components']}\..*({PATTERNS_HELPERS['ymds']}|{PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']})$", # ACCESS-OM3 ] def __init__(self, path): @@ -438,13 +427,6 @@ class AccessOm3Builder(BaseBuilder): """Intake-ESM datastore builder for ACCESS-OM3 COSIMA datasets""" PATTERNS = [ - # rf"^iceh.*\.({PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']})$", # ACCESS-ESM1.5/OM2/CM2 ice - # rf"^iceh.*\.({PATTERNS_HELPERS['ym']})-{PATTERNS_HELPERS['not_multi_digit']}.*", # ACCESS-CM2 ice - # rf"^iceh.*\.(\d{{3}})-{PATTERNS_HELPERS['not_multi_digit']}.*", # ACCESS-OM2 ice - # rf"^ocean.*[_,-](?:ymd|ym|y)_({PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']}|{PATTERNS_HELPERS['y']})(?:$|[_,-]{PATTERNS_HELPERS['not_multi_digit']}.*)", # ACCESS-OM2 ocean - # r"^ocean.*[^\d]_(\d{2})$", # A few wierd files in ACCESS-OM2 01deg_jra55v13_ryf9091 - # r"^.*\.p.(\d{6})_.*", # ACCESS-CM2 atmosphere - # r"^.*\.p.-(\d{6})_.*", # ACCESS-ESM1.5 atmosphere rf"[^\.]*\.{PATTERNS_HELPERS['om3_components']}\..*({PATTERNS_HELPERS['ymds']}|{PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']})$", # ACCESS-OM3 ] @@ -537,13 +519,7 @@ class AccessEsm15Builder(BaseBuilder): PATTERNS = [ rf"^iceh.*\.({PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']})$", # ACCESS-ESM1.5/OM2/CM2 ice - # rf"^iceh.*\.({PATTERNS_HELPERS['ym']})-{PATTERNS_HELPERS['not_multi_digit']}.*", # ACCESS-CM2 ice - # rf"^iceh.*\.(\d{{3}})-{PATTERNS_HELPERS['not_multi_digit']}.*", # ACCESS-OM2 ice - # rf"^ocean.*[_,-](?:ymd|ym|y)_({PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']}|{PATTERNS_HELPERS['y']})(?:$|[_,-]{PATTERNS_HELPERS['not_multi_digit']}.*)", # ACCESS-OM2 ocean - # r"^ocean.*[^\d]_(\d{2})$", # A few wierd files in ACCESS-OM2 01deg_jra55v13_ryf9091 - # r"^.*\.p.(\d{6})_.*", # ACCESS-CM2 atmosphere r"^.*\.p.-(\d{6})_.*", # ACCESS-ESM1.5 atmosphere - # rf"[^\.]*\.{PATTERNS_HELPERS['om3_components']}\..*({PATTERNS_HELPERS['ymds']}|{PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']})$", # ACCESS-OM3 ] def __init__(self, path, ensemble): @@ -644,10 +620,5 @@ class AccessCm2Builder(AccessEsm15Builder): PATTERNS = [ rf"^iceh.*\.({PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']})$", # ACCESS-ESM1.5/OM2/CM2 ice rf"^iceh.*\.({PATTERNS_HELPERS['ym']})-{PATTERNS_HELPERS['not_multi_digit']}.*", # ACCESS-CM2 ice - # rf"^iceh.*\.(\d{{3}})-{PATTERNS_HELPERS['not_multi_digit']}.*", # ACCESS-OM2 ice - # rf"^ocean.*[_,-](?:ymd|ym|y)_({PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']}|{PATTERNS_HELPERS['y']})(?:$|[_,-]{PATTERNS_HELPERS['not_multi_digit']}.*)", # ACCESS-OM2 ocean - # r"^ocean.*[^\d]_(\d{2})$", # A few wierd files in ACCESS-OM2 01deg_jra55v13_ryf9091 r"^.*\.p.(\d{6})_.*", # ACCESS-CM2 atmosphere - # r"^.*\.p.-(\d{6})_.*", # ACCESS-ESM1.5 atmosphere - # rf"[^\.]*\.{PATTERNS_HELPERS['om3_components']}\..*({PATTERNS_HELPERS['ymds']}|{PATTERNS_HELPERS['ymd']}|{PATTERNS_HELPERS['ym']})$", # ACCESS-OM3 ]