add all metrics calls

PCMDI · Jun 28, 2024 · 3c86769 · 3c86769
1 parent a52a529
commit 3c86769
Showing 1 changed file with 118 additions and 2 deletions.
diff --git a/pcmdi_metrics/drcdm/drcdm_driver.py b/pcmdi_metrics/drcdm/drcdm_driver.py
@@ -288,6 +288,8 @@
                     nc_base = None
                 if plots:
                     fig_base = os.path.join(nc_dir, "_".join([model, run, "$index.nc"]))
+                else:
+                    fig_base = None
 
                 if varname == "tasmax":
                     # Example using get_annual_txx
@@ -312,9 +314,58 @@
                         nc_base,
                     )
                     metrics_dict["RESULTS"][model][run].update(result_dict)
+                    result_dict = compute_metrics.get_tasmax_q50(
+                        ds,
+                        sftlf,
+                        dec_mode,
+                        drop_incomplete_djf,
+                        annual_strict,
+                        fig_base,
+                        nc_base,
+                    )
+                    metrics_dict["RESULTS"][model][run].update(result_dict)
+                    result_dict = compute_metrics.get_annual_txx(
+                        ds,
+                        sftlf,
+                        dec_mode,
+                        drop_incomplete_djf,
+                        annual_strict,
+                        fig_base,
+                        nc_base,
+                    )
+                    metrics_dict["RESULTS"][model][run].update(result_dict)
+                    result_dict = compute_metrics.get_annual_tasmax_ge_95F(
+                        ds,
+                        sftlf,
+                        dec_mode,
+                        drop_incomplete_djf,
+                        annual_strict,
+                        fig_base,
+                        nc_base,
+                    )
+                    metrics_dict["RESULTS"][model][run].update(result_dict)
+                    result_dict = compute_metrics.get_annual_tasmax_ge_100F(
+                        ds,
+                        sftlf,
+                        dec_mode,
+                        drop_incomplete_djf,
+                        annual_strict,
+                        fig_base,
+                        nc_base,
+                    )
+                    metrics_dict["RESULTS"][model][run].update(result_dict)
+                    result_dict = compute_metrics.get_annual_tasmax_ge_105F(
+                        ds,
+                        sftlf,
+                        dec_mode,
+                        drop_incomplete_djf,
+                        annual_strict,
+                        fig_base,
+                        nc_base,
+                    )
+                    metrics_dict["RESULTS"][model][run].update(result_dict)
 
                 elif varname == "tasmin":
-                    # tasmin metrics
                     result_dict = compute_metrics.get_annual_tnn(
                         ds,
                         sftlf,
@@ -325,7 +376,6 @@
                         nc_base,
                     )
                     metrics_dict["RESULTS"][model][run].update(result_dict)
-
                     result_dict = compute_metrics.get_annual_tasmin_le_32F(
                         ds,
                         sftlf,
@@ -337,6 +387,72 @@
                     )
                     metrics_dict["RESULTS"][model][run].update(result_dict)
 
+                    result_dict = compute_metrics.get_annualmean_tasmin(
+                        ds,
+                        sftlf,
+                        dec_mode,
+                        drop_incomplete_djf,
+                        annual_strict,
+                        fig_base,
+                        nc_base,
+                    )
+                    metrics_dict["RESULTS"][model][run].update(result_dict)
+                elif varname == "pr":
+                    # Annual mean precipitation
+                    result_dict = compute_metrics.get_annualmean_pr(
+                        ds,
+                        sftlf,
+                        dec_mode,
+                        drop_incomplete_djf,
+                        annual_strict,
+                        fig_base,
+                        nc_base,
+                    )
+                    metrics_dict["RESULTS"][model][run].update(result_dict)
+                    # Seasonal mean precipitation
+                    result_dict = compute_metrics.get_seasonalmean_pr(
+                        ds,
+                        sftlf,
+                        dec_mode,
+                        drop_incomplete_djf,
+                        annual_strict,
+                        fig_base,
+                        nc_base,
+                    )
+                    metrics_dict["RESULTS"][model][run].update(result_dict)
+                    # Median
+                    result_dict = compute_metrics.get_pr_q50(
+                        ds,
+                        sftlf,
+                        dec_mode,
+                        drop_incomplete_djf,
+                        annual_strict,
+                        fig_base,
+                        nc_base,
+                    )
+                    metrics_dict["RESULTS"][model][run].update(result_dict)
+                    # 99.9 percentile
+                    result_dict = compute_metrics.get_pr_q99p9(
+                        ds,
+                        sftlf,
+                        dec_mode,
+                        drop_incomplete_djf,
+                        annual_strict,
+                        fig_base,
+                        nc_base,
+                    )
+                    metrics_dict["RESULTS"][model][run].update(result_dict)
+                    # Max daily precip
+                    result_dict = compute_metrics.get_annual_pxx(
+                        ds,
+                        sftlf,
+                        dec_mode,
+                        drop_incomplete_djf,
+                        annual_strict,
+                        fig_base,
+                        nc_base,
+                    )
+                    metrics_dict["RESULTS"][model][run].update(result_dict)
                 if run not in metrics_dict["DIMENSIONS"]["realization"]:
                     metrics_dict["DIMENSIONS"]["realization"].append(run)