Ipc forests

pyaerocom/_concprcp_units_helpers.py

@@ -12,6 +12,7 @@
 PR_IMPLICIT_UNITS = [Unit("mm")]
 DEP_TEST_UNIT = "kg m-2 s-1"
 
+
 # ToDo: check if still needed
 def translate_rate_units_implicit(unit_implicit, ts_type):
     unit = Unit(unit_implicit)

pyaerocom/aeroval/coldatatojson_helpers.py

@@ -634,7 +634,7 @@ def _init_site_coord_arrays(data):
 
 def _get_stat_regions(lats, lons, regions):
     regs = []
-    for (lat, lon) in zip(lats, lons):
+    for lat, lon in zip(lats, lons):
         reg = find_closest_region_coord(lat, lon, regions=regions)
         regs.append(reg)
     return regs
@@ -857,11 +857,9 @@ def _process_map_and_scat(
 
                         #  Code for the calculation of trends
                         if add_trends and freq != "daily":
-
                             (start, stop) = _get_min_max_year_periods([per])
 
                             if stop - start >= trends_min_yrs:
-
                                 try:
                                     time = subset.data.time.values
                                     (obs_trend, mod_trend) = _make_trends(

pyaerocom/aeroval/experiment_output.py

@@ -16,6 +16,7 @@
 from pyaerocom.aeroval.glob_defaults import (
     extended_statistics,
     statistics_defaults,
+    statistics_model_only,
     statistics_obs_only,
     statistics_trend,
     var_ranges_defaults,
@@ -444,7 +445,6 @@ def _check_clean_ts_file(self, fp):
         return modified
 
     def _clean_modelmap_files(self):
-
         # Note: to be called after cleanup of files in map subdir
         json_files = self._get_json_output_files("contour")
         rm = []
@@ -575,6 +575,8 @@ def _create_var_ranges_json(self):
     def _create_statistics_json(self):
         if self.cfg.statistics_opts.obs_only_stats:
             stats_info = statistics_obs_only
+        elif self.cfg.statistics_opts.model_only_stats:
+            stats_info = statistics_model_only
         else:
             stats_info = statistics_defaults
             stats_info.update(extended_statistics)
@@ -624,7 +626,6 @@ def _init_menu_entry(self, var: str) -> dict:
         return {"type": tp, "cat": cat, "name": name, "longname": lname, "obs": {}}
 
     def _check_ovar_mvar_entry(self, mcfg, mod_var, ocfg, obs_var):
-
         muv = mcfg.model_use_vars
         mrv = mcfg.model_rename_vars
 
@@ -747,7 +748,6 @@ def _create_menu_dict(self):
             (obs_name, obs_var, vert_code, mod_name, mod_var, per) = self._info_from_map_file(file)
 
             if self._is_part_of_experiment(obs_name, obs_var, mod_name, mod_var):
-
                 mcfg = self.cfg.model_cfg.get_entry(mod_name)
                 var = mcfg.get_varname_web(mod_var, obs_var)
                 if not var in new:

pyaerocom/aeroval/glob_defaults.py

@@ -81,10 +81,10 @@
         "scale": [0, 0.5, 1.0, 1.5, 2.0, 2.5, 3.0, 3.5, 4.0, 4.5, 5.0],
         "colmap": "coolwarm",
     },
-    "wetoxs": {"scale": [0, 1.25, 2.5, 3.75, 5, 6.25, 7.5, 8.75, 10], "colmap": "coolwarm"},
+    "wetoxs": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
     "wetoxn": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
     "wetrdn": {
-        "scale": [0, 0.75, 1.5, 2.25, 3.0, 3.75, 4.5, 5.25, 6.0, 6.75, 7.5, 8.25],
+        "scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2],
         "colmap": "coolwarm",
     },
     "prmm": {"scale": [0, 1.25, 2.5, 3.75, 5, 6.25, 7.5, 8.75, 10], "colmap": "coolwarm"},
@@ -100,6 +100,55 @@
         "colmap": "coolwarm",
     },
     "ts": {"scale": [265, 270, 275, 280, 285, 290, 300, 305, 310, 315, 320], "colmap": "coolwarm"},
+    "proxydryo3": {"scale": [0, 0.5, 1, 15, 20, 25, 0.30, 40, 50], "colmap": "coolwarm"},
+    "proxydrypm10": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
+    "proxydrypm25": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
+    "proxydryno2": {
+        "scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4],
+        "colmap": "coolwarm",
+    },
+    "proxydryhono": {"scale": [0.001, 0.002, 0.003, 0.004, 0.005, 0.006], "colmap": "coolwarm"},
+    "proxydryn2o5": {"scale": [0.01, 0.02, 0.03, 0.04, 0.05], "colmap": "coolwarm"},
+    "proxydryhno3": {
+        "scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4],
+        "colmap": "coolwarm",
+    },
+    "proxydryno3c": {
+        "scale": [0.01, 0.02, 0.03, 0.04, 0.05],
+        "colmap": "coolwarm",
+    },
+    "proxydryno3f": {"scale": [0.01, 0.02, 0.03, 0.04, 0.05], "colmap": "coolwarm"},
+    "proxydrynh3": {
+        "scale": [0, 0.10, 0.20, 0.30, 0.40, 0.50, 0.60, 0.70, 0.80],
+        "colmap": "coolwarm",
+    },
+    "proxydrynh4": {
+        "scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4],
+        "colmap": "coolwarm",
+    },
+    "proxydryso2": {
+        "scale": [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4],
+        "colmap": "coolwarm",
+    },
+    "proxydryso4": {
+        "scale": [0.01, 0.02, 0.03, 0.04, 0.05],
+        "colmap": "coolwarm",
+    },
+    "proxydryoxs": {
+        "scale": [0, 0.05, 0.1, 0.15, 0.20, 0.25, 0.30, 0.35, 0.40],
+        "colmap": "coolwarm",
+    },
+    "proxydryoxn": {
+        "scale": [0, 0.10, 0.20, 0.30, 0.40, 0.50, 0.60, 0.70, 0.80],
+        "colmap": "coolwarm",
+    },
+    "proxydryrdn": {
+        "scale": [0, 0.10, 0.20, 0.30, 0.40, 0.50, 0.60, 0.70, 0.80],
+        "colmap": "coolwarm",
+    },
+    "depoxs": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
+    "depoxn": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
+    "deprdn": {"scale": [0, 0.25, 0.5, 0.75, 1, 1.25, 1.5, 1.75, 2], "colmap": "coolwarm"},
 }
 
 #: Default information for statistical parameters
@@ -256,6 +305,18 @@
 statistics_obs_only = {
     "refdata_mean": {
         "name": "Mean-Obs",
+        "longname": "Model Mean",
+        "scale": None,
+        "colmap": "coolwarm",
+        "unit": "1",
+        "decimals": 2,
+    },
+}
+
+# For experiments where only model data is interesting, as with proxy drydep
+statistics_model_only = {
+    "data_mean": {
+        "name": "Mean-Mod",
         "longname": "Observation Mean",
         "scale": None,
         "colmap": "coolwarm",
@@ -293,6 +354,7 @@
     concNno=["NO", "3D", "Concentration"],
     concno2=["NO2", "3D", "Gas concentrations"],
     concNno2=["NO2", "3D", "Gas concentrations"],
+    vmrno=["NO", "3D", "Volume mixing ratios"],
     vmrno2=["NO2", "3D", "Volume mixing ratios"],
     concno3=["NO3", "3D", "Gas concentrations"],
     conctno3=["tNO3", "3D", "Concentration"],
@@ -314,6 +376,11 @@
     vmrox=["OX", "3D", "Gas volume mixing ratio"],
     concco=["CO", "3D", "Particle concentration"],
     vmrco=["CO", "3D", "Volume mixing ratios"],
+    vmrc2h2=["Ethyne", "3D", "Volume mixing ratios"],
+    vmrc2h4=["Ethylene", "3D", "Volume mixing ratios"],
+    vmrc2h6=["Ethane", "3D", "Volume mixing ratios"],
+    vmrhcho=["Formaldehyde", "3D", "Volume mixing ratios"],
+    vmrisop=["Isoprene", "3D", "Volume mixing ratios"],
     # PMs
     concpm10=["PM10", "3D", "Particle concentrations"],
     concpm25=["PM2.5", "3D", "Particle concentrations"],
@@ -337,15 +404,37 @@
     concCocpm25=["OC PM2.5", "3D", "Particle concentration"],
     concCecpm10=["EC PM10", "3D", "Particle concentration"],
     concCocpm10=["OC PM10", "3D", "Particle concentration"],
+    concCoc25=["OC PM2.5", "3D", "Particle concentration"],
     # Depositions
     drysox=["DryOXS", "3D", "Deposition"],
-    dryoxs=["FakeDryOXS", "3D", "Deposition"],
-    dryoxn=["FakeDryOXN", "3D", "Deposition"],
-    dryrdn=["FakeDryRDN", "3D", "Deposition"],
+    dryoxs=["proxyDryOXS", "3D", "Deposition"],
+    dryoxn=["proxyDryOXN", "3D", "Deposition"],
+    dryrdn=["proxyDryRDN", "3D", "Deposition"],
+    depoxs=["TotDepOXS", "3D", "Total Deposition"],
+    depoxn=["TotDepOXN", "3D", "Total Deposition"],
+    deprdn=["TotDepRDN", "3D", "Total Deposition"],
     wetoxs=["WetOXS", "3D", "Deposition"],
     wetoxn=["WetOXN", "3D", "Deposition"],
     wetrdn=["WetRDN", "3D", "Deposition"],
     prmm=["Precipitation", "3D", "Deposition"],
     # Temperature
     ts=["Surface Temperature", "3D", "Temperature"],
+    # proxy drydep
+    proxydryoxs=["proxyDryOXS", "3D", "Deposition"],
+    proxydryso2=["proxyDrySO2", "3D", "Deposition"],
+    proxydryso4=["proxyDrySO4", "3D", "Deposition"],
+    proxydryoxn=["proxyDryOXN", "3D", "Deposition"],
+    proxydryno2=["proxyDryNO2", "3D", "Deposition"],
+    proxydryno2no2=["proxyDryNO2NO2", "3D", "Deposition"],
+    proxydryhono=["proxyDryHONO", "3D", "Deposition"],
+    proxydryn2o5=["proxyDryN2O5", "3D", "Deposition"],
+    proxydryhno3=["proxyDryHNO3", "3D", "Deposition"],
+    proxydryno3c=["proxyDryNO3Coarse", "3D", "Deposition"],
+    proxydryno3f=["proxyDryNO3Fine", "3D", "Deposition"],
+    proxydryrdn=["proxyDryRDN", "3D", "Deposition"],
+    proxydrynh3=["proxyDryNH3", "3D", "Deposition"],
+    proxydrynh4=["proxyDryNH4", "3D", "Deposition"],
+    proxydryo3=["proxyDryO3", "3D", "Deposition"],
+    proxydrypm10=["proxyDryPM10", "3D", "Deposition"],
+    proxydrypm25=["proxyDryPM2.5", "3D", "Deposition"],
 )

pyaerocom/aeroval/helpers.py

@@ -151,7 +151,6 @@ def _get_min_max_year_periods(statistics_periods):
 
 
 def make_dummy_model(obs_list: list, cfg) -> str:
-
     # Sets up variable for the model register
     tmpdir = const.LOCAL_TMP_DIR
     const.add_data_search_dir(tmpdir)

pyaerocom/aeroval/modelmaps_engine.py

@@ -49,7 +49,6 @@ def run(self, **kwargs):
         return files
 
     def _get_vars_to_process(self, model_name, var_list):
-
         mvars = self.cfg.model_cfg.get_entry(model_name).get_vars_to_process(
             self.cfg.obs_cfg.get_all_vars()
         )[1]

pyaerocom/aeroval/modelmaps_helpers.py

@@ -67,7 +67,6 @@ def griddeddata_to_jsondict(data, lat_res_deg=5, lon_res_deg=5):
     if isinstance(nparr, dask.array.core.Array):
         nparr = nparr.compute()
     for i, (lat, lon) in enumerate(stacked.station_name.values):
-
         coord = lat, lon
         vals = nparr[:, i]
         dd[str(coord)] = sd = {}

pyaerocom/aeroval/obsentry.py

@@ -51,7 +51,7 @@ class ObsEntry(BrowseDict):
         (c.g. :class:`pyaerocom.io.ReadUngridded`).
     """
 
-    SUPPORTED_VERT_CODES = ["Column", "Profile", "Surface"]
+    SUPPORTED_VERT_CODES = ["Column", "Profile", "Surface"]  # , "2D"]
     ALT_NAMES_VERT_CODES = dict(ModelLevel="Profile")
 
     SUPPORTED_VERT_LOCS = DataSource.SUPPORTED_VERT_LOCS
@@ -60,7 +60,6 @@ class ObsEntry(BrowseDict):
     obs_vert_type = StrType()
 
     def __init__(self, **kwargs):
-
         self.obs_id = ""
 
         self.obs_vars = []

pyaerocom/aeroval/setupclasses.py

@@ -155,6 +155,7 @@ def __init__(self, **kwargs):
         self.use_fairmode = False
         self.use_diurnal = False
         self.obs_only_stats = False
+        self.model_only_stats = False
         self.update(**kwargs)
 
 
@@ -206,7 +207,6 @@ def _get_all_period_strings(self):
 
 
 class WebDisplaySetup(ConstrainedContainer):
-
     map_zoom = EitherOf(["World", "Europe"])
     regions_how = EitherOf(["default", "aerocom", "htap", "country"])
 
@@ -384,7 +384,6 @@ def from_json(filepath: str) -> "EvalSetup":
         return EvalSetup(**settings)
 
     def _import_aux_funs(self):
-
         h = ReadAuxHandler(self.io_aux_file)
         self._aux_funs.update(**h.import_all())
 

pyaerocom/aeroval/superobs_engine.py

@@ -18,7 +18,6 @@ class SuperObsEngine(ProcessingEngine, HasColocator):
     """
 
     def run(self, model_name, obs_name, var_list, try_colocate_if_missing=True):
-
         self._process_entry(
             model_name=model_name,
             obs_name=obs_name,
@@ -27,7 +26,6 @@ def run(self, model_name, obs_name, var_list, try_colocate_if_missing=True):
         )
 
     def _process_entry(self, model_name, obs_name, var_list, try_colocate_if_missing):
-
         sobs_cfg = self.cfg.obs_cfg.get_entry(obs_name)
 
         if var_list is None:

pyaerocom/aux_var_helpers.py

@@ -609,6 +609,18 @@ def compute_wetrdn_from_concprcprdn(data):
     return _compute_wdep_from_concprcp_helper(data, "wetrdn", "concprcprdn", "pr")
 
 
+def compute_wetnh4_from_concprcpnh4(data):
+    return _compute_wdep_from_concprcp_helper(data, "wetnh4", "concprcpnh4", "pr")
+
+
+def compute_wetno3_from_concprcpno3(data):
+    return _compute_wdep_from_concprcp_helper(data, "wetno3", "concprcpno3", "pr")
+
+
+def compute_wetso4_from_concprcpso4(data):
+    return _compute_wdep_from_concprcp_helper(data, "wetso4", "concprcpso4", "pr")
+
+
 def vmrx_to_concx(data, p_pascal, T_kelvin, vmr_unit, mmol_var, mmol_air=None, to_unit=None):
     """
     Convert volume mixing ratio (vmr) to mass concentration
@@ -706,7 +718,6 @@ def concx_to_vmrx(data, p_pascal, T_kelvin, conc_unit, mmol_var, mmol_air=None,
 
 
 def calc_vmro3max(data):
-
     var_name = "vmro3"
     new_var_name = "vmro3max"
 
@@ -726,3 +737,51 @@ def calc_vmro3max(data):
     # print(data.var_info)
     # exit()
     return o3max
+
+
+def identity(data):
+    return data
+
+
+def make_proxy_drydep_from_O3(data):
+    # sort of prototype to add a compted variable
+    # one has to extend the data structures of the station data object
+    # 'right', but has to return just the data array
+    # That concept is a bit confusing (why not do everything in data here?)
+    var_name = "vmro3"
+    new_var_name = "proxydryo3"
+
+    flags = data.data_flagged[var_name]
+    new_var_data = data[var_name]
+    units = data.var_info[var_name]["units"]
+    # data.var_info[new_var_name]["units"] = units
+
+    if not new_var_name in data.var_info:
+        data.var_info[new_var_name] = {}
+    data.var_info[new_var_name] = data.var_info[var_name]
+    data.var_info[new_var_name]["units"] = "mg m-2 d-1"
+
+    data.data_flagged[new_var_name] = flags
+    return new_var_data
+
+
+def make_proxy_wetdep_from_O3(data):
+    # sort of prototype to add a compted variable
+    # one has to extend the data structures of the station data object
+    # 'right', but has to return just the data array
+    # That concept is a bit confusing (why not do everything in data here?)
+    var_name = "vmro3"
+    new_var_name = "proxyweto3"
+
+    flags = data.data_flagged[var_name]
+    new_var_data = data[var_name]
+    units = data.var_info[var_name]["units"]
+    # data.var_info[new_var_name]["units"] = units
+
+    if not new_var_name in data.var_info:
+        data.var_info[new_var_name] = {}
+    data.var_info[new_var_name] = data.var_info[var_name]
+    data.var_info[new_var_name]["units"] = "mg m-2 d-1"
+
+    data.data_flagged[new_var_name] = flags
+    return new_var_data

pyaerocom/colocateddata.py

@@ -1715,7 +1715,7 @@ def apply_region_mask(self, region_id, inplace=False):
 
             drop_idx = []
             nstats = len(arr.station_name)
-            for (lat, lon, stat) in data._iter_stats():
+            for lat, lon, stat in data._iter_stats():
                 if get_mask_value(lat, lon, mask) < 1:
                     drop_idx.append(stat)